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

Merge pull request #1985 from CC-Jeff/CloseEscSerial_Fix

Browse source 
Fix CloseEscSerial to set down correct timer
This commit is contained in:
Michael Keller 2017-01-04 14:00:34 +13:00 • committed by GitHub
commit b3ad232eec
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -345,17 +345,18 @@ void escSerialInputPortDeConfig(const timerHardware_t *timerHardwarePtr)
} }
void closeEscSerial(escSerialPortIndex_e portIndex, uint16_t output) void closeEscSerial(escSerialPortIndex_e portIndex, uint8_t mode)
{ {
escSerial_t *escSerial = &(escSerialPorts[portIndex]); escSerial_t *escSerial = &(escSerialPorts[portIndex]);
escSerial->rxTimerHardware = &(timerHardware[output]); if(mode != PROTOCOL_KISSALL){
escSerial->txTimerHardware = &(timerHardware[ESCSERIAL_TIMER_TX_HARDWARE]); escSerialInputPortDeConfig(escSerial->rxTimerHardware);
escSerialInputPortDeConfig(escSerial->rxTimerHardware); timerChConfigCallbacks(escSerial->rxTimerHardware,NULL,NULL);
TIM_DeInit(escSerial->rxTimerHardware->tim);
}
timerChConfigCallbacks(escSerial->txTimerHardware,NULL,NULL); timerChConfigCallbacks(escSerial->txTimerHardware,NULL,NULL);
timerChConfigCallbacks(escSerial->rxTimerHardware,NULL,NULL);
TIM_DeInit(escSerial->txTimerHardware->tim); TIM_DeInit(escSerial->txTimerHardware->tim);
TIM_DeInit(escSerial->rxTimerHardware->tim);
} }
/*********************************************/ /*********************************************/
@ -982,7 +983,7 @@ void escEnablePassthrough(serialPort_t *escPassthroughPort, uint16_t output, uin
serialWrite(escPassthroughPort, 0x00); serialWrite(escPassthroughPort, 0x00);
serialWrite(escPassthroughPort, 0xF4); serialWrite(escPassthroughPort, 0xF4);
serialWrite(escPassthroughPort, 0xF4); serialWrite(escPassthroughPort, 0xF4);
closeEscSerial(ESCSERIAL1, output); closeEscSerial(ESCSERIAL1, mode);
return; return;
} }
if(mode==PROTOCOL_BLHELI){ if(mode==PROTOCOL_BLHELI){