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

handle priorities in boat data

Browse Source
This commit is contained in:
andreas
2021-11-01 11:41:41 +01:00
parent 14b04fb4a0
commit 0bdcc8fff2
4 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/boatData/GwBoatData.cpp
View File

@@ -19,7 +19,7 @@ String GwBoatData::toJson() const {
count++;
elementSizes+=(*it)->getJsonSize();
}
DynamicJsonDocument json(JSON_OBJECT_SIZE(count)+elementSizes);
DynamicJsonDocument json(JSON_OBJECT_SIZE(count)+elementSizes+4);
for (it=values.begin() ; it != values.end();it++){
(*it)->toJsonDoc(&json,minTime);
}

21
lib/boatData/GwBoatData.h
View File

@@ -14,8 +14,9 @@ class GwBoatItemBase{
unsigned long lastSet=0;
unsigned long invalidTime=INVALID_TIME;
String name;
void uls(){
lastSet=millis();
void uls(unsigned long ts=0){
if (ts) lastSet=ts;
else lastSet=millis();
}
public:
unsigned long getLastSet() const {return lastSet;}
@@ -35,7 +36,7 @@ class GwBoatItemBase{
lastSet=0;
}
virtual void toJsonDoc(JsonDocument *doc, unsigned long minTime)=0;
virtual size_t getJsonSize(){return JSON_OBJECT_SIZE(4);}
virtual size_t getJsonSize(){return JSON_OBJECT_SIZE(5);}
virtual int getLastSource()=0;
};
class GwBoatData;
@@ -56,10 +57,20 @@ template<class T> class GwBoatItem : public GwBoatItemBase{
lastUpdateSource=-1;
}
virtual ~GwBoatItem(){}
void update(T nv, int source=-1){
bool update(T nv, int source=-1){
unsigned long now=millis();
if (isValid(now)){
//priority handling
//sources with lower ids will win
//and we will not overwrite their value
if (lastUpdateSource < source){
return false;
}
}
data=nv;
lastUpdateSource=source;
uls();
uls(now);
return true;
}
T getData(bool useFormatter=false){
if (! useFormatter || fmt == NULL) return data;