Merge branch 'develop' of https://github.com/anklimov/lighthub into develop

This commit is contained in:
2020-12-19 01:12:48 +03:00
2 changed files with 8 additions and 0 deletions

View File

@@ -1 +1,5 @@
<<<<<<< HEAD
..\tools\win\arduinoOTA.exe -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
=======
..\tools\win\arduinoOTA.exe -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
>>>>>>> 9b164a1dfc40ee0e8f29dbedff4f3954edf55d76

View File

@@ -1 +1,5 @@
<<<<<<< HEAD
..\tools\win\arduinoOTA.exe -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
=======
..\tools\win\arduinoOTA.exe -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
>>>>>>> 9b164a1dfc40ee0e8f29dbedff4f3954edf55d76