diff --git a/lib/obp60task/OBPDataOperations.cpp b/lib/obp60task/OBPDataOperations.cpp index cc6ac2a..eca2fe9 100644 --- a/lib/obp60task/OBPDataOperations.cpp +++ b/lib/obp60task/OBPDataOperations.cpp @@ -94,7 +94,7 @@ bool WindUtils::calcTrueWind(const double* awaVal, const double* awsVal, } else if (*cogVal != DBL_MIN) { hdt = *cogVal; // Use COG as fallback if HDT and HDM are not available } else { - return false; // Cannot calculate without valid HDT or HDM + return false; // Cannot calculate without valid HDT or HDM+VAR or COG } } @@ -102,8 +102,7 @@ bool WindUtils::calcTrueWind(const double* awaVal, const double* awsVal, ctw = *cogVal; // Use COG as CTW if available // ctw = *cogVal + ((*cogVal - hdt) / 2); // Estimate CTW from COG } else { - ctw = hdt; // 2nd approximation for CTW; - return false; + ctw = hdt; // 2nd approximation for CTW; hdt must exist if we reach this part of the code } if (*stwVal != DBL_MIN) { @@ -115,11 +114,11 @@ bool WindUtils::calcTrueWind(const double* awaVal, const double* awsVal, return false; } - if ((*awaVal == DBL_MIN) || (*awsVal == DBL_MIN) || (*cogVal == DBL_MIN) || (*stwVal == DBL_MIN)) { - // Cannot calculate true wind without valid AWA, AWS, COG, or STW + if ((*awaVal == DBL_MIN) || (*awsVal == DBL_MIN)) { + // Cannot calculate true wind without valid AWA, AWS; other checks are done earlier return false; } else { - calcTwdSA(awaVal, awsVal, &ctw, stwVal, &hdt, &twd, &tws, &twa); + calcTwdSA(awaVal, awsVal, &ctw, &stw, &hdt, &twd, &tws, &twa); *twdVal = twd; *twsVal = tws; *twaVal = twa; diff --git a/lib/obp60task/PageBattery.cpp b/lib/obp60task/PageBattery.cpp index 0938b13..463b848 100644 --- a/lib/obp60task/PageBattery.cpp +++ b/lib/obp60task/PageBattery.cpp @@ -5,7 +5,7 @@ class PageBattery : public Page { - int average = 0; // Average type [0...3], 0=off, 1=10s, 2=60s, 3=300s + int average = 0; // Average type [0...3], 0=off, 1=10s, 2=60s, 3=300s public: PageBattery(CommonData &common){ diff --git a/lib/obp60task/PageFourValues.cpp b/lib/obp60task/PageFourValues.cpp index 53120cc..b7526c0 100644 --- a/lib/obp60task/PageFourValues.cpp +++ b/lib/obp60task/PageFourValues.cpp @@ -53,7 +53,7 @@ class PageFourValues : public Page String unit1 = formatValue(bvalue1, *commonData).unit; // Unit of value // Get boat values #2 - GwApi::BoatValue *bvalue2 = pageData.values[1]; // Second element in list (only one value by PageOneValue) + GwApi::BoatValue *bvalue2 = pageData.values[1]; // Second element in list String name2 = xdrDelete(bvalue2->getName()); // Value name name2 = name2.substring(0, 6); // String length limit for value name calibrationData.calibrateInstance(bvalue2, logger); // Check if boat data value is to be calibrated @@ -63,7 +63,7 @@ class PageFourValues : public Page String unit2 = formatValue(bvalue2, *commonData).unit; // Unit of value // Get boat values #3 - GwApi::BoatValue *bvalue3 = pageData.values[2]; // Second element in list (only one value by PageOneValue) + GwApi::BoatValue *bvalue3 = pageData.values[2]; // Third element in list String name3 = xdrDelete(bvalue3->getName()); // Value name name3 = name3.substring(0, 6); // String length limit for value name calibrationData.calibrateInstance(bvalue3, logger); // Check if boat data value is to be calibrated @@ -73,7 +73,7 @@ class PageFourValues : public Page String unit3 = formatValue(bvalue3, *commonData).unit; // Unit of value // Get boat values #4 - GwApi::BoatValue *bvalue4 = pageData.values[3]; // Second element in list (only one value by PageOneValue) + GwApi::BoatValue *bvalue4 = pageData.values[3]; // Fourth element in list String name4 = xdrDelete(bvalue4->getName()); // Value name name4 = name4.substring(0, 6); // String length limit for value name calibrationData.calibrateInstance(bvalue4, logger); // Check if boat data value is to be calibrated @@ -301,7 +301,7 @@ static Page *createPage(CommonData &common){ * this will be number of BoatValue pointers in pageData.values */ PageDescription registerPageFourValues( - "FourValues", // Page name + "FourValues", // Page name createPage, // Action 4, // Number of bus values depends on selection in Web configuration true // Show display header on/off diff --git a/lib/obp60task/PageKeelPosition.cpp b/lib/obp60task/PageKeelPosition.cpp index 48e5018..dd86611 100644 --- a/lib/obp60task/PageKeelPosition.cpp +++ b/lib/obp60task/PageKeelPosition.cpp @@ -86,21 +86,20 @@ public: float x = 200 + (rInstrument-30)*sin(i/180.0*pi); // x-coordinate dots float y = 150 - (rInstrument-30)*cos(i/180.0*pi); // y-coordinate cots const char *ii = " "; - switch (i) - { - case 0: ii=" "; break; // Use a blank for a empty scale value - case 30 : ii=" "; break; - case 60 : ii=" "; break; - case 90 : ii="45"; break; - case 120 : ii="30"; break; - case 150 : ii="15"; break; - case 180 : ii="0"; break; - case 210 : ii="15"; break; - case 240 : ii="30"; break; - case 270 : ii="45"; break; - case 300 : ii=" "; break; - case 330 : ii=" "; break; - default: break; + switch (i) { + case 0: ii=" "; break; // Use a blank for a empty scale value + case 30 : ii=" "; break; + case 60 : ii=" "; break; + case 90 : ii="45"; break; + case 120 : ii="30"; break; + case 150 : ii="15"; break; + case 180 : ii="0"; break; + case 210 : ii="15"; break; + case 240 : ii="30"; break; + case 270 : ii="45"; break; + case 300 : ii=" "; break; + case 330 : ii=" "; break; + default: break; } // Print text centered on position x, y diff --git a/lib/obp60task/PageRollPitch.cpp b/lib/obp60task/PageRollPitch.cpp index db3d27f..3cc9277 100644 --- a/lib/obp60task/PageRollPitch.cpp +++ b/lib/obp60task/PageRollPitch.cpp @@ -41,9 +41,9 @@ public: String backlightMode = config->getString(config->backlight); int rolllimit = config->getInt(config->rollLimit); String roffset = config->getString(config->rollOffset); - double rolloffset = roffset.toFloat()/360*(2*PI); + double rolloffset = roffset.toFloat()/360*(2*M_PI); String poffset = config->getString(config->pitchOffset); - double pitchoffset = poffset.toFloat()/360*(2*PI); + double pitchoffset = poffset.toFloat()/360*(2*M_PI); // Get boat values for roll GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (xdrRoll) @@ -55,17 +55,17 @@ public: } else{ if(simulation == true){ - value1 = (20 + float(random(0, 50)) / 10.0)/360*2*PI; + value1 = (20 + float(random(0, 50)) / 10.0)/360*2*M_PI; } else{ value1 = 0; } } - if(value1/(2*PI)*360 > -10 && value1/(2*PI)*360 < 10){ - svalue1 = String(value1/(2*PI)*360,1); // Convert raw value to string + if(value1/(2*M_PI)*360 > -10 && value1/(2*M_PI)*360 < 10){ + svalue1 = String(value1/(2*M_PI)*360,1); // Convert raw value to string } else{ - svalue1 = String(value1/(2*PI)*360,0); + svalue1 = String(value1/(2*M_PI)*360,0); } if(valid1 == true){ svalue1old = svalue1; // Save the old value @@ -80,17 +80,17 @@ public: } else{ if(simulation == true){ - value2 = (float(random(-5, 5)))/360*2*PI; + value2 = (float(random(-5, 5)))/360*2*M_PI; } else{ value2 = 0; } } - if(value2/(2*PI)*360 > -10 && value2/(2*PI)*360 < 10){ - svalue2 = String(value2/(2*PI)*360,1); // Convert raw value to string + if(value2/(2*PI)*360 > -10 && value2/(2*M_PI)*360 < 10){ + svalue2 = String(value2/(2*M_PI)*360,1); // Convert raw value to string } else{ - svalue2 = String(value2/(2*PI)*360,0); + svalue2 = String(value2/(2*M_PI)*360,0); } if(valid2 == true){ svalue2old = svalue2; // Save the old value @@ -99,7 +99,7 @@ public: // Optical warning by limit violation if(String(flashLED) == "Limit Violation"){ // Limits for roll - if(value1*360/(2*PI) >= -1*rolllimit && value1*360/(2*PI) <= rolllimit){ + if(value1*360/(2*M_PI) >= -1*rolllimit && value1*360/(2*M_PI) <= rolllimit){ setBlinkingLED(false); setFlashLED(false); } @@ -132,7 +132,7 @@ public: getdisplay().setFont(&Ubuntu_Bold8pt8b); getdisplay().setCursor(10, 115); getdisplay().print("DEG"); - + // Horizintal separator left getdisplay().fillRect(0, 149, 60, 3, commonData->fgcolor); @@ -164,7 +164,7 @@ public: getdisplay().print("Deg"); //******************************************************************************************* - + // Draw instrument int rInstrument = 100; // Radius of instrument float pi = 3.141592; @@ -177,19 +177,18 @@ public: // Only scaling +/- 60 degrees if((i >= 0 && i <= 60) || (i >= 300 && i <= 360)){ // Scaling values - float x = 200 + (rInstrument+25)*sin(i/180.0*pi); // x-coordinate dots - float y = 150 - (rInstrument+25)*cos(i/180.0*pi); // y-coordinate cots + float x = 200 + (rInstrument+25)*sin(i/180.0*M_PI); // x-coordinate dots + float y = 150 - (rInstrument+25)*cos(i/180.0*M_PI); // y-coordinate cots const char *ii = ""; - switch (i) - { - case 0: ii="0"; break; - case 20 : ii="20"; break; - case 40 : ii="40"; break; - case 60 : ii="60"; break; - case 300 : ii="60"; break; - case 320 : ii="40"; break; - case 340 : ii="20"; break; - default: break; + switch (i) { + case 0: ii="0"; break; + case 20 : ii="20"; break; + case 40 : ii="40"; break; + case 60 : ii="60"; break; + case 300 : ii="60"; break; + case 320 : ii="40"; break; + case 340 : ii="20"; break; + default: break; } // Print text centered on position x, y @@ -203,11 +202,11 @@ public: } // Draw sub scale with dots - float x1c = 200 + rInstrument*sin(i/180.0*pi); - float y1c = 150 - rInstrument*cos(i/180.0*pi); + float x1c = 200 + rInstrument*sin(i/180.0*M_PI); + float y1c = 150 - rInstrument*cos(i/180.0*M_PI); getdisplay().fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor); - float sinx=sin(i/180.0*pi); - float cosx=cos(i/180.0*pi); + float sinx=sin(i/180.0*M_PI); + float cosx=cos(i/180.0*M_PI); // Draw sub scale with lines (two triangles) if(i % 20 == 0){ @@ -229,17 +228,17 @@ public: // Draw mast position pointer float startwidth = 8; // Start width of pointer -// value1 = (2 * pi ) - value1; // Mirror coordiante system for pointer, keel and boat +// value1 = (2 * M_PI ) - value1; // Mirror coordiante system for pointer, keel and boat if(valid1 == true || holdvalues == true || simulation == true){ - float sinx=sin(value1 + pi); - float cosx=cos(value1 + pi); + float sinx=sin(value1 + M_PI); + float cosx=cos(value1 + M_PI); // Normal pointer // Pointer as triangle with center base 2*width float xx1 = -startwidth; float xx2 = startwidth; float yy1 = -startwidth; - float yy2 = -(rInstrument * 0.7); + float yy2 = -(rInstrument * 0.7); getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1), 200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1), 200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2),commonData->fgcolor); @@ -283,7 +282,7 @@ public: float xx1 = -startwidth; float xx2 = startwidth; float yy1 = -startwidth; - float yy2 = -(rInstrument - 15); + float yy2 = -(rInstrument - 15); getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1), 200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1), 200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2),commonData->fgcolor); diff --git a/lib/obp60task/PageThreeValues.cpp b/lib/obp60task/PageThreeValues.cpp index 3bd2d0b..996e2bc 100644 --- a/lib/obp60task/PageThreeValues.cpp +++ b/lib/obp60task/PageThreeValues.cpp @@ -51,7 +51,7 @@ class PageThreeValues : public Page String unit1 = formatValue(bvalue1, *commonData).unit; // Unit of value // Get boat values #2 - GwApi::BoatValue *bvalue2 = pageData.values[1]; // Second element in list (only one value by PageOneValue) + GwApi::BoatValue *bvalue2 = pageData.values[1]; // Second element in list String name2 = xdrDelete(bvalue2->getName()); // Value name name2 = name2.substring(0, 6); // String length limit for value name calibrationData.calibrateInstance(bvalue2, logger); // Check if boat data value is to be calibrated @@ -61,7 +61,7 @@ class PageThreeValues : public Page String unit2 = formatValue(bvalue2, *commonData).unit; // Unit of value // Get boat values #3 - GwApi::BoatValue *bvalue3 = pageData.values[2]; // Second element in list (only one value by PageOneValue) + GwApi::BoatValue *bvalue3 = pageData.values[2]; // Third element in list String name3 = xdrDelete(bvalue3->getName()); // Value name name3 = name3.substring(0, 6); // String length limit for value name calibrationData.calibrateInstance(bvalue3, logger); // Check if boat data value is to be calibrated diff --git a/lib/obp60task/PageTwoValues.cpp b/lib/obp60task/PageTwoValues.cpp index 8b27e7b..eaa59d4 100644 --- a/lib/obp60task/PageTwoValues.cpp +++ b/lib/obp60task/PageTwoValues.cpp @@ -49,7 +49,7 @@ class PageTwoValues : public Page String unit1 = formatValue(bvalue1, *commonData).unit; // Unit of value // Get boat values #2 - GwApi::BoatValue *bvalue2 = pageData.values[1]; // Second element in list (only one value by PageOneValue) + GwApi::BoatValue *bvalue2 = pageData.values[1]; // Second element in list String name2 = xdrDelete(bvalue2->getName()); // Value name name2 = name2.substring(0, 6); // String length limit for value name calibrationData.calibrateInstance(bvalue2, logger); // Check if boat data value is to be calibrated diff --git a/lib/obp60task/PageVoltage.cpp b/lib/obp60task/PageVoltage.cpp index 3c2693b..6681b5e 100644 --- a/lib/obp60task/PageVoltage.cpp +++ b/lib/obp60task/PageVoltage.cpp @@ -398,11 +398,11 @@ static Page *createPage(CommonData &common){ * and will will provide the names of the fixed values we need */ PageDescription registerPageVoltage( - "Voltage", // Name of page - createPage, // Action - 0, // Number of bus values depends on selection in Web configuration - {}, // Names of bus values undepends on selection in Web configuration (refer GwBoatData.h) - true // Show display header on/off + "Voltage", // Name of page + createPage, // Action + 0, // Number of bus values depends on selection in Web configuration + {}, // Names of bus values undepends on selection in Web configuration (refer GwBoatData.h) + true // Show display header on/off ); #endif diff --git a/lib/obp60task/PageWind.cpp b/lib/obp60task/PageWind.cpp index 0b11461..460d1fb 100644 --- a/lib/obp60task/PageWind.cpp +++ b/lib/obp60task/PageWind.cpp @@ -633,11 +633,11 @@ static Page *createPage(CommonData &common){ * and will will provide the names of the fixed values we need */ PageDescription registerPageWind( - "Wind", // Page name - createPage, // Action - 0, // Number of bus values depends on selection in Web configuration + "Wind", // Page name + createPage, // Action + 0, // Number of bus values depends on selection in Web configuration {"AWS","AWA", "TWS", "TWA"}, // Bus values we need in the page - true // Show display header on/off + true // Show display header on/off ); #endif diff --git a/lib/obp60task/PageWindPlot.cpp b/lib/obp60task/PageWindPlot.cpp index cf6430c..5255320 100644 --- a/lib/obp60task/PageWindPlot.cpp +++ b/lib/obp60task/PageWindPlot.cpp @@ -206,7 +206,7 @@ public: // read boat data values; TWD only for validation test, TWS for display of current value for (int i = 0; i < numBoatData; i++) { bvalue = pageData.values[i]; - // BDataName[i] = xdrDelete(bvalue->getName()); + BDataName[i] = xdrDelete(bvalue->getName()); BDataName[i] = BDataName[i].substring(0, 6); // String length limit for value name calibrationData.calibrateInstance(bvalue, logger); // Check if boat data value is to be calibrated BDataValue[i] = bvalue->value; // Value as double in SI unit @@ -326,24 +326,13 @@ public: 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 if (chrtVal == INT16_MIN) { chrtPrevVal = INT16_MIN; - /* if (i == linesToShow - 1) { - numNoData++; - // If more than 4 invalid values in a row, reset chart - } else { - numNoData = 0; // Reset invalid value counter - } - if (numNoData > 4) { - // If more than 4 invalid values in a row, send message - getdisplay().setFont(&Ubuntu_Bold10pt8b); - getdisplay().fillRect(xCenter - 66, height / 2 - 20, 146, 24, commonData->bgcolor); // Clear area for TWS value - drawTextCenter(xCenter, height / 2 - 10, "No sensor data"); - } */ } else { chrtVal = static_cast((chrtVal / 1000.0 * radToDeg) + 0.5); // Convert to degrees and round x = ((chrtVal - wndLeft + 360) % 360) * chrtScl; y = yOffset + cHeight - i; // Position in chart area - if (i >= (numWndVals / dataIntv) - 10) +// if (i >= (numWndVals / dataIntv) - 10) + if (i >= (numWndVals / dataIntv) - 1) LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Chart: i: %d, chrtVal: %d, bufStart: %d, count: %d, linesToShow: %d", i, chrtVal, bufStart, count, (numWndVals / dataIntv)); if ((i == 0) || (chrtPrevVal == INT16_MIN)) { @@ -378,7 +367,8 @@ public: int minWndDir = pageData.boatHstry.twdHstry->getMin(numWndVals) / 1000.0 * radToDeg; int maxWndDir = pageData.boatHstry.twdHstry->getMax(numWndVals) / 1000.0 * radToDeg; LOG_DEBUG(GwLog::DEBUG, "PageWindPlot FreeTop: Minimum: %d, Maximum: %d, OldwndCenter: %d", minWndDir, maxWndDir, wndCenter); - if ((minWndDir + 540 >= wndCenter + 540) || (maxWndDir + 540 <= wndCenter + 540)) { +// if ((minWndDir + 540 >= wndCenter + 540) || (maxWndDir + 540 <= wndCenter + 540)) { + if (((minWndDir - wndCenter >= 0) && (minWndDir - wndCenter < 180)) || ((maxWndDir - wndCenter <= 0) && (maxWndDir - wndCenter >=180))) { // Check if all wind value are left or right of center value -> optimize chart range midWndDir = pageData.boatHstry.twdHstry->getMid(numWndVals) / 1000.0 * radToDeg; if (midWndDir != INT16_MIN) { diff --git a/lib/obp60task/PageWindRose.cpp b/lib/obp60task/PageWindRose.cpp index 45c62ce..c4ab0e0 100644 --- a/lib/obp60task/PageWindRose.cpp +++ b/lib/obp60task/PageWindRose.cpp @@ -48,7 +48,7 @@ public: String flashLED = config->getString(config->flashLED); String backlightMode = config->getString(config->backlight); - // Get boat values for AWA + // Get boat value for AWA GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue) String name1 = xdrDelete(bvalue1->getName()); // Value name name1 = name1.substring(0, 6); // String length limit for value name @@ -63,8 +63,8 @@ public: unit1old = unit1; // Save old unit } - // Get boat values for AWS - GwApi::BoatValue *bvalue2 = pageData.values[1]; // First element in list (only one value by PageOneValue) + // Get boat value for AWS + GwApi::BoatValue *bvalue2 = pageData.values[1]; // Second element in list String name2 = xdrDelete(bvalue2->getName()); // Value name name2 = name2.substring(0, 6); // String length limit for value name calibrationData.calibrateInstance(bvalue2, logger); // Check if boat data value is to be calibrated @@ -77,8 +77,8 @@ public: unit2old = unit2; // Save old unit } - // Get boat values TWD - GwApi::BoatValue *bvalue3 = pageData.values[2]; // Second element in list (only one value by PageOneValue) + // Get boat value for TWD + GwApi::BoatValue *bvalue3 = pageData.values[2]; // Third element in list String name3 = xdrDelete(bvalue3->getName()); // Value name name3 = name3.substring(0, 6); // String length limit for value name calibrationData.calibrateInstance(bvalue3, logger); // Check if boat data value is to be calibrated @@ -91,9 +91,9 @@ public: unit3old = unit3; // Save old unit } - // Get boat values TWS - GwApi::BoatValue *bvalue4 = pageData.values[3]; // Second element in list (only one value by PageOneValue) - String name4 = xdrDelete(bvalue4->getName()); // Value name + // Get boat value for TWS + GwApi::BoatValue *bvalue4 = pageData.values[3]; // Fourth element in list + String name4 = xdrDelete(bvalue4->getName()); // Value name name4 = name4.substring(0, 6); // String length limit for value name calibrationData.calibrateInstance(bvalue4, logger); // Check if boat data value is to be calibrated double value4 = bvalue4->value; // Value as double in SI unit @@ -105,9 +105,9 @@ public: unit4old = unit4; // Save old unit } - // Get boat values DBT - GwApi::BoatValue *bvalue5 = pageData.values[4]; // Second element in list (only one value by PageOneValue) - String name5 = xdrDelete(bvalue5->getName()); // Value name + // Get boat value for DBT + GwApi::BoatValue *bvalue5 = pageData.values[4]; // Fifth element in list + String name5 = xdrDelete(bvalue5->getName()); // Value name name5 = name5.substring(0, 6); // String length limit for value name calibrationData.calibrateInstance(bvalue5, logger); // Check if boat data value is to be calibrated double value5 = bvalue5->value; // Value as double in SI unit @@ -119,9 +119,9 @@ public: unit5old = unit5; // Save old unit } - // Get boat values STW - GwApi::BoatValue *bvalue6 = pageData.values[5]; // Second element in list (only one value by PageOneValue) - String name6 = xdrDelete(bvalue6->getName()); // Value name + // Get boat value for STW + GwApi::BoatValue *bvalue6 = pageData.values[5]; // Sixth element in list + String name6 = xdrDelete(bvalue6->getName()); // Value name name6 = name6.substring(0, 6); // String length limit for value name calibrationData.calibrateInstance(bvalue6, logger); // Check if boat data value is to be calibrated double value6 = bvalue6->value; // Value as double in SI unit @@ -248,7 +248,7 @@ public: float y = 150 - (rInstrument-30)*cos(i/180.0*pi); // y-coordinate cots const char *ii = ""; switch (i) - { +{ case 0: ii="0"; break; case 30 : ii="30"; break; case 60 : ii="60"; break; @@ -372,11 +372,11 @@ static Page *createPage(CommonData &common){ * and will will provide the names of the fixed values we need */ PageDescription registerPageWindRose( - "WindRose", // Page name - createPage, // Action - 0, // Number of bus values depends on selection in Web configuration + "WindRose", // Page name + createPage, // Action + 0, // Number of bus values depends on selection in Web configuration {"AWA", "AWS", "TWD", "TWS", "DBT", "STW"}, // Bus values we need in the page - true // Show display header on/off + true // Show display header on/off ); #endif diff --git a/lib/obp60task/PageWindRoseFlex.cpp b/lib/obp60task/PageWindRoseFlex.cpp index f0e21ab..35215c9 100644 --- a/lib/obp60task/PageWindRoseFlex.cpp +++ b/lib/obp60task/PageWindRoseFlex.cpp @@ -48,7 +48,7 @@ public: String flashLED = config->getString(config->flashLED); String backlightMode = config->getString(config->backlight); - // Get boat values for AWA + // Get boat values #1 GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue) String name1 = xdrDelete(bvalue1->getName()); // Value name name1 = name1.substring(0, 6); // String length limit for value name @@ -63,13 +63,13 @@ public: unit1old = unit1; // Save old unit } - // Get boat values for AWS - GwApi::BoatValue *bvalue2 = pageData.values[1]; // First element in list (only one value by PageOneValue) + // Get boat values #2 + GwApi::BoatValue *bvalue2 = pageData.values[1]; // Second element in list String name2 = xdrDelete(bvalue2->getName()); // Value name name2 = name2.substring(0, 6); // String length limit for value name calibrationData.calibrateInstance(bvalue2, logger); // Check if boat data value is to be calibrated double value2 = bvalue2->value; // Value as double in SI unit - bool valid2 = bvalue2->valid; // Valid information + bool valid2 = bvalue2->valid; // Valid information String svalue2 = formatValue(bvalue2, *commonData).svalue; // Formatted value as string including unit conversion and switching decimal places String unit2 = formatValue(bvalue2, *commonData).unit; // Unit of value if(valid2 == true){ @@ -77,13 +77,13 @@ public: unit2old = unit2; // Save old unit } - // Get boat values TWD - GwApi::BoatValue *bvalue3 = pageData.values[2]; // Second element in list (only one value by PageOneValue) + // Get boat values #3 + GwApi::BoatValue *bvalue3 = pageData.values[2]; // Third element in list String name3 = xdrDelete(bvalue3->getName()); // Value name name3 = name3.substring(0, 6); // String length limit for value name calibrationData.calibrateInstance(bvalue3, logger); // Check if boat data value is to be calibrated double value3 = bvalue3->value; // Value as double in SI unit - bool valid3 = bvalue3->valid; // Valid information + bool valid3 = bvalue3->valid; // Valid information String svalue3 = formatValue(bvalue3, *commonData).svalue; // Formatted value as string including unit conversion and switching decimal places String unit3 = formatValue(bvalue3, *commonData).unit; // Unit of value if(valid3 == true){ @@ -91,13 +91,13 @@ public: unit3old = unit3; // Save old unit } - // Get boat values TWS - GwApi::BoatValue *bvalue4 = pageData.values[3]; // Second element in list (only one value by PageOneValue) - String name4 = xdrDelete(bvalue4->getName()); // Value name + // Get boat values #4 + GwApi::BoatValue *bvalue4 = pageData.values[3]; // Fourth element in list + String name4 = xdrDelete(bvalue4->getName()); // Value name name4 = name4.substring(0, 6); // String length limit for value name calibrationData.calibrateInstance(bvalue4, logger); // Check if boat data value is to be calibrated double value4 = bvalue4->value; // Value as double in SI unit - bool valid4 = bvalue4->valid; // Valid information + bool valid4 = bvalue4->valid; // Valid information String svalue4 = formatValue(bvalue4, *commonData).svalue; // Formatted value as string including unit conversion and switching decimal places String unit4 = formatValue(bvalue4, *commonData).unit; // Unit of value if(valid4 == true){ @@ -105,13 +105,13 @@ public: unit4old = unit4; // Save old unit } - // Get boat values DBT - GwApi::BoatValue *bvalue5 = pageData.values[4]; // Second element in list (only one value by PageOneValue) - String name5 = xdrDelete(bvalue5->getName()); // Value name + // Get boat values #5 + GwApi::BoatValue *bvalue5 = pageData.values[4]; // Fifth element in list + String name5 = xdrDelete(bvalue5->getName()); // Value name name5 = name5.substring(0, 6); // String length limit for value name calibrationData.calibrateInstance(bvalue5, logger); // Check if boat data value is to be calibrated double value5 = bvalue5->value; // Value as double in SI unit - bool valid5 = bvalue5->valid; // Valid information + bool valid5 = bvalue5->valid; // Valid information String svalue5 = formatValue(bvalue5, *commonData).svalue; // Formatted value as string including unit conversion and switching decimal places String unit5 = formatValue(bvalue5, *commonData).unit; // Unit of value if(valid5 == true){ @@ -119,13 +119,13 @@ public: unit5old = unit5; // Save old unit } - // Get boat values STW - GwApi::BoatValue *bvalue6 = pageData.values[5]; // Second element in list (only one value by PageOneValue) - String name6 = xdrDelete(bvalue6->getName()); // Value name + // Get boat values #5 + GwApi::BoatValue *bvalue6 = pageData.values[5]; // Sixth element in list + String name6 = xdrDelete(bvalue6->getName()); // Value name name6 = name6.substring(0, 6); // String length limit for value name calibrationData.calibrateInstance(bvalue6, logger); // Check if boat data value is to be calibrated double value6 = bvalue6->value; // Value as double in SI unit - bool valid6 = bvalue6->valid; // Valid information + bool valid6 = bvalue6->valid; // Valid information String svalue6 = formatValue(bvalue6, *commonData).svalue; // Formatted value as string including unit conversion and switching decimal places String unit6 = formatValue(bvalue6, *commonData).unit; // Unit of value if(valid6 == true){ @@ -136,7 +136,7 @@ public: // Optical warning by limit violation (unused) if(String(flashLED) == "Limit Violation"){ setBlinkingLED(false); - setFlashLED(false); + setFlashLED(false); } // Logging boat values @@ -192,7 +192,7 @@ public: getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b); getdisplay().setCursor(295, 65); if(valid3 == true){ - // getdisplay().print(abs(value3 * 180 / PI), 0); // Value + // getdisplay().print(abs(value3 * 180 / M_PI), 0); // Value getdisplay().print(svalue4); // Value } else{ @@ -227,16 +227,15 @@ public: if(holdvalues == false){ getdisplay().print(unit5); // Unit } - else{ + else{ getdisplay().print(unit5old); // Unit } - + //******************************************************************************************* - + // Draw wind rose int rInstrument = 110; // Radius of grafic instrument - float pi = 3.141592; getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor); // Outer circle getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor); // Outer circle @@ -246,24 +245,23 @@ public: for(int i=0; i<360; i=i+10) { // Scaling values - float x = 200 + (rInstrument-30)*sin(i/180.0*pi); // x-coordinate dots - float y = 150 - (rInstrument-30)*cos(i/180.0*pi); // y-coordinate dots + float x = 200 + (rInstrument-30)*sin(i/180.0*M_PI); // x-coordinate dots + float y = 150 - (rInstrument-30)*cos(i/180.0*M_PI); // y-coordinate dots const char *ii = ""; - switch (i) - { - case 0: ii="0"; break; - case 30 : ii="30"; break; - case 60 : ii="60"; break; - case 90 : ii="90"; break; - case 120 : ii="120"; break; - case 150 : ii="150"; break; - case 180 : ii="180"; break; - case 210 : ii="210"; break; - case 240 : ii="240"; break; - case 270 : ii="270"; break; - case 300 : ii="300"; break; - case 330 : ii="330"; break; - default: break; + switch (i) { + case 0: ii="0"; break; + case 30 : ii="30"; break; + case 60 : ii="60"; break; + case 90 : ii="90"; break; + case 120 : ii="120"; break; + case 150 : ii="150"; break; + case 180 : ii="180"; break; + case 210 : ii="210"; break; + case 240 : ii="240"; break; + case 270 : ii="270"; break; + case 300 : ii="300"; break; + case 330 : ii="330"; break; + default: break; } // Print text centered on position x, y @@ -277,11 +275,11 @@ public: } // Draw sub scale with dots - float x1c = 200 + rInstrument*sin(i/180.0*pi); - float y1c = 150 - rInstrument*cos(i/180.0*pi); + float x1c = 200 + rInstrument*sin(i/180.0*M_PI); + float y1c = 150 - rInstrument*cos(i/180.0*M_PI); getdisplay().fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor); - float sinx=sin(i/180.0*pi); - float cosx=cos(i/180.0*pi); + float sinx=sin(i/180.0*M_PI); + float cosx=cos(i/180.0*M_PI); // Draw sub scale with lines (two triangles) if(i % 30 == 0){ @@ -309,7 +307,7 @@ public: float xx1 = -startwidth; float xx2 = startwidth; float yy1 = -startwidth; - float yy2 = -(rInstrument-15); + float yy2 = -(rInstrument-15); getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1), 200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1), 200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2),commonData->fgcolor); @@ -331,36 +329,26 @@ public: //******************************************************************************************* -// Show value6, so that it does not collide with the wind pointer -if ( cos(value1) > 0){ - getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b); - getdisplay().setCursor(160, 200); - getdisplay().print(svalue6); // Value - getdisplay().setFont(&Ubuntu_Bold8pt8b); - getdisplay().setCursor(190, 215); - getdisplay().print(" "); - if(holdvalues == false){ - getdisplay().print(unit6); // Unit - } - else{ - getdisplay().print(unit6old); // Unit - } - } - else{ - getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b); - getdisplay().setCursor(160, 130); - getdisplay().print(svalue6); // Value - getdisplay().setFont(&Ubuntu_Bold8pt8b); - getdisplay().setCursor(190, 90); - getdisplay().print(" "); - if(holdvalues == false){ - getdisplay().print(unit6); // Unit - } - else{ - getdisplay().print(unit6old); // Unit - } - } - + // Show value6, so that it does not collide with the wind pointer + getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b); + if (cos(value1) > 0){ + getdisplay().setCursor(160, 200); + getdisplay().print(svalue6); // Value + getdisplay().setFont(&Ubuntu_Bold8pt8b); + getdisplay().setCursor(190, 215); + } else{ + getdisplay().setCursor(160, 130); + getdisplay().print(svalue6); // Value + getdisplay().setFont(&Ubuntu_Bold8pt8b); + getdisplay().setCursor(190, 90); + } + getdisplay().print(" "); + if(holdvalues == false){ + getdisplay().print(unit6); // Unit + } + else{ + getdisplay().print(unit6old); // Unit + } return PAGE_UPDATE; }; @@ -377,11 +365,10 @@ static Page *createPage(CommonData &common){ * and will will provide the names of the fixed values we need */ PageDescription registerPageWindRoseFlex( - "WindRoseFlex", // Page name - createPage, // Action - 6, // Number of bus values depends on selection in Web configuration; was zero - //{"AWA", "AWS", "COG", "SOG", "TWD", "TWS"}, // Bus values we need in the page, modified for WindRose2 - true // Show display header on/off + "WindRoseFlex", // Page name + createPage, // Action + 6, // Number of bus values depends on selection in Web configuration; was zero + true // Show display header on/off ); #endif diff --git a/lib/obp60task/PageXTETrack.cpp b/lib/obp60task/PageXTETrack.cpp index cbb0af5..0b513df 100644 --- a/lib/obp60task/PageXTETrack.cpp +++ b/lib/obp60task/PageXTETrack.cpp @@ -223,11 +223,11 @@ static Page* createPage(CommonData &common){ * this will be number of BoatValue pointers in pageData.values */ PageDescription registerPageXTETrack( - "XTETrack", // Page name - createPage, // Action - 0, // Number of bus values depends on selection in Web configuration + "XTETrack", // Page name + createPage, // Action + 0, // Number of bus values depends on selection in Web configuration {"XTE", "COG", "DTW", "BTW"}, // Bus values we need in the page - true // Show display header on/off + true // Show display header on/off ); #endif diff --git a/lib/obp60task/obp60task.cpp b/lib/obp60task/obp60task.cpp index e5bb518..45b34fc 100644 --- a/lib/obp60task/obp60task.cpp +++ b/lib/obp60task/obp60task.cpp @@ -386,10 +386,9 @@ bool addTrueWind(GwApi* api, BoatValueList* boatValues) { hdtVal = hdtBVal->valid ? hdtBVal->value : DBL_MIN; hdmVal = hdmBVal->valid ? hdmBVal->value : DBL_MIN; varVal = varBVal->valid ? varBVal->value : DBL_MIN; - api->getLogger()->logDebug(GwLog::DEBUG,"obp60task addTrueWind: AWA: %.1f, AWS: %.1f, COG: %.1f, STW: %.1f, HDT: %.1f, HDM: %.1f, VAR: %.1f", awaBVal->value * RAD_TO_DEG, awsBVal->value * 3.6 / 1.852, - cogBVal->value * RAD_TO_DEG, stwBVal->value * 3.6 / 1.852, hdtBVal->value * RAD_TO_DEG, hdmBVal->value * RAD_TO_DEG, varBVal->value * RAD_TO_DEG); + api->getLogger()->logDebug(GwLog::DEBUG,"obp60task addTrueWind: AWA %.1f, AWS %.1f, COG %.1f, STW %.1f, SOG %.1f, HDT %.1f, HDM %.1f, VAR %.1f", awaBVal->value * RAD_TO_DEG, awsBVal->value * 3.6 / 1.852, + cogBVal->value * RAD_TO_DEG, stwBVal->value * 3.6 / 1.852, sogBVal->value * 3.6 / 1.852, hdtBVal->value * RAD_TO_DEG, hdmBVal->value * RAD_TO_DEG, varBVal->value * RAD_TO_DEG); -// isCalculated = WindUtils::calcTrueWind(&awaVal, &awsVal, &cogVal, &stwVal, &sogVal, &hdtVal, &hdmVal, &varVal, &twdBVal->value, &twsBVal->value, &twaBVal->value); isCalculated = WindUtils::calcTrueWind(&awaVal, &awsVal, &cogVal, &stwVal, &sogVal, &hdtVal, &hdmVal, &varVal, &twd, &tws, &twa); if (isCalculated) { // Replace values only, if successfully calculated and not already available @@ -406,8 +405,8 @@ bool addTrueWind(GwApi* api, BoatValueList* boatValues) { twaBVal->valid = true; } } - api->getLogger()->logDebug(GwLog::DEBUG,"obp60task calcTrueWind: TWD_Valid? %d, TWD=%.1f, TWS=%.1f, TWA=%.1f, isCalculated? %d", twdBVal->valid, twdBVal->value * RAD_TO_DEG, twsBVal->value * 3.6 / 1.852, - twaBVal->value * RAD_TO_DEG, isCalculated); + api->getLogger()->logDebug(GwLog::DEBUG,"obp60task addTrueWind: TWD_Valid %d, isCalculated %d, TWD %.1f, TWA %.1f, TWS %.1f", twdBVal->valid, isCalculated, twdBVal->value * RAD_TO_DEG, + twaBVal->value * RAD_TO_DEG, twsBVal->value * 3.6 / 1.852); return isCalculated; } @@ -446,8 +445,8 @@ void handleHstryBuf(GwApi* api, BoatValueList* boatValues, tBoatHstryData hstryB GwApi::BoatValue *twsBVal = boatValues->findValueOrCreate(hstryBufList.twsHstry->getName()); GwApi::BoatValue *twaBVal = boatValues->findValueOrCreate("TWA"); - api->getLogger()->logDebug(GwLog::DEBUG,"obp60task handleHstryBuf: twdBVal: %f, twsBVal: %f, twaBVal: %f, TWD_isValid? %d", twdBVal->value * RAD_TO_DEG, - twsBVal->value * 3.6 / 1.852, twaBVal->value * RAD_TO_DEG, twdBVal->valid); + api->getLogger()->logDebug(GwLog::DEBUG,"obp60task handleHstryBuf: twdBVal: %.1f, twaBVal: %.1f, twsBVal: %.1f, TWD_isValid? %d", twdBVal->value * RAD_TO_DEG, + twaBVal->value * RAD_TO_DEG, twsBVal->value * 3.6 / 1.852, twdBVal->valid); calBVal = new GwApi::BoatValue("TWD"); // temporary solution for calibration of history buffer values calBVal->setFormat(twdBVal->getFormat()); if (twdBVal->valid) {