fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-19 19:33:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

PWM: transition PWM_{MIN,MAX,DISARMED,RATE} -> PWM_MAIN

Browse Source
This commit is contained in:
Daniel Agar
2021-02-01 08:53:33 +01:00
committed by Lorenz Meier
parent 8b8adbf48e
commit d1a3590aac
71 changed files with 170 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/linux_pwm_out/linux_pwm_out.cpp
+3 -3
View File
@@ -559,9 +559,9 @@ int linux_pwm_out_main(int argc, char *argv[])
}
/** gets the parameters for the esc's pwm */
param_get(param_find("PWM_DISARMED"), &linux_pwm_out::_pwm_disarmed);
param_get(param_find("PWM_MIN"), &linux_pwm_out::_pwm_min);
param_get(param_find("PWM_MAX"), &linux_pwm_out::_pwm_max);
param_get(param_find("PWM_MAIN_DISARM"), &linux_pwm_out::_pwm_disarmed);
param_get(param_find("PWM_MAIN_MIN"), &linux_pwm_out::_pwm_min);
param_get(param_find("PWM_MAIN_MAX"), &linux_pwm_out::_pwm_max);
/*
* Start/load the driver.
src/drivers/pca9685_pwm_out/main.cpp
+6 -6
View File
@@ -185,25 +185,25 @@ void PCA9685Wrapper::updatePWMParams()
default_pwm_fail = PWM_DEFAULT_MIN,
default_pwm_dis = PWM_MOTOR_OFF;
param_t param_h = param_find("PWM_MAX");
param_t param_h = param_find("PWM_MAIN_MAX");
if (param_h != PARAM_INVALID) {
param_get(param_h, &default_pwm_max);
} else {
PX4_DEBUG("PARAM_INVALID: %s", "PWM_MAX");
PX4_DEBUG("PARAM_INVALID: %s", "PWM_MAIN_MAX");
}
param_h = param_find("PWM_MIN");
param_h = param_find("PWM_MAIN_MIN");
if (param_h != PARAM_INVALID) {
param_get(param_h, &default_pwm_min);
} else {
PX4_DEBUG("PARAM_INVALID: %s", "PWM_MIN");
PX4_DEBUG("PARAM_INVALID: %s", "PWM_MAIN_MIN");
}
param_h = param_find("PWM_RATE");
param_h = param_find("PWM_MAIN_RATE");
if (param_h != PARAM_INVALID) {
int32_t pval = 0;
@@ -215,7 +215,7 @@ void PCA9685Wrapper::updatePWMParams()
}
} else {
PX4_DEBUG("PARAM_INVALID: %s", "PWM_RATE");
PX4_DEBUG("PARAM_INVALID: %s", "PWM_MAIN_RATE");
}
for (int i = 0; i < PCA9685_PWM_CHANNEL_COUNT; i++) {
src/drivers/pwm_out/PWMOut.cpp
+5 -5
View File
@@ -572,17 +572,17 @@ void PWMOut::update_params()
if (_class_instance == CLASS_DEVICE_PRIMARY) {
prefix = "PWM_MAIN";
param_get(param_find("PWM_MIN"), &pwm_min_default);
param_get(param_find("PWM_MAX"), &pwm_max_default);
param_get(param_find("PWM_DISARMED"), &pwm_disarmed_default);
param_get(param_find("PWM_RATE"), &pwm_rate_default);
param_get(param_find("PWM_MAIN_MIN"), &pwm_min_default);
param_get(param_find("PWM_MAIN_MAX"), &pwm_max_default);
param_get(param_find("PWM_MAIN_DISARM"), &pwm_disarmed_default);
param_get(param_find("PWM_MAIN_RATE"), &pwm_rate_default);
} else if (_class_instance == CLASS_DEVICE_SECONDARY) {
prefix = "PWM_AUX";
param_get(param_find("PWM_AUX_MIN"), &pwm_min_default);
param_get(param_find("PWM_AUX_MAX"), &pwm_max_default);
param_get(param_find("PWM_AUX_DISARMED"), &pwm_disarmed_default);
param_get(param_find("PWM_AUX_DISARM"), &pwm_disarmed_default);
param_get(param_find("PWM_AUX_RATE"), &pwm_rate_default);
} else if (_class_instance == CLASS_DEVICE_TERTIARY) {
src/drivers/pwm_out/pwm_aux_params.yaml
+1 -1
View File
@@ -40,7 +40,7 @@ parameters:
max: 2200
default: 2000
PWM_AUX_DISARMED:
PWM_AUX_DISARM:
description:
short: PWM aux disarmed value
long: |
src/drivers/pwm_out/pwm_main_params.yaml
+2 -2
View File
@@ -6,7 +6,7 @@ parameters:
- group: PWM Outputs
definitions:
PWM_RATE:
PWM_MAIN_RATE:
description:
short: PWM main output frequency
long: |
@@ -40,7 +40,7 @@ parameters:
max: 2200
default: 2000
PWM_DISARMED:
PWM_MAIN_DISARM:
description:
short: PWM main disarmed value
long: |
src/drivers/px4io/px4io.cpp
+4 -4
View File
@@ -1206,10 +1206,10 @@ void PX4IO::update_params()
const char *prefix = "PWM_MAIN";
param_get(param_find("PWM_MIN"), &pwm_min_default);
param_get(param_find("PWM_MAX"), &pwm_max_default);
param_get(param_find("PWM_DISARMED"), &pwm_disarmed_default);
param_get(param_find("PWM_RATE"), &pwm_rate_default);
param_get(param_find("PWM_MAIN_MIN"), &pwm_min_default);
param_get(param_find("PWM_MAIN_MAX"), &pwm_max_default);
param_get(param_find("PWM_MAIN_DISARM"), &pwm_disarmed_default);
param_get(param_find("PWM_MAIN_RATE"), &pwm_rate_default);
char str[17];
src/drivers/snapdragon_pwm_out/snapdragon_pwm_out.cpp
+3 -3
View File
@@ -557,9 +557,9 @@ int snapdragon_pwm_out_main(int argc, char *argv[])
}
// gets the parameters for the esc's pwm
param_get(param_find("PWM_DISARMED"), &snapdragon_pwm::_pwm_disarmed);
param_get(param_find("PWM_MIN"), &snapdragon_pwm::_pwm_min);
param_get(param_find("PWM_MAX"), &snapdragon_pwm::_pwm_max);
param_get(param_find("PWM_MAIN_DISARM"), &snapdragon_pwm::_pwm_disarmed);
param_get(param_find("PWM_MAIN_MIN"), &snapdragon_pwm::_pwm_min);
param_get(param_find("PWM_MAIN_MAX"), &snapdragon_pwm::_pwm_max);
/*
* Start/load the driver.