thooge/esp32-nmea2000-obp60
1
0
Fork 0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2025-12-15 23:13:07 +01:00
Code Releases Activity

Pointer correction -> no data copy; conc. access issues

Browse Source
This commit is contained in:
Ulrich Meine
2025-07-01 01:27:41 +02:00
parent 2729ef9cb6
commit 72ddeb3cfb
8 changed files with 159 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
lib/obp60task/OBPRingBuffer.tpp
View File

@@ -20,6 +20,7 @@ RingBuffer<T>::RingBuffer(size_t size)
updFreq = MIN_VAL;
smallest = MIN_VAL;
largest = MAX_VAL;
buffer.resize(size, MIN_VAL);
// return true;
@@ -46,9 +47,9 @@ bool RingBuffer<T>::getMetaData(String& name, String& format, int& updateFrequen
name = dataName;
format = dataFmt;
updFreq = updFreq;
smallest = smallest;
largest = largest;
updateFrequency = updFreq;
minValue = smallest;
maxValue = largest;
return true; // Meta data successfully retrieved
}
@@ -78,12 +79,8 @@ void RingBuffer<T>::add(const T& value)
template <typename T>
T RingBuffer<T>::get(size_t index) const
{
if (isEmpty()) {
throw std::runtime_error("Buffer is empty");
}
if (index < 0 || index >= count) {
if (isEmpty() || index < 0 || index >= count) {
return MIN_VAL;
// throw std::out_of_range("Index out of range");
}
size_t realIndex = (first + index) % capacity;
@@ -103,7 +100,6 @@ T RingBuffer<T>::getFirst() const
{
if (isEmpty()) {
return MIN_VAL;
// throw std::runtime_error("Buffer is empty");
}
return buffer[first];
}
@@ -114,7 +110,6 @@ T RingBuffer<T>::getLast() const
{
if (isEmpty()) {
return MIN_VAL;
// throw std::runtime_error("Buffer is empty");
}
return buffer[last];
}
@@ -125,7 +120,6 @@ T RingBuffer<T>::getMin() const
{
if (isEmpty()) {
return MIN_VAL;
// throw std::runtime_error("Buffer is empty");
}
T minVal = get(first);
@@ -145,7 +139,6 @@ T RingBuffer<T>::getMin(size_t amount) const
{
if (isEmpty() || amount <= 0) {
return MIN_VAL;
// throw std::runtime_error("Buffer is empty");
}
if (amount > count)
amount = count;
@@ -167,7 +160,6 @@ T RingBuffer<T>::getMax() const
{
if (isEmpty()) {
return MIN_VAL;
// throw std::runtime_error("Buffer is empty");
}
T maxVal = get(first);
@@ -187,7 +179,6 @@ T RingBuffer<T>::getMax(size_t amount) const
{
if (isEmpty() || amount <= 0) {
return MIN_VAL;
// throw std::runtime_error("Buffer is empty");
}
if (amount > count)
amount = count;
@@ -209,7 +200,6 @@ T RingBuffer<T>::getMid() const
{
if (isEmpty()) {
return MIN_VAL;
// throw std::runtime_error("Buffer is empty");
}
return (getMin() + getMax()) / static_cast<T>(2);
@@ -221,7 +211,6 @@ T RingBuffer<T>::getMid(size_t amount) const
{
if (isEmpty() || amount <= 0) {
return MIN_VAL;
// throw std::runtime_error("Buffer is empty");
}
if (amount > count)
@@ -230,44 +219,12 @@ T RingBuffer<T>::getMid(size_t amount) const
return (getMin(amount) + getMax(amount)) / static_cast<T>(2);
}
// ******************* works for wind direction only -> move out of here *******************************
// Get maximum difference of last <amount> of buffer values to center value
template <typename T>
T RingBuffer<T>::getRng(T center, size_t amount) const
{
if (isEmpty() || amount <= 0) {
return MIN_VAL;
// throw std::runtime_error("Buffer is empty");
}
if (amount > count)
amount = count;
T value = 0;
T rng = 0;
T maxRng = MIN_VAL;
// Start from the newest value (last) and go backwards x times
for (size_t i = 0; i < amount; i++) {
value = get((last + capacity - i) % capacity);
if (value == MIN_VAL) {
continue;
}
rng = abs(((value - center + 540) % 360) - 180);
if (rng > maxRng)
maxRng = rng;
}
if (maxRng > 180) {
maxRng = 180;
}
return maxRng;
}
// Get the median value in the buffer
template <typename T>
T RingBuffer<T>::getMedian() const
{
if (isEmpty()) {
return MIN_VAL;
// throw std::runtime_error("Buffer is empty");
}
// Create a temporary vector with current valid elements
@@ -297,7 +254,6 @@ T RingBuffer<T>::getMedian(size_t amount) const
{
if (isEmpty() || amount <= 0) {
return MIN_VAL;
// throw std::runtime_error("Buffer is empty");
}
if (amount > count)
amount = count;