Merge pull request #132 from ledvinap/bugfix-targets

quick fix
This commit is contained in:
Dominic Clifton 2014-10-24 08:30:14 +01:00
commit 51574338e8
3 changed files with 12 additions and 3 deletions

View File

@ -287,8 +287,9 @@ void init(void)
pwm_params.airplane = true;
else
pwm_params.airplane = false;
#ifdef STM32F10X
pwm_params.useUART2 = doesConfigurationUsePort(SERIAL_PORT_USART2);
#endif
pwm_params.useVbat = feature(FEATURE_VBAT);
pwm_params.useSoftSerial = feature(FEATURE_SOFTSERIAL);
pwm_params.useParallelPWM = feature(FEATURE_RX_PARALLEL_PWM);

View File

@ -17,6 +17,8 @@
#pragma once
#define TARGET_BOARD_IDENTIFIER "MASSIVEF3"
#define LED0_GPIO GPIOE
#define LED0_PIN Pin_8|Pin_12 // Blue LEDs - PE8/PE12
#define LED0_PERIPHERAL RCC_AHBPeriph_GPIOE

View File

@ -270,10 +270,16 @@ void configureHoTTTelemetryPort(void)
// FIXME only need to do this if the port is shared
previousPortMode = hottPort->mode;
previousBaudRate = hottPort->baudRate;
if (hottPort->identifier == SERIAL_PORT_SOFTSERIAL1 || hottPort->identifier == SERIAL_PORT_SOFTSERIAL2) {
#ifdef USE_SOFTSERIAL1
if (hottPort->identifier == SERIAL_PORT_SOFTSERIAL1) {
useSoftserialRxFailureWorkaround = true;
}
#endif
#ifdef USE_SOFTSERIAL2
if (hottPort->identifier == SERIAL_PORT_SOFTSERIAL2) {
useSoftserialRxFailureWorkaround = true;
}
#endif
}
}