From 029e7eef4a9edda23bea6fbe56460bffa979f008 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Wed, 18 Nov 2020 20:35:07 +0000 Subject: [PATCH] Fix bugs. --- RingBuff.h | 2 +- SerialPort.cpp | 2 +- SerialSTM_CMSIS.cpp | 10 ++++++++++ Version.h | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/RingBuff.h b/RingBuff.h index cc15605..c85a6bf 100644 --- a/RingBuff.h +++ b/RingBuff.h @@ -32,7 +32,7 @@ #define RINGBUFF_WRITE(ringBuff, dataIn) (ringBuff).data[RINGBUFF_MASK(ringBuff) & ringBuff.wrIdx++] = (dataIn) #define RINGBUFF_READ(ringBuff) ((ringBuff).data[RINGBUFF_MASK(ringBuff) & ((ringBuff).rdIdx++)]) #define RINGBUFF_EMPTY(ringBuff) ((ringBuff).rdIdx == (ringBuff).wrIdx) -#define RINGBUFF_FULL(ringBuff) ((RINGBUFF_MASK(ringBuff) & ringFifo.rdIdx) == (RINGBUFF_MASK(ringBuff) & ringFifo.wrIdx)) +#define RINGBUFF_FULL(ringBuff) ((RINGBUFF_MASK(ringBuff) & ringBuff.rdIdx) == (RINGBUFF_MASK(ringBuff) & ringBuff.wrIdx)) #define RINGBUFF_COUNT(ringBuff) (RINGBUFF_MASK(ringBuff) & ((ringBuff).wrIdx - (ringBuff).rdIdx)) /* Buffer type */ diff --git a/SerialPort.cpp b/SerialPort.cpp index c0c397e..5e8dc05 100644 --- a/SerialPort.cpp +++ b/SerialPort.cpp @@ -347,7 +347,7 @@ void CSerialPort::getVersion() reply[6U] = io.getCPU(); // Reserve 16 bytes for the UDID - ::memcpy(reply + 7U, 0x00U, 16U); + ::memset(reply + 7U, 0x00U, 16U); io.getUDID(reply + 7U); uint8_t count = 23U; diff --git a/SerialSTM_CMSIS.cpp b/SerialSTM_CMSIS.cpp index 71e4ff2..2ca6070 100644 --- a/SerialSTM_CMSIS.cpp +++ b/SerialSTM_CMSIS.cpp @@ -128,6 +128,16 @@ int CSerialPort::availableForReadInt(uint8_t n) } } +int CSerialPort::availableForWriteInt(uint8_t n) +{ + switch (n) { + case 1U: + return !RINGBUFF_FULL(txBuffer1); + default: + return false; + } +} + uint8_t CSerialPort::readInt(uint8_t n) { switch (n) { diff --git a/Version.h b/Version.h index 7987a7c..f04229c 100644 --- a/Version.h +++ b/Version.h @@ -19,7 +19,7 @@ #if !defined(VERSION_H) #define VERSION_H -#define VERSION "20201117" +#define VERSION "20201118" #endif