1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-25 17:25:20 +03:00

Merge branch 'naze32pro' - work in progress

Conflicts:
	Makefile
This commit is contained in:
Dominic Clifton 2014-05-31 22:50:05 +01:00
commit 14448f4734
5 changed files with 51 additions and 10 deletions

View file

@ -18,7 +18,7 @@
#define SOFT_SERIAL_2_TIMER_TX_HARDWARE 7 // PWM 8
#endif
#if defined(STM32F3DISCOVERY) && !defined(CHEBUZZF3)
#if defined(STM32F303xC) && !defined(CHEBUZZF3)
#define SOFT_SERIAL_1_TIMER_RX_HARDWARE 8 // PWM 9
#define SOFT_SERIAL_1_TIMER_TX_HARDWARE 9 // PWM 10
#define SOFT_SERIAL_2_TIMER_RX_HARDWARE 10 // PWM 11