fixes

tube0013 · Aug 26, 2024 · 83a6345 · 83a6345
1 parent 443a895
commit 83a6345
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/tzb-cc2652-flasher/CHANGELOG.md b/tzb-cc2652-flasher/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Changelog
+## 0.3.3.2
+- Script fixes
+
 ## 0.3.3.1
 - move custom url to advanced drop down
 

diff --git a/tzb-cc2652-flasher/config.yaml b/tzb-cc2652-flasher/config.yaml
@@ -1,5 +1,5 @@
 ---
-version: 0.3.3.1
+version: 0.3.3.2
 slug: tzb-cc2652-flasher
 name: TubesZB TI CC2652 FW Flasher
 description: TubesZB TI CC2652 firmware flasher add-on
@@ -31,7 +31,6 @@ schema:
   sonoff: bool?
   cc2652p2_fw: bool?
   cc2652p7_fw: bool?
-  custom_fw_url: bool?
   firmware_url: str?
 stage: experimental
 startup: once

diff --git a/tzb-cc2652-flasher/rootfs/etc/s6-overlay/scripts/cc2652-flasher-up b/tzb-cc2652-flasher/rootfs/etc/s6-overlay/scripts/cc2652-flasher-up
@@ -59,6 +59,8 @@ if bashio::config.true 'cc2652p2_fw'; then
         exit 0
     fi
 
+    firmware="firmware.hex"
+
 if bashio::config.true 'cc2652p7_fw'; then
     curl --silent -L -o "/root/firmware.zip" ${cc2652p7_release_url}
     if [ ! -f "/root/firmware.zip" ]; then
@@ -72,7 +74,9 @@ if bashio::config.true 'cc2652p7_fw'; then
         exit 0
     fi
 
-if bashio::config.true 'custom_fw_url:'; then
+    firmware="firmware.hex"
+
+if bashio::config.has_value 'firmware_url'; then
     curl --silent -L -o "/root/firmware.zip" "$(bashio::config 'firmware_url')"
     if [ ! -f "/root/firmware.zip" ]; then
         bashio::log.warning "Firmware Download failed"
@@ -105,4 +109,4 @@ if bashio::config.true 'sonoff'; then
 else
    bashio::log.info "Starting cc2652 flasher with ${device}"
    cc1352-flasher.py -p ${device} -evw "/root/${firmware}"
-fi
+fi
diff --git a/tzb-cc2652-flasher/translations/en.yaml b/tzb-cc2652-flasher/translations/en.yaml
@@ -10,7 +10,7 @@ configuration:
     name: Hardware flow control
     description: Enable hardware flow control for serial port.
   firmware_url:
-    name: Firmware URL
+    name: Custom Firmware URL
     description: >-
       URL for firmware zip image you wish to flash
   trigger_esphome_bsl:
@@ -29,6 +29,3 @@ configuration:
   cc2652p7_fw:
     name: Select for Current Recommended CC2652 P7 Firmware
     description: Current Z-Stack Release for CC2652 P7 Devices - Use with TubesZB CC2652 P7 PoE
-  custom_fw_url:
-    name: Select to Custom_Firmware_URL
-    description: Select if entering a custom url for zipped firmware