From 782d353478d3ca3ebdf448bb861f4e25879851d0 Mon Sep 17 00:00:00 2001 From: Andrey Klimov Date: Thu, 17 Feb 2022 02:04:16 +0300 Subject: [PATCH] Fixed interferention with homie $ contained topics --- compiled/due/uploadOTA.sh | 2 +- compiled/mega2560slim-5100/uploadOTA.sh | 1 + lighthub/main.cpp | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100755 compiled/mega2560slim-5100/uploadOTA.sh diff --git a/compiled/due/uploadOTA.sh b/compiled/due/uploadOTA.sh index 5cba131..a470441 100755 --- a/compiled/due/uploadOTA.sh +++ b/compiled/due/uploadOTA.sh @@ -1 +1 @@ -../tools/mac/arduinoOTA -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch +../tools/mac/arduinoOTA -address 192.168.88.21 -port 80 -username arduino -password password -sketch firmware.bin -b -upload /sketch diff --git a/compiled/mega2560slim-5100/uploadOTA.sh b/compiled/mega2560slim-5100/uploadOTA.sh new file mode 100755 index 0000000..63cb991 --- /dev/null +++ b/compiled/mega2560slim-5100/uploadOTA.sh @@ -0,0 +1 @@ +../tools/mac/tool-avrdude/avrdude -C ../tools/mac/tool-avrdude/avrdude.conf -P net:192.168.88.2:23000 -v -V -patmega2560 -cwiring -b115200 -D -Uflash:w:firmware.hex:i diff --git a/lighthub/main.cpp b/lighthub/main.cpp index 45dfe90..f4cb39e 100644 --- a/lighthub/main.cpp +++ b/lighthub/main.cpp @@ -429,7 +429,8 @@ else cmd_parse((char *)payload); return;// -4; } - if (itemName[0]=='$') return;// -6; //Skipping homie stuff + //if (itemName[0]=='$') return;// -6; //Skipping homie stuff + if (strrchr(topic,'$')) return; Item item(itemName); if (item.isValid() && (item.Ctrl((char *)payload)>0) && savedTopic[0] && lanStatus != RETAINING_COLLECTING)