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

Handling of missing data

This commit is contained in:
Ulrich Meine 2025-06-22 14:29:03 +02:00
parent 03d8339170
commit 9ada5be7cb
2 changed files with 72 additions and 593 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

188
lib/obp60task/PageWindPlot.cpp
View File

@ -52,11 +52,12 @@ public:
int get(int index) const int get(int index) const
// Get value by index in [0..360 deg] format (0 = oldest, count-1 = newest) // Get value by index in [0..360 deg] format (0 = oldest, count-1 = newest)
// INT_MIN indicates missing value or wrong index
{ {
int realIndex; int realIndex;
if (index < 0 || index >= count) { if (index < 0 || index >= count) {
return -1; // Invalid index return INT_MIN; // Invalid index
} }
realIndex = (first + index) % SIZE; realIndex = (first + index) % SIZE;
return buffer[realIndex]; return buffer[realIndex];
@ -78,7 +79,6 @@ public:
return value; return value;
} }
default: default:
// Return value in [-180..180 deg] format
return -1; return -1;
} }
} }
@ -105,42 +105,23 @@ public:
} }
} }
/* int getMin(int amount) const
// Get minimum value of the last <amount> values of buffer
{
if (count == 0 || amount <= 0) {
return -1;
} else if (amount > count) {
amount = count; // Limit to available values
}
if (last + amount <= SIZE) {
// No wrap-around
return *std::min_element(buffer.begin() + last, buffer.begin() + (last + amount));
} else {
// Wrap-around
int min1 = *std::min_element(buffer.begin() + ((last - amount) % last), buffer.begin() + last);
int min2 = *std::min_element(buffer.end() - (count - amount - last > 0 ? amount - last : 0), buffer.end());
return std::min(min1, min2);
}
} */
int getMin(int amount) const int getMin(int amount) const
// Get minimum value of the last <amount> values of buffer // Get minimum value of the last <amount> values of buffer
// INT_MIN indicates missing value or wrong index
{ {
if (count == 0 || amount <= 0) if (count == 0 || amount <= 0)
return -1; return INT_MIN;
if (amount > count) if (amount > count)
amount = count; amount = count;
int minVal = INT_MAX; int minVal = INT_MAX;
int value = 0;
// Start from the newest value (last) and go backwards x times // Start from the newest value (last) and go backwards x times
for (int i = 0; i < amount; ++i) { for (int i = 0; i < amount; ++i) {
// int idx = (last - i + SIZE) % SIZE; value = get(i);
// if (buffer[idx] < minVal) if (value < minVal)
// minVal = buffer[idx]; minVal = value;
if (get(i) > minVal)
minVal = get(i);
} }
return minVal; return minVal;
} }
@ -163,6 +144,8 @@ public:
int getMax(int amount) const int getMax(int amount) const
// Get maximum value of the last <amount> values of buffer // Get maximum value of the last <amount> values of buffer
// INT_MIN indicates missing value or wrong index
{ {
if (count == 0 || amount <= 0) if (count == 0 || amount <= 0)
return -1; return -1;
@ -170,42 +153,21 @@ public:
amount = count; amount = count;
int maxVal = INT_MIN; int maxVal = INT_MIN;
int value = 0;
// Start from the newest value (last) and go backwards x times // Start from the newest value (last) and go backwards x times
for (int i = 0; i < amount; ++i) { for (int i = 0; i < amount; ++i) {
// int idx = (last - i + SIZE) % SIZE; value = get(i);
// if (buffer[idx] > maxVal) if (value > maxVal)
// maxVal = buffer[idx]; maxVal = value;
if (get(i) > maxVal)
maxVal = get(i);
} }
return maxVal; return maxVal;
} }
/* int getMax(int amount) const
// Get maximum value of the last <amount> values of buffer
{
if (count == 0 || amount <= 0) {
return -1;
} else if (amount > count) {
amount = count; // Limit to available values
}
if (first + count <= SIZE) {
// No wrap-around
return *std::max_element(buffer.begin() + last, buffer.begin() + (last + amount));
} else {
// Wrap-around
int max1 = *std::max_element(buffer.begin() + ((last - amount) % last), buffer.begin() + last);
int max2 = *std::max_element(buffer.end(), buffer.end() - (amount - last > 0 ? amount - last : 0);
return std::max(max1, max2);
}
} */
int getMid(int amount) const int getMid(int amount) const
// Get middle value in the buffer // Get middle value in the buffer
{ {
if (count == 0) { if (count == 0) {
return -1; // Buffer is empty return INT_MIN; // Buffer is empty
} }
return (getMin(amount) + getMax(amount)) / 2; return (getMin(amount) + getMax(amount)) / 2;
} }
@ -214,15 +176,20 @@ public:
// Get maximum difference of last <amount> of buffer values to center value // Get maximum difference of last <amount> of buffer values to center value
{ {
if (count == 0 || amount <= 0) if (count == 0 || amount <= 0)
return -1; return INT_MIN;
if (amount > count) if (amount > count)
amount = count; amount = count;
int value = 0;
int maxRng = INT_MIN; int maxRng = INT_MIN;
int rng = 0; int rng = 0;
// Start from the newest value (last) and go backwards x times // Start from the newest value (last) and go backwards x times
for (int i = 0; i < amount; ++i) { for (int i = 0; i < amount; ++i) {
rng = abs(((get(i) - center + 540) % 360) - 180); value = get(i);
if (value == INT_MIN) {
continue;
}
rng = abs(((value - center + 540) % 360) - 180);
if (rng > maxRng) if (rng > maxRng)
maxRng = rng; maxRng = rng;
} }
@ -231,20 +198,6 @@ public:
} }
return maxRng; return maxRng;
} }
void mvStart(int delta)
// Move the start index of buffer forward by <delta> positions -> virtually delete oldest <delta> data entries
{
first = (first + delta) % SIZE;
if (count > delta)
count -= delta;
else
count = 0;
if (first == 0)
last = count;
else
last = first - 1;
}
}; };
// **************************************************************** // ****************************************************************
@ -253,8 +206,8 @@ class PageWindPlot : public Page {
bool keylock = false; // Keylock bool keylock = false; // Keylock
// int16_t lp = 80; // Pointer length // int16_t lp = 80; // Pointer length
char chrtMode = 'D'; // Chart mode: 'D' for TWD, 'S' for TWS, 'B' for both06121990 char chrtMode = 'D'; // Chart mode: 'D' for TWD, 'S' for TWS, 'B' for both06121990
int dataInterv = 1; // Update interval for wind history chart: int dataIntv = 1; // Update interval for wind history chart:
// (1)|(2)|(3)|(4) seconds for approx. 4, 8, 12, 16 min. history chart // (1)|(2)|(3)|(4) seconds for approx. 4, 8, 12, 16 min. history chart
bool showTWS = true; // Show TWS value in chart area bool showTWS = true; // Show TWS value in chart area
public: public:
@ -289,14 +242,14 @@ public:
// Set interval for wind history chart update time // Set interval for wind history chart update time
if (key == 2) { if (key == 2) {
if (dataInterv == 1) { if (dataIntv == 1) {
dataInterv = 2; dataIntv = 2;
} else if (dataInterv == 2) { } else if (dataIntv == 2) {
dataInterv = 3; dataIntv = 3;
} else if (dataInterv == 3) { } else if (dataIntv == 3) {
dataInterv = 4; dataIntv = 4;
} else { } else {
dataInterv = 1; dataIntv = 1;
} }
return 0; // Commit the key return 0; // Commit the key
} }
@ -351,7 +304,7 @@ public:
int numWndValues; // number of wind values available for current interval selection int numWndValues; // number of wind values available for current interval selection
static int linesToShow; // current number of lines to display on chart static int linesToShow; // current number of lines to display on chart
static int bufStart; // 1st data value in buffer to show static int bufStart; // 1st data value in buffer to show
static int oldDataInterv; // remember recent user selection of data interval static int oldDataIntv; // remember recent user selection of data interval
static int newDate; // indicates for higher time intervals that new date is available static int newDate; // indicates for higher time intervals that new date is available
static int wndCenter = INT_MIN; // chart wind center value position; init value indicates that wndCenter is not set yet static int wndCenter = INT_MIN; // chart wind center value position; init value indicates that wndCenter is not set yet
@ -386,7 +339,7 @@ public:
twdValue = 0; twdValue = 0;
bufStart = 0; bufStart = 0;
linesToShow = 0; linesToShow = 0;
oldDataInterv = dataInterv; oldDataIntv = dataIntv;
newDate = 0; newDate = 0;
} }
@ -442,21 +395,22 @@ public:
} }
// Identify buffer sizes and buffer position to print on the chart // Identify buffer sizes and buffer position to print on the chart
intvBufSize = cHeight * dataInterv; intvBufSize = cHeight * dataIntv;
count = windDirHstry.getSize(); count = windDirHstry.getSize();
numWndValues = min(count, intvBufSize); numWndValues = min(count, intvBufSize);
newDate++; newDate++;
if (dataInterv != oldDataInterv) { if (dataIntv != oldDataIntv) {
linesToShow = min(numWndValues / dataInterv, max(0, cHeight - 40)); linesToShow = min(numWndValues / dataIntv, max(0, cHeight - 40));
bufStart = max(0, (count - (linesToShow * dataInterv))); bufStart = max(0, (count - (linesToShow * dataIntv)));
oldDataInterv = dataInterv; oldDataIntv = dataIntv;
} else if (newDate >= dataInterv) { } else if (newDate >= dataIntv) {
linesToShow = min(numWndValues / dataInterv, linesToShow + 1); linesToShow = min(numWndValues / dataIntv, linesToShow + 1);
newDate = 0; newDate = 0;
} }
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 DateSet: TWD: %d, count: %d, bufStart: %d, linesToShow: %d, newDate: %d", twdValue, count, bufStart, linesToShow, newDate); }
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);
if (bvalue == NULL) if (bvalue == NULL)
return; return;
@ -466,14 +420,14 @@ public:
// initialize chart range values // initialize chart range values
if (wndCenter == INT_MIN) { if (wndCenter == INT_MIN) {
wndCenter = windDirHstry.get(max(0, numWndValues - intvBufSize)); // get 1st value of current data interval wndCenter = max(0, windDirHstry.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 = windDirHstry.getRng(wndCenter, numWndValues); diffRng = windDirHstry.getRng(wndCenter, numWndValues);
diffRng = (diffRng < 0 ? 0 : diffRng); // If no data in buffer, set range to 0 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
@ -484,12 +438,10 @@ public:
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
// wndCenter = windDirHstry.get(max(0, numWndValues - intvBufSize)); // Get 1st value of current data interval
// wndCenter = int((wndCenter + (wndCenter >= 0 ? 5 : -5)) / 10) * 10; // Round to nearest 10 degree value
wndLeft = wndCenter - chrtRng; wndLeft = wndCenter - chrtRng;
if (wndLeft < 0) if (wndLeft < 0)
wndLeft += 360; wndLeft += 360;
wndRight = wndCenter + chrtRng - 1; wndRight = (chrtRng < 180 ? wndCenter + chrtRng : wndCenter + chrtRng - 1);
if (wndRight >= 360) if (wndRight >= 360)
wndRight -= 360; wndRight -= 360;
// LOG_DEBUG(GwLog::DEBUG, "PageWindPlot dataValue[0]: %f, windValue: %d, count: %d, diffRng: %d, chartRng: %d, Center: %d, scale: %f", double(dataValue[0] * radToDeg), // LOG_DEBUG(GwLog::DEBUG, "PageWindPlot dataValue[0]: %f, windValue: %d, count: %d, diffRng: %d, chartRng: %d, Center: %d, scale: %f", double(dataValue[0] * radToDeg),
@ -502,9 +454,6 @@ public:
getdisplay().setPartialWindow(0, 0, width, height); // Set partial update getdisplay().setPartialWindow(0, 0, width, height); // Set partial update
getdisplay().setTextColor(commonData->fgcolor); getdisplay().setTextColor(commonData->fgcolor);
// Horizontal top line for orientation -> to be deleted
// getdisplay().fillRect(0, 20, width, 1, commonData->fgcolor);
// chart lines // chart lines
getdisplay().fillRect(0, yOffset, width, 2, commonData->fgcolor); getdisplay().fillRect(0, yOffset, width, 2, commonData->fgcolor);
getdisplay().fillRect(xCenter, yOffset, 1, cHeight, commonData->fgcolor); getdisplay().fillRect(xCenter, yOffset, 1, cHeight, commonData->fgcolor);
@ -514,21 +463,22 @@ public:
getdisplay().setFont(&Ubuntu_Bold12pt7b); getdisplay().setFont(&Ubuntu_Bold12pt7b);
getdisplay().setCursor(xCenter - 88, yOffset - 3); getdisplay().setCursor(xCenter - 88, yOffset - 3);
getdisplay().print("TWD"); // Wind name getdisplay().print("TWD"); // Wind name
getdisplay().setCursor(xCenter - 20, yOffset - 3); // getdisplay().setCursor(xCenter - 20, yOffset - 3);
snprintf(sWndLbl, 4, "%03d", (wndCenter < 0) ? (wndCenter + 360) : wndCenter); snprintf(sWndLbl, 4, "%03d", (wndCenter < 0) ? (wndCenter + 360) : wndCenter);
getdisplay().print(sWndLbl); // Wind center value drawTextCenter(xCenter, yOffset - 11, sWndLbl);
getdisplay().drawCircle(xCenter + 25, yOffset - 16, 2, commonData->fgcolor); // <degree> symbol // getdisplay().print(sWndLbl); // Wind center value
getdisplay().drawCircle(xCenter + 25, yOffset - 16, 3, commonData->fgcolor); // <degree> symbol getdisplay().drawCircle(xCenter + 25, yOffset - 17, 2, commonData->fgcolor); // <degree> symbol
getdisplay().drawCircle(xCenter + 25, yOffset - 17, 3, commonData->fgcolor); // <degree> symbol
getdisplay().setCursor(1, yOffset - 3); getdisplay().setCursor(1, yOffset - 3);
snprintf(sWndLbl, 4, "%03d", (wndLeft < 0) ? (wndLeft + 360) : wndLeft); snprintf(sWndLbl, 4, "%03d", (wndLeft < 0) ? (wndLeft + 360) : wndLeft);
getdisplay().print(sWndLbl); // Wind left value getdisplay().print(sWndLbl); // Wind left value
getdisplay().drawCircle(46, yOffset - 16, 2, commonData->fgcolor); // <degree> symbol getdisplay().drawCircle(46, yOffset - 17, 2, commonData->fgcolor); // <degree> symbol
getdisplay().drawCircle(46, yOffset - 16, 3, commonData->fgcolor); // <degree> symbol getdisplay().drawCircle(46, yOffset - 17, 3, commonData->fgcolor); // <degree> symbol
getdisplay().setCursor(width - 51, yOffset - 3); getdisplay().setCursor(width - 50, yOffset - 3);
snprintf(sWndLbl, 4, "%03d", (wndRight < 0) ? (wndRight + 360) : wndRight); snprintf(sWndLbl, 4, "%03d", (wndRight < 0) ? (wndRight + 360) : wndRight);
getdisplay().print(sWndLbl); // Wind right value getdisplay().print(sWndLbl); // Wind right value
getdisplay().drawCircle(width - 5, yOffset - 16, 2, commonData->fgcolor); // <degree> symbol getdisplay().drawCircle(width - 5, yOffset - 17, 2, commonData->fgcolor); // <degree> symbol
getdisplay().drawCircle(width - 5, yOffset - 16, 3, commonData->fgcolor); // <degree> symbol getdisplay().drawCircle(width - 5, yOffset - 17, 3, commonData->fgcolor); // <degree> symbol
// Draw wind values in chart // Draw wind values in chart
//*********************************************************** //***********************************************************
@ -536,10 +486,11 @@ public:
// if (count == bufSize) // if (count == bufSize)
// bufStart--; // show the latest wind values in buffer; keep 1st value constant in a rolling buffer // 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 * dataInterv)); // 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
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
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 > 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);
if (i == 0) { if (i == 0) {
prevX = x; // just a dot for 1st chart point prevX = x; // just a dot for 1st chart point
@ -570,12 +521,14 @@ 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 * dataInterv)); // next start value in buffer to show bufStart = max(0, count - (linesToShow * dataIntv)); // next start value in buffer to show
// windDirHstry.mvStart(); // virtually delete 40 values from buffer // windDirHstry.mvStart(); // virtually delete 40 values from buffer
if ((windDirHstry.getMin(numWndValues) > wndCenter) || (windDirHstry.getMax(numWndValues) < wndCenter)) { if ((windDirHstry.getMin(numWndValues) > wndCenter) || (windDirHstry.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 = windDirHstry.getMid(numWndValues);
wndCenter = int((mid + (mid >= 0 ? 5 : -5)) / 10) * 10; // Set new center value; round to nearest 10 degree value if (mid != INT_MIN) {
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;
@ -637,13 +590,16 @@ public:
int yPos; int yPos;
getdisplay().setFont(&Ubuntu_Bold8pt7b); getdisplay().setFont(&Ubuntu_Bold8pt7b);
for (int i = 1; i <= 3; i++) { for (int i = 1; i <= 3; i++) {
yPos = yOffset + (i * 60); // Y position for label if (numWndValues < intvBufSize) {
// yPos = yOffset + cHeight - (i * 60); // Y position for label // chart initially filled from botton to top -> revert minute labels
yPos = yOffset + cHeight - (i * 60);
} else {
yPos = yOffset + (i * 60);
}
getdisplay().fillRect(0, yPos, width, 1, commonData->fgcolor); getdisplay().fillRect(0, yPos, width, 1, commonData->fgcolor);
getdisplay().fillRect(0, yPos - 9, 26, 16, commonData->bgcolor); // Clear small area to remove potential chart lines getdisplay().fillRect(0, yPos - 8, 26, 16, commonData->bgcolor); // Clear small area to remove potential chart lines
// getdisplay().fillRect(0, yPos, 8, 2, commonData->fgcolor);
getdisplay().setCursor(1, yPos + 4); getdisplay().setCursor(1, yPos + 4);
snprintf(sWndYAx, 4, "%3d", i * dataInterv * -1); snprintf(sWndYAx, 4, "%3d", i * dataIntv * -1);
getdisplay().print(sWndYAx); // Wind value label getdisplay().print(sWndYAx); // Wind value label
} }

477
lib/obp60task/PageWindPlot.cpp.txt
View File

@ -1,477 +0,0 @@
#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "BoatDataCalibration.h"
#include "OBP60Extensions.h"
#include "Pagedata.h"
#include <vector>
// ****************************************************************
class wndHistory {
// provides a FiFo circular buffer to store wind history values
private:
int SIZE;
std::vector<int> buffer;
int first = 0; // points to the first valid element
int head = 0; // points to the next insertion index
int count = 0; // number of valid elements
public:
bool begin(int size)
// specifies buffer size
{
if (size <= 0 || size > 1000) {
return false;
}
SIZE = size;
buffer.resize(size); // allocate buffer
return true;
}
void add(int value)
// Add a new value
{
if (value > 180) {
value -= 360; // Normalize value to -180..180 to make min/max calculations working
}
buffer[head] = value;
head = (head + 1) % SIZE;
if (count < SIZE) {
count++;
} else {
first = head - 1; // When buffer is full, first points to the oldest value
}
}
int get(int index) const
// Get value by index in [-180..180 deg] format (0 = oldest, count-1 = newest)
{
int realIndex;
if (index < 0 || index >= count) {
return -1; // Invalid index
}
realIndex = (first + index) % SIZE;
return buffer[realIndex];
// }
}
int get(int index, int deg) const
// Get value by index in [-180..180 deg] or [0..360 deg] format (0 = oldest, count-1 = newest)
{
switch (deg) {
case 180:
// Return value in [-180..180 deg] format
return get(index);
case 360: {
// Return value in [0..360 deg] format
int value = get(index);
if (value < 0) {
value += 360;
};
return value;
}
default:
// Return value in [-180..180 deg] format
return -1;
}
}
int getSize() const
// Get number of valid elements
{
return count;
}
int getMin() const
// Get minimum value in the buffer
{
if (count == 0) {
return -1; // Buffer is empty
} else if (first + count <= SIZE) {
// No wrap-around
return *std::min_element(buffer.begin() + first, buffer.begin() + first + count);
} else {
// Wrap-around: check [first, end) and [begin, (first+count)%SIZE)
int min1 = *std::min_element(buffer.begin() + first, buffer.end());
int min2 = *std::min_element(buffer.begin(), buffer.begin() + ((first + count) % SIZE));
return std::min(min1, min2);
}
}
int getMax() const
// Get maximum value in the buffer
{
if (count == 0) {
return -1; // Buffer is empty
} else if (first + count <= SIZE) {
// No wrap-around
return *std::max_element(buffer.begin() + first, buffer.begin() + first + count);
} else {
// Wrap-around: check [first, end) and [begin, (first+count)%SIZE)
int max1 = *std::max_element(buffer.begin() + first, buffer.end());
int max2 = *std::max_element(buffer.begin(), buffer.begin() + ((first + count) % SIZE));
return std::max(max1, max2);
}
}
int getMid() const
// Get middle value in the buffer
{
if (count == 0) {
return -1; // Buffer is empty
}
return (getMin() + getMax()) / 2;
}
void mvStart(int start)
// Move the start index of buffer forward by <start> positions
{
first = (first + start) % SIZE;
if (count > start)
count -= start;
else
count = 0;
}
// TWA, TWS, HDM, AWA, AWS, STW
bool calcTWD(int* twd, float twa, float tws, float hdm, float awa, float aws, float stw)
// Calculate TWD based on other boat data values
{
if (count == 0) {
return false; // Buffer is empty
}
int twdMin = getMin();
int twdMax = getMax();
int twdMid = getMid();
// Calculate TWD based on TWA and HDM
return true;
}
};
// ****************************************************************
class PageWindPlot : public Page {
bool keylock = false; // Keylock
// int16_t lp = 80; // Pointer length
char mode = 'D'; // Chart mode: 'D' for TWD, 'S' for TWS
int updTime = 1; // Update interval for wind history chart:
// (1)|(2)|(3)|(5) seconds for 3, 7, 10, 15 min. history chart
public:
PageWindPlot(CommonData& common)
{
commonData = &common;
common.logger->logDebug(GwLog::LOG, "Instantiate PageWindPlot");
}
virtual void setupKeys()
{
Page::setupKeys();
commonData->keydata[0].label = "MODE";
commonData->keydata[1].label = "INTV";
}
// Key functions
virtual int handleKey(int key)
{
// Set chart mode TWD | TWS
if (key == 1) {
if (mode == 'D') {
mode = 'S';
} else {
mode = 'D';
}
// setupKeys(); // Update key labels
return 0; // Commit the key
}
// Set interval for wind history chart update time
if (key == 2) {
if (updTime == 1) {
updTime = 2;
} else if (updTime == 2) {
updTime = 3;
} else if (updTime == 3) {
updTime = 5;
} else {
updTime = 1;
}
setupKeys(); // Update key labels
return 0; // Commit the key
}
// Keylock function
if (key == 11) { // Code for keylock
commonData->keylock = !commonData->keylock;
return 0; // Commit the key
}
return key;
}
virtual void displayPage(PageData& pageData)
{
GwConfigHandler* config = commonData->config;
GwLog* logger = commonData->logger;
static wndHistory windValues; // Circular buffer to store wind values
GwApi::BoatValue* bvalue;
const int numCfgValues = 9;
String dataName[numCfgValues];
double dataValue[numCfgValues];
bool dataValid[numCfgValues];
String dataSValue[numCfgValues];
String dataUnit[numCfgValues];
String dataSValueOld[numCfgValues];
String dataUnitOld[numCfgValues];
int width = getdisplay().width(); // Get screen width
int height = getdisplay().height(); // Get screen height
int cHeight = height - 98; // height of chart area
// int cHeight = 80; // height of chart area
int xCenter = width / 2; // Center of screen in x direction
static const int yOffset = 76; // Offset for y coordinates of chart area
static const float radToDeg = 180.0 / M_PI; // Conversion factor from radians to degrees
static int wndCenter = -400; // chart wind center value position; init value indicates that wndCenter is not set yet
static int wndLeft; // chart wind left value position
static int wndRight; // chart wind right value position
static int chrtRng; // Range of wind values from mid wind value to min/max wind value in degrees
int diffRng; // Difference between mid and current wind value
static bool plotShift = false; // Flag to indicate if chartplot data have been shifted
int x, y; // x and y coordinates for drawing
static int prevX, prevY; // Last x and y coordinates for drawing
static int chrtScl; // Scale for wind values in pixels per degree
int chrtVal; // Current wind value
static int chrtPrevVal; // Last wind value in chart area for check if value crosses 180 degree line
int count; // index for next wind value in buffer
static int updCnt = 0; // update counter for wind history chart in seconds
bool isTimeforUpd = true; // Flag to indicate if it is time for chart update
if (windValues.getSize() == 0) {
if (!windValues.begin(cHeight)) {
logger->logDebug(GwLog::ERROR, "Failed to initialize wind values buffer");
return;
}
}
LOG_DEBUG(GwLog::LOG, "Display page WindPlot");
if (updCnt < updTime) {
// Next update interval not reached yet
updCnt++;
isTimeforUpd = false;
} else {
isTimeforUpd = true;
updCnt = 1; // Data update is now; reset counter
}
// Get config data
String lengthformat = config->getString(config->lengthFormat);
bool simulation = config->getBool(config->useSimuData);
bool holdvalues = config->getBool(config->holdvalues);
String flashLED = config->getString(config->flashLED);
String backlightMode = config->getString(config->backlight);
// Read boatdata values for TWD, TWA, TWS, HDM, AWA, AWS, STW, if available
for (int i = 0; i < numCfgValues; i++) {
bvalue = pageData.values[i];
dataName[i] = xdrDelete(bvalue->getName());
dataName[i] = dataName[i].substring(0, 6); // String length limit for value name
dataValue[i] = bvalue->value; // Value as double in SI unit
calibrationData.calibrateInstance(dataName[i], bvalue, logger); // Check if boat data value is to be calibrated
dataValid[i] = bvalue->valid;
dataSValue[i] = formatValue(bvalue, *commonData).svalue; // Formatted value as string including unit conversion and switching decimal places
dataUnit[i] = formatValue(bvalue, *commonData).unit;
if (dataValid[i]) {
dataSValueOld[i] = dataSValue[i]; // Save old value
dataUnitOld[i] = dataUnit[i]; // Save old unit
}
}
// Optical warning by limit violation (unused)
if (String(flashLED) == "Limit Violation") {
setBlinkingLED(false);
setFlashLED(false);
}
// Logging boat values
if (bvalue == NULL)
return;
LOG_DEBUG(GwLog::DEBUG, "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[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]);
// Store TWD wind value in buffer
int twdValue = 0;
if (dataValid[0]) { // TWD data existing
twdValue = int((dataValue[0] * radToDeg) + 0.5); // Read TWD value in degrees and round to integer
} else {
// Try to calculate TWD value from other data, if available
// dataValid[0] = windValues.calcTWD(&twdValue, dataValue[1], dataValue[2], dataValue[3], dataValue[4], dataValue[5], dataValue[6]);
}
if (dataValid[0]) {
windValues.add(twdValue);
count = windValues.getSize(); // Get number of valid elements in buffer; maximum is cHeight
LOG_DEBUG(GwLog::DEBUG, "PageWindPlot: Data 0 valid - dataValue[0]: %f, TWD: %d, cnt: %d, valid0: %d", dataValue[0] * radToDeg, twdValue, count, dataValid[0]);
}
// initialize chart range values
if (wndCenter == -400) {
wndCenter = windValues.get(0);
wndCenter = int((wndCenter + (wndCenter >= 0 ? 5 : -5)) / 10) * 10; // Set new center value; round to nearest 10 degree value
diffRng = 30;
chrtRng = 30;
LOG_DEBUG(GwLog::DEBUG, "PageWindPlot initialized. wndCenter: %d, chrtRng: %d ", wndCenter, chrtRng);
} else {
diffRng = max(abs(((windValues.getMax() - wndCenter + 540) % 360) - 180), abs(((windValues.getMin() - wndCenter + 540) % 360) - 180)); // check necessary range size
if (diffRng < -180) {
// wind value crosses 180 degree line, so we need to adjust the chart range
// ********************** hier an der Skalierung arbeiten ********************
}
if (diffRng > chrtRng) {
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
chrtRng = max(30, int((diffRng + (diffRng >= 0 ? 9 : -1)) / 10) * 10); // Round up to next 10 degree value
}
}
wndLeft = wndCenter - chrtRng;
if (wndLeft < -180)
wndLeft += 360;
wndRight = wndCenter + chrtRng;
if (wndRight >= 180)
wndRight -= 360;
LOG_DEBUG(GwLog::LOG, "PageWindPlot dataValue[0]: %f, windValue: %d, count: %d, diffRng: %d, chartRng: %d", float(dataValue[0] * radToDeg), windValues.get(count - 1), count, diffRng, chrtRng);
// Draw page
//***********************************************************
// Set display in partial refresh mode
getdisplay().setPartialWindow(0, 0, width, height); // Set partial update
getdisplay().setTextColor(commonData->fgcolor);
// Horizontal top line for orientation -> to be deleted
// getdisplay().fillRect(0, 20, width, 1, commonData->fgcolor);
// Show TWS value on top right
getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
getdisplay().setCursor(252, 52);
getdisplay().print(dataSValue[2]); // Value
getdisplay().setFont(&Ubuntu_Bold12pt7b);
getdisplay().setCursor(334, 38);
getdisplay().print(dataName[2]); // Name
getdisplay().setFont(&Ubuntu_Bold8pt7b);
getdisplay().setCursor(330, 53);
getdisplay().print(" ");
if (holdvalues == false) {
getdisplay().print(dataUnit[2]); // Unit
} else {
getdisplay().print(dataUnitOld[2]); // Unit
}
// chart lines
getdisplay().fillRect(0, yOffset, width, 2, commonData->fgcolor);
getdisplay().fillRect(xCenter - 1, yOffset, 2, cHeight, commonData->fgcolor);
// chart labels
char sWndLbl[4]; // Wind label
getdisplay().setFont(&Ubuntu_Bold10pt7b);
getdisplay().setCursor(xCenter - 80, yOffset - 3);
getdisplay().print("TWD"); // Wind name
getdisplay().setCursor(xCenter - 16, yOffset - 3);
snprintf(sWndLbl, 4, "%03d", (wndCenter < 0) ? (wndCenter + 360) : wndCenter);
getdisplay().print(sWndLbl); // Wind center value
getdisplay().drawCircle(xCenter + 21, 63, 2, commonData->fgcolor); // <degree> symbol
getdisplay().drawCircle(xCenter + 21, 63, 3, commonData->fgcolor); // <degree> symbol
getdisplay().setCursor(2, yOffset - 3);
snprintf(sWndLbl, 4, "%03d", (wndLeft < 0) ? (wndLeft + 360) : wndLeft);
getdisplay().print(sWndLbl); // Wind left value
getdisplay().drawCircle(39, 63, 2, commonData->fgcolor); // <degree> symbol
getdisplay().drawCircle(39, 63, 3, commonData->fgcolor); // <degree> symbol
getdisplay().setCursor(width - 43, yOffset - 3);
snprintf(sWndLbl, 4, "%03d", (wndRight < 0) ? (wndRight + 360) : wndRight);
getdisplay().print(sWndLbl); // Wind right value
getdisplay().drawCircle(width - 6, 63, 2, commonData->fgcolor); // <degree> symbol
getdisplay().drawCircle(width - 6, 63, 3, commonData->fgcolor); // <degree> symbol
// Draw wind values in chart
//***********************************************************
if ((dataValid[0] || holdvalues || simulation == true) && isTimeforUpd) {
prevX = xCenter + ((windValues.get(0) - wndCenter) * chrtScl);
prevY = yOffset + cHeight; // Reset lastY to bottom of chart
for (int i = 0; i < count; i++) {
chrtVal = windValues.get(i); // Get value from buffer
if (abs(chrtVal - chrtPrevVal) > 180) {
// Large value jump, so probably crosses -180°/180° degree boundary }
break; // Stop drawing and adjust chart center at next page update
}
chrtScl = xCenter / chrtRng; // current scale: pixels per degree
x = xCenter + ((chrtVal - wndCenter) * chrtScl); // Scale to chart width
// x = xCenter + ((((chrtVal - wndCenter + 540) % 360) - 180) * chrtScl); // Scale to chart width
y = yOffset + cHeight - i; // Position in chart area
// LOG_DEBUG(GwLog::DEBUG, "PageWindPlot: chrtVal: %d, wndCenter: %d, chrtScl: %d, x: %d, y: %d", chrtVal, wndCenter, chrtScl, x, y);
// Draw line with 2 pixels width; make sure vertical line are drawn correctly
getdisplay().drawLine(prevX, prevY, x, y, commonData->fgcolor);
getdisplay().drawLine(prevX, prevY - 1, (x != prevX) ? x : x - 1, (x != prevX) ? y - 1 : y, commonData->fgcolor);
chrtPrevVal = chrtVal;
prevX = x;
prevY = y;
if (i == (cHeight - 1)) {
// Reaching chart area top end
windValues.mvStart(40);
// virtually delete 40 values from buffer
if ((windValues.getMin() > wndCenter) || (windValues.getMax() < wndCenter)) {
int mid = windValues.getMid();
wndCenter = int((mid + (mid >= 0 ? 5 : -5)) / 10) * 10; // Set new center value; round to nearest 10 degree value
}
LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Shift: Min: %d, Max: %d, Mid: %d, new Center: %d", windValues.getMin(), windValues.getMax(), windValues.getMid(), wndCenter);
break;
}
}
LOG_DEBUG(GwLog::DEBUG, "PageWindPlot End: prevX: %d, prevY: %d, loop-Counter: %d", prevX, prevY, count);
} else {
// No valid data available
LOG_DEBUG(GwLog::LOG, "PageWindPlot: No valid data available");
getdisplay().setFont(&Ubuntu_Bold10pt7b);
getdisplay().setCursor(xCenter - 60, height / 2);
getdisplay().print("No sensor data");
}
// Update display
getdisplay().nextPage(); // Partial update (fast)
};
};
static Page* createPage(CommonData& common)
{
return new PageWindPlot(common);
}
/**
* with the code below we make this page known to the PageTask
* we give it a type (name) that can be selected in the config
* we define which function is to be called
* and we provide the number of user parameters we expect (0 here)
* and will will provide the names of the fixed values we need
*/
PageDescription registerPageWindPlot(
"WindPlot", // Page name
createPage, // Action
0, // Number of bus values depends on selection in Web configuration
{ "TWD", "TWA", "TWS", "HDM", "AWA", "AWS", "STW", "COG", "SOG" }, // Bus values we need in the page
true // Show display header on/off
);
#endif