thooge/esp32-nmea2000-obp60
1
0
Fork 0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2025-12-13 05:53:06 +01:00
Code Releases Activity

Merge pull request #105 from free-x/VWR

Browse Source 
VWR
This commit is contained in:
Andreas Vogel
2025-03-04 20:49:44 +01:00
committed by GitHub
parent a1b8f06959 5e41c64dd3
commit c55bcc1f94
3 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/boatData/GwBoatData.cpp
View File

@@ -493,6 +493,11 @@ double formatKnots(double cv)
return cv * 3600.0 / 1852.0;
}
double formatKmh(double cv)
{
return cv *3600.0 / 1000.0;
}
uint32_t mtr2nm(uint32_t m)
{
return m / 1852;
@@ -523,4 +528,4 @@ public:
};
static XWriter xwriter;
ARDUINOJSON_NAMESPACE::TextFormatter<XWriter> testWriter(xwriter);
#endif
#endif

3
lib/boatData/GwBoatData.h
View File

@@ -129,6 +129,7 @@ double formatCourse(double cv);
double formatDegToRad(double deg);
double formatWind(double cv);
double formatKnots(double cv);
double formatKmh(double cv);
uint32_t mtr2nm(uint32_t m);
double mtr2nm(double m);
@@ -251,4 +252,4 @@ class GwBoatData{
};
#endif
#endif

25
lib/nmea2kto0183/N2kDataToNMEA0183.cpp
View File

@@ -528,6 +528,31 @@ private:
{
SendMessage(NMEA0183Msg);
}
if (shouldSend && NMEA0183Reference == NMEA0183Wind_Apparent)
{
double wa = formatCourse(WindAngle);
if (!NMEA0183Msg.Init("VWR", talkerId))
return;
if (!NMEA0183Msg.AddDoubleField(( wa > 180 ) ? 360-wa : wa))
return;
if (!NMEA0183Msg.AddStrField(( wa >= 0 && wa <= 180) ? 'R' : 'L'))
return;
if (!NMEA0183Msg.AddDoubleField(formatKnots(WindSpeed)))
return;
if (!NMEA0183Msg.AddStrField("N"))
return;
if (!NMEA0183Msg.AddDoubleField(WindSpeed))
return;
if (!NMEA0183Msg.AddStrField("M"))
return;
if (!NMEA0183Msg.AddDoubleField(formatKmh(WindSpeed)))
return;
if (!NMEA0183Msg.AddStrField("K"))
return;
SendMessage(NMEA0183Msg);
}
}
/* if (WindReference == N2kWind_Apparent && boatData->SOG->isValid())