thooge/esp32-nmea2000-obp60
1
0
Fork 0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2026-09-11 19:55:14 +02:00
Code Releases Activity

Fix potential CTW under-/overflow; has to be [0..2PI]

Browse Source
This commit is contained in:
Ulrich Meine
2026-08-09 22:44:00 +02:00
parent eaa1f793ff
commit e60ead0455
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/obp60task/PageCurrent.cpp
+7 -5
View File
@@ -16,7 +16,7 @@ static const std::unordered_map<std::string, int> leeKMap = {
{ "Multihull Fixed Keel [16]", 16 } { "Multihull Fixed Keel [16]", 16 }
}; };
enum bValIdx { enum bValueIdx {
ROLL = 0, ROLL = 0,
SET, SET,
DFT, DFT,
@@ -30,7 +30,7 @@ enum bValIdx {
NUM_VALS NUM_VALS
}; };
// Screen coordinates for boat values // Screen coordinates for boat value, name, unit
struct Points { struct Points {
int16_t x1, y1; int16_t x1, y1;
int16_t x2, y2; int16_t x2, y2;
@@ -126,9 +126,9 @@ private:
double ctw; // course through water (rad true) double ctw; // course through water (rad true)
if (awa >= M_PI) { // apparent wind > 180° -> comes from port if (awa >= M_PI) { // apparent wind > 180° -> comes from port
ctw = hdt + lay; ctw = WindUtils::to2PI(hdt + lay);
} else { // wind comes from starboard } else { // wind comes from starboard
ctw = hdt - lay; ctw = WindUtils::to2PI(hdt - lay);
} }
return ctw; return ctw;
@@ -231,7 +231,9 @@ private:
float direction // angle the arrow is pointing to [0..2PI] float direction // angle the arrow is pointing to [0..2PI]
) )
{ {
if (size < 0.05) { // no arrow for current set below 0.05 m/s static constexpr double MINSIZE = 0.05; // minimum current set (size) (m/s) for arrow size
if (size < MINSIZE) { // no arrow for current set below 0.05 m/s
return; return;
} }