dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

PWMOut/px4io: correct automatic servo/motor configuration messages

This commit is contained in:
Matthias Grob 2024-02-08 16:08:11 +01:00 committed by Beat Küng
parent 3de7d83e5f
commit 7fdb5ef3cb
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/drivers/pwm_out/PWMOut.cpp
View File

@ -229,7 +229,7 @@ void PWMOut::update_params()
if (output_function >= (int)OutputFunction::Servo1 if (output_function >= (int)OutputFunction::Servo1
&& output_function <= (int)OutputFunction::ServoMax) { // Function got set to a servo && output_function <= (int)OutputFunction::ServoMax) { // Function got set to a servo
int32_t val = 1500; int32_t val = 1500;
PX4_INFO("Setting channel %i disarmed to %i", (int) val, i); PX4_INFO("Setting channel %i disarmed to %i", i + 1, (int)val);
param_set(_mixing_output.disarmedParamHandle(i), &val); param_set(_mixing_output.disarmedParamHandle(i), &val);
// If the whole timer group was not set previously, then set the pwm rate to 50 Hz // If the whole timer group was not set previously, then set the pwm rate to 50 Hz
@ -250,7 +250,7 @@ void PWMOut::update_params()
if (param_get(handle, &tim_config) == 0 && tim_config == 400) { if (param_get(handle, &tim_config) == 0 && tim_config == 400) {
tim_config = 50; tim_config = 50;
PX4_INFO("setting timer %i to %i Hz", timer, (int) tim_config); PX4_INFO("Setting timer %i to %i Hz", timer, (int)tim_config);
param_set(handle, &tim_config); param_set(handle, &tim_config);
} }
} }
@ -261,10 +261,10 @@ void PWMOut::update_params()
if (output_function >= (int)OutputFunction::Motor1 if (output_function >= (int)OutputFunction::Motor1
&& output_function <= (int)OutputFunction::MotorMax) { // Function got set to a motor && output_function <= (int)OutputFunction::MotorMax) { // Function got set to a motor
int32_t val = 1100; int32_t val = 1100;
PX4_INFO("Setting channel %i minimum to %i", (int) val, i); PX4_INFO("Setting channel %i minimum to %i", i + 1, (int)val);
param_set(_mixing_output.minParamHandle(i), &val); param_set(_mixing_output.minParamHandle(i), &val);
val = 1900; val = 1900;
PX4_INFO("Setting channel %i maximum to %i", (int) val, i); PX4_INFO("Setting channel %i maximum to %i", i + 1, (int)val);
param_set(_mixing_output.maxParamHandle(i), &val); param_set(_mixing_output.maxParamHandle(i), &val);
} }
} }

8
src/drivers/px4io/px4io.cpp
View File

@ -705,7 +705,7 @@ void PX4IO::update_params()
if (output_function >= (int)OutputFunction::Servo1 if (output_function >= (int)OutputFunction::Servo1
&& output_function <= (int)OutputFunction::ServoMax) { // Function got set to a servo && output_function <= (int)OutputFunction::ServoMax) { // Function got set to a servo
int32_t val = 1500; int32_t val = 1500;
PX4_INFO("Setting channel %i disarmed to %i", (int) val, i); PX4_INFO("Setting channel %i disarmed to %i", i + 1, (int)val);
param_set(_mixing_output.disarmedParamHandle(i), &val); param_set(_mixing_output.disarmedParamHandle(i), &val);
// If the whole timer group was not set previously, then set the pwm rate to 50 Hz // If the whole timer group was not set previously, then set the pwm rate to 50 Hz
@ -726,7 +726,7 @@ void PX4IO::update_params()
if (param_get(handle, &tim_config) == 0 && tim_config == 400) { if (param_get(handle, &tim_config) == 0 && tim_config == 400) {
tim_config = 50; tim_config = 50;
PX4_INFO("setting timer %i to %i Hz", timer, (int) tim_config); PX4_INFO("Setting timer %i to %i Hz", timer, (int)tim_config);
param_set(handle, &tim_config); param_set(handle, &tim_config);
} }
} }
@ -737,10 +737,10 @@ void PX4IO::update_params()
if (output_function >= (int)OutputFunction::Motor1 if (output_function >= (int)OutputFunction::Motor1
&& output_function <= (int)OutputFunction::MotorMax) { // Function got set to a motor && output_function <= (int)OutputFunction::MotorMax) { // Function got set to a motor
int32_t val = 1100; int32_t val = 1100;
PX4_INFO("Setting channel %i minimum to %i", (int) val, i); PX4_INFO("Setting channel %i minimum to %i", i + 1, (int)val);
param_set(_mixing_output.minParamHandle(i), &val); param_set(_mixing_output.minParamHandle(i), &val);
val = 1900; val = 1900;
PX4_INFO("Setting channel %i maximum to %i", (int) val, i); PX4_INFO("Setting channel %i maximum to %i", i + 1, (int)val);
param_set(_mixing_output.maxParamHandle(i), &val); param_set(_mixing_output.maxParamHandle(i), &val);
} }
} }