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

Ignore incoming software serial data that doesn't have a start and stop

Browse source 
bit.  Track software serial transmission and receive errors.
  
Nothing exposes the error counter values yet.
This commit is contained in:
Dominic Clifton 2014-04-07 20:16:28 +01:00
parent eed511f90a
commit 4530f99e3b
2 changed files with 30 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/drv_softserial.c
View file

@ -141,6 +141,9 @@ void initialiseSoftSerial(softSerial_t *softSerial, uint8_t portIndex, uint32_t
softSerial->rxBitIndex = 0; softSerial->rxBitIndex = 0;
softSerial->isInverted = inverted; softSerial->isInverted = inverted;
softSerial->transmissionErrors = 0;
softSerial->receiveErrors = 0;
serialOutputPortConfig(softSerial->txTimerHardware); serialOutputPortConfig(softSerial->txTimerHardware);
serialInputPortConfig(softSerial->rxTimerHardware); serialInputPortConfig(softSerial->rxTimerHardware);
@ -260,8 +263,19 @@ void prepareForNextRxByte(softSerial_t *softSerial)
} }
} }
#define STOP_BIT_MASK (1 << 0)
#define START_BIT_MASK (1 << (RX_TOTAL_BITS - 1))
void extractAndStoreRxByte(softSerial_t *softSerial) void extractAndStoreRxByte(softSerial_t *softSerial)
{ {
uint8_t haveStartBit = (softSerial->internalRxBuffer & START_BIT_MASK) == 0;
uint8_t haveStopBit = (softSerial->internalRxBuffer & STOP_BIT_MASK) == 1;
if (!haveStartBit || !haveStopBit) {
softSerial->receiveErrors++;
return;
}
uint8_t rxByte = (softSerial->internalRxBuffer >> 1) & 0xFF; uint8_t rxByte = (softSerial->internalRxBuffer >> 1) & 0xFF;
softSerial->port.rxBuffer[softSerial->port.rxBufferTail] = rxByte; softSerial->port.rxBuffer[softSerial->port.rxBufferTail] = rxByte;
updateBufferIndex(softSerial); updateBufferIndex(softSerial);
@ -281,6 +295,11 @@ void processRxState(softSerial_t *softSerial)
} }
if (softSerial->rxBitIndex == RX_TOTAL_BITS) { if (softSerial->rxBitIndex == RX_TOTAL_BITS) {
if (softSerial->rxEdge == TRAILING) {
softSerial->internalRxBuffer |= STOP_BIT_MASK;
}
extractAndStoreRxByte(softSerial); extractAndStoreRxByte(softSerial);
prepareForNextRxByte(softSerial); prepareForNextRxByte(softSerial);
} }
@ -299,7 +318,14 @@ void onSerialRxPinChange(uint8_t portIndex, uint16_t capture)
softSerial_t *softSerial = &(softSerialPorts[portIndex]); softSerial_t *softSerial = &(softSerialPorts[portIndex]);
if (softSerial->isSearchingForStartBit) { if (softSerial->isSearchingForStartBit) {
TIM_SetCounter(softSerial->rxTimerHardware->tim, 0); // synchronise bit counter // synchronise bit counter
// FIXME this reduces functionality somewhat as receiving breaks concurrent transmission on all ports because
// the next callback to the onSerialTimer will happen too early causing transmission errors.
TIM_SetCounter(softSerial->rxTimerHardware->tim, 0);
if (softSerial->isTransmittingData) {
softSerial->transmissionErrors++;
}
serialICConfig(softSerial->rxTimerHardware->tim, softSerial->rxTimerHardware->channel, softSerial->isInverted ? TIM_ICPolarity_Falling : TIM_ICPolarity_Rising); serialICConfig(softSerial->rxTimerHardware->tim, softSerial->rxTimerHardware->channel, softSerial->isInverted ? TIM_ICPolarity_Falling : TIM_ICPolarity_Rising);
softSerial->rxEdge = LEADING; softSerial->rxEdge = LEADING;

3
src/drv_softserial.h
View file

@ -30,6 +30,9 @@ typedef struct softSerial_s {
uint16_t internalRxBuffer; // includes start and stop bits uint16_t internalRxBuffer; // includes start and stop bits
uint8_t isInverted; uint8_t isInverted;
uint16_t transmissionErrors;
uint16_t receiveErrors;
} softSerial_t; } softSerial_t;
extern timerHardware_t* serialTimerHardware; extern timerHardware_t* serialTimerHardware;