rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'digitalentity/cc3d-buzzer-on-pin6' into betaflight

This commit is contained in:
borisbstyle 2015-10-20 11:12:32 +02:00
parent 18c972f9a8 a2743f50e9
commit 2b722b6f82
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/Board - CC3D.md
View File

@ -38,7 +38,7 @@ The 6 pin RC_Output connector has the following pinouts when used in RX_PPM/RX_S
| 3 | MOTOR 3 | | | 3 | MOTOR 3 | |
| 4 | MOTOR 4 | | | 4 | MOTOR 4 | |
| 5 | LED Strip | | | 5 | LED Strip | |
| 6 | Unused | | | 6 | Buzzer | |
The 8 pin RC_Input connector has the following pinouts when used in RX_PARALLEL_PWM mode The 8 pin RC_Input connector has the following pinouts when used in RX_PARALLEL_PWM mode

6
docs/Buzzer.md
View File

@ -68,8 +68,4 @@ Connect a supported buzzer directly to the BUZZ pins. Observe polarity. Also if
### CC3D ### CC3D
Buzzer support on the CC3D requires that a buzzer circuit be created to which the input is PA15. Connect a supported buzzer to the '-' and 'Sig' of Pin 6 on RC_Output connector. Observe polarity. Please note that RC_Output can provide no more than 25mA current, so you should use a buzzer with rated current of no more than 25mA or use a buzzer with additional driver circuit like this one [Active Buzzer module on eBay](http://www.ebay.com/itm/221686970259)
PA15 is unused and not connected according to the CC3D Revision A schematic.
Connecting to PA15 requires careful soldering.
See the [CC3D - buzzer circuit.pdf](Wiring/CC3D - buzzer circuit.pdf) for details.

8
src/main/drivers/pwm_mapping.c
View File

@ -152,7 +152,7 @@ static const uint16_t multiPPM[] = {
PWM9 | (MAP_TO_MOTOR_OUTPUT << 8), PWM9 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM10 | (MAP_TO_MOTOR_OUTPUT << 8), PWM10 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM11 | (MAP_TO_MOTOR_OUTPUT << 8), PWM11 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM12 | (MAP_TO_MOTOR_OUTPUT << 8), //PWM12 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM2 | (MAP_TO_MOTOR_OUTPUT << 8), // Swap to servo if needed PWM2 | (MAP_TO_MOTOR_OUTPUT << 8), // Swap to servo if needed
PWM3 | (MAP_TO_MOTOR_OUTPUT << 8), // Swap to servo if needed PWM3 | (MAP_TO_MOTOR_OUTPUT << 8), // Swap to servo if needed
PWM4 | (MAP_TO_MOTOR_OUTPUT << 8), // Swap to servo if needed PWM4 | (MAP_TO_MOTOR_OUTPUT << 8), // Swap to servo if needed
@ -172,7 +172,7 @@ static const uint16_t multiPWM[] = {
PWM9 | (MAP_TO_MOTOR_OUTPUT << 8), // motor #1 or #3 PWM9 | (MAP_TO_MOTOR_OUTPUT << 8), // motor #1 or #3
PWM10 | (MAP_TO_MOTOR_OUTPUT << 8), PWM10 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM11 | (MAP_TO_MOTOR_OUTPUT << 8), PWM11 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM12 | (MAP_TO_MOTOR_OUTPUT << 8), // motor #4 or #6 //PWM12 | (MAP_TO_MOTOR_OUTPUT << 8), // motor #4 or #6
0xFFFF 0xFFFF
}; };
@ -183,7 +183,7 @@ static const uint16_t airPPM[] = {
PWM9 | (MAP_TO_SERVO_OUTPUT << 8), PWM9 | (MAP_TO_SERVO_OUTPUT << 8),
PWM10 | (MAP_TO_SERVO_OUTPUT << 8), PWM10 | (MAP_TO_SERVO_OUTPUT << 8),
PWM11 | (MAP_TO_SERVO_OUTPUT << 8), PWM11 | (MAP_TO_SERVO_OUTPUT << 8),
PWM12 | (MAP_TO_SERVO_OUTPUT << 8), //PWM12 | (MAP_TO_SERVO_OUTPUT << 8),
PWM2 | (MAP_TO_SERVO_OUTPUT << 8), PWM2 | (MAP_TO_SERVO_OUTPUT << 8),
PWM3 | (MAP_TO_SERVO_OUTPUT << 8), PWM3 | (MAP_TO_SERVO_OUTPUT << 8),
PWM4 | (MAP_TO_SERVO_OUTPUT << 8), PWM4 | (MAP_TO_SERVO_OUTPUT << 8),
@ -204,7 +204,7 @@ static const uint16_t airPWM[] = {
PWM9 | (MAP_TO_SERVO_OUTPUT << 8), // servo #1 PWM9 | (MAP_TO_SERVO_OUTPUT << 8), // servo #1
PWM10 | (MAP_TO_SERVO_OUTPUT << 8), // servo #2 PWM10 | (MAP_TO_SERVO_OUTPUT << 8), // servo #2
PWM11 | (MAP_TO_SERVO_OUTPUT << 8), // servo #3 PWM11 | (MAP_TO_SERVO_OUTPUT << 8), // servo #3
PWM12 | (MAP_TO_SERVO_OUTPUT << 8), // servo #4 //PWM12 | (MAP_TO_SERVO_OUTPUT << 8), // servo #4
0xFFFF 0xFFFF
}; };
#endif #endif

2
src/main/target/CC3D/target.h
View File

@ -28,7 +28,7 @@
#define INVERTER_USART USART1 #define INVERTER_USART USART1
#define BEEP_GPIO GPIOA #define BEEP_GPIO GPIOA
#define BEEP_PIN Pin_15 // PA15 (Beeper) #define BEEP_PIN Pin_2 // PA2 (Beeper)
#define BEEP_PERIPHERAL RCC_APB2Periph_GPIOA #define BEEP_PERIPHERAL RCC_APB2Periph_GPIOA
#define MPU6000_CS_GPIO GPIOA #define MPU6000_CS_GPIO GPIOA