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

add new function getBoatDataValues to api for easier access

Browse Source
This commit is contained in:
wellenvogel
2021-12-03 17:00:51 +01:00
parent b4b08fa12d
commit 04d90447e8
7 changed files with 106 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/boatData/GwBoatData.cpp
View File

@@ -329,6 +329,17 @@ String GwBoatData::toString(){
}
return rt;
}
bool GwBoatData::isValid(String name){
auto it=values.find(name);
if (it == values.end()) return false;
return it->second->isValid();
}
double GwBoatData::getDoubleValue(String name,double defaultv){
auto it=values.find(name);
if (it == values.end()) return defaultv;
if (! it->second->isValid()) return defaultv;
return it->second->getDoubleValue();
}
double formatCourse(double cv)
{
double rt = cv * 180.0 / M_PI;

9
lib/boatData/GwBoatData.h
View File

@@ -69,7 +69,9 @@ class GwBoatItemBase{
virtual size_t getJsonSize();
virtual int getLastSource(){return lastUpdateSource;}
virtual void refresh(unsigned long ts=0){uls(ts);}
virtual double getDoubleValue()=0;
String getName(){return name;}
String getFormat(){return format;}
};
class GwBoatData;
template<class T> class GwBoatItem : public GwBoatItemBase{
@@ -88,6 +90,7 @@ template<class T> class GwBoatItem : public GwBoatItemBase{
if (! isValid(millis())) return defaultv;
return data;
}
virtual double getDoubleValue(){return (double)data;}
virtual void fillString();
virtual void toJsonDoc(GwJsonDocument *doc, unsigned long minTime);
virtual int getLastSource(){return lastUpdateSource;}
@@ -120,6 +123,7 @@ class GwSatInfoList{
if (idx >= 0 && idx < sats.size()) return &sats.at(idx);
return NULL;
}
operator double(){ return getNumSats();}
};
class GwBoatDataSatList : public GwBoatItem<GwSatInfoList>
@@ -136,6 +140,9 @@ public:
if (! isValid()) return 0;
return data.getNumSats();
}
virtual double getDoubleValue(){
return (double)(data.getNumSats());
}
};
@@ -199,6 +206,8 @@ class GwBoatData{
template<class T> GwBoatItem<T> *getOrCreate(T initial,GwBoatItemNameProvider *provider);
template<class T> bool update(T value,int source,GwBoatItemNameProvider *provider);
template<class T> T getDataWithDefault(T defaultv, GwBoatItemNameProvider *provider);
bool isValid(String name);
double getDoubleValue(String name,double defaultv);
String toJson() const;
String toString();
};