convert RMC from 0183 to 2k, avoid cores

lib/nmea0183ton2k/NMEA0183DataToN2K.cpp

@@ -1,6 +1,8 @@
 #include "NMEA0183DataToN2K.h"
 #include "NMEA0183Messages.h"
+#include "N2kMessages.h"
 #include "ConverterList.h"
+#include <map>
 NMEA0183DataToN2K::NMEA0183DataToN2K(GwLog *logger, GwBoatData *boatData,N2kSender callback)
 {
     this->sender = callback;
@@ -14,47 +16,127 @@ bool NMEA0183DataToN2K::parseAndSend(const char *buffer, int sourceId) {
     return false;
 }
 
+class SNMEA0183Msg {
+        public:
+            int sourceId;
+            const char *line;
+            tNMEA0183Msg msg;
+    };
 class NMEA0183DataToN2KFunctions : public NMEA0183DataToN2K
 {
-private:
+private:   
     double dummy = 0;
-    ConverterList<NMEA0183DataToN2KFunctions, tNMEA0183Msg> converters;
-    void createBoatData()
-    {
+    ConverterList<NMEA0183DataToN2KFunctions, SNMEA0183Msg> converters;
+    std::map<unsigned long,unsigned long> lastSends;
+    
+    bool send(tN2kMsg &msg,unsigned long minDiff=50){
+        unsigned long now=millis();
+        unsigned long pgn=msg.PGN;
+        auto it=lastSends.find(pgn);
+        if (it == lastSends.end()){
+            lastSends[pgn]=now;
+            sender(msg);
+            return true;
+        }
+        if ((it->second + minDiff) < now){
+            lastSends[pgn]=now;
+            sender(msg);
+            return true;
+        }
+        return false;
     }
-    void convertRMB(const tNMEA0183Msg &msg)
+    bool updateDouble(GwBoatItem<double> *target,double v, int sourceId){
+        if (v != NMEA0183DoubleNA){
+            target->update(v,sourceId);
+            return true;
+        }
+        return false;
+    }
+    bool updateUint32(GwBoatItem<uint32_t> *target,uint32_t v, int sourceId){
+        if (v != NMEA0183UInt32NA){
+            target->update(v,sourceId);
+            return true;
+        }
+        return v;
+    }
+    uint32_t getUint32(GwBoatItem<uint32_t> *src){
+        return src->getDataWithDefault(N2kUInt32NA);
+    }
+    void convertRMB(const SNMEA0183Msg &msg)
     {
         LOG_DEBUG(GwLog::DEBUG + 1, "convert RMB");
     }
+    #define UD(item) updateDouble(boatData->item, item, msg.sourceId)
+    #define UI(item) updateUint32(boatData->item, item, msg.sourceId)
+    void convertRMC(const SNMEA0183Msg &msg)
+    {
+        double SecondsSinceMidnight=0, Latitude=0, Longitude=0, COG=0, SOG=0, Variation=0;
+        unsigned long DaysSince1970=0;
+        time_t DateTime;
+        char status;
+        if (!NMEA0183ParseRMC_nc(msg.msg, SecondsSinceMidnight, status, Latitude, Longitude, COG, SOG, DaysSince1970, Variation, &DateTime))
+        {
+            logger->logDebug(GwLog::DEBUG, "failed to parse RMC %s", msg.line);
+            return;
+        }
+        tN2kMsg n2kMsg;
+        if (
+            UD(SecondsSinceMidnight) &&
+            UI(DaysSince1970)
+        )
+        {
+            
+            SetN2kSystemTime(n2kMsg, 1, DaysSince1970, SecondsSinceMidnight);
+            send(n2kMsg);
+        }
+        if (UD(Latitude) &&
+            UD(Longitude)){
+            SetN2kLatLonRapid(n2kMsg,Latitude,Longitude);
+            send(n2kMsg);
+        }
+        if (UD(COG) && UD(SOG)){
+            SetN2kCOGSOGRapid(n2kMsg,1,N2khr_true,COG,SOG);
+            send(n2kMsg);
+        }
+        if (UD(Variation)){
+            SetN2kMagneticVariation(n2kMsg,1,N2kmagvar_Calc,
+                getUint32(boatData->DaysSince1970), Variation);
+            send(n2kMsg);    
+        }
+
+    }
+
 //shortcut for lambda converters
-#define CVL [](const tNMEA0183Msg &msg, NMEA0183DataToN2KFunctions *p) -> void
+#define CVL [](const SNMEA0183Msg &msg, NMEA0183DataToN2KFunctions *p) -> void
     void registerConverters()
     {
         converters.registerConverter(129283UL, String(F("RMB")), &NMEA0183DataToN2KFunctions::convertRMB);
         converters.registerConverter(
-            123UL, String(F("RMC")), CVL
-            {
-                p->dummy++;
-                p->logger->logDebug(GwLog::DEBUG, "RMC converter");
-            });
+            126992UL,129025UL,129026UL,127258UL, String(F("RMC")), 
+            &NMEA0183DataToN2KFunctions::convertRMC);
     }
 
 public:
     virtual bool parseAndSend(const char *buffer, int sourceId)
     {
         LOG_DEBUG(GwLog::DEBUG + 1, "NMEA0183DataToN2K[%d] parsing %s", sourceId, buffer)
-        tNMEA0183Msg msg;
-        if (!msg.SetMessage(buffer))
+        SNMEA0183Msg msg;
+        msg.sourceId=sourceId;
+        msg.line=buffer;
+        if (!msg.msg.SetMessage(buffer))
         {
             LOG_DEBUG(GwLog::DEBUG, "NMEA0183DataToN2K[%d] invalid message %s", sourceId, buffer)
             return false;
         }
-        String code = msg.MessageCode();
+        String code = msg.msg.MessageCode();
         bool rt = converters.handleMessage(code, msg, this);
         if (!rt)
         {
             LOG_DEBUG(GwLog::DEBUG, "NMEA0183DataToN2K[%d] no handler for %s", sourceId, buffer);
         }
+        else{
+            LOG_DEBUG(GwLog::DEBUG+1, "NMEA0183DataToN2K[%d] handler done ", sourceId);
+        }
         return rt;
     }
 
@@ -66,7 +148,6 @@ public:
     NMEA0183DataToN2KFunctions(GwLog *logger, GwBoatData *boatData, N2kSender callback)
         : NMEA0183DataToN2K(logger, boatData, callback)
     {
-        createBoatData();
         registerConverters();
         LOG_DEBUG(GwLog::LOG, "NMEA0183DataToN2KFunctions: registered %d converters", converters.numConverters());
     }