thooge
/
esp32-nmea2000-obp60
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git
1
0
Fork 0
Code Releases Activity

fix merge errors

This commit is contained in:
andreas 2024-11-25 16:50:32 +01:00
parent f9a001a9c2
commit 243c20c468
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/usercode/GwUserCode.cpp
View File

@ -90,7 +90,6 @@ class TaskInterfacesStorage{
return true; return true;
} }
GwApi::TaskInterfaces::Ptr get(const String &name, int &result){ GwApi::TaskInterfaces::Ptr get(const String &name, int &result){
GWSYNCHRONIZED(lock);
GWSYNCHRONIZED(lock); GWSYNCHRONIZED(lock);
auto it = values.find(name); auto it = values.find(name);
if (it == values.end()) if (it == values.end())
@ -245,7 +244,6 @@ public:
} }
}; };
virtual int getJsonSize(){ virtual int getJsonSize(){
GWSYNCHRONIZED(localLock);
GWSYNCHRONIZED(localLock); GWSYNCHRONIZED(localLock);
if (! counterUsed) return 0; if (! counterUsed) return 0;
int rt=0; int rt=0;
@ -255,7 +253,6 @@ public:
return rt; return rt;
}; };
virtual void increment(int idx,const String &name,bool failed=false){ virtual void increment(int idx,const String &name,bool failed=false){
GWSYNCHRONIZED(localLock);
GWSYNCHRONIZED(localLock); GWSYNCHRONIZED(localLock);
counterUsed=true; counterUsed=true;
auto it=counter.find(idx); auto it=counter.find(idx);