Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-02 20:28:37 +08:00
Code Issues Actions 21 Packages Projects Releases Wiki Activity

Added remaining two channels of PWM_AUX_DIS disarm parameter set commands, remove trailing whitespace from pwm_params_aux.c and pwm_params_main.c, gps/params.c and added block comment headers to separate sections instead of whitespace.

Browse Source
This commit is contained in:
mcsauder
2018-07-26 13:29:20 -06:00
committed by Beat Küng
parent 56a7c63789
commit ac8f44268b
4 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ROMFS/px4fmu_common/init.d/rc.interface
+2
View File
@@ -278,6 +278,8 @@ then
pwm disarmed -c 4 -p p:PWM_AUX_DIS4 -d ${OUTPUT_AUX_DEV} pwm disarmed -c 4 -p p:PWM_AUX_DIS4 -d ${OUTPUT_AUX_DEV}
pwm disarmed -c 5 -p p:PWM_AUX_DIS5 -d ${OUTPUT_AUX_DEV} pwm disarmed -c 5 -p p:PWM_AUX_DIS5 -d ${OUTPUT_AUX_DEV}
pwm disarmed -c 6 -p p:PWM_AUX_DIS6 -d ${OUTPUT_AUX_DEV} pwm disarmed -c 6 -p p:PWM_AUX_DIS6 -d ${OUTPUT_AUX_DEV}
pwm disarmed -c 7 -p p:PWM_AUX_DIS7 -d ${OUTPUT_AUX_DEV}
pwm disarmed -c 8 -p p:PWM_AUX_DIS8 -d ${OUTPUT_AUX_DEV}
if [ $FAILSAFE_AUX != none ] if [ $FAILSAFE_AUX != none ]
then then
src/drivers/gps/params.c
-2
View File
@@ -85,5 +85,3 @@ PARAM_DEFINE_INT32(GPS_UBX_DYNMODEL, 7);
* @group GPS * @group GPS
*/ */
PARAM_DEFINE_FLOAT(GPS_YAW_OFFSET, 0.f); PARAM_DEFINE_FLOAT(GPS_YAW_OFFSET, 0.f);
src/modules/sensors/pwm_params_aux.c
+13 -10
View File
@@ -38,6 +38,10 @@
* *
*/ */
/******************************************************************************
* PWM_AUX_RATE *
******************************************************************************/
/** /**
* Set the PWM output frequency for the auxiliary outputs * Set the PWM output frequency for the auxiliary outputs
* *
@@ -98,8 +102,9 @@ PARAM_DEFINE_INT32(PWM_AUX_MAX, 2000);
PARAM_DEFINE_INT32(PWM_AUX_DISARMED, 1500); PARAM_DEFINE_INT32(PWM_AUX_DISARMED, 1500);
/******************************************************************************
* PWM_AUX_DIS *
******************************************************************************/
/** /**
* Set the disarmed PWM for the auxiliary 1 output * Set the disarmed PWM for the auxiliary 1 output
* *
@@ -220,9 +225,9 @@ PARAM_DEFINE_INT32(PWM_AUX_DIS7, -1);
*/ */
PARAM_DEFINE_INT32(PWM_AUX_DIS8, -1); PARAM_DEFINE_INT32(PWM_AUX_DIS8, -1);
/******************************************************************************
* PWM_AUX_REV *
******************************************************************************/
/** /**
* Invert direction of auxiliary output channel 1 * Invert direction of auxiliary output channel 1
* *
@@ -303,8 +308,9 @@ PARAM_DEFINE_INT32(PWM_AUX_REV7, 0);
*/ */
PARAM_DEFINE_INT32(PWM_AUX_REV8, 0); PARAM_DEFINE_INT32(PWM_AUX_REV8, 0);
/******************************************************************************
* PWM_AUX_TRIM *
******************************************************************************/
/** /**
* Trim value for auxiliary output channel 1 * Trim value for auxiliary output channel 1
@@ -401,6 +407,3 @@ PARAM_DEFINE_FLOAT(PWM_AUX_TRIM7, 0);
* @group PWM Outputs * @group PWM Outputs
*/ */
PARAM_DEFINE_FLOAT(PWM_AUX_TRIM8, 0); PARAM_DEFINE_FLOAT(PWM_AUX_TRIM8, 0);
src/modules/sensors/pwm_params_main.c
+13 -9
View File
@@ -38,6 +38,10 @@
* *
*/ */
/******************************************************************************
* PWM_RATE *
******************************************************************************/
/** /**
* Set the PWM output frequency for the main outputs * Set the PWM output frequency for the main outputs
* *
@@ -97,8 +101,9 @@ PARAM_DEFINE_INT32(PWM_MAX, 2000);
*/ */
PARAM_DEFINE_INT32(PWM_DISARMED, 900); PARAM_DEFINE_INT32(PWM_DISARMED, 900);
/******************************************************************************
* PWM_MAIN_DIS *
******************************************************************************/
/** /**
* Set the disarmed PWM for the main 1 output * Set the disarmed PWM for the main 1 output
@@ -220,8 +225,9 @@ PARAM_DEFINE_INT32(PWM_MAIN_DIS7, -1);
*/ */
PARAM_DEFINE_INT32(PWM_MAIN_DIS8, -1); PARAM_DEFINE_INT32(PWM_MAIN_DIS8, -1);
/******************************************************************************
* PWM_MAIN_REV *
******************************************************************************/
/** /**
* Invert direction of main output channel 1 * Invert direction of main output channel 1
@@ -303,8 +309,9 @@ PARAM_DEFINE_INT32(PWM_MAIN_REV7, 0);
*/ */
PARAM_DEFINE_INT32(PWM_MAIN_REV8, 0); PARAM_DEFINE_INT32(PWM_MAIN_REV8, 0);
/******************************************************************************
* PWM_MAIN_TRIM *
******************************************************************************/
/** /**
* Trim value for main output channel 1 * Trim value for main output channel 1
@@ -401,6 +408,3 @@ PARAM_DEFINE_FLOAT(PWM_MAIN_TRIM7, 0);
* @group PWM Outputs * @group PWM Outputs
*/ */
PARAM_DEFINE_FLOAT(PWM_MAIN_TRIM8, 0); PARAM_DEFINE_FLOAT(PWM_MAIN_TRIM8, 0);