Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-02 05:17:03 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

[fix] fix PWM7 index and disable pwm on SRVb connector by default

Browse Source
This commit is contained in:
Gautier Hattenberger
2019-07-09 11:23:50 +02:00
parent 2289512bbb
commit 27057a37ab
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/boards/tawaki/chibios/v1.0/tawaki.h
+17 -5
View File
@@ -152,6 +152,9 @@
/* /*
* PWM defines * PWM defines
*/ */
// SRVa connectors, activated in PWM mode by default
#ifndef USE_PWM1 #ifndef USE_PWM1
#define USE_PWM1 1 #define USE_PWM1 1
#endif #endif
@@ -212,8 +215,10 @@
#define PWM_SERVO_4_ACTIVE PWM_OUTPUT_DISABLED #define PWM_SERVO_4_ACTIVE PWM_OUTPUT_DISABLED
#endif #endif
// SRVb connector, PWM mode disabled by default (DShot is enabled by default)
#ifndef USE_PWM5 #ifndef USE_PWM5
#define USE_PWM5 1 #define USE_PWM5 0
#endif #endif
#if USE_PWM5 #if USE_PWM5
#define PWM_SERVO_5 5 #define PWM_SERVO_5 5
@@ -228,7 +233,7 @@
#endif #endif
#ifndef USE_PWM6 #ifndef USE_PWM6
#define USE_PWM6 1 #define USE_PWM6 0
#endif #endif
#if USE_PWM6 #if USE_PWM6
#define PWM_SERVO_6 6 #define PWM_SERVO_6 6
@@ -242,8 +247,8 @@
#define PWM_SERVO_6_ACTIVE PWM_OUTPUT_DISABLED #define PWM_SERVO_6_ACTIVE PWM_OUTPUT_DISABLED
#endif #endif
#ifndef USE_PWM6 #ifndef USE_PWM7
#define USE_PWM6 1 #define USE_PWM7 0
#endif #endif
#if USE_PWM7 #if USE_PWM7
#define PWM_SERVO_7 7 #define PWM_SERVO_7 7
@@ -258,7 +263,7 @@
#endif #endif
#ifndef USE_PWM8 #ifndef USE_PWM8
#define USE_PWM8 1 #define USE_PWM8 0
#endif #endif
#if USE_PWM8 #if USE_PWM8
#define PWM_SERVO_8 8 #define PWM_SERVO_8 8
@@ -323,6 +328,12 @@
#define DSHOT_TELEMETRY_DEV NULL #define DSHOT_TELEMETRY_DEV NULL
#endif #endif
#ifndef USE_DSHOT_TIM4
#define USE_DSHOT_TIM4 1 // use SRVb for DShot by default
#endif
#if USE_DSHOT_TIM4 // Servo B1, B2, B3, B4 on TIM4
// Servo B1, B2, B3, B4 on TM4 are primary DSHOT connector // Servo B1, B2, B3, B4 on TM4 are primary DSHOT connector
#define DSHOT_SERVO_1 1 #define DSHOT_SERVO_1 1
#define DSHOT_SERVO_1_GPIO GPIOB #define DSHOT_SERVO_1_GPIO GPIOB
@@ -360,6 +371,7 @@
.tlm_sd = DSHOT_TELEMETRY_DEV \ .tlm_sd = DSHOT_TELEMETRY_DEV \
} }
#endif
#if USE_DSHOT_TIM1 // Servo A1, A2, A3, A4 on TIM1 only activated if needed #if USE_DSHOT_TIM1 // Servo A1, A2, A3, A4 on TIM1 only activated if needed