mirror of
https://github.com/thooge/esp32-nmea2000-obp60.git
synced 2025-12-15 23:13:07 +01:00
Code cleanup: moved buffer + wind calc to OBPDataOperations; <BoatValueList> header to obp60task.h; tws 3 decimals
This commit is contained in:
@@ -1,5 +1,30 @@
|
||||
#include "OBPRingBuffer.h"
|
||||
|
||||
template <typename T>
|
||||
void RingBuffer<T>::initCommon() {
|
||||
MIN_VAL = std::numeric_limits<T>::lowest();
|
||||
MAX_VAL = std::numeric_limits<T>::max();
|
||||
dataName = "";
|
||||
dataFmt = "";
|
||||
updFreq = -1;
|
||||
smallest = MIN_VAL;
|
||||
largest = MAX_VAL;
|
||||
bufLocker = xSemaphoreCreateMutex();
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
RingBuffer<T>::RingBuffer()
|
||||
: capacity(0)
|
||||
, head(0)
|
||||
, first(0)
|
||||
, last(0)
|
||||
, count(0)
|
||||
, is_Full(false)
|
||||
{
|
||||
initCommon();
|
||||
// <buffer> stays empty
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
RingBuffer<T>::RingBuffer(size_t size)
|
||||
: capacity(size)
|
||||
@@ -9,23 +34,8 @@ RingBuffer<T>::RingBuffer(size_t size)
|
||||
, count(0)
|
||||
, is_Full(false)
|
||||
{
|
||||
bufLocker = xSemaphoreCreateMutex();
|
||||
|
||||
if (size == 0) {
|
||||
// return false;
|
||||
}
|
||||
|
||||
MIN_VAL = std::numeric_limits<T>::lowest();
|
||||
MAX_VAL = std::numeric_limits<T>::max();
|
||||
dataName = "";
|
||||
dataFmt = "";
|
||||
updFreq = -1;
|
||||
smallest = MIN_VAL;
|
||||
largest = MAX_VAL;
|
||||
|
||||
initCommon();
|
||||
buffer.resize(size, MIN_VAL);
|
||||
|
||||
// return true;
|
||||
}
|
||||
|
||||
// Specify meta data of buffer content
|
||||
@@ -57,6 +67,20 @@ bool RingBuffer<T>::getMetaData(String& name, String& format, int& updateFrequen
|
||||
return true;
|
||||
}
|
||||
|
||||
// Get meta data of buffer content
|
||||
template <typename T>
|
||||
bool RingBuffer<T>::getMetaData(String& name, String& format)
|
||||
{
|
||||
if (dataName == "" || dataFmt == "") {
|
||||
return false; // Meta data not set
|
||||
}
|
||||
|
||||
GWSYNCHRONIZED(&bufLocker);
|
||||
name = dataName;
|
||||
format = dataFmt;
|
||||
return true;
|
||||
}
|
||||
|
||||
// Get buffer name
|
||||
template <typename T>
|
||||
String RingBuffer<T>::getName() const
|
||||
@@ -368,6 +392,22 @@ void RingBuffer<T>::clear()
|
||||
is_Full = false;
|
||||
}
|
||||
|
||||
// Delete buffer and set new size
|
||||
template <typename T>
|
||||
void RingBuffer<T>::resize(size_t newSize)
|
||||
{
|
||||
GWSYNCHRONIZED(&bufLocker);
|
||||
capacity = newSize;
|
||||
head = 0;
|
||||
first = 0;
|
||||
last = 0;
|
||||
count = 0;
|
||||
is_Full = false;
|
||||
|
||||
buffer.clear();
|
||||
buffer.resize(newSize, MIN_VAL);
|
||||
}
|
||||
|
||||
// Get all current values as a vector
|
||||
template <typename T>
|
||||
std::vector<T> RingBuffer<T>::getAllValues() const
|
||||
|
||||
Reference in New Issue
Block a user