Make recent changes work with branch usb-interface

sarfata · Apr 23, 2018 · 00361b2 · 00361b2
1 parent b0382bf
commit 00361b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/host/services/NMEA2000Service.cpp b/src/host/services/NMEA2000Service.cpp
@@ -43,17 +43,16 @@ void NMEA2000Service::publishN2kMessage(const tN2kMsg& msg) {
   if (_config.rxEnabled) {
     KBoxMetrics.event(KBoxEventNMEA2000MessageReceived);
 
+    DEBUG("Received N2K Message with pgn: %i", msg.PGN);
+
     for (auto it = _sentenceRepeaters.begin(); it != _sentenceRepeaters.end(); it++) {
       (*it)->write(msg);
     }
 
-    DEBUG("Received N2K Message with pgn: %i", msg.PGN);
-    NMEA2000Message m(msg, now());
-    sendMessage(m);
-
     SKNMEA2000Parser p;
     //FIXME: Get the time properly here!
-    const SKUpdate &update = p.parse(SKSourceInputNMEA2000, msg, SKTime(0));
+    uint32_t ts = millis();
+    const SKUpdate &update = p.parse(SKSourceInputNMEA2000, msg, SKTime(ts / 1000, ts % 1000));
     if (update.getSize() > 0) {
       _hub.publish(update);
     }

diff --git a/src/host/services/SerialService.cpp b/src/host/services/SerialService.cpp
@@ -196,7 +196,7 @@ void SerialService::loop() {
       }
     }
     else {
-      DEBUG("Invalid NMEA sentence: %s", (*it).getSentence().c_str());
+      DEBUG("Invalid NMEA sentence: %s", (*it).c_str());
       KBoxMetrics.event(_rxErrorEvent);
     }
   }