Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 16:25:31 +03:00
Code Issues Wiki Activity

Conditionalize SimonK handling from escserial and drop it from F3

Browse source
This commit is contained in:
jflyper 2018-12-23 18:02:25 +09:00
parent 131e32c142
commit 938a2f708c
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/drivers/serial_escserial.c
View file

@ -50,6 +50,7 @@
typedef enum {
BAUDRATE_NORMAL = 19200,
BAUDRATE_SIMONK = 28800, // = 9600 * 3
BAUDRATE_KISS = 38400,
BAUDRATE_CASTLE = 18880
} escBaudRate_e;
@ -432,6 +433,7 @@ static void serialTimerRxConfigBL(const timerHardware_t *timerHardwarePtr, uint8
timerChConfigCallbacks(timerHardwarePtr, &escSerialPorts[reference].edgeCb, NULL);
}
#ifdef USE_ESCSERIAL_SIMONK
static void processTxStateEsc(escSerial_t *escSerial)
{
uint8_t mask;
@ -643,6 +645,7 @@ static void escSerialTimerRxConfig(const timerHardware_t *timerHardwarePtr, uint
timerChCCHandlerInit(&escSerialPorts[reference].edgeCb, onSerialRxPinChangeEsc);
timerChConfigCallbacks(timerHardwarePtr, &escSerialPorts[reference].edgeCb, NULL);
}
#endif
static void resetBuffers(escSerial_t *escSerial)
{
@ -706,11 +709,14 @@ static serialPort_t *openEscSerial(escSerialPortIndex_e portIndex, serialReceive
}
delay(50);
#ifdef USE_ESCSERIAL_SIMONK
if (mode==PROTOCOL_SIMONK) {
escSerialTimerTxConfig(escSerial->txTimerHardware, portIndex);
escSerialTimerRxConfig(escSerial->rxTimerHardware, portIndex);
}
else if (mode==PROTOCOL_BLHELI) {
else
#endif
if (mode==PROTOCOL_BLHELI) {
serialTimerTxConfigBL(escSerial->txTimerHardware, portIndex, baud);
serialTimerRxConfigBL(escSerial->rxTimerHardware, portIndex, options);
}