From 50192d712e4103e204d0eeac71a6a9486edf81cf Mon Sep 17 00:00:00 2001 From: free-x Date: Thu, 18 Nov 2021 11:44:51 +0100 Subject: [PATCH 1/4] set monitor_speed in ini --- platformio.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/platformio.ini b/platformio.ini index 2e5cadf..4bf75a3 100644 --- a/platformio.ini +++ b/platformio.ini @@ -28,6 +28,7 @@ extra_scripts = pre:extra_script.py post:post.py build_flags = -Igenerated +monitor_speed = 115200 [env:m5stack-atom] board = m5stack-atom From 75b7aab909baef3c3df391ee5fe701bb3863c4be Mon Sep 17 00:00:00 2001 From: free-x Date: Fri, 19 Nov 2021 16:13:15 +0100 Subject: [PATCH 2/4] Avoid deprecated function --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 071d610..e514809 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -543,7 +543,7 @@ void setup() { NMEA2000.SetN2kCANReceiveFrameBufSize(250); NMEA2000.SetN2kCANSendFrameBufSize(250); - esp_efuse_read_mac(chipid); + esp_efuse_mac_get_default(chipid); for (int i = 0; i < 6; i++) id += (chipid[i] << (7 * i)); // Set product information From ca65ea87b448e474f536d553a9d2a1aa68b266ad Mon Sep 17 00:00:00 2001 From: free-x Date: Sun, 21 Nov 2021 13:28:27 +0100 Subject: [PATCH 3/4] Handle 130312: Temperature --- lib/nmea2kto0183/N2kDataToNMEA0183.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/lib/nmea2kto0183/N2kDataToNMEA0183.cpp b/lib/nmea2kto0183/N2kDataToNMEA0183.cpp index 3d30a71..659fad8 100644 --- a/lib/nmea2kto0183/N2kDataToNMEA0183.cpp +++ b/lib/nmea2kto0183/N2kDataToNMEA0183.cpp @@ -1196,6 +1196,23 @@ private: SendMessage(nmeaMsg); } + void Handle130312(const tN2kMsg &msg){ + unsigned char SID=-1; + unsigned char TemperatureInstance=0; + tN2kTempSource TemperatureSource; + double Temperature=N2kDoubleNA; + double setTemperature=N2kDoubleNA; + if (!ParseN2kPGN130312(msg,SID,TemperatureInstance,TemperatureSource,Temperature,setTemperature)){ + LOG_DEBUG(GwLog::DEBUG,"unable to parse PGN %d",msg.PGN); + return; + } + GwXDRFoundMapping mapping=xdrMappings->getMapping(XDRTEMP,(int)TemperatureSource,0,TemperatureInstance); + if (mapping.empty) return; + LOG_DEBUG(GwLog::DEBUG,"found temperature mapping %s",mapping.definition->toString().c_str()); + addToXdr(buildXdrEntry(mapping,Temperature)); + finalizeXdr(); + } + void Handle130314(const tN2kMsg &msg){ unsigned char SID=-1; unsigned char PressureInstance=0; @@ -1239,6 +1256,7 @@ private: converters.registerConverter(127251UL, &N2kToNMEA0183Functions::HandleROT); converters.registerConverter(129283UL, &N2kToNMEA0183Functions::HandleXTE); converters.registerConverter(129284UL, &N2kToNMEA0183Functions::HandleNavigation); + converters.registerConverter(130312UL, &N2kToNMEA0183Functions::Handle130312); converters.registerConverter(130314UL, &N2kToNMEA0183Functions::Handle130314); #define HANDLE_AIS #ifdef HANDLE_AIS From 8beab691eecf7eb985a874f0571c8e768eca171b Mon Sep 17 00:00:00 2001 From: free-x Date: Sun, 21 Nov 2021 13:39:39 +0100 Subject: [PATCH 4/4] Handle 130313: Humidity --- lib/nmea2kto0183/N2kDataToNMEA0183.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/lib/nmea2kto0183/N2kDataToNMEA0183.cpp b/lib/nmea2kto0183/N2kDataToNMEA0183.cpp index 659fad8..b5bddf8 100644 --- a/lib/nmea2kto0183/N2kDataToNMEA0183.cpp +++ b/lib/nmea2kto0183/N2kDataToNMEA0183.cpp @@ -1213,6 +1213,23 @@ private: finalizeXdr(); } + void Handle130313(const tN2kMsg &msg){ + unsigned char SID=-1; + unsigned char HumidityInstance=0; + tN2kHumiditySource HumiditySource; + double ActualHumidity=N2kDoubleNA; + double SetHumidity=N2kDoubleNA; + if (!ParseN2kPGN130313(msg,SID,HumidityInstance,HumiditySource,ActualHumidity,SetHumidity)){ + LOG_DEBUG(GwLog::DEBUG,"unable to parse PGN %d",msg.PGN); + return; + } + GwXDRFoundMapping mapping=xdrMappings->getMapping(XDRHUMIDITY,(int)HumiditySource,0,HumidityInstance); + if (mapping.empty) return; + LOG_DEBUG(GwLog::DEBUG,"found humidity mapping %s",mapping.definition->toString().c_str()); + addToXdr(buildXdrEntry(mapping,ActualHumidity)); + finalizeXdr(); + } + void Handle130314(const tN2kMsg &msg){ unsigned char SID=-1; unsigned char PressureInstance=0; @@ -1257,6 +1274,7 @@ private: converters.registerConverter(129283UL, &N2kToNMEA0183Functions::HandleXTE); converters.registerConverter(129284UL, &N2kToNMEA0183Functions::HandleNavigation); converters.registerConverter(130312UL, &N2kToNMEA0183Functions::Handle130312); + converters.registerConverter(130313UL, &N2kToNMEA0183Functions::Handle130313); converters.registerConverter(130314UL, &N2kToNMEA0183Functions::Handle130314); #define HANDLE_AIS #ifdef HANDLE_AIS