rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix softserial inverted head/tail usage. 

This fixes softSerialTotalBytesWaiting() which means that HoTT now works
on SoftSerial.
This commit is contained in:
Dominic Clifton 2014-05-21 21:02:55 +01:00
parent 63a97b2ab5
commit b24472eca2
1 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/drivers/serial_softserial.c
View File

@ -172,16 +172,6 @@ serialPort_t *openSoftSerial(softSerialPortIndex_e portIndex, serialReceiveCallb
return &softSerial->port;
}
void updateBufferIndex(softSerial_t *softSerial)
{
if (softSerial->port.rxBufferTail >= softSerial->port.rxBufferSize - 1) {
softSerial->port.rxBufferTail = 0; //cycling the buffer
} else {
softSerial->port.rxBufferTail++;
}
}
/*********************************************/
void processTxState(softSerial_t *softSerial)
@ -274,8 +264,8 @@ void extractAndStoreRxByte(softSerial_t *softSerial)
if (softSerial->port.callback) {
softSerial->port.callback(rxByte);
} else {
softSerial->port.rxBuffer[softSerial->port.rxBufferTail] = rxByte;
updateBufferIndex(softSerial);
softSerial->port.rxBuffer[softSerial->port.rxBufferHead] = rxByte;
softSerial->port.rxBufferHead = (softSerial->port.rxBufferHead + 1) % softSerial->port.rxBufferSize;
}
}
@ -364,18 +354,9 @@ uint8_t softSerialTotalBytesWaiting(serialPort_t *instance)
return (s->port.rxBufferHead - s->port.rxBufferTail) & (s->port.txBufferSize - 1);
}
static void moveHeadToNextByte(softSerial_t *softSerial)
{
if (softSerial->port.rxBufferHead < softSerial->port.rxBufferSize - 1) {
softSerial->port.rxBufferHead++;
} else {
softSerial->port.rxBufferHead = 0;
}
}
uint8_t softSerialReadByte(serialPort_t *instance)
{
char b;
uint8_t ch;
if ((instance->mode & MODE_RX) == 0) {
return 0;
@ -385,10 +366,9 @@ uint8_t softSerialReadByte(serialPort_t *instance)
return 0;
}
b = instance->rxBuffer[instance->rxBufferHead];
moveHeadToNextByte((softSerial_t *)instance);
return b;
ch = instance->rxBuffer[instance->rxBufferTail];
instance->rxBufferTail = (instance->rxBufferTail + 1) % instance->rxBufferSize;
return ch;
}
void softSerialWriteByte(serialPort_t *s, uint8_t ch)