thooge
/
esp32-nmea2000-obp60
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git
1
0
Fork 0
Code Releases Activity

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/settings.json vendored
View File

@ -3,7 +3,8 @@
"files.associations": { "files.associations": {
"stdexcept": "cpp", "stdexcept": "cpp",
"limits": "cpp", "limits": "cpp",
"functional": "cpp" "functional": "cpp",
"*.tpp": "cpp"
}, },
"github.copilot.nextEditSuggestions.enabled": false "github.copilot.nextEditSuggestions.enabled": false
} }

8
lib/obp60task/OBPRingBuffer.h
View File

@ -1,4 +1,5 @@
#pragma once #pragma once
#include "GwSynchronized.h"
#include <algorithm> #include <algorithm>
#include <limits> #include <limits>
#include <stdexcept> #include <stdexcept>
@ -8,6 +9,7 @@
template <typename T> template <typename T>
class RingBuffer { class RingBuffer {
private: private:
SemaphoreHandle_t locker;
std::vector<T> buffer; std::vector<T> buffer;
size_t capacity; size_t capacity;
size_t head; // Points to the next insertion position size_t head; // Points to the next insertion position
@ -39,7 +41,6 @@ public:
T getMax(size_t amount) const; // Get maximum value of the last <amount> values of buffer T getMax(size_t amount) const; // Get maximum value of the last <amount> values of buffer
T getMid() const; // Get mid value between <min> and <max> value in buffer T getMid() const; // Get mid value between <min> and <max> value in buffer
T getMid(size_t amount) const; // Get mid value between <min> and <max> value of the last <amount> values of buffer T getMid(size_t amount) const; // Get mid value between <min> and <max> value of the last <amount> values of buffer
T getRng(T center, size_t amount) const; // Get maximum difference of last <amount> of buffer values to center value
T getMedian() const; // Get the median value in buffer T getMedian() const; // Get the median value in buffer
T getMedian(size_t amount) const; // Get the median value of the last <amount> values of buffer T getMedian(size_t amount) const; // Get the median value of the last <amount> values of buffer
size_t getCapacity() const; // Get the buffer capacity (maximum size) size_t getCapacity() const; // Get the buffer capacity (maximum size)
@ -50,9 +51,8 @@ public:
T getMinVal() const; // Get lowest possible value for buffer; used for initialized buffer data T getMinVal() const; // Get lowest possible value for buffer; used for initialized buffer data
T getMaxVal() const; // Get highest possible value for buffer T getMaxVal() const; // Get highest possible value for buffer
void clear(); // Clear buffer void clear(); // Clear buffer
T operator[](size_t index); T operator[](size_t index); // Operator[] for convenient access (same as get())
std::vector<T> getAllValues() const; // Operator[] for convenient access (same as get()) std::vector<T> getAllValues() const; // Get all current values as a vector
}; };
#include "OBPRingBuffer.tpp" #include "OBPRingBuffer.tpp"

54
lib/obp60task/OBPRingBuffer.tpp
View File

@ -20,6 +20,7 @@ RingBuffer<T>::RingBuffer(size_t size)
updFreq = MIN_VAL; updFreq = MIN_VAL;
smallest = MIN_VAL; smallest = MIN_VAL;
largest = MAX_VAL; largest = MAX_VAL;
buffer.resize(size, MIN_VAL); buffer.resize(size, MIN_VAL);
// return true; // return true;
@ -46,9 +47,9 @@ bool RingBuffer<T>::getMetaData(String& name, String& format, int& updateFrequen
name = dataName; name = dataName;
format = dataFmt; format = dataFmt;
updFreq = updFreq; updateFrequency = updFreq;
smallest = smallest; minValue = smallest;
largest = largest; maxValue = largest;
return true; // Meta data successfully retrieved return true; // Meta data successfully retrieved
} }
@ -78,12 +79,8 @@ void RingBuffer<T>::add(const T& value)
template <typename T> template <typename T>
T RingBuffer<T>::get(size_t index) const T RingBuffer<T>::get(size_t index) const
{ {
if (isEmpty()) { if (isEmpty() || index < 0 || index >= count) {
throw std::runtime_error("Buffer is empty");
}
if (index < 0 || index >= count) {
return MIN_VAL; return MIN_VAL;
// throw std::out_of_range("Index out of range");
} }
size_t realIndex = (first + index) % capacity; size_t realIndex = (first + index) % capacity;
@ -103,7 +100,6 @@ T RingBuffer<T>::getFirst() const
{ {
if (isEmpty()) { if (isEmpty()) {
return MIN_VAL; return MIN_VAL;
// throw std::runtime_error("Buffer is empty");
} }
return buffer[first]; return buffer[first];
} }
@ -114,7 +110,6 @@ T RingBuffer<T>::getLast() const
{ {
if (isEmpty()) { if (isEmpty()) {
return MIN_VAL; return MIN_VAL;
// throw std::runtime_error("Buffer is empty");
} }
return buffer[last]; return buffer[last];
} }
@ -125,7 +120,6 @@ T RingBuffer<T>::getMin() const
{ {
if (isEmpty()) { if (isEmpty()) {
return MIN_VAL; return MIN_VAL;
// throw std::runtime_error("Buffer is empty");
} }
T minVal = get(first); T minVal = get(first);
@ -145,7 +139,6 @@ T RingBuffer<T>::getMin(size_t amount) const
{ {
if (isEmpty() || amount <= 0) { if (isEmpty() || amount <= 0) {
return MIN_VAL; return MIN_VAL;
// throw std::runtime_error("Buffer is empty");
} }
if (amount > count) if (amount > count)
amount = count; amount = count;
@ -167,7 +160,6 @@ T RingBuffer<T>::getMax() const
{ {
if (isEmpty()) { if (isEmpty()) {
return MIN_VAL; return MIN_VAL;
// throw std::runtime_error("Buffer is empty");
} }
T maxVal = get(first); T maxVal = get(first);
@ -187,7 +179,6 @@ T RingBuffer<T>::getMax(size_t amount) const
{ {
if (isEmpty() || amount <= 0) { if (isEmpty() || amount <= 0) {
return MIN_VAL; return MIN_VAL;
// throw std::runtime_error("Buffer is empty");
} }
if (amount > count) if (amount > count)
amount = count; amount = count;
@ -209,7 +200,6 @@ T RingBuffer<T>::getMid() const
{ {
if (isEmpty()) { if (isEmpty()) {
return MIN_VAL; return MIN_VAL;
// throw std::runtime_error("Buffer is empty");
} }
return (getMin() + getMax()) / static_cast<T>(2); return (getMin() + getMax()) / static_cast<T>(2);
@ -221,7 +211,6 @@ T RingBuffer<T>::getMid(size_t amount) const
{ {
if (isEmpty() || amount <= 0) { if (isEmpty() || amount <= 0) {
return MIN_VAL; return MIN_VAL;
// throw std::runtime_error("Buffer is empty");
} }
if (amount > count) if (amount > count)
@ -230,44 +219,12 @@ T RingBuffer<T>::getMid(size_t amount) const
return (getMin(amount) + getMax(amount)) / static_cast<T>(2); 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 // Get the median value in the buffer
template <typename T> template <typename T>
T RingBuffer<T>::getMedian() const T RingBuffer<T>::getMedian() const
{ {
if (isEmpty()) { if (isEmpty()) {
return MIN_VAL; return MIN_VAL;
// throw std::runtime_error("Buffer is empty");
} }
// Create a temporary vector with current valid elements // Create a temporary vector with current valid elements
@ -297,7 +254,6 @@ T RingBuffer<T>::getMedian(size_t amount) const
{ {
if (isEmpty() || amount <= 0) { if (isEmpty() || amount <= 0) {
return MIN_VAL; return MIN_VAL;
// throw std::runtime_error("Buffer is empty");
} }
if (amount > count) if (amount > count)
amount = count; amount = count;

71
lib/obp60task/OBPSensorTask.cpp
View File

@ -71,7 +71,7 @@ void sensorTask(void *param){
batC.begin(); batC.begin();
// Create ring buffers for history storage of some boat data // Create ring buffers for history storage of some boat data
// later read data types from config and specify buffers accordingly // later read additonal data types from config and specify buffers accordingly
RingBuffer<int16_t> twdHstry(960); // Circular buffer to store wind direction values; store 960 TWD values for 16 minutes history RingBuffer<int16_t> twdHstry(960); // Circular buffer to store wind direction values; store 960 TWD values for 16 minutes history
RingBuffer<int16_t> twsHstry(960); // Circular buffer to store wind speed values (TWS) RingBuffer<int16_t> twsHstry(960); // Circular buffer to store wind speed values (TWS)
RingBuffer<int16_t> dbtHstry(960); // Circular buffer to store water depth values (DBT) RingBuffer<int16_t> dbtHstry(960); // Circular buffer to store water depth values (DBT)
@ -381,16 +381,18 @@ void sensorTask(void *param){
// later read data types from config and specify hstryvalList accordingly // later read data types from config and specify hstryvalList accordingly
GwApi::BoatValue *twdBVal=new GwApi::BoatValue(GwBoatData::_TWD); GwApi::BoatValue *twdBVal=new GwApi::BoatValue(GwBoatData::_TWD);
GwApi::BoatValue *twsBVal=new GwApi::BoatValue(GwBoatData::_TWS); GwApi::BoatValue *twsBVal=new GwApi::BoatValue(GwBoatData::_TWS);
GwApi::BoatValue *dbtBVal=new GwApi::BoatValue(GwBoatData::_DBT); GwApi::BoatValue *dbtBVal=new GwApi::BoatValue(GwBoatData::_STW); // STW just for testing
GwApi::BoatValue *hstryValList[]={twdBVal, twsBVal, dbtBVal}; // List of boat values for history storage GwApi::BoatValue *hstryValList[]={twdBVal, twsBVal, dbtBVal}; // List of boat values for history storage
int twdHstryMin = 0;
int twsHstryMin = 0;
int dbtHstryMin = 0;
// Initialize history buffers with meta data // Initialize history buffers with meta data
api->getBoatDataValues(3,hstryValList); api->getBoatDataValues(3,hstryValList);
twdHstry.setMetaData(twdBVal->getName(), twdBVal->getFormat(), 1000, twdHstryMin, 360); // Set meta data for TWD buffer: update frequency 1000ms, min value 0, max value 360 int hstryUpdFreq = 1000; // Update frequency for history buffers in ms
twsHstry.setMetaData(twsBVal->getName(), twsBVal->getFormat(), 1000, twsHstryMin, 100); // Set meta data for TWS buffer: update frequency 1000ms, min value 0, max value 100 int hstryMinVal = 0; // Minimum value for history buffers
dbtHstry.setMetaData(dbtBVal->getName(), dbtBVal->getFormat(), 1000, dbtHstryMin, 10928); // Set meta data for TWS buffer: update frequency 1000ms, min value 0, max value 10,928 int twdHstryMax = 360;
int twsHstryMax = 100;
int dbtHstryMax = 327; // Max value for depth (due to signed 16 bit integer and decimals shift)
twdHstry.setMetaData(twdBVal->getName(), twdBVal->getFormat(), hstryUpdFreq, hstryMinVal, twdHstryMax);
twsHstry.setMetaData(twsBVal->getName(), twsBVal->getFormat(), hstryUpdFreq, hstryMinVal, twsHstryMax);
dbtHstry.setMetaData(dbtBVal->getName(), dbtBVal->getFormat(), hstryUpdFreq, hstryMinVal, dbtHstryMax);
// Internal RTC with NTP init // Internal RTC with NTP init
ESP32Time rtc(0); ESP32Time rtc(0);
@ -800,37 +802,48 @@ void sensorTask(void *param){
// Read TWD, TWS, DBT data from boatData every 1000ms for history and windplot display // Read TWD, TWS, DBT data from boatData every 1000ms for history and windplot display
if(millis() > starttime20 + 1000){ if(millis() > starttime20 + 1000){
starttime20 = millis(); starttime20 = millis();
int16_t val;
api->getBoatDataValues(3,hstryValList); api->getBoatDataValues(3,hstryValList);
int16_t bValue;
if (twdBVal->valid) { if (twdBVal->valid) {
bValue = int16_t(RadToDeg(twdBVal->value)); val = static_cast<int16_t>(std::round(RadToDeg(twdBVal->value)));
twdHstry.add(bValue); if (val < hstryMinVal || val > twdHstryMax) {
} else { val = INT16_MIN; // Add invalid value
twdHstry.add(INT16_MIN); // Add invalid value
} }
} else {
val = INT16_MIN;
}
twdHstry.add(val);
if (twsBVal->valid) { if (twsBVal->valid) {
bValue = int16_t(twsBVal->value); val = static_cast<int16_t>(twsBVal->value * 100); // Shift value to store decimals in int16_t
twsHstry.add(bValue); if (val < hstryMinVal || val > twsHstryMax) {
} else { val = INT16_MIN; // Add invalid value
twsHstry.add(INT16_MIN); // Add invalid value
} }
} else {
val = INT16_MIN;
}
twsHstry.add(val);
if (dbtBVal->valid) { if (dbtBVal->valid) {
bValue = int16_t(dbtBVal->value); val = static_cast<int16_t>(dbtBVal->value * 100); // Shift value to store decimals in int16_t
dbtHstry.add(bValue); if (val < hstryMinVal || val > dbtHstryMax) {
} else { val = INT16_MIN; // Add invalid value
dbtHstry.add(INT16_MIN); // Add invalid value
} }
String TmpName; } else {
String TmpFormat; val = INT16_MIN;
int TmpUpdFreq; }
int TmpSmallest; dbtHstry.add(val);
int TmpBiggest;
twdHstry.getMetaData(TmpName, TmpFormat, TmpUpdFreq, TmpSmallest, TmpBiggest); // api->getLogger()->logDebug(GwLog::ERROR,"SensorTask pointer: TWD: %p, TWS: %p, STW: %p", twdHstry, twsHstry, dbtHstry);
api->getLogger()->logDebug(GwLog::ERROR,"History buffer TWD: name:%s format:%s Freq:%d, Min: %d, Max: %d", TmpName.c_str(), TmpFormat.c_str(), TmpUpdFreq, TmpSmallest, TmpBiggest); api->getLogger()->logDebug(GwLog::ERROR,"SensorTask Data: TWD:%d TWS:%f DBT:%f", std::round(RadToDeg(twdBVal->value)), twsBVal->value, dbtBVal->value);
api->getLogger()->logDebug(GwLog::ERROR,"History buffers: TWD:%d TWS:%d DBT:%d", twdHstry.getLast(), twsHstry.getLast(), dbtHstry.getLast()); api->getLogger()->logDebug(GwLog::ERROR,"SensorTask buffers: TWD:%d TWS:%f DBT:%f", twdHstry.getLast(), twsHstry.getLast(), dbtHstry.getLast());
} }
// Add sensor and history data to shared memory for transfer to pages
shared->setSensorData(sensors); shared->setSensorData(sensors);
shared->setHstryBuf(twdHstry, twsHstry, dbtHstry);
// tBoatHstryData tmpHstryData = shared->getHstryBuf();
// api->getLogger()->logDebug(GwLog::ERROR,"SensorTask tmpHstryData pointer: TWD: %p, TWS: %p, STW: %p", tmpHstryData.twdHstry, tmpHstryData.twsHstry, tmpHstryData.dbtHstry);
} }
vTaskDelete(NULL); vTaskDelete(NULL);
} }

10
lib/obp60task/OBPSensorTask.h
View File

@ -8,6 +8,7 @@ class SharedData{
private: private:
SemaphoreHandle_t locker; SemaphoreHandle_t locker;
SensorData sensors; SensorData sensors;
tBoatHstryData boatHstry;
public: public:
GwApi *api=NULL; GwApi *api=NULL;
SharedData(GwApi *api){ SharedData(GwApi *api){
@ -22,6 +23,15 @@ class SharedData{
GWSYNCHRONIZED(&locker); GWSYNCHRONIZED(&locker);
return sensors; return sensors;
} }
void setHstryBuf(RingBuffer<int16_t> twdHstry,RingBuffer<int16_t> twsHstry,RingBuffer<int16_t> dbtHstry) {
GWSYNCHRONIZED(&locker);
boatHstry={&twdHstry, &twsHstry, &dbtHstry};
// api->getLogger()->logDebug(GwLog::ERROR, "SharedData setHstryBuf: TWD: %p, TWS: %p, STW: %p", boatHstry.twdHstry, boatHstry.twsHstry, boatHstry.dbtHstry);
}
tBoatHstryData getHstryBuf() {
GWSYNCHRONIZED(&locker);
return boatHstry;
}
}; };
void createSensorTask(SharedData *shared); void createSensorTask(SharedData *shared);

92
lib/obp60task/PageWindPlot.cpp
View File

@ -4,6 +4,7 @@
#include "OBP60Extensions.h" #include "OBP60Extensions.h"
#include "OBPRingBuffer.h" #include "OBPRingBuffer.h"
#include "Pagedata.h" #include "Pagedata.h"
#include <N2kMessages.h> // just for RadToDeg function
#include <vector> #include <vector>
@ -318,6 +319,7 @@ public:
int twdValue; int twdValue;
static const float radToDeg = 180.0 / M_PI; // Conversion factor from radians to degrees static const float radToDeg = 180.0 / M_PI; // Conversion factor from radians to degrees
bool isInitialized = false; // Flag to indicate that page is initialized
bool wndDataValid = false; // Flag to indicate if wind data is valid bool wndDataValid = false; // Flag to indicate if wind data is valid
bool simulation = false; bool simulation = false;
bool holdValues = false; bool holdValues = false;
@ -352,21 +354,21 @@ public:
static float chrtScl; // Scale for wind values in pixels per degree static float chrtScl; // Scale for wind values in pixels per degree
int chrtVal; // Current wind value int chrtVal; // Current wind value
static int chrtPrevVal; // Last wind value in chart area for check if value crosses 180 degree line static int chrtPrevVal; // Last wind value in chart area for check if value crosses 180 degree line
int distVals; // helper to check wndCenter crossing // int distVals; // helper to check wndCenter crossing
int distMid; // helper to check wndCenter crossing // int distMid; // helper to check wndCenter crossing
static RingBuffer<int16_t> windDirHstry(bufSize); // Circular buffer to store wind direction values // static RingBuffer<int16_t> windDirHstry(bufSize); // Circular buffer to store wind direction values
static RingBuffer<int16_t> windSpdHstry(bufSize); // Circular buffer to store wind speed values // static RingBuffer<int16_t> windSpdHstry(bufSize); // Circular buffer to store wind speed values
LOG_DEBUG(GwLog::LOG, "Display page WindPlot"); LOG_DEBUG(GwLog::LOG, "Display page WindPlot");
unsigned long start = millis(); unsigned long start = millis();
// Data initialization // Data initialization
if (windDirHstry.getCurrentSize() == 0) { LOG_DEBUG(GwLog::ERROR, "PageWindPlot buffers: TWD:%d TWS:%f DBT:%f", pageData.boatHstry.twdHstry->getLast(),
/* if (!windDirHstry.begin(bufSize)) { pageData.boatHstry.twsHstry->getLast() * 0.0194384, pageData.boatHstry.dbtHstry->getLast() / 100);
logger->logDebug(GwLog::ERROR, "Failed to initialize wind direction history buffer");
return; // if (windDirHstry.getCurrentSize() == 0) {
} */ if (!isInitialized) {
simWnd = 0; simWnd = 0;
simTWS = 0; simTWS = 0;
twdValue = 0; twdValue = 0;
@ -374,6 +376,7 @@ public:
linesToShow = 0; linesToShow = 0;
oldDataIntv = dataIntv; oldDataIntv = dataIntv;
newDate = 0; newDate = 0;
isInitialized = true; // Set flag to indicate that page is now initialized
} }
// Get config data // Get config data
@ -389,7 +392,7 @@ public:
setFlashLED(false); setFlashLED(false);
} }
// Read boatdata values for TWD, TWA, TWS, HDM, AWA, AWS, STW, COG, SOG, if available /* // Read boatdata values for TWD, TWA, TWS, HDM, AWA, AWS, STW, COG, SOG, if available
for (int i = 0; i < numCfgValues; i++) { for (int i = 0; i < numCfgValues; i++) {
bvalue = pageData.values[i]; bvalue = pageData.values[i];
dataName[i] = xdrDelete(bvalue->getName()); dataName[i] = xdrDelete(bvalue->getName());
@ -424,11 +427,12 @@ public:
// LOG_DEBUG(GwLog::DEBUG, "PageWindPlot simulation data: windValue: %d, windSpeed: %s", simWnd, dataSValue[2].c_str()); // LOG_DEBUG(GwLog::DEBUG, "PageWindPlot simulation data: windValue: %d, windSpeed: %s", simWnd, dataSValue[2].c_str());
} else if (wndDataValid) { } else if (wndDataValid) {
windDirHstry.add(twdValue); windDirHstry.add(twdValue);
} } */
// Identify buffer sizes and buffer position to print on the chart // Identify buffer sizes and buffer position to print on the chart
intvBufSize = cHeight * dataIntv; intvBufSize = cHeight * dataIntv;
count = windDirHstry.getCurrentSize(); // count = windDirHstry.getCurrentSize();
count = pageData.boatHstry.twdHstry->getCurrentSize();
numWndValues = min(count, intvBufSize); numWndValues = min(count, intvBufSize);
newDate++; newDate++;
if (dataIntv != oldDataIntv) { if (dataIntv != oldDataIntv) {
@ -442,31 +446,34 @@ public:
if (count == bufSize) { if (count == bufSize) {
bufStart--; // show the latest wind values in buffer; keep 1st value constant in a rolling buffer when new data is added bufStart--; // show the latest wind values in buffer; keep 1st value constant in a rolling buffer when new data is added
} }
LOG_DEBUG(GwLog::ERROR, "PageWindPlot Dataset: TWD: %d, count: %d, intvBufSize: %d, numWndValues: %d, bufStart: %d, linesToShow: %d, newDate: %d", twdValue, count, intvBufSize, numWndValues, bufStart, linesToShow, newDate); LOG_DEBUG(GwLog::ERROR, "PageWindPlot Dataset: TWD: %d, TWS: %f, STW: %f, count: %d, intvBufSize: %d, numWndValues: %d, bufStart: %d, linesToShow: %d, newDate: %d", pageData.boatHstry.twdHstry->getLast(),
pageData.boatHstry.twsHstry->getLast() * 0.0194384, pageData.boatHstry.dbtHstry->getLast() / 100, count, intvBufSize, numWndValues, bufStart, linesToShow, newDate);
// LOG_DEBUG(GwLog::ERROR, "PageWindPlot Pointer: TWD: %p, TWS: %p, STW: %p", pageData.boatHstry.twdHstry, pageData.boatHstry.twsHstry, pageData.boatHstry.dbtHstry);
if (bvalue == NULL) // LOG_DEBUG(GwLog::LOG, "PageWindPlot, %s:%f, %s:%f, %s:%f, %s:%f, %s:%f, %s:%f, %s:%f, %s:%f, %s:%f, cnt: %d, valid0: %d", dataName[0].c_str(), dataValue[0],
return; // dataName[1].c_str(), dataValue[1], dataName[2].c_str(), dataValue[2], dataName[3].c_str(), dataValue[3], dataName[4].c_str(), dataValue[4],
LOG_DEBUG(GwLog::LOG, "PageWindPlot, %s:%f, %s:%f, %s:%f, %s:%f, %s:%f, %s:%f, %s:%f, %s:%f, %s:%f, cnt: %d, valid0: %d", dataName[0].c_str(), dataValue[0], // dataName[5].c_str(), dataValue[5], dataName[6].c_str(), dataValue[6], dataName[7].c_str(), dataValue[7], dataName[8].c_str(), dataValue[8], count, dataValid[0]);
dataName[1].c_str(), dataValue[1], dataName[2].c_str(), dataValue[2], dataName[3].c_str(), dataValue[3], dataName[4].c_str(), dataValue[4],
dataName[5].c_str(), dataValue[5], dataName[6].c_str(), dataValue[6], dataName[7].c_str(), dataValue[7], dataName[8].c_str(), dataValue[8], count, dataValid[0]);
// initialize chart range values // initialize chart range values
if (wndCenter == INT_MIN) { if (wndCenter == INT_MIN) {
wndCenter = max(0, int(windDirHstry.get(numWndValues - intvBufSize))); // get 1st value of current data interval // wndCenter = max(0, int(windDirHstry.get(numWndValues - intvBufSize))); // get 1st value of current data interval
wndCenter = max(0, int(pageData.boatHstry.twdHstry->get(numWndValues - intvBufSize))); // get 1st value of current data interval
wndCenter = (int((wndCenter + (wndCenter >= 0 ? 5 : -5)) / 10) * 10) % 360; // Set new center value; round to nearest 10 degree value; 360° -> 0° wndCenter = (int((wndCenter + (wndCenter >= 0 ? 5 : -5)) / 10) * 10) % 360; // Set new center value; round to nearest 10 degree value; 360° -> 0°
diffRng = dfltRng; diffRng = dfltRng;
chrtRng = dfltRng; chrtRng = dfltRng;
} else { } else {
// check and adjust range between left, center, and right chart limit // check and adjust range between left, center, and right chart limit
diffRng = getRng(windDirHstry, wndCenter, numWndValues); // diffRng = getRng(windDirHstry, wndCenter, numWndValues);
diffRng = getRng(*pageData.boatHstry.twdHstry, wndCenter, numWndValues);
diffRng = (diffRng == INT_MIN ? 0 : diffRng); diffRng = (diffRng == INT_MIN ? 0 : diffRng);
if (diffRng > chrtRng) { if (diffRng > chrtRng) {
chrtRng = int((diffRng + (diffRng >= 0 ? 9 : -1)) / 10) * 10; // Round up to next 10 degree value chrtRng = int((diffRng + (diffRng >= 0 ? 9 : -1)) / 10) * 10; // Round up to next 10 degree value
} else if (diffRng + 10 < chrtRng) { // Reduce chart range for higher resolution if possible } else if (diffRng + 10 < chrtRng) { // Reduce chart range for higher resolution if possible
chrtRng = max(dfltRng, int((diffRng + (diffRng >= 0 ? 9 : -1)) / 10) * 10); chrtRng = max(dfltRng, int((diffRng + (diffRng >= 0 ? 9 : -1)) / 10) * 10);
} }
int debugMin = windDirHstry.getMin(numWndValues); // int debugMin = windDirHstry.getMin(numWndValues);
int debugMax = windDirHstry.getMax(numWndValues); int debugMin = pageData.boatHstry.twdHstry->getMin(numWndValues);
int debugMax = pageData.boatHstry.twdHstry->getMax(numWndValues);
LOG_DEBUG(GwLog::ERROR, "PageWindPlot Range. wndCenter: %d, numWndValues: %d, min: %d, max: %d, diffrng: %d, chrtRng: %d ", wndCenter, numWndValues, debugMin, debugMax, diffRng, chrtRng); LOG_DEBUG(GwLog::ERROR, "PageWindPlot Range. wndCenter: %d, numWndValues: %d, min: %d, max: %d, diffrng: %d, chrtRng: %d ", wndCenter, numWndValues, debugMin, debugMax, diffRng, chrtRng);
} }
chrtScl = float(width) / float(chrtRng) / 2.0; // Chart scale: pixels per degree chrtScl = float(width) / float(chrtRng) / 2.0; // Chart scale: pixels per degree
@ -512,20 +519,29 @@ public:
getdisplay().drawCircle(width - 5, yOffset - 17, 2, commonData->fgcolor); // <degree> symbol getdisplay().drawCircle(width - 5, yOffset - 17, 2, commonData->fgcolor); // <degree> symbol
getdisplay().drawCircle(width - 5, yOffset - 17, 3, commonData->fgcolor); // <degree> symbol getdisplay().drawCircle(width - 5, yOffset - 17, 3, commonData->fgcolor); // <degree> symbol
if (pageData.boatHstry.twdHstry->getMax() == INT16_MIN) {
wndDataValid = false; // only <INT16_MIN> values in buffer -> no valid wind data available
} else {
wndDataValid = true; // At least some wind data available
}
// Draw wind values in chart // Draw wind values in chart
//*********************************************************** //***********************************************************
if (wndDataValid || holdValues || simulation) { if (wndDataValid) {
// if (count == bufSize)
// bufStart--; // show the latest wind values in buffer; keep 1st value constant in a rolling buffer
for (int i = 0; i < linesToShow; i++) { for (int i = 0; i < linesToShow; i++) {
chrtVal = windDirHstry.get(bufStart + (i * dataIntv)); // show the latest wind values in buffer; keep 1st value constant in a rolling buffer // chrtVal = windDirHstry.get(bufStart + (i * dataIntv)); // show the latest wind values in buffer; keep 1st value constant in a rolling buffer
chrtVal = pageData.boatHstry.twdHstry->get(bufStart + (i * dataIntv)); // show the latest wind values in buffer; keep 1st value constant in a rolling buffer
if (chrtVal == INT16_MIN) {
chrtPrevVal = INT16_MIN;
continue; // skip invalid values
}
x = ((chrtVal - wndLeft + 360) % 360) * chrtScl; x = ((chrtVal - wndLeft + 360) % 360) * chrtScl;
y = yOffset + cHeight - i; // Position in chart area y = yOffset + cHeight - i; // Position in chart area
if (i > linesToShow - 15) if (i > linesToShow - 15)
LOG_DEBUG(GwLog::ERROR, "PageWindPlot Chart: i: %d, chrtVal: %d, chrtPrevVal: %d, bufStart: %d count: %d, linesToShow: %d", i, chrtVal, chrtPrevVal, bufStart, count, linesToShow); LOG_DEBUG(GwLog::ERROR, "PageWindPlot Chart: i: %d, chrtVal: %d, chrtPrevVal: %d, bufStart: %d count: %d, linesToShow: %d", i, chrtVal, chrtPrevVal, bufStart, count, linesToShow);
if (i == 0) { // if (i == 0) {
prevX = x; // just a dot for 1st chart point if ((i == 0) || (chrtPrevVal == INT16_MIN)) {
prevX = x; // just a dot for 1st chart point or after some invalid values
prevY = y; prevY = y;
} else { } else {
// cross borders check; shift values to [-180..0..180]; when crossing borders, range is 2x 180 degrees // cross borders check; shift values to [-180..0..180]; when crossing borders, range is 2x 180 degrees
@ -540,7 +556,7 @@ public:
getdisplay().drawLine(prevX, prevY, xSplit, y, commonData->fgcolor); getdisplay().drawLine(prevX, prevY, xSplit, y, commonData->fgcolor);
getdisplay().drawLine(prevX, prevY - 1, ((xSplit != prevX) ? xSplit : xSplit - 1), ((xSplit != prevX) ? y - 1 : y), commonData->fgcolor); getdisplay().drawLine(prevX, prevY - 1, ((xSplit != prevX) ? xSplit : xSplit - 1), ((xSplit != prevX) ? y - 1 : y), commonData->fgcolor);
prevX = (((chrtVal180 > 0 ? wndRight : wndLeft) - wndLeft + 360) % 360) * chrtScl; prevX = (((chrtVal180 > 0 ? wndRight : wndLeft) - wndLeft + 360) % 360) * chrtScl;
LOG_DEBUG(GwLog::ERROR, "PageWindPlot Cross: i: %d, chrtVal: %d, chrtPrevVal: %d, wndLeft: %d wndRight: %d, curr:{%d,%d} prev:{%d,%d}", i, chrtVal, chrtPrevVal, wndLeft, wndRight, x, y, prevX, prevY); // LOG_DEBUG(GwLog::ERROR, "PageWindPlot Cross: i: %d, chrtVal: %d, chrtPrevVal: %d, wndLeft: %d wndRight: %d, curr:{%d,%d} prev:{%d,%d}", i, chrtVal, chrtPrevVal, wndLeft, wndRight, x, y, prevX, prevY);
} }
} }
@ -554,27 +570,25 @@ public:
if (i == (cHeight - 1)) { // Reaching chart area top end () if (i == (cHeight - 1)) { // Reaching chart area top end ()
linesToShow -= min(40, cHeight); // free top 40 lines of chart for new values linesToShow -= min(40, cHeight); // free top 40 lines of chart for new values
bufStart = max(0, count - (linesToShow * dataIntv)); // next start value in buffer to show bufStart = max(0, count - (linesToShow * dataIntv)); // next start value in buffer to show
if ((windDirHstry.getMin(numWndValues) > wndCenter) || (windDirHstry.getMax(numWndValues) < wndCenter)) { // if ((windDirHstry.getMin(numWndValues) > wndCenter) || (windDirHstry.getMax(numWndValues) < wndCenter)) {
if ((pageData.boatHstry.twdHstry->getMin(numWndValues) > wndCenter) || (pageData.boatHstry.twdHstry->getMax(numWndValues) < wndCenter)) {
// Check if all wind value are left or right of center value -> optimize chart range // Check if all wind value are left or right of center value -> optimize chart range
int mid = windDirHstry.getMid(numWndValues); int mid = pageData.boatHstry.twdHstry->getMid(numWndValues);
if (mid != INT_MIN) { if (mid != INT16_MIN) {
wndCenter = int((mid + (mid >= 0 ? 5 : -5)) / 10) * 10; // Set new center value; round to nearest 10 degree value wndCenter = int((mid + (mid >= 0 ? 5 : -5)) / 10) * 10; // Set new center value; round to nearest 10 degree value
} }
} }
LOG_DEBUG(GwLog::ERROR, "PageWindPlot FreeTop: cHeight: %d, LinesToShow: %d, numWndValues: %d, wndCenter: %d, bufStart: %d", cHeight, linesToShow, numWndValues, wndCenter, bufStart); // LOG_DEBUG(GwLog::ERROR, "PageWindPlot FreeTop: cHeight: %d, LinesToShow: %d, numWndValues: %d, wndCenter: %d, bufStart: %d", cHeight, linesToShow, numWndValues, wndCenter, bufStart);
break; break;
} }
} }
// LOG_DEBUG(GwLog::DEBUG, "PageWindPlot chart end: chrtVal: %d, x: %d, y: %d prevX: %d, prevY: %d, loop-Counter: %d", chrtVal, x, y, prevX, prevY, count);
}
else if (!wndDataValid) { } else {
// No valid data available // No valid data available
LOG_DEBUG(GwLog::LOG, "PageWindPlot: No valid data available"); LOG_DEBUG(GwLog::LOG, "PageWindPlot: No valid data available");
getdisplay().setFont(&Ubuntu_Bold10pt7b); getdisplay().setFont(&Ubuntu_Bold10pt7b);
getdisplay().fillRect(xCenter - 66, height / 2 - 18, 146, 24, commonData->bgcolor); // Clear area for TWS value getdisplay().fillRect(xCenter - 66, height / 2 - 20, 146, 24, commonData->bgcolor); // Clear area for TWS value
getdisplay().setCursor(xCenter - 66, height / 2); drawTextCenter(xCenter, height / 2 - 10, "No sensor data");
getdisplay().print("No sensor data");
} }
// Print TWS value // Print TWS value

9
lib/obp60task/Pagedata.h
View File

@ -4,15 +4,24 @@
#include <functional> #include <functional>
#include <vector> #include <vector>
#include "LedSpiTask.h" #include "LedSpiTask.h"
#include "OBPRingBuffer.h"
#define MAX_PAGE_NUMBER 10 // Max number of pages for show data #define MAX_PAGE_NUMBER 10 // Max number of pages for show data
typedef struct{
RingBuffer<int16_t>* twdHstry;
RingBuffer<int16_t>* twsHstry;
RingBuffer<int16_t>* dbtHstry;
} tBoatHstryData;
typedef std::vector<GwApi::BoatValue *> ValueList; typedef std::vector<GwApi::BoatValue *> ValueList;
typedef struct{ typedef struct{
String pageName; String pageName;
uint8_t pageNumber; // page number in sequence of visible pages uint8_t pageNumber; // page number in sequence of visible pages
//the values will always contain the user defined values first //the values will always contain the user defined values first
ValueList values; ValueList values;
tBoatHstryData boatHstry;
} PageData; } PageData;
// Sensor data structure (only for extended sensors, not for NMEA bus sensors) // Sensor data structure (only for extended sensors, not for NMEA bus sensors)

5
lib/obp60task/obp60task.cpp
View File

@ -837,6 +837,11 @@ void OBP60Task(GwApi *api){
currentPage->displayNew(pages[pageNumber].parameters); currentPage->displayNew(pages[pageNumber].parameters);
lastPage=pageNumber; lastPage=pageNumber;
} }
pages[pageNumber].parameters.boatHstry = shared->getHstryBuf(); // Add boat history to page parameters
LOG_DEBUG(GwLog::ERROR,"obp60task buffers: TWD:%d TWS:%f DBT:%f", pages[pageNumber].parameters.boatHstry.twdHstry->getLast(),
pages[pageNumber].parameters.boatHstry.twsHstry->getLast() * 0.0194384, pages[pageNumber].parameters.boatHstry.dbtHstry->getLast() / 100);
// LOG_DEBUG(GwLog::ERROR, "obp60task pointer: TWD: %p, TWS: %p, STW: %p", pages[pageNumber].parameters.boatHstry.twdHstry,
// pages[pageNumber].parameters.boatHstry.twsHstry, pages[pageNumber].parameters.boatHstry.dbtHstry);
//call the page code //call the page code
LOG_DEBUG(GwLog::DEBUG,"calling page %d",pageNumber); LOG_DEBUG(GwLog::DEBUG,"calling page %d",pageNumber);
// Show footer if enabled (together with header) // Show footer if enabled (together with header)