From 00361b2a4ef96d5eadbdeacb917d4e1066b476c3 Mon Sep 17 00:00:00 2001 From: Thomas Sarlandie Date: Mon, 23 Apr 2018 13:57:51 -0700 Subject: [PATCH] Make recent changes work with branch usb-interface --- src/host/services/NMEA2000Service.cpp | 9 ++++----- src/host/services/SerialService.cpp | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/host/services/NMEA2000Service.cpp b/src/host/services/NMEA2000Service.cpp index 88dc4d50..d395fe5b 100644 --- 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 index a7cb8663..4d154648 100644 --- 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); } }