From f98307d100498eb75f0f3d19cb562d1ff62777d7 Mon Sep 17 00:00:00 2001 From: jasper Date: Sun, 26 Nov 2023 16:46:08 +0100 Subject: [PATCH] uuid print --- DSP/Model.cpp | 2 +- IO/Network.cpp | 2 ++ Library/NMEA.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/DSP/Model.cpp b/DSP/Model.cpp index 74fcdcb79b..58e444910a 100644 --- a/DSP/Model.cpp +++ b/DSP/Model.cpp @@ -697,6 +697,6 @@ namespace AIS { } std::string ModelNMEA::Get() { - return "nmea_refresh " + Util::Convert::toString(nmea.getRegenerate()) + " crc_check " + Util::Convert::toString(nmea.getCRCcheck()) + " VDO " + Util::Convert::toString(nmea.getVDO()) + Model::Get(); + return "nmea_refresh " + Util::Convert::toString(nmea.getRegenerate()) + " uuid " + nmea.getUUID() + " crc_check " + Util::Convert::toString(nmea.getCRCcheck()) + " VDO " + Util::Convert::toString(nmea.getVDO()) + Model::Get(); } } diff --git a/IO/Network.cpp b/IO/Network.cpp index 2a11a7c19c..f2325cfbc7 100644 --- a/IO/Network.cpp +++ b/IO/Network.cpp @@ -337,6 +337,8 @@ namespace IO { std::cerr << ", JSON: " << Util::Convert::toString(JSON); if (broadcast) std::cerr << ", broadcast: true"; if (reset > 0) std::cerr << ", reset: " << reset; + if (!uuid.empty()) std::cerr << ", uuid: " << uuid; + std::cerr << std::endl; if (sock != -1) { diff --git a/Library/NMEA.h b/Library/NMEA.h index 567ac4d007..3477eca9a5 100644 --- a/Library/NMEA.h +++ b/Library/NMEA.h @@ -98,6 +98,7 @@ namespace AIS { void setVDO(bool b) { VDO = b; } bool getVDO() { return VDO; } void setUUID(const std::string &u) { uuid = u; } + std::string getUUID() { return uuid; } void setStation(int s) { station = s; }