Y Axis label; some interval bug fixing
This commit is contained in:
parent
235188dfb2
commit
fe095a9716
|
@ -31,9 +31,9 @@ public:
|
|||
void add(int value)
|
||||
// Add a new value
|
||||
{
|
||||
if (value > 180) {
|
||||
value -= 360; // Normalize value to -180..180 to make min/max calculations working
|
||||
}
|
||||
// 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) {
|
||||
|
@ -44,7 +44,8 @@ public:
|
|||
}
|
||||
|
||||
int get(int index) const
|
||||
// Get value by index in [-180..180 deg] format (0 = oldest, count-1 = newest)
|
||||
// Get value by index in [0..360 deg] format (0 = oldest, count-1 = newest)
|
||||
// **** Get value by index in [-180..180 deg] format (0 = oldest, count-1 = newest)
|
||||
{
|
||||
int realIndex;
|
||||
|
||||
|
@ -124,6 +125,22 @@ public:
|
|||
return (getMin() + getMax()) / 2;
|
||||
}
|
||||
|
||||
int getRng(int center) const
|
||||
// Get range of values in the buffer relative to a center value
|
||||
{
|
||||
if (count == 0) {
|
||||
return -1; // Buffer is empty
|
||||
}
|
||||
int min = getMin();
|
||||
int max = getMax();
|
||||
int rng = std::max(abs((min - center + 540) % 360 - 180), abs((max - center + 540) % 360 - 180));
|
||||
// if (rng < -180) {
|
||||
// wind value crosses 180 degree line, so we need to adjust the chart range
|
||||
// ********************** hier an der Skalierung arbeiten ********************
|
||||
// }
|
||||
return rng;
|
||||
}
|
||||
|
||||
void mvStart(int start)
|
||||
// Move the start index of buffer forward by <start> positions
|
||||
{
|
||||
|
@ -155,7 +172,7 @@ public:
|
|||
class PageWindPlot : public Page {
|
||||
|
||||
bool keylock = false; // Keylock
|
||||
// int16_t lp = 80; // Pointer length
|
||||
// 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
|
||||
|
@ -227,6 +244,9 @@ public:
|
|||
String dataUnit[numCfgValues];
|
||||
String dataSValueOld[numCfgValues];
|
||||
String dataUnitOld[numCfgValues];
|
||||
bool wndDataValid = false; // Flag to indicate if wind data is valid
|
||||
bool simulation = false;
|
||||
bool holdValues = false;
|
||||
|
||||
int width = getdisplay().width(); // Get screen width
|
||||
int height = getdisplay().height(); // Get screen height
|
||||
|
@ -234,6 +254,7 @@ public:
|
|||
// 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 bool plotShift = false; // Flag to indicate if chartplot data have been shifted
|
||||
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
|
||||
|
@ -241,7 +262,9 @@ public:
|
|||
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
|
||||
static int simWnd = 0; // Simulation value for wind data
|
||||
static float simTWS = 0; // Simulation value for TWS data
|
||||
static const int simStep = 10; // Simulation step for wind data
|
||||
|
||||
int x, y; // x and y coordinates for drawing
|
||||
static int prevX, prevY; // Last x and y coordinates for drawing
|
||||
|
@ -273,8 +296,8 @@ public:
|
|||
|
||||
// Get config data
|
||||
String lengthformat = config->getString(config->lengthFormat);
|
||||
bool simulation = config->getBool(config->useSimuData);
|
||||
bool holdvalues = config->getBool(config->holdvalues);
|
||||
simulation = config->getBool(config->useSimuData);
|
||||
holdValues = config->getBool(config->holdvalues);
|
||||
String flashLED = config->getString(config->flashLED);
|
||||
String backlightMode = config->getString(config->backlight);
|
||||
|
||||
|
@ -294,33 +317,45 @@ public:
|
|||
}
|
||||
}
|
||||
|
||||
// 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
|
||||
wndDataValid = true;
|
||||
} else {
|
||||
// Try to calculate TWD value from other data, if available
|
||||
// wndDataValid = windValues.calcTWD(&twdValue, dataValue[1], dataValue[2], dataValue[3], dataValue[4], dataValue[5], dataValue[6]);
|
||||
}
|
||||
if (isTimeforUpd) {
|
||||
if (wndDataValid) {
|
||||
windValues.add(twdValue);
|
||||
LOG_DEBUG(GwLog::DEBUG, "PageWindPlot: Data 0 valid - dataValue[0]: %f, TWD: %d, cnt: %d, valid0: %d", dataValue[0] * radToDeg, twdValue, count, dataValid[0]);
|
||||
}
|
||||
|
||||
if (simulation) {
|
||||
// Simulate data if simulation is enabled; use default simulation values for TWS
|
||||
simWnd += random(simStep * -1, simStep); // random value between -simStep and +simStep
|
||||
if (simWnd < 0)
|
||||
simWnd += 360;
|
||||
simWnd = simWnd % 360;
|
||||
windValues.add(simWnd);
|
||||
LOG_DEBUG(GwLog::DEBUG, "PageWindPlot simulation data: windValue: %d, windSpeed: %s", simWnd, dataSValue[2].c_str());
|
||||
}
|
||||
}
|
||||
count = windValues.getSize(); // Get number of valid elements in buffer; maximum is cHeight
|
||||
|
||||
// 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],
|
||||
// if (bvalue == NULL)
|
||||
// return;
|
||||
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[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);
|
||||
|
@ -329,14 +364,8 @@ public:
|
|||
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 ********************
|
||||
|
||||
}
|
||||
|
||||
diffRng = windValues.getRng(wndCenter);
|
||||
// diffRng = max(abs(((windValues.getMax() - wndCenter + 540) % 360) - 180), abs(((windValues.getMin() - wndCenter + 540) % 360) - 180)); // check necessary range size
|
||||
if (diffRng > chrtRng) {
|
||||
chrtRng = int((diffRng + (diffRng >= 0 ? 9 : -1)) / 10) * 10; // Round up to next 10 degree value
|
||||
} else if (diffRng + 10 < chrtRng) {
|
||||
|
@ -372,7 +401,7 @@ public:
|
|||
getdisplay().setFont(&Ubuntu_Bold8pt7b);
|
||||
getdisplay().setCursor(330, 53);
|
||||
getdisplay().print(" ");
|
||||
if (holdvalues == false) {
|
||||
if (holdValues == false) {
|
||||
getdisplay().print(dataUnit[2]); // Unit
|
||||
} else {
|
||||
getdisplay().print(dataUnitOld[2]); // Unit
|
||||
|
@ -383,7 +412,7 @@ public:
|
|||
getdisplay().fillRect(xCenter - 1, yOffset, 2, cHeight, commonData->fgcolor);
|
||||
|
||||
// chart labels
|
||||
char sWndLbl[4]; // Wind label
|
||||
char sWndLbl[4]; // char buffer for Wind angle label
|
||||
getdisplay().setFont(&Ubuntu_Bold10pt7b);
|
||||
getdisplay().setCursor(xCenter - 80, yOffset - 3);
|
||||
getdisplay().print("TWD"); // Wind name
|
||||
|
@ -405,20 +434,17 @@ public:
|
|||
|
||||
// Draw wind values in chart
|
||||
//***********************************************************
|
||||
if ((dataValid[0] || holdvalues || simulation == true) && isTimeforUpd) {
|
||||
if (wndDataValid || holdValues || simulation) {
|
||||
|
||||
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
|
||||
// chrtScl = xCenter / chrtRng; // current scale: pixels per degree
|
||||
chrtScl = width / chrtRng / 2; // current scale: pixels per degree
|
||||
// x = xCenter + ((chrtVal - wndCenter) * chrtScl); // Scale to chart width
|
||||
x = ((chrtVal - wndLeft + 360) % 360) * 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);
|
||||
|
||||
|
@ -433,6 +459,7 @@ public:
|
|||
windValues.mvStart(40);
|
||||
// virtually delete 40 values from buffer
|
||||
if ((windValues.getMin() > wndCenter) || (windValues.getMax() < wndCenter)) {
|
||||
// Check if all wind value are left or right of center value -> optimize chart range
|
||||
int mid = windValues.getMid();
|
||||
wndCenter = int((mid + (mid >= 0 ? 5 : -5)) / 10) * 10; // Set new center value; round to nearest 10 degree value
|
||||
}
|
||||
|
@ -442,14 +469,27 @@ public:
|
|||
}
|
||||
LOG_DEBUG(GwLog::DEBUG, "PageWindPlot End: prevX: %d, prevY: %d, loop-Counter: %d", prevX, prevY, count);
|
||||
|
||||
} else {
|
||||
} else if (!wndDataValid) {
|
||||
// No valid data available
|
||||
LOG_DEBUG(GwLog::LOG, "PageWindPlot: No valid data available");
|
||||
getdisplay().setFont(&Ubuntu_Bold10pt7b);
|
||||
getdisplay().setCursor(xCenter - 60, height / 2);
|
||||
getdisplay().setCursor(xCenter - 54, height / 2);
|
||||
getdisplay().print("No sensor data");
|
||||
}
|
||||
|
||||
// chart Y axis labels
|
||||
char sWndYAx[3]; // char buffer for wind Y axis labels
|
||||
int yPos; // Y position for label
|
||||
getdisplay().setFont(&Ubuntu_Bold8pt7b);
|
||||
for (int i = 3; i > 0; i--) {
|
||||
yPos = yOffset + cHeight - (i * 60); // Y position for label
|
||||
getdisplay().fillRect(0, yPos - 7, 28, 15, commonData->bgcolor); // Clear small area to remove potential chart lines
|
||||
getdisplay().fillRect(0, yPos, 8, 2, commonData->fgcolor);
|
||||
getdisplay().setCursor(9, yPos + 5);
|
||||
snprintf(sWndYAx, 4, "%2d", i * updTime);
|
||||
getdisplay().print(sWndYAx); // Wind value label
|
||||
}
|
||||
|
||||
// Update display
|
||||
getdisplay().nextPage(); // Partial update (fast)
|
||||
};
|
||||
|
|
|
@ -0,0 +1,477 @@
|
|||
#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
|
Loading…
Reference in New Issue