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

Implemented string boatdata value WPName for next waypoint

Browse Source
This commit is contained in:
Thomas Hooge
2025-08-20 21:33:08 +02:00
parent 318a218470
commit ae9334236b
7 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/boatData/GwBoatData.cpp
View File

@@ -2,12 +2,6 @@
#include <GwJsonDocument.h>
#include <ArduinoJson/Json/TextFormatter.hpp>
#include "GWConfig.h"
#define GWTYPE_DOUBLE 1
#define GWTYPE_UINT32 2
#define GWTYPE_UINT16 3
#define GWTYPE_INT16 4
#define GWTYPE_STRING 5
#define GWTYPE_USER 100
class GwBoatItemTypes
{
@@ -294,6 +288,7 @@ template class GwBoatItem<double>;
template class GwBoatItem<uint32_t>;
template class GwBoatItem<uint16_t>;
template class GwBoatItem<int16_t>;
template class GwBoatItem<String>;
void GwSatInfoList::houseKeeping(unsigned long ts)
{
if (ts == 0)

12
lib/boatData/GwBoatData.h
View File

@@ -9,6 +9,13 @@
#define GW_BOAT_VALUE_LEN 32
#define GWSC(name) static constexpr const char* name=#name
#define GWTYPE_DOUBLE 1
#define GWTYPE_UINT32 2
#define GWTYPE_UINT16 3
#define GWTYPE_INT16 4
#define GWTYPE_STRING 5
#define GWTYPE_USER 100
//see https://github.com/wellenvogel/esp32-nmea2000/issues/44
//factor to convert from N2k/SI rad/s to current NMEA rad/min
#define ROT_WA_FACTOR 60
@@ -93,6 +100,7 @@ class GwBoatItemBase{
virtual int getLastSource(){return lastUpdateSource;}
virtual void refresh(unsigned long ts=0){uls(ts);}
virtual double getDoubleValue()=0;
virtual String getStringValue()=0;
String getName(){return name;}
const String & getFormat() const{return format;}
virtual void setInvalidTime(GwConfigHandler *cfg);
@@ -128,6 +136,10 @@ template<class T> class GwBoatItem : public GwBoatItemBase{
return (double)data;
}
}
virtual String getStringValue(){
return (String)data;
}
virtual void fillString();
virtual void toJsonDoc(GwJsonDocument *doc, unsigned long minTime);
virtual int getLastSource(){return lastUpdateSource;}