Superminaren
/
MMDVM
mirror of https://github.com/g4klx/MMDVM.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SerialRB now inherits from RingBuffer

This commit is contained in:
Geoffrey Merck 2020-05-09 19:57:40 +02:00
parent 05d21c0a14
commit b0ba3b5dd8
3 changed files with 9 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RingBuffer.h
View File

@ -56,7 +56,7 @@ public:
bool put(const volatile TDATATYPE item) volatile; bool put(const volatile TDATATYPE item) volatile;
bool get(volatile TDATATYPE& item) volatile; bool get(volatile TDATATYPE& item) volatile;
TDATATYPE peek() const; TDATATYPE peek() const;
bool hasOverflowed(); bool hasOverflowed();

76
SerialRB.cpp
View File

@ -21,80 +21,16 @@ Boston, MA 02110-1301, USA.
#include "SerialRB.h" #include "SerialRB.h"
CSerialRB::CSerialRB(uint16_t length) : CSerialRB::CSerialRB(uint16_t length) :
m_length(length), CRingBuffer<uint8_t>(length)
m_head(0U),
m_tail(0U),
m_full(false)
{ {
m_buffer = new uint8_t[length];
}
void CSerialRB::reset()
{
m_head = 0U;
m_tail = 0U;
m_full = false;
}
uint16_t CSerialRB::getSpace() const
{
uint16_t n = 0U;
if (m_tail == m_head)
n = m_full ? 0U : m_length;
else if (m_tail < m_head)
n = m_length - m_head + m_tail;
else
n = m_tail - m_head;
if (n > m_length)
n = 0U;
return n;
}
uint16_t CSerialRB::getData() const
{
if (m_tail == m_head)
return m_full ? m_length : 0U;
else if (m_tail < m_head)
return m_head - m_tail;
else
return m_length - m_tail + m_head;
}
bool CSerialRB::put(uint8_t c)
{
if (m_full)
return false;
m_buffer[m_head] = c;
m_head++;
if (m_head >= m_length)
m_head = 0U;
if (m_head == m_tail)
m_full = true;
return true;
}
uint8_t CSerialRB::peek() const
{
return m_buffer[m_tail];
} }
uint8_t CSerialRB::get() uint8_t CSerialRB::get()
{ {
uint8_t value = m_buffer[m_tail]; uint8_t value;
if(CRingBuffer<uint8_t>::get(value))
m_full = false; return value;
m_tail++; return 0U;
if (m_tail >= m_length)
m_tail = 0U;
return value;
} }

30
SerialRB.h
View File

@ -21,41 +21,15 @@ Boston, MA 02110-1301, USA.
#if !defined(SERIALRB_H) #if !defined(SERIALRB_H)
#define SERIALRB_H #define SERIALRB_H
#if defined(STM32F4XX) #include "RingBuffer.h"
#include "stm32f4xx.h"
#elif defined(STM32F7XX)
#include "stm32f7xx.h"
#elif defined(STM32F105xC)
#include "stm32f1xx.h"
#include <cstddef>
#else
#include <Arduino.h>
#endif
const uint16_t SERIAL_RINGBUFFER_SIZE = 370U; const uint16_t SERIAL_RINGBUFFER_SIZE = 370U;
class CSerialRB { class CSerialRB : public CRingBuffer<uint8_t>{
public: public:
CSerialRB(uint16_t length = SERIAL_RINGBUFFER_SIZE); CSerialRB(uint16_t length = SERIAL_RINGBUFFER_SIZE);
uint16_t getSpace() const;
uint16_t getData() const;
void reset();
bool put(uint8_t c);
uint8_t peek() const;
uint8_t get(); uint8_t get();
private:
uint16_t m_length;
volatile uint8_t* m_buffer;
volatile uint16_t m_head;
volatile uint16_t m_tail;
volatile bool m_full;
}; };
#endif #endif