Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-22 22:32:11 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fix rebase merge error

Browse Source
This commit is contained in:
Mark Whitehorn
2016-11-05 09:55:28 -06:00
committed by Lorenz Meier
parent 257e236c92
commit f3c3d1f7f9
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/drv_pwm_output.h
+11 -10
View File
@@ -267,16 +267,17 @@ struct pwm_output_rc_config {
/** set auxillary output mode. These correspond to enum Mode in px4fmu/fmu.cpp */
#define PWM_SERVO_MODE_NONE 0
#define PWM_SERVO_MODE_2PWM 1
#define PWM_SERVO_MODE_2PWM2CAP 2
#define PWM_SERVO_MODE_3PWM 3
#define PWM_SERVO_MODE_3PWM1CAP 4
#define PWM_SERVO_MODE_4PWM 5
#define PWM_SERVO_MODE_6PWM 6
#define PWM_SERVO_MODE_8PWM 7
#define PWM_SERVO_MODE_4CAP 8
#define PWM_SERVO_MODE_5CAP 9
#define PWM_SERVO_MODE_6CAP 10
#define PWM_SERVO_MODE_1PWM 1
#define PWM_SERVO_MODE_2PWM 2
#define PWM_SERVO_MODE_2PWM2CAP 3
#define PWM_SERVO_MODE_3PWM 4
#define PWM_SERVO_MODE_3PWM1CAP 5
#define PWM_SERVO_MODE_4PWM 6
#define PWM_SERVO_MODE_6PWM 7
#define PWM_SERVO_MODE_8PWM 8
#define PWM_SERVO_MODE_4CAP 9
#define PWM_SERVO_MODE_5CAP 10
#define PWM_SERVO_MODE_6CAP 11
#define PWM_SERVO_SET_MODE _PX4_IOC(_PWM_SERVO_BASE, 34)
/*