OTA utils upd for data & ESP, compilation fix ESP

build-flags/build_flags_esp32-wifi

@@ -15,12 +15,25 @@
 #-DW5500_CS_PIN=15
 #-DPID_DISABLE
 
-#Define pins for Serial1. Default - 9/10 is utilized by ESP flash 
+#Define pins for modbus UART Serial1. Default - 9/10 is utilized by ESP flash 
 #-DMODBUS_UART_RX_PIN=15
 #-DMODBUS_UART_TX_PIN=2
 #-DmodbusSerial=Serial1
+#-DMODBUS_DEBUG
 
-# Use default pins
--DMODBUS_UART_RX_PIN=-1
--DMODBUS_UART_TX_PIN=-1
+# Use default pins for modbus UART
+#-DMODBUS_UART_RX_PIN=-1
+#-DMODBUS_UART_TX_PIN=-1
+
+# Example of UARTBRIDGE configuration
+#-DUARTBRIDGE_ENABLE
+#-DMODULE_UATRBRIDGE_UARTA=Serial1
+#-DMODULE_UATRBRIDGE_UARTA_RX_PIN=15
+#-DMODULE_UATRBRIDGE_UARTA_TX_PIN=2
+
+#-DMODULE_UATRBRIDGE_UARTB=Serial2
+#-DMODULE_UATRBRIDGE_UARTB_RX_PIN=-1
+#-DMODULE_UATRBRIDGE_UARTB_TX_PIN=-1
+
+#-DAUTOCONNECT_RECONNECT_WAITTIME=60
 

compiled/esp32-wifi/uploadCFG.sh

@@ -0,0 +1,2 @@
+~/.platformio/packages/tool-mkspiffs/mkspiffs_espressif32_arduino -c data data.bin
+../tools/mac/arduinoOTA -v -address 192.168.88.60 -port 65280 -username arduino -password password -sketch data.bin  -upload /data -b

compiled/esp32-wifi/uploadCounter.sh

@@ -1 +0,0 @@
-../tools/mac/arduinoOTA -address 192.168.8.58 -port 65280 -username arduino -password password -sketch StartCounter.ino.bin -b -upload /sketch

compiled/esp32-wifi/uploadOTA.sh

@@ -1 +1 @@
-../tools/mac/arduinoOTA -address 192.168.88.45 -port 65280 -username arduino -password password -sketch firmware.bin  -upload /sketch -b
+../tools/mac/arduinoOTA -v -address 192.168.88.60 -port 65280 -username arduino -password password -sketch firmware.bin  -upload /sketch -b

compiled/lighthub21/uploadCFG.sh

@@ -0,0 +1 @@
+../tools/mac/arduinoOTA -address 192.168.88.45 -port 65280 -username arduino -password password -sketch data/config.json -b -upload /data

compiled/lighthub21/uploadOTA.bat

@@ -1,5 +1,2 @@
-<<<<<<< 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
+

compiled/lighthub21/uploadOTA.sh

@@ -1 +1 @@
-../tools/mac/arduinoOTA -address 192.168.11.172 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
+../tools/mac/arduinoOTA -address 192.168.88.45 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch

compiled/untitled folder/upload.bat

@@ -1,3 +0,0 @@
-mode com3:1200,n,8,1
-pause
-..\tools\win\tool-bossac\bossac.exe -i --port=com3 -U false -e -w -v -b firmware.bin -R 

compiled/untitled folder/upload.sh

@@ -1,3 +0,0 @@
-export PORT=cu.usbmodem14101
-echo . |  stty -f /dev/$PORT speed 1200
-../tools/mac/tool-bossac/bossac -U false -p $PORT -i -e -w -v -b firmware.bin -R 

lighthub/modules/out_uartbridge.cpp

@@ -108,7 +108,7 @@ bool out_UARTbridge::getConfig()
     aJsonObject * debugPortObj=aJson.getObjectItem(item->itemArg, "port");
 
     if (debugIPObj)
-          inet_aton(debugIPObj->valuestring, targetIP);
+          _inet_aton(debugIPObj->valuestring, targetIP);
 
     if (debugPortObj) targetPort = debugPortObj->valueint;      
 

lighthub/utils.cpp

@@ -325,7 +325,7 @@ void ReadUniqueID( uint32_t * pdwUniqueID )
 }
 
 
-int inet_aton(const char* aIPAddrString, IPAddress& aResult)
+int _inet_aton(const char* aIPAddrString, IPAddress& aResult)
 {
     // See if we've been given a valid IP address
     const char* p =aIPAddrString;
@@ -395,7 +395,7 @@ int inet_aton(const char* aIPAddrString, IPAddress& aResult)
  * @return either pointer to buf which now holds the ASCII
  *         representation of addr or NULL if buf was too small
  */
-char *inet_ntoa_r(IPAddress addr, char *buf, int buflen)
+char *_inet_ntoa_r(IPAddress addr, char *buf, int buflen)
 {
   short n;
   char intbuf[4];