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

intermediate: dynamic boat data for xdr

This commit is contained in:
wellenvogel 2021-11-24 12:47:41 +01:00
parent 3ef74581de
commit 166d8d826b
3 changed files with 67 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/boatData/GwBoatData.cpp
View File

@ -6,20 +6,42 @@ GwBoatData::GwBoatData(GwLog *logger){
GwBoatData::~GwBoatData(){ GwBoatData::~GwBoatData(){
GwBoatItemBase::GwBoatItemMap::iterator it; GwBoatItemBase::GwBoatItemMap::iterator it;
for (it=values.begin() ; it != values.end();it++){ for (it=values.begin() ; it != values.end();it++){
delete *it; delete it->second;
} }
} }
template<class T> GwBoatItem<T> *GwBoatData::getOrCreate(T dummy, String name, String format, template<class T> GwBoatItem<T> *GwBoatData::getOrCreate(T initial, GwBoatItemNameProvider *provider)
unsigned long invalidTime)
{ {
for (auto it=values.begin();it != values.end();it++){ String name=provider->getBoatItemName();
if ((*it)->getName() == name){ auto it=values.find(name);
return *it; if (it != values.end()) {
int expectedType=GwBoatItemTypes::getType(initial);
if (expectedType != it->second->getCurrentType()){
return NULL;
} }
return (GwBoatItem<T>*)(it->second);
} }
return new GwBoatItem<T>(name,format,invalidTime,&values); GwBoatItem<T> *rt=new GwBoatItem<T>(GwBoatItemTypes::getType(initial), name,
provider->getBoatItemFormat(),
provider->getInvalidTime(),
&values);
rt->update(initial);
return rt;
} }
template<class T> bool GwBoatData::update(T value,int source,GwBoatItemNameProvider *provider){
GwBoatItem<T> *item=getOrCreate(value,provider);
if (! item) return false;
return item->update(value,source);
}
template bool GwBoatData::update<double>(double value,int source,GwBoatItemNameProvider *provider);
template<class T> T GwBoatData::getDataWithDefault(T defaultv, GwBoatItemNameProvider *provider){
auto it=values.find(provider->getBoatItemName());
if (it == values.end()) return defaultv;
int expectedType=GwBoatItemTypes::getType(defaultv);
if (expectedType != it->second->getCurrentType()) return defaultv;
return ((GwBoatItem<T> *)(it->second))->getDataWithDefault(defaultv);
}
template double GwBoatData::getDataWithDefault<double>(double defaultv, GwBoatItemNameProvider *provider);
String GwBoatData::toJson() const { String GwBoatData::toJson() const {
unsigned long minTime=millis(); unsigned long minTime=millis();
GwBoatItemBase::GwBoatItemMap::const_iterator it; GwBoatItemBase::GwBoatItemMap::const_iterator it;
@ -27,11 +49,11 @@ String GwBoatData::toJson() const {
size_t elementSizes=0; size_t elementSizes=0;
for (it=values.begin() ; it != values.end();it++){ for (it=values.begin() ; it != values.end();it++){
count++; count++;
elementSizes+=(*it)->getJsonSize(); elementSizes+=it->second->getJsonSize();
} }
DynamicJsonDocument json(JSON_OBJECT_SIZE(count)+elementSizes+10); DynamicJsonDocument json(JSON_OBJECT_SIZE(count)+elementSizes+10);
for (it=values.begin() ; it != values.end();it++){ for (it=values.begin() ; it != values.end();it++){
(*it)->toJsonDoc(&json,minTime); it->second->toJsonDoc(&json,minTime);
} }
String buf; String buf;
serializeJson(json,buf); serializeJson(json,buf);

77
lib/boatData/GwBoatData.h
View File

@ -4,9 +4,21 @@
#include "GwLog.h" #include "GwLog.h"
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include <Arduino.h> #include <Arduino.h>
#include <vector> #include <map>
#define GW_BOAT_VALUE_LEN 32 #define GW_BOAT_VALUE_LEN 32
#define GWSC(name) static constexpr const __FlashStringHelper* name=F(#name) #define GWSC(name) static constexpr const __FlashStringHelper* name=F(#name)
#define GWTYPE_DOUBLE 1
#define GWTYPE_UINT32 2
#define GWTYPE_UINT16 3
#define GWTYPE_INT16 4
#define GWTYPE_USER 100
class GwBoatItemTypes{
public:
static int getType(const uint32_t &x){return GWTYPE_UINT32;}
static int getType(const uint16_t &x){return GWTYPE_UINT16;}
static int getType(const int16_t &x){return GWTYPE_INT16;}
static int getType(const double &x){return GWTYPE_DOUBLE;}
};
class GwBoatItemBase{ class GwBoatItemBase{
public: public:
static const unsigned long INVALID_TIME=60000; static const unsigned long INVALID_TIME=60000;
@ -23,8 +35,9 @@ class GwBoatItemBase{
GWSC(mtr2nm); GWSC(mtr2nm);
GWSC(formatDop); GWSC(formatDop);
GWSC(formatRot); GWSC(formatRot);
typedef std::vector<GwBoatItemBase*> GwBoatItemMap; typedef std::map<String,GwBoatItemBase*> GwBoatItemMap;
protected: protected:
int type;
unsigned long lastSet=0; unsigned long lastSet=0;
unsigned long invalidTime=INVALID_TIME; unsigned long invalidTime=INVALID_TIME;
String name; String name;
@ -34,6 +47,7 @@ class GwBoatItemBase{
else lastSet=millis(); else lastSet=millis();
} }
public: public:
int getCurrentType(){return type;}
unsigned long getLastSet() const {return lastSet;} unsigned long getLastSet() const {return lastSet;}
bool isValid(unsigned long now=0) const { bool isValid(unsigned long now=0) const {
if (lastSet == 0) return false; if (lastSet == 0) return false;
@ -46,6 +60,7 @@ class GwBoatItemBase{
this->invalidTime=invalidTime; this->invalidTime=invalidTime;
this->name=name; this->name=name;
this->format=format; this->format=format;
this->type=0;
} }
virtual ~GwBoatItemBase(){} virtual ~GwBoatItemBase(){}
void invalidate(){ void invalidate(){
@ -63,10 +78,11 @@ template<class T> class GwBoatItem : public GwBoatItemBase{
T data; T data;
int lastUpdateSource; int lastUpdateSource;
public: public:
GwBoatItem(String name,String formatInfo,unsigned long invalidTime=INVALID_TIME,GwBoatItemMap *map=NULL): GwBoatItem(int type,String name,String formatInfo,unsigned long invalidTime=INVALID_TIME,GwBoatItemMap *map=NULL):
GwBoatItemBase(name,formatInfo,invalidTime){ GwBoatItemBase(name,formatInfo,invalidTime){
type=type;
if (map){ if (map){
map->push_back(this); (*map)[name]=this;
} }
lastUpdateSource=-1; lastUpdateSource=-1;
} }
@ -171,7 +187,8 @@ bool convertToJson(const GwSatInfoList &si,JsonVariant &variant);
class GwBoatDataSatList : public GwBoatItem<GwSatInfoList> class GwBoatDataSatList : public GwBoatItem<GwSatInfoList>
{ {
public: public:
GwBoatDataSatList(String name, String formatInfo, unsigned long invalidTime = INVALID_TIME, GwBoatItemMap *map = NULL) : GwBoatItem<GwSatInfoList>(name, formatInfo, invalidTime, map) {} GwBoatDataSatList(String name, String formatInfo, unsigned long invalidTime = INVALID_TIME, GwBoatItemMap *map = NULL) :
GwBoatItem<GwSatInfoList>(GWTYPE_USER+1, name, formatInfo, invalidTime, map) {}
bool update(GwSatInfo info, int source) bool update(GwSatInfo info, int source)
{ {
unsigned long now = millis(); unsigned long now = millis();
@ -205,8 +222,16 @@ public:
}; };
class GwBoatItemNameProvider
{
public:
virtual String getBoatItemName() = 0;
virtual String getBoatItemFormat() = 0;
virtual unsigned long getInvalidTime(){ return GwBoatItemBase::INVALID_TIME;}
virtual ~GwBoatItemNameProvider() {}
};
#define GWBOATDATA(type,name,time,fmt) \ #define GWBOATDATA(type,name,time,fmt) \
GwBoatItem<type> *name=new GwBoatItem<type>(F(#name),GwBoatItemBase::fmt,time,&values) ; GwBoatItem<type> *name=new GwBoatItem<type>(GwBoatItemTypes::getType((type)0),F(#name),GwBoatItemBase::fmt,time,&values) ;
#define GWSPECBOATDATA(clazz,name,time,fmt) \ #define GWSPECBOATDATA(clazz,name,time,fmt) \
clazz *name=new clazz(F(#name),GwBoatItemBase::fmt,time,&values) ; clazz *name=new clazz(F(#name),GwBoatItemBase::fmt,time,&values) ;
class GwBoatData{ class GwBoatData{
@ -254,43 +279,11 @@ class GwBoatData{
public: public:
GwBoatData(GwLog *logger); GwBoatData(GwLog *logger);
~GwBoatData(); ~GwBoatData();
template<class T> GwBoatItem<T> *getOrCreate(T dummy,String name,String format, template<class T> GwBoatItem<T> *getOrCreate(T initial,GwBoatItemNameProvider *provider);
unsigned long invalidTime=GwBoatItemBase::INVALID_TIME); template<class T> bool update(T value,int source,GwBoatItemNameProvider *provider);
template<class T> T getDataWithDefault(T defaultv, GwBoatItemNameProvider *provider);
String toJson() const; String toJson() const;
}; };
/**
* class for lazy creation of a boat item
* once we have someone that knows the name for it
* and providing fast access without searching all the time trough the map
* xdr mappings implement such a provider
*/
class GwBoatItemNameProvider
{
public:
virtual String getBoatItemName() = 0;
virtual String getBoatItemFormat() = 0;
virtual ~GwBoatItemNameProvider() {}
};
template<class T> class GwBoatItemHolder{
private:
GwBoatItem<T> *item=NULL;
GwBoatData *data;
unsigned long invalidTime=GwBoatItemBase::INVALID_TIME;
public:
GwBoatItemHolder(GwBoatData *data,unsigned long invalidTime=GwBoatItemBase::INVALID_TIME){
this->data=data;
this->invalidTime=invalidTime;
}
GwBoatItem<T> *getItem(GwBoatItemNameProvider *provider){
if (item) return item;
T dummy;
item=data->getOrCreate(dummy,
provider->getBoatItemName() ,
provider->getBoatItemFormat(),
invalidTime);
return item;
}
GwBoatItem<T> *getItem(){return item;}
};
#endif #endif

1
lib/nmea2kto0183/N2kDataToNMEA0183.cpp
View File

@ -1222,6 +1222,7 @@ private:
} }
GwXDRFoundMapping mapping=xdrMappings->getMapping(XDRPRESSURE,(int)PressureSource,0,PressureInstance); GwXDRFoundMapping mapping=xdrMappings->getMapping(XDRPRESSURE,(int)PressureSource,0,PressureInstance);
if (mapping.empty) return; if (mapping.empty) return;
if (! boatData->update(ActualPressure,sourceId,&mapping)) return;
LOG_DEBUG(GwLog::DEBUG+1,"found pressure mapping %s",mapping.definition->toString().c_str()); LOG_DEBUG(GwLog::DEBUG+1,"found pressure mapping %s",mapping.definition->toString().c_str());
addToXdr(mapping.buildXdrEntry(ActualPressure)); addToXdr(mapping.buildXdrEntry(ActualPressure));
finalizeXdr(); finalizeXdr();