Merge pull request #45 from pennam/package-upd

package: update script to handle binary version tag

Author: pennam

unor4wifi-updater/package.sh

@@ -11,8 +11,8 @@ function package_windows() {
     wget https://github.com/bcmi-labs/uno-r4-wifi-usb-bridge/releases/download/0.1.0/unor4wifi-reboot-windows.zip -O /tmp/unor4wifi-reboot-windows.zip
     unzip /tmp/unor4wifi-reboot-windows.zip -d unor4wifi-update-windows/bin
 
-    cp update_windows.bat unor4wifi-update-windows/update.bat
-    wget https://github.com/bcmi-labs/uno-r4-wifi-usb-bridge/releases/download/0.2.0/S3.bin -O unor4wifi-update-windows/firmware/UNOR4-WIFI-S3-0.2.0-rc1.bin
+    sed s#VVERSION#$VERSION#g update_windows.bat > unor4wifi-update-windows/update.bat
+    cp ../UNOR4USBBridge/build/esp32-patched.esp32.arduino_unor4wifi_usb_bridge/S3-ALL.bin unor4wifi-update-windows/firmware/UNOR4-WIFI-S3-$VERSION.bin
 
     zip -r unor4wifi-update-windows.zip unor4wifi-update-windows
 
@@ -29,8 +29,8 @@ function package_linux() {
     wget https://github.com/bcmi-labs/uno-r4-wifi-usb-bridge/releases/download/0.1.0/unor4wifi-reboot-linux64.zip -O /tmp/unor4wifi-reboot-linux64.zip
     unzip /tmp/unor4wifi-reboot-linux64.zip -d unor4wifi-update-linux/bin
 
-    cp update_linux.sh unor4wifi-update-linux/update.sh
-    wget https://github.com/bcmi-labs/uno-r4-wifi-usb-bridge/releases/download/0.2.0/S3.bin -O unor4wifi-update-linux/firmware/UNOR4-WIFI-S3-0.2.0-rc1.bin
+    sed s#VVERSION#$VERSION#g update_linux.sh > unor4wifi-update-linux/update.sh
+    cp ../UNOR4USBBridge/build/esp32-patched.esp32.arduino_unor4wifi_usb_bridge/S3-ALL.bin unor4wifi-update-linux/firmware/UNOR4-WIFI-S3-$VERSION.bin
 
     zip -r unor4wifi-update-linux.zip unor4wifi-update-linux
 
@@ -48,13 +48,14 @@ function package_macos() {
     wget https://github.com/bcmi-labs/uno-r4-wifi-usb-bridge/releases/download/0.1.0/unor4wifi-reboot-macos.zip -O /tmp/unor4wifi-reboot-macos.zip
     unzip /tmp/unor4wifi-reboot-macos.zip -d unor4wifi-update-macos/bin
 
-    cp update_mac.command unor4wifi-update-macos/update.command
-    wget https://github.com/bcmi-labs/uno-r4-wifi-usb-bridge/releases/download/0.2.0/S3.bin -O unor4wifi-update-macos/firmware/UNOR4-WIFI-S3-0.2.0-rc1.bin
+    sed s#VVERSION#$VERSION#g update_mac.command > unor4wifi-update-macos/update.command
+    cp ../UNOR4USBBridge/build/esp32-patched.esp32.arduino_unor4wifi_usb_bridge/S3-ALL.bin unor4wifi-update-macos/firmware/UNOR4-WIFI-S3-$VERSION.bin
 
     zip -r unor4wifi-update-macos.zip unor4wifi-update-macos
 
 }
 
+VERSION="4.0.0"
 
 # Cleanup before starting
 rm -rf unor4wifi-update-linux*

unor4wifi-updater/update_linux.sh

@@ -13,4 +13,4 @@ fi
 
 echo "Start flashing firmware"
 sleep 1
-./bin/espflash write-bin -b 115200 0x0 firmware/UNOR4-WIFI-S3-0.2.0-rc1.bin
+./bin/espflash write-bin -b 115200 0x0 firmware/UNOR4-WIFI-S3-VVERSION.bin

unor4wifi-updater/update_mac.command

@@ -13,4 +13,4 @@ fi
 
 echo "Start flashing firmware"
 sleep 1
-./bin/espflash write-bin -b 115200 0x0 firmware/UNOR4-WIFI-S3-0.2.0-rc1.bin
+./bin/espflash write-bin -b 115200 0x0 firmware/UNOR4-WIFI-S3-VVERSION.bin

unor4wifi-updater/update_windows.bat

@@ -13,7 +13,7 @@ IF %ERRORLEVEL% NEQ 0 (
 
 echo Start flashing firmware
 timeout /t 5 /nobreak > NUL
-CALL bin\espflash write-bin -b 115200 0x0 firmware\UNOR4-WIFI-S3-0.2.0-rc1.bin
+CALL bin\espflash write-bin -b 115200 0x0 firmware\UNOR4-WIFI-S3-VVERSION.bin
 
 @pause
 exit /b 0