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

further move to dynamic boat data

Browse Source
This commit is contained in:
andreas
2021-10-18 21:58:32 +02:00
parent 9fa577c768
commit 68769368f2
3 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/boatData/GwBoatData.h
View File

@@ -43,30 +43,36 @@ class GwBoatData{
friend class GwBoatItemBase;
};
template<class T> class GwBoatItem : public GwBoatItemBase{
public:
typedef T (*Formatter)(T);
private:
T data;
Formatter fmt;
public:
GwBoatItem(long invalidTime=INVALID_TIME): GwBoatItemBase(invalidTime){}
GwBoatItem(long invalidTime=INVALID_TIME,Formatter fmt=NULL): GwBoatItemBase(invalidTime){
this->fmt=fmt;
}
virtual ~GwBoatItem(){}
void update(T nv){
data=nv;
uls();
}
T getData(){
return data;
T getData(bool useFormatter=false){
if (! useFormatter || fmt == NULL) return data;
return (*fmt)(data);
}
virtual void toJsonDoc(DynamicJsonDocument *doc,String name){
(*doc)[name]=data;
(*doc)[name]=getData(true);
}
static GwBoatItem<T> *findOrCreate(GwBoatData *handler, String name,bool doCreate=true,
long invalidTime=GwBoatItemBase::INVALID_TIME){
long invalidTime=GwBoatItemBase::INVALID_TIME, Formatter fmt=NULL){
GwBoatItemMap *values=handler->getValues();
GwBoatItemMap::iterator it;
if ((it=values->find(name)) != values->end()){
return (GwBoatItem<T> *)it->second;
}
if (! doCreate) return NULL;
GwBoatItem<T> *ni=new GwBoatItem<T>(invalidTime);
GwBoatItem<T> *ni=new GwBoatItem<T>(invalidTime,fmt);
(*values)[name]=ni;
return ni;
}