From 8003d0604941a3d8c680f7b32f4688c40b20bef0 Mon Sep 17 00:00:00 2001 From: "timecop@gmail.com" Date: Tue, 1 Oct 2013 00:07:44 +0000 Subject: [PATCH] Totally rework software serial to provide tx at the same time as rx using only one timer. First cut at polymorphic serial port implementation. Split serialPort_t into uartPort_t and serialPort_t. Calls to uartWrite() can now be replaced with calls to serialWrite(). Replacing calls to serialWriteByte(softSerial_t*, char) with calls to serialWrite(serialPort_t*, char). This completes the proof of concept for polymorphic serial port implementations (uartPort and softSerialPort). Renaming isSerialAvailable to uartTotalBytesWaiting. Renaming serialAvailable to softSerialTotalBytesWaiting. Adding serialTotalBytesWaiting to serial API and updating calls to the former methods to use the serial API. Renaming serialRead to softSerialRead. Adding serialRead to serial API and updating calls to uartRead and softSerialRead to use the serial API. Renamed uartPrint to serialPrint which now works on any serialPort implementation. Replacing calls to isUartTransmitEmpty with isSoftSerialTransmitBufferEmpty. Replacing remaing calls to uartWrite with serialWrite. Adding isSoftSerialTransmitBufferEmpty to the serial API. Adding serialSet/GetBaudRate to the serial API. Since softSerial does not implement serialSetBaudRate some GPS serial initialisation code has been updated. At this point it is probably possible to switch around all the ports and use a software serial implementation if desired. By Dominic Clifton / https://github.com/hydra/baseflight/ git-svn-id: https://afrodevices.googlecode.com/svn/trunk/baseflight@423 7c89a4a9-59b9-e629-4cfe-3a2d53b20e61 Conflicts: src/drv_serial.c src/drv_serial.h src/main.c --- baseflight.uvproj | 15 +++++++++++++++ src/drv_serial.c | 29 +++++++++++++++++++++++++++-- src/drv_serial.h | 31 +++++-------------------------- src/main.c | 2 +- 4 files changed, 48 insertions(+), 29 deletions(-) diff --git a/baseflight.uvproj b/baseflight.uvproj index 3d5e23a4f..e9deda99e 100755 --- a/baseflight.uvproj +++ b/baseflight.uvproj @@ -672,6 +672,11 @@ 1 .\src\drv_bma280.c + + drv_serial.c + 1 + .\src\drv_serial.c + @@ -1518,6 +1523,11 @@ 1 .\src\drv_bma280.c + + drv_serial.c + 1 + .\src\drv_serial.c + @@ -2548,6 +2558,11 @@ 1 .\src\drv_bma280.c + + drv_serial.c + 1 + .\src\drv_serial.c + diff --git a/src/drv_serial.c b/src/drv_serial.c index 234bb5594..35c806036 100644 --- a/src/drv_serial.c +++ b/src/drv_serial.c @@ -1,6 +1,5 @@ #include "board.h" - void serialPrint(serialPort_t *instance, const char *str) { uint8_t ch; @@ -12,4 +11,30 @@ void serialPrint(serialPort_t *instance, const char *str) inline uint32_t serialGetBaudRate(serialPort_t *instance) { return instance->baudRate; -} \ No newline at end of file +} + +inline void serialWrite(serialPort_t *instance, uint8_t ch) +{ + instance->vTable->serialWrite(instance, ch); +} + +inline uint8_t serialTotalBytesWaiting(serialPort_t *instance) +{ + return instance->vTable->serialTotalBytesWaiting(instance); +} + +inline uint8_t serialRead(serialPort_t *instance) +{ + return instance->vTable->serialRead(instance); +} + +inline void serialSetBaudRate(serialPort_t *instance, uint32_t baudRate) +{ + instance->vTable->serialSetBaudRate(instance, baudRate); +} + +inline bool isSerialTransmitBufferEmpty(serialPort_t *instance) +{ + return instance->vTable->isSerialTransmitBufferEmpty(instance); +} + diff --git a/src/drv_serial.h b/src/drv_serial.h index 8643b3b4c..de3d67438 100644 --- a/src/drv_serial.h +++ b/src/drv_serial.h @@ -39,31 +39,10 @@ struct serialPortVTable { bool (*isSerialTransmitBufferEmpty)(serialPort_t *instance); }; -static inline void serialWrite(serialPort_t *instance, uint8_t ch) -{ - instance->vTable->serialWrite(instance, ch); -} - -static inline uint8_t serialTotalBytesWaiting(serialPort_t *instance) -{ - return instance->vTable->serialTotalBytesWaiting(instance); -} - -static inline uint8_t serialRead(serialPort_t *instance) -{ - return instance->vTable->serialRead(instance); -} - -static inline void serialSetBaudRate(serialPort_t *instance, uint32_t baudRate) -{ - instance->vTable->serialSetBaudRate(instance, baudRate); -} - -static inline bool isSerialTransmitBufferEmpty(serialPort_t *instance) -{ - return instance->vTable->isSerialTransmitBufferEmpty(instance); -} - +inline void serialWrite(serialPort_t *instance, uint8_t ch); +inline uint8_t serialTotalBytesWaiting(serialPort_t *instance); +inline uint8_t serialRead(serialPort_t *instance); +inline void serialSetBaudRate(serialPort_t *instance, uint32_t baudRate); +inline bool isSerialTransmitBufferEmpty(serialPort_t *instance); void serialPrint(serialPort_t *instance, const char *str); uint32_t serialGetBaudRate(serialPort_t *instance); - diff --git a/src/main.c b/src/main.c index 84f0997d3..033d49c59 100755 --- a/src/main.c +++ b/src/main.c @@ -19,7 +19,7 @@ static void _putc(void *p, char c) int fputc(int c, FILE *f) { // let DMA catch up a bit when using set or dump, we're too fast. - while (!isUartTransmitEmpty(core.mainport)); + while (!isSerialTransmitBufferEmpty(core.mainport)); serialWrite(core.mainport, c); return c; }