From 371816f94646b698b5931b79cb14f6af794c8184 Mon Sep 17 00:00:00 2001 From: Ulrich Meine Date: Sun, 17 Aug 2025 23:50:19 +0200 Subject: [PATCH] PageWindPlot: add simulation data, switch TWD/AWD; diff. setup for OBP40; delete showTWS option --- lib/obp60task/BoatDataCalibration.cpp | 8 +- lib/obp60task/OBPDataOperations.cpp | 26 ++- lib/obp60task/OBPDataOperations.h | 5 +- lib/obp60task/OBPRingBuffer.h | 1 + lib/obp60task/OBPRingBuffer.tpp | 7 + lib/obp60task/PageWindPlot.cpp | 242 ++++++++++++++++---------- lib/obp60task/config_obp40.json | 201 ++++++++++++++++++++- lib/obp60task/obp60task.cpp | 115 +++++++++--- 8 files changed, 480 insertions(+), 125 deletions(-) diff --git a/lib/obp60task/BoatDataCalibration.cpp b/lib/obp60task/BoatDataCalibration.cpp index dcfd8ba..9543926 100644 --- a/lib/obp60task/BoatDataCalibration.cpp +++ b/lib/obp60task/BoatDataCalibration.cpp @@ -101,7 +101,7 @@ void CalibrationDataList::readConfig(GwConfigHandler* config, GwLog* logger) calibMap[instance].slope = slope; calibMap[instance].smooth = smooth; calibMap[instance].isCalibrated = false; - LOG_DEBUG(GwLog::LOG, "stored calibration data: %s, offset: %f, slope: %f, smoothing: %f", instance.c_str(), + LOG_DEBUG(GwLog::LOG, "calibration data: %s, offset: %f, slope: %f, smoothing: %f", instance.c_str(), calibMap[instance].offset, calibMap[instance].slope, calibMap[instance].smooth); } LOG_DEBUG(GwLog::LOG, "all calibration data read"); @@ -117,7 +117,7 @@ void CalibrationDataList::calibrateInstance(GwApi::BoatValue* boatDataValue, GwL std::string format = ""; if (calibMap.find(instance) == calibMap.end()) { - LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s not found in calibration data list", instance.c_str()); + LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s not in calibration list", instance.c_str()); return; } else if (!boatDataValue->valid) { // no valid boat data value, so we don't want to apply calibration data calibMap[instance].isCalibrated = false; @@ -173,7 +173,7 @@ void CalibrationDataList::smoothInstance(GwApi::BoatValue* boatDataValue, GwLog* if (!boatDataValue->valid) { // no valid boat data value, so we don't want to smoothen value return; } else if (calibMap.find(instance) == calibMap.end()) { - LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: smooth factor for %s not found in calibration data list", instance.c_str()); + LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: smooth factor for %s not found in calibration list", instance.c_str()); return; } else { smoothFactor = calibMap[instance].smooth; @@ -184,8 +184,6 @@ void CalibrationDataList::smoothInstance(GwApi::BoatValue* boatDataValue, GwLog* } lastValue[instance] = dataValue; // store the new value for next cycle; first time, store only the current value and return boatDataValue->value = dataValue; // set the smoothed value to the boat data value - - LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s: Smoothing factor: %f, Smoothed value: %f", instance.c_str(), smoothFactor, dataValue); } } diff --git a/lib/obp60task/OBPDataOperations.cpp b/lib/obp60task/OBPDataOperations.cpp index 72c5a8d..5e463e4 100644 --- a/lib/obp60task/OBPDataOperations.cpp +++ b/lib/obp60task/OBPDataOperations.cpp @@ -77,6 +77,25 @@ void WindUtils::calcTwdSA(const double* AWA, const double* AWS, // Serial.println("calcTwdSA: TWD: " + String(*TWD) + ", TWS: " + String(*TWS)); } +double WindUtils::calcHDT(const double* hdmVal, const double* varVal, const double* cogVal, const double* sogVal) +{ + double hdt; + double minSogVal = 0.1; // SOG below this value (m/s) is assumed to be data noise from GPS sensor + static const double DBL_MIN = std::numeric_limits::lowest(); + + // Serial.println("\ncalcTrueWind: HDT: " + String(*hdtVal) + ", HDM: " + String(*hdmVal) + ", VAR: " + String(*varVal) + ", SOG: " + String(*sogVal) + ", COG: " + String(*cogVal)); + if (*hdmVal != DBL_MIN) { + hdt = *hdmVal + (*varVal != DBL_MIN ? *varVal : 0.0); // Use corrected HDM if HDT is not available (or just HDM if VAR is not available) + hdt = to2PI(hdt); + } else if (*cogVal != DBL_MIN && *sogVal >= minSogVal) { + hdt = *cogVal; // Use COG as fallback if HDT and HDM are not available, and SOG is not data noise + } else { + hdt = DBL_MIN; // Cannot calculate HDT without valid HDM or HDM+VAR or COG + } + + return hdt; +} + bool WindUtils::calcTrueWind(const double* awaVal, const double* awsVal, const double* cogVal, const double* stwVal, const double* sogVal, const double* hdtVal, const double* hdmVal, const double* varVal, double* twdVal, double* twsVal, double* twaVal) @@ -87,7 +106,7 @@ bool WindUtils::calcTrueWind(const double* awaVal, const double* awsVal, static const double DBL_MIN = std::numeric_limits::lowest(); // Serial.println("\ncalcTrueWind: HDT: " + String(*hdtVal) + ", HDM: " + String(*hdmVal) + ", VAR: " + String(*varVal) + ", SOG: " + String(*sogVal) + ", COG: " + String(*cogVal)); - if (*hdtVal != DBL_MIN) { +/* if (*hdtVal != DBL_MIN) { hdt = *hdtVal; // Use HDT if available } else { if (*hdmVal != DBL_MIN) { @@ -98,6 +117,11 @@ bool WindUtils::calcTrueWind(const double* awaVal, const double* awsVal, } else { return false; // Cannot calculate without valid HDT or HDM+VAR or COG } + } */ + if (*hdtVal != DBL_MIN) { + hdt = *hdtVal; // Use HDT if available + } else { + hdt = calcHDT(hdmVal, varVal, cogVal, sogVal); } if (*cogVal != DBL_MIN && *sogVal >= minSogVal) { // if SOG is data noise, we don't trust COG diff --git a/lib/obp60task/OBPDataOperations.h b/lib/obp60task/OBPDataOperations.h index 7994057..912a8d8 100644 --- a/lib/obp60task/OBPDataOperations.h +++ b/lib/obp60task/OBPDataOperations.h @@ -1,12 +1,14 @@ #pragma once #include "GwApi.h" #include "OBPRingBuffer.h" -#include +// #include #include typedef struct { RingBuffer* twdHstry; RingBuffer* twsHstry; + RingBuffer* awdHstry; + RingBuffer* awsHstry; } tBoatHstryData; // Holds pointers to all history buffers for boat data class HstryBuf { @@ -30,6 +32,7 @@ public: static void calcTwdSA(const double* AWA, const double* AWS, const double* CTW, const double* STW, const double* HDT, double* TWD, double* TWS, double* TWA); + static double calcHDT(const double* hdmVal, const double* varVal, const double* cogVal, const double* sogVal); static bool calcTrueWind(const double* awaVal, const double* awsVal, const double* cogVal, const double* stwVal, const double* sogVal, const double* hdtVal, const double* hdmVal, const double* varVal, double* twdVal, double* twsVal, double* twaVal); diff --git a/lib/obp60task/OBPRingBuffer.h b/lib/obp60task/OBPRingBuffer.h index 4b5e5bd..79840de 100644 --- a/lib/obp60task/OBPRingBuffer.h +++ b/lib/obp60task/OBPRingBuffer.h @@ -32,6 +32,7 @@ public: void setMetaData(String name, String format, int updateFrequency, T minValue, T maxValue); // Set meta data for buffer bool getMetaData(String& name, String& format, int& updateFrequency, T& minValue, T& maxValue); // Get meta data of buffer String getName() const; // Get buffer name + String getFormat() const; // Get buffer data format void add(const T& value); // Add a new value to buffer T get(size_t index) const; // Get value at specific position (0-based index from oldest to newest) T getFirst() const; // Get the first (oldest) value in buffer diff --git a/lib/obp60task/OBPRingBuffer.tpp b/lib/obp60task/OBPRingBuffer.tpp index a0da425..2f7cc13 100644 --- a/lib/obp60task/OBPRingBuffer.tpp +++ b/lib/obp60task/OBPRingBuffer.tpp @@ -64,6 +64,13 @@ String RingBuffer::getName() const return dataName; } +// Get buffer data format +template +String RingBuffer::getFormat() const +{ + return dataFmt; +} + // Add a new value to buffer template void RingBuffer::add(const T& value) diff --git a/lib/obp60task/PageWindPlot.cpp b/lib/obp60task/PageWindPlot.cpp index acac0fc..497fd44 100644 --- a/lib/obp60task/PageWindPlot.cpp +++ b/lib/obp60task/PageWindPlot.cpp @@ -6,16 +6,16 @@ #include "Pagedata.h" #include -static const double radToDeg = 180.0 / PI; // Conversion factor from radians to degrees +static const double radToDeg = 180.0 / M_PI; // Conversion factor from radians to degrees -// Get maximum difference of last of TWD ringbuffer values to center chart +// Get maximum difference of last of TWD ringbuffer values to center chart; returns "0" if data is not valid int getCntr(const RingBuffer& windDirHstry, size_t amount) { int minVal = windDirHstry.getMinVal(); size_t count = windDirHstry.getCurrentSize(); if (windDirHstry.isEmpty() || amount <= 0) { - return minVal; + return 0; } if (amount > count) amount = count; @@ -54,7 +54,6 @@ int getRng(const RingBuffer& windDirHstry, int center, size_t amount) int maxRng = minVal; // Start from the newest value (last) and go backwards x times for (size_t i = 0; i < amount; i++) { - // value = windDirHstry.get(((last - i) % capacity + capacity) % capacity); value = windDirHstry.get(count - 1 - i); if (value == minVal) { @@ -78,23 +77,37 @@ class PageWindPlot : public Page { bool keylock = false; // Keylock char chrtMode = 'D'; // Chart mode: 'D' for TWD, 'S' for TWS, 'B' for both + bool showTruW = true; // Show true wind or apparant wind in chart area int dataIntv = 1; // Update interval for wind 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 useSimuData; + String flashLED; + String backlightMode; public: PageWindPlot(CommonData& common) { commonData = &common; common.logger->logDebug(GwLog::LOG, "Instantiate PageWindPlot"); + + // Get config data + useSimuData = common.config->getBool(common.config->useSimuData); + // holdValues = common.config->getBool(common.config->holdvalues); + flashLED = common.config->getString(common.config->flashLED); + backlightMode = common.config->getString(common.config->backlight); + } virtual void setupKeys() { Page::setupKeys(); // commonData->keydata[0].label = "MODE"; +#if defined BOARD_OBP60S3 + commonData->keydata[1].label = "SRC"; + commonData->keydata[4].label = "INTV"; +#elif defined BOARD_OBP40S3 commonData->keydata[1].label = "INTV"; - commonData->keydata[4].label = "TWS"; +#endif } // Key functions @@ -112,8 +125,18 @@ public: return 0; // Commit the key } - // Set interval for wind history chart update time +#if defined BOARD_OBP60S3 + // Set data source TRUE | APP if (key == 2) { + showTruW = !showTruW; + return 0; // Commit the key + } + + // Set interval for wind history chart update time (interval) + if (key == 5) { +#elif defined BOARD_OBP40S3 + if (key == 2) { +#endif if (dataIntv == 1) { dataIntv = 2; } else if (dataIntv == 2) { @@ -126,12 +149,6 @@ public: return 0; // Commit the key } - // Switch TWS on/off - if (key == 5) { - showTWS = !showTWS; - return 0; // Commit the key - } - // Keylock function if (key == 11) { // Code for keylock commonData->keylock = !commonData->keylock; @@ -140,19 +157,39 @@ public: return key; } + virtual void displayNew(PageData &pageData){ +#ifdef BOARD_OBP40S3 + String wndSrc; // Wind source true/apparant wind - preselection for OBP40 + + wndSrc = commonData->config->getString("page" + String(pageData.pageNumber) + "wndsrc"); + if (wndSrc =="True wind") { + showTruW = true; + } else { + showTruW = false; // Wind source is apparant wind + } + commonData->logger->logDebug(GwLog::LOG,"New PageWindPlot: wind source=%s", wndSrc); +#endif + } + + + int displayPage(PageData& pageData) { GwConfigHandler* config = commonData->config; GwLog* logger = commonData->logger; - float twsValue; // TWS value in chart area - static String twdName, twdUnit; // TWD name and unit - static int updFreq; // Update frequency for TWD - static int16_t twdLowest, twdHighest; // TWD range - // static int16_t twdBufMinVal; // lowest possible twd buffer value; used for non-set data + static RingBuffer* wdHstry; // Wind direction data buffer + static RingBuffer* wsHstry; // Wind speed data buffer + static String wdName, wdFormat; // Wind direction name and format + static String wsName, wsFormat; // Wind speed name and format + static int updFreq; // Update frequency for wind direction + static int16_t wdLowest, wdHighest; // Wind direction range + float wsValue; // Wind speed value in chart area + String wsUnit; // Wind speed unit in chart area + static GwApi::BoatValue* wsBVal = new GwApi::BoatValue("TWS"); // temp BoatValue for wind speed unit identification; required by OBP60Formater - // current boat data values; TWD only for validation test, TWS for display of current value - const int numBoatData = 2; + // current boat data values; TWD/AWD only for validation test, TWS/AWS for display of current value + const int numBoatData = 4; GwApi::BoatValue* bvalue; String BDataName[numBoatData]; double BDataValue[numBoatData]; @@ -164,8 +201,6 @@ public: static bool isInitialized = false; // Flag to indicate that page is initialized static bool wndDataValid = false; // Flag to indicate if wind data is valid static int numNoData; // Counter for multiple invalid data values in a row - // static bool useSimuData = false; - // static bool holdValues = false; static int width; // Screen width static int height; // Screen height @@ -182,6 +217,7 @@ public: static size_t lastIdx; // Last index of TWD history buffer static size_t lastAddedIdx = 0; // Last index of TWD history buffer when new data was added static int oldDataIntv; // remember recent user selection of data interval + static bool oldShowTruW; // remember recent user selection of wind data type static int wndCenter; // chart wind center value position static int wndLeft; // chart wind left value position @@ -190,8 +226,6 @@ public: int diffRng; // Difference between mid and current wind value static const int dfltRng = 60; // Default range for chart int midWndDir; // New value for wndCenter after chart start / shift - // static int simTwd; // Simulation value for TWD - // static float simTws; // Simulation value for TWS int x, y; // x and y coordinates for drawing static int prevX, prevY; // Last x and y coordinates for drawing @@ -199,29 +233,33 @@ public: int chrtVal; // Current wind value static int chrtPrevVal; // Last wind value in chart area for check if value crosses 180 degree line - LOG_DEBUG(GwLog::LOG, "Display page WindPlot"); + LOG_DEBUG(GwLog::LOG, "Display PageWindPlot"); - // Get config data +/* // Get config data bool useSimuData = config->getBool(config->useSimuData); // holdValues = config->getBool(config->holdvalues); String flashLED = config->getString(config->flashLED); String backlightMode = config->getString(config->backlight); - +*/ if (!isInitialized) { width = getdisplay().width(); height = getdisplay().height(); xCenter = width / 2; cHeight = height - yOffset - 22; - bufSize = pageData.boatHstry.twdHstry->getCapacity(); numNoData = 0; - // simTwd = pageData.boatHstry.twdHstry->getLast() / 1000.0 * radToDeg; - // simTws = 0; - twsValue = 0; bufStart = 0; oldDataIntv = 0; + oldShowTruW = false; // we want to initialize wind buffers at 1st time routine runs + wdHstry = pageData.boatHstry.twdHstry; + bufSize = wdHstry->getCapacity(); + wsHstry = pageData.boatHstry.twsHstry; + bufSize = wsHstry->getCapacity(); + wdHstry->getMetaData(wdName, wdFormat, updFreq, wdLowest, wdHighest); + wsHstry->getMetaData(wsName, wsFormat, updFreq, wdLowest, wdHighest); + wsValue = 0; + wsBVal->setFormat(wsHstry->getFormat()); numAddedBufVals, currIdx, lastIdx = 0; - lastAddedIdx = pageData.boatHstry.twdHstry->getLastIdx(); - pageData.boatHstry.twdHstry->getMetaData(twdName, twdUnit, updFreq, twdLowest, twdHighest); + lastAddedIdx = wdHstry->getLastIdx(); wndCenter = INT_MIN; midWndDir = 0; diffRng = dfltRng; @@ -249,9 +287,25 @@ public: setFlashLED(false); } + if (showTruW != oldShowTruW) { + if (showTruW) { + wdHstry = pageData.boatHstry.twdHstry; + wsHstry = pageData.boatHstry.twsHstry; + } else { + wdHstry = pageData.boatHstry.awdHstry; + wsHstry = pageData.boatHstry.awsHstry; + } + wdHstry->getMetaData(wdName, wdFormat, updFreq, wdLowest, wdHighest); + wsHstry->getMetaData(wsName, wsFormat, updFreq, wdLowest, wdHighest); + bufSize = wdHstry->getCapacity(); + wsBVal->setFormat(wsHstry->getFormat()); + + oldShowTruW = showTruW; + } + // Identify buffer size and buffer start position for chart - count = pageData.boatHstry.twdHstry->getCurrentSize(); - currIdx = pageData.boatHstry.twdHstry->getLastIdx(); + count = wdHstry->getCurrentSize(); + currIdx = wdHstry->getLastIdx(); numAddedBufVals = (currIdx - lastAddedIdx + bufSize) % bufSize; // Number of values added to buffer since last display if (dataIntv != oldDataIntv || count == 1) { // new data interval selected by user @@ -267,24 +321,25 @@ public: bufStart = max(0, bufStart - numAddedBufVals); } } - LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Dataset: count: %d, TWD: %.0f, TWS: %.1f, TWD_valid? %d, intvBufSize: %d, numWndVals: %d, bufStart: %d, numAddedBufVals: %d, lastIdx: %d, old: %d, act: %d", - count, pageData.boatHstry.twdHstry->getLast() / 1000.0 * radToDeg, pageData.boatHstry.twsHstry->getLast() / 10.0 * 1.94384, BDataValid[0], - intvBufSize, numWndVals, bufStart, numAddedBufVals, pageData.boatHstry.twdHstry->getLastIdx(), oldDataIntv, dataIntv); + LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Dataset: count: %d, xWD: %.0f, xWS: %.1f, xWD_valid? %d, intvBufSize: %d, numWndVals: %d, bufStart: %d, numAddedBufVals: %d, lastIdx: %d, wind source: %s", + count, wdHstry->getLast() / 1000.0 * radToDeg, wsHstry->getLast() / 10.0 * 1.94384, BDataValid[0], intvBufSize, numWndVals, bufStart, numAddedBufVals, wdHstry->getLastIdx(), + showTruW ? "True" : "App"); // Set wndCenter from 1st real buffer value if (wndCenter == INT_MIN || (wndCenter == 0 && count == 1)) { - wndCenter = getCntr(*pageData.boatHstry.twdHstry, numWndVals); - LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Range Init: count: %d, TWD: %.0f, wndCenter: %d, diffRng: %d, chrtRng: %d, Min: %.0f, Max: %.0f", count, pageData.boatHstry.twdHstry->getLast() / 1000.0 * radToDeg, - wndCenter, diffRng, chrtRng, pageData.boatHstry.twdHstry->getMin(numWndVals) / 1000.0 * radToDeg, pageData.boatHstry.twdHstry->getMax(numWndVals) / 1000.0 * radToDeg); + wndCenter = getCntr(*wdHstry, numWndVals); + LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Range Init: count: %d, xWD: %.0f, wndCenter: %d, diffRng: %d, chrtRng: %d, Min: %.0f, Max: %.0f", count, wdHstry->getLast() / 1000.0 * radToDeg, + wndCenter, diffRng, chrtRng, wdHstry->getMin(numWndVals) / 1000.0 * radToDeg, wdHstry->getMax(numWndVals) / 1000.0 * radToDeg); } else { // check and adjust range between left, center, and right chart limit - diffRng = getRng(*pageData.boatHstry.twdHstry, wndCenter, numWndVals); + diffRng = getRng(*wdHstry, wndCenter, numWndVals); diffRng = (diffRng == INT16_MIN ? 0 : diffRng); 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(dfltRng, int((diffRng + (diffRng >= 0 ? 9 : -1)) / 10) * 10); - LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Range adjust: wndCenter: %d, diffRng: %d, chrtRng: %d, Min: %.0f, Max: %.0f", wndCenter, diffRng, chrtRng, pageData.boatHstry.twdHstry->getMin(numWndVals) / 1000.0 * radToDeg, pageData.boatHstry.twdHstry->getMax(numWndVals) / 1000.0 * radToDeg); + LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Range adjust: wndCenter: %d, diffRng: %d, chrtRng: %d, Min: %.0f, Max: %.0f", wndCenter, diffRng, chrtRng, + wdHstry->getMin(numWndVals) / 1000.0 * radToDeg, wdHstry->getMax(numWndVals) / 1000.0 * radToDeg); } } chrtScl = float(width) / float(chrtRng) / 2.0; // Chart scale: pixels per degree @@ -310,7 +365,8 @@ public: char sWndLbl[4]; // char buffer for Wind angle label getdisplay().setFont(&Ubuntu_Bold12pt8b); getdisplay().setCursor(xCenter - 88, yOffset - 3); - getdisplay().print("TWD"); // Wind data name +// getdisplay().print("TWD"); // Wind data name + getdisplay().print(wdName); // Wind data name snprintf(sWndLbl, 4, "%03d", (wndCenter < 0) ? (wndCenter + 360) : wndCenter); drawTextCenter(xCenter, yOffset - 11, sWndLbl); getdisplay().drawCircle(xCenter + 25, yOffset - 17, 2, commonData->fgcolor); // symbol @@ -326,7 +382,7 @@ public: getdisplay().drawCircle(width - 5, yOffset - 17, 2, commonData->fgcolor); // symbol getdisplay().drawCircle(width - 5, yOffset - 17, 3, commonData->fgcolor); // symbol - if (pageData.boatHstry.twdHstry->getMax() == pageData.boatHstry.twdHstry->getMinVal()) { + if (wdHstry->getMax() == wdHstry->getMinVal()) { // only values in buffer -> no valid wind data available wndDataValid = false; } else if (!BDataValid[0] && !useSimuData) { @@ -345,7 +401,7 @@ public: //*********************************************************************** if (wndDataValid) { for (int i = 0; i < (numWndVals / dataIntv); i++) { - chrtVal = static_cast(pageData.boatHstry.twdHstry->get(bufStart + (i * dataIntv))); // show the latest wind values in buffer; keep 1st value constant in a rolling buffer + chrtVal = static_cast(wdHstry->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; } else { @@ -385,62 +441,60 @@ public: if (i >= (cHeight - 1)) { oldDataIntv = 0; // force reset of buffer start and number of values to show in next display loop - int minWndDir = pageData.boatHstry.twdHstry->getMin(numWndVals) / 1000.0 * radToDeg; - int maxWndDir = pageData.boatHstry.twdHstry->getMax(numWndVals) / 1000.0 * radToDeg; + int minWndDir = wdHstry->getMin(numWndVals) / 1000.0 * radToDeg; + int maxWndDir = wdHstry->getMax(numWndVals) / 1000.0 * radToDeg; LOG_DEBUG(GwLog::DEBUG, "PageWindPlot FreeTop: Minimum: %d, Maximum: %d, OldwndCenter: %d", minWndDir, maxWndDir, wndCenter); // if (((minWndDir - wndCenter >= 0) && (minWndDir - wndCenter < 180)) || ((maxWndDir - wndCenter <= 0) && (maxWndDir - wndCenter >=180))) { if ((wndRight > wndCenter && (minWndDir >= wndCenter && minWndDir <= wndRight)) || (wndRight <= wndCenter && (minWndDir >= wndCenter || minWndDir <= wndRight)) || (wndLeft < wndCenter && (maxWndDir <= wndCenter && maxWndDir >= wndLeft)) || (wndLeft >= wndCenter && (maxWndDir <= wndCenter || maxWndDir >= wndLeft))) { // Check if all wind value are left or right of center value -> optimize chart center - wndCenter = getCntr(*pageData.boatHstry.twdHstry, numWndVals); + wndCenter = getCntr(*wdHstry, numWndVals); } LOG_DEBUG(GwLog::DEBUG, "PageWindPlot FreeTop: cHeight: %d, bufStart: %d, numWndVals: %d, wndCenter: %d", cHeight, bufStart, numWndVals, wndCenter); break; } } - // Print TWS value - if (showTWS) { - int currentZone; - static int lastZone = 0; - static bool flipTws = false; - int xPosTws; - static const int yPosTws = yOffset + 40; + // Print wind speed value + int currentZone; + static int lastZone = 0; + static bool flipTws = false; + int xPosTws; + static const int yPosTws = yOffset + 40; - xPosTws = flipTws ? 20 : width - 145; - currentZone = (y >= yPosTws - 38) && (y <= yPosTws + 6) && (x >= xPosTws - 4) && (x <= xPosTws + 146) ? 1 : 0; // Define current zone for TWS value - if (currentZone != lastZone) { - // Only flip when x moves to a different zone - if ((y >= yPosTws - 38) && (y <= yPosTws + 6) && (x >= xPosTws - 4) && (x <= xPosTws + 146)) { - flipTws = !flipTws; - xPosTws = flipTws ? 20 : width - 145; - } + xPosTws = flipTws ? 20 : width - 145; + currentZone = (y >= yPosTws - 38) && (y <= yPosTws + 6) && (x >= xPosTws - 4) && (x <= xPosTws + 146) ? 1 : 0; // Define current zone for TWS value + if (currentZone != lastZone) { + // Only flip when x moves to a different zone + if ((y >= yPosTws - 38) && (y <= yPosTws + 6) && (x >= xPosTws - 4) && (x <= xPosTws + 146)) { + flipTws = !flipTws; + xPosTws = flipTws ? 20 : width - 145; } - lastZone = currentZone; - - twsValue = pageData.boatHstry.twsHstry->getLast(); - getdisplay().fillRect(xPosTws - 4, yPosTws - 38, 142, 44, commonData->bgcolor); // Clear area for TWS value - getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b); - getdisplay().setCursor(xPosTws, yPosTws); - if (twsValue == pageData.boatHstry.twsHstry->getMinVal()) { - getdisplay().print("--.-"); - } else { - twsValue = twsValue / 10.0 * 1.94384; // TWS value in knots - if (twsValue < 10.0) { - getdisplay().printf("!%3.1f", twsValue); // Value, round to 1 decimal - } else { - getdisplay().printf("%4.1f", twsValue); // Value, round to 1 decimal - } - } - getdisplay().setFont(&Ubuntu_Bold12pt8b); - getdisplay().setCursor(xPosTws + 82, yPosTws - 14); - // getdisplay().print("TWS"); // Name - getdisplay().print(BDataName[1]); // Name - getdisplay().setFont(&Ubuntu_Bold8pt8b); - // getdisplay().setCursor(xPosTws + 78, yPosTws + 1); - getdisplay().setCursor(xPosTws + 82, yPosTws + 1); - // getdisplay().printf(" kn"); // Unit - getdisplay().print(BDataUnit[1]); // Unit } + lastZone = currentZone; + + wsValue = wsHstry->getLast(); + wsBVal->value = wsValue; // temp variable to retreive data unit from OBP60Formater + wsBVal->valid = (static_cast(wsValue) != wsHstry->getMinVal()); + wsUnit = formatValue(wsBVal, *commonData).unit; // Unit of value + getdisplay().fillRect(xPosTws - 4, yPosTws - 38, 142, 44, commonData->bgcolor); // Clear area for TWS value + getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b); + getdisplay().setCursor(xPosTws, yPosTws); + if (!wsBVal->valid) { + getdisplay().print("--.-"); + } else { + wsValue = wsValue / 10.0 * 1.94384; // Wind speed value in knots + if (wsValue < 10.0) { + getdisplay().printf("!%3.1f", wsValue); // Value, round to 1 decimal + } else { + getdisplay().printf("%4.1f", wsValue); // Value, round to 1 decimal + } + } + getdisplay().setFont(&Ubuntu_Bold12pt8b); + getdisplay().setCursor(xPosTws + 82, yPosTws - 14); + getdisplay().print(wsName); // Name + getdisplay().setFont(&Ubuntu_Bold8pt8b); + getdisplay().setCursor(xPosTws + 82, yPosTws + 1); + getdisplay().print(wsUnit); // Unit } else { // No valid data available @@ -477,19 +531,17 @@ static Page* createPage(CommonData& common) { return new PageWindPlot(common); } -/** - * with the code below we make this page known to the PageTask + +/* 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 - */ + * 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", "TWS" }, // Bus values we need in the page - // {}, // Bus values we need in the page + { "TWD", "TWS", "AWD", "AWS" }, // Bus values we need in the page true // Show display header on/off ); diff --git a/lib/obp60task/config_obp40.json b/lib/obp60task/config_obp40.json index 92cb0f6..5e32cbf 100644 --- a/lib/obp60task/config_obp40.json +++ b/lib/obp60task/config_obp40.json @@ -1600,6 +1600,26 @@ } ] }, + { + "name": "page1wndsrc", + "label": "Wind source", + "type": "list", + "default": "True wind", + "description": "Wind source for page 1: [true|apparant]", + "list": [ + "True wind", + "Apparant wind" + ], + "category": "OBP40 Page 1", + "capabilities": { + "obp40": "true" + }, + "condition": [ + { + "page1type": "WindPlot" + } + ] + }, { "name": "page2type", "label": "Type", @@ -1878,6 +1898,26 @@ } ] }, + { + "name": "page2wndsrc", + "label": "Wind source", + "type": "list", + "default": "True wind", + "description": "Wind source for page 2: [true|apparant]", + "list": [ + "True wind", + "Apparant wind" + ], + "category": "OBP40 Page 2", + "capabilities": { + "obp40": "true" + }, + "condition": [ + { + "page2type": "WindPlot" + } + ] + }, { "name": "page3type", "label": "Type", @@ -2153,6 +2193,26 @@ } ] }, + { + "name": "page3wndsrc", + "label": "Wind source", + "type": "list", + "default": "True wind", + "description": "Wind source for page 3: [true|apparant]", + "list": [ + "True wind", + "Apparant wind" + ], + "category": "OBP40 Page 3", + "capabilities": { + "obp40": "true" + }, + "condition": [ + { + "page3type": "WindPlot" + } + ] + }, { "name": "page4type", "label": "Type", @@ -2425,6 +2485,26 @@ } ] }, + { + "name": "page4wndsrc", + "label": "Wind source", + "type": "list", + "default": "True wind", + "description": "Wind source for page 4: [true|apparant]", + "list": [ + "True wind", + "Apparant wind" + ], + "category": "OBP40 Page 4", + "capabilities": { + "obp40": "true" + }, + "condition": [ + { + "page4type": "WindPlot" + } + ] + }, { "name": "page5type", "label": "Type", @@ -2694,6 +2774,26 @@ } ] }, + { + "name": "page5wndsrc", + "label": "Wind source", + "type": "list", + "default": "True wind", + "description": "Wind source for page 5: [true|apparant]", + "list": [ + "True wind", + "Apparant wind" + ], + "category": "OBP40 Page 5", + "capabilities": { + "obp40": "true" + }, + "condition": [ + { + "page5type": "WindPlot" + } + ] + }, { "name": "page6type", "label": "Type", @@ -2960,6 +3060,26 @@ } ] }, + { + "name": "page6wndsrc", + "label": "Wind source", + "type": "list", + "default": "True wind", + "description": "Wind source for page 6: [true|apparant]", + "list": [ + "True wind", + "Apparant wind" + ], + "category": "OBP40 Page 6", + "capabilities": { + "obp40": "true" + }, + "condition": [ + { + "page6type": "WindPlot" + } + ] + }, { "name": "page7type", "label": "Type", @@ -3223,6 +3343,26 @@ } ] }, + { + "name": "page7wndsrc", + "label": "Wind source", + "type": "list", + "default": "True wind", + "description": "Wind source for page 7: [true|apparant]", + "list": [ + "True wind", + "Apparant wind" + ], + "category": "OBP40 Page 7", + "capabilities": { + "obp40": "true" + }, + "condition": [ + { + "page7type": "WindPlot" + } + ] + }, { "name": "page8type", "label": "Type", @@ -3483,6 +3623,26 @@ } ] }, + { + "name": "page8wndsrc", + "label": "Wind source", + "type": "list", + "default": "True wind", + "description": "Wind source for page 8: [true|apparant]", + "list": [ + "True wind", + "Apparant wind" + ], + "category": "OBP40 Page 8", + "capabilities": { + "obp40": "true" + }, + "condition": [ + { + "page8type": "WindPlot" + } + ] + }, { "name": "page9type", "label": "Type", @@ -3740,6 +3900,26 @@ } ] }, + { + "name": "page9wndsrc", + "label": "Wind source", + "type": "list", + "default": "True wind", + "description": "Wind source for page 9: [true|apparant]", + "list": [ + "True wind", + "Apparant wind" + ], + "category": "OBP40 Page 9", + "capabilities": { + "obp40": "true" + }, + "condition": [ + { + "page9type": "WindPlot" + } + ] + }, { "name": "page10type", "label": "Type", @@ -3993,6 +4173,25 @@ "page10type": "Fluid" } ] + }, + { + "name": "page10wndsrc", + "label": "Wind source", + "type": "list", + "default": "True wind", + "description": "Wind source for page 10: [true|apparant]", + "list": [ + "True wind", + "Apparant wind" + ], + "category": "OBP40 Page 10", + "capabilities": { + "obp40": "true" + }, + "condition": [ + { + "page10type": "WindPlot" + } + ] } ] - diff --git a/lib/obp60task/obp60task.cpp b/lib/obp60task/obp60task.cpp index c27ec9a..b78428d 100644 --- a/lib/obp60task/obp60task.cpp +++ b/lib/obp60task/obp60task.cpp @@ -376,8 +376,8 @@ void underVoltageDetection(GwApi *api, CommonData &common){ } } +// Calculate true wind data and add to obp60task boat data list bool addTrueWind(GwApi* api, BoatValueList* boatValues) { - // Calculate true wind data and add to obp60task boat data list double awaVal, awsVal, cogVal, stwVal, sogVal, hdtVal, hdmVal, varVal; double twd, tws, twa; @@ -428,22 +428,33 @@ bool addTrueWind(GwApi* api, BoatValueList* boatValues) { return isCalculated; } +// Init history buffers for selected boat data void initHstryBuf(GwApi* api, BoatValueList* boatValues, tBoatHstryData hstryBufList) { - // Init history buffers for TWD, TWS GwApi::BoatValue *calBVal; // temp variable just for data calibration -> we don't want to calibrate the original data here + const double DBL_MIN = std::numeric_limits::lowest(); int hstryUpdFreq = 1000; // Update frequency for history buffers in ms int hstryMinVal = 0; // Minimum value for these history buffers - int twdHstryMax = 6283; // Max value for wind direction (TWD) in rad (0...2*PI), shifted by 1000 for 3 decimals - int twsHstryMax = 1000; // Max value for wind speed (TWS) in m/s, shifted by 10 for 1 decimal + int twdHstryMax = 6283; // Max value for wind direction (TWD, AWD) in rad (0...2*PI), shifted by 1000 for 3 decimals + int twsHstryMax = 1000; // Max value for wind speed (TWS, AWS) in m/s, shifted by 10 for 1 decimal // Initialize history buffers with meta data hstryBufList.twdHstry->setMetaData("TWD", "formatCourse", hstryUpdFreq, hstryMinVal, twdHstryMax); hstryBufList.twsHstry->setMetaData("TWS", "formatKnots", hstryUpdFreq, hstryMinVal, twsHstryMax); + hstryBufList.awdHstry->setMetaData("AWD", "formatCourse", hstryUpdFreq, hstryMinVal, twdHstryMax); + hstryBufList.awsHstry->setMetaData("AWS", "formatKnots", hstryUpdFreq, hstryMinVal, twsHstryMax); + // create boat values for history data types, if they don't exist yet GwApi::BoatValue *twdBVal = boatValues->findValueOrCreate(hstryBufList.twdHstry->getName()); GwApi::BoatValue *twsBVal = boatValues->findValueOrCreate(hstryBufList.twsHstry->getName()); GwApi::BoatValue *twaBVal = boatValues->findValueOrCreate("TWA"); + GwApi::BoatValue *awdBVal = boatValues->findValueOrCreate(hstryBufList.awdHstry->getName()); + GwApi::BoatValue *awsBVal = boatValues->findValueOrCreate(hstryBufList.awsHstry->getName()); + + if (!awdBVal->valid) { // AWD usually does not exist + awdBVal->setFormat(hstryBufList.awdHstry->getFormat()); + awdBVal->value = DBL_MIN; + } } void handleHstryBuf(GwApi* api, BoatValueList* boatValues, tBoatHstryData hstryBufList, bool useSimuData) { @@ -455,12 +466,26 @@ void handleHstryBuf(GwApi* api, BoatValueList* boatValues, tBoatHstryData hstryB int16_t twdHstryMax = hstryBufList.twdHstry->getMaxVal(); int16_t twsHstryMin = hstryBufList.twsHstry->getMinVal(); int16_t twsHstryMax = hstryBufList.twsHstry->getMaxVal(); - static int16_t twdBuf, twsBuf = 20; //initial value only relevant if we use simulation data + int16_t awdHstryMin = hstryBufList.awdHstry->getMinVal(); + int16_t awdHstryMax = hstryBufList.awdHstry->getMaxVal(); + int16_t awsHstryMin = hstryBufList.awsHstry->getMinVal(); + int16_t awsHstryMax = hstryBufList.awsHstry->getMaxVal(); + static int16_t twd, tws = 20; //initial value only relevant if we use simulation data + static double awd, aws, hdt = 20; //initial value only relevant if we use simulation data GwApi::BoatValue *calBVal; // temp variable just for data calibration -> we don't want to calibrate the original data here GwApi::BoatValue *twdBVal = boatValues->findValueOrCreate(hstryBufList.twdHstry->getName()); GwApi::BoatValue *twsBVal = boatValues->findValueOrCreate(hstryBufList.twsHstry->getName()); GwApi::BoatValue *twaBVal = boatValues->findValueOrCreate("TWA"); + GwApi::BoatValue *awdBVal = boatValues->findValueOrCreate(hstryBufList.awdHstry->getName()); + GwApi::BoatValue *awsBVal = boatValues->findValueOrCreate(hstryBufList.awsHstry->getName()); + GwApi::BoatValue *awaBVal = boatValues->findValueOrCreate("AWA"); + GwApi::BoatValue *hdtBVal = boatValues->findValueOrCreate("HDT"); + GwApi::BoatValue *hdmBVal = boatValues->findValueOrCreate("HDM"); + GwApi::BoatValue *varBVal = boatValues->findValueOrCreate("VAR"); + GwApi::BoatValue *cogBVal = boatValues->findValueOrCreate("COG"); + GwApi::BoatValue *sogBVal = boatValues->findValueOrCreate("SOG"); + api->getLogger()->logDebug(GwLog::DEBUG,"obp60task handleHstryBuf: TWD_isValid? %d, twdBVal: %.1f, twaBVal: %.1f, twsBVal: %.1f", twdBVal->valid, twdBVal->value * RAD_TO_DEG, twaBVal->value * RAD_TO_DEG, twsBVal->value * 3.6 / 1.852); @@ -470,17 +495,16 @@ void handleHstryBuf(GwApi* api, BoatValueList* boatValues, tBoatHstryData hstryB calBVal->value = twdBVal->value; calBVal->valid = twdBVal->valid; calibrationData.calibrateInstance(calBVal, logger); // Check if boat data value is to be calibrated - twdBuf = static_cast(std::round(calBVal->value * 1000)); - if (twdBuf >= twdHstryMin && twdBuf <= twdHstryMax) { - hstryBufList.twdHstry->add(twdBuf); + twd = static_cast(std::round(calBVal->value * 1000)); + if (twd >= twdHstryMin && twd <= twdHstryMax) { + hstryBufList.twdHstry->add(twd); } delete calBVal; calBVal = nullptr; } else if (useSimuData) { - twdBuf += random(-20, 20); - twdBuf = WindUtils::to360(twdBuf); - api->getLogger()->logDebug(GwLog::DEBUG,"obp60task Simu: twdBVal: %d", twdBuf); - hstryBufList.twdHstry->add(static_cast(DegToRad(twdBuf) * 1000.0)); + twd += random(-20, 20); + twd = WindUtils::to360(twd); + hstryBufList.twdHstry->add(static_cast(DegToRad(twd) * 1000.0)); } if (twsBVal->valid) { @@ -489,17 +513,62 @@ void handleHstryBuf(GwApi* api, BoatValueList* boatValues, tBoatHstryData hstryB calBVal->value = twsBVal->value; calBVal->valid = twsBVal->valid; calibrationData.calibrateInstance(calBVal, logger); // Check if boat data value is to be calibrated - twsBuf = static_cast(std::round(calBVal->value * 10)); - if (twsBuf >= twsHstryMin && twsBuf <= twsHstryMax) { - hstryBufList.twsHstry->add(twsBuf); + tws = static_cast(std::round(calBVal->value * 10)); + if (tws >= twsHstryMin && tws <= twsHstryMax) { + hstryBufList.twsHstry->add(tws); } delete calBVal; calBVal = nullptr; } else if (useSimuData) { - twsBuf += random(-50, 50); // TWS value in m/s; expands to 1 decimal - twsBuf = constrain(twsBuf, 0, 250); // Limit TWS to [0..25] m/s - api->getLogger()->logDebug(GwLog::DEBUG,"obp60task Simu: twsBVal: %d", twsBuf); - hstryBufList.twsHstry->add(twsBuf); + tws += random(-50, 50); // TWS value in m/s; expands to 1 decimal + tws = constrain(tws, 0, 250); // Limit TWS to [0..25] m/s + hstryBufList.twsHstry->add(tws); + } + + if (awaBVal->valid) { + if (hdtBVal->valid) { + hdt = hdtBVal->value; // Use HDT if available + } else { + hdt = WindUtils::calcHDT(&hdmBVal->value, &varBVal->value, &cogBVal->value, &sogBVal->value); + } + + awd = awaBVal->value + hdt; + awd = WindUtils::to2PI(awd); + calBVal = new GwApi::BoatValue("AWD"); // temporary solution for calibration of history buffer values + calBVal->value = awd; + calBVal->setFormat(awdBVal->getFormat()); + calBVal->valid = true; + calibrationData.calibrateInstance(calBVal, logger); // Check if boat data value is to be calibrated + awdBVal->value = calBVal->value; + awdBVal->valid = true; + awd = std::round(calBVal->value * 1000); + if (awd >= awdHstryMin && awd <= awdHstryMax) { + hstryBufList.awdHstry->add(static_cast(awd)); + } + delete calBVal; + calBVal = nullptr; + } else if (useSimuData) { + awd += random(-20, 20); + awd = WindUtils::to360(awd); + hstryBufList.awdHstry->add(static_cast(DegToRad(awd) * 1000.0)); + } + + if (awsBVal->valid) { + calBVal = new GwApi::BoatValue("AWS"); // temporary solution for calibration of history buffer values + calBVal->setFormat(awsBVal->getFormat()); + calBVal->value = awsBVal->value; + calBVal->valid = awsBVal->valid; + calibrationData.calibrateInstance(calBVal, logger); // Check if boat data value is to be calibrated + aws = std::round(calBVal->value * 10); + if (aws >= awsHstryMin && aws <= awsHstryMax) { + hstryBufList.awsHstry->add(static_cast(aws)); + } + delete calBVal; + calBVal = nullptr; + } else if (useSimuData) { + aws += random(-50, 50); // TWS value in m/s; expands to 1 decimal + aws = constrain(aws, 0, 250); // Limit TWS to [0..25] m/s + hstryBufList.awsHstry->add(aws); } } @@ -617,9 +686,11 @@ void OBP60Task(GwApi *api){ //add all necessary data to common data // Create ring buffers for history storage of some boat data - RingBuffer twdHstry(960); // Circular buffer to store wind direction values; store 960 TWD values for 16 minutes history - RingBuffer twsHstry(960); // Circular buffer to store wind speed values (TWS) - tBoatHstryData hstryBufList = {&twdHstry, &twsHstry}; + RingBuffer twdHstry(960); // Circular buffer to store true wind direction values; store 960 TWD values for 16 minutes history + RingBuffer twsHstry(960); // Circular buffer to store true wind speed values (TWS) + RingBuffer awdHstry(960); // Circular buffer to store appearant wind direction values; store 960 AWD values for 16 minutes history + RingBuffer awsHstry(960); // Circular buffer to store appearant xwind speed values (AWS) + tBoatHstryData hstryBufList = {&twdHstry, &twsHstry, &awdHstry, &awsHstry}; //fill the page data from config numPages=config->getInt(config->visiblePages,1);