From a31030bf90d5fc62e32066acfd523d295bc62c08 Mon Sep 17 00:00:00 2001 From: bunnie Date: Wed, 20 Apr 2022 16:59:19 +0800 Subject: [PATCH] remove excess wait state and clarify wait text --- tools/update_ci.ps1 | 8 ++++---- tools/update_ci.sh | 11 ++++------- tools/update_release.ps1 | 8 ++++---- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/tools/update_ci.ps1 b/tools/update_ci.ps1 index c5b99bafc..ba820dd59 100644 --- a/tools/update_ci.ps1 +++ b/tools/update_ci.ps1 @@ -15,28 +15,28 @@ if ($decision -eq 0) { } python usb_update.py --disable-boot -Write-Output "waiting for device to reboot" +Write-Output "waiting for device to reconnect" Start-Sleep 5 Invoke-WebRequest https://ci.betrusted.io/latest-ci/xous-$LOCALE.img -OutFile xous.img python usb_update.py -k xous.img Remove-Item xous.img -Write-Output "waiting for device to reboot" +Write-Output "waiting for device to reconnect" Start-Sleep 5 Invoke-WebRequest https://ci.betrusted.io/latest-ci/ec_fw.bin -OutFile ec_fw.bin python usb_update.py -e ec_fw.bin Remove-Item ec_fw.bin -Write-Output "waiting for device to reboot" +Write-Output "waiting for device to reconnect" Start-Sleep 5 Invoke-WebRequest https://ci.betrusted.io/latest-ci/wf200_fw.bin -OutFile wf200_fw.bin python usb_update.py -w wf200_fw.bin Remove-Item wf200_fw.bin -Write-Output "waiting for device to reboot" +Write-Output "waiting for device to reconnect" Start-Sleep 5 Invoke-WebRequest https://ci.betrusted.io/latest-ci/loader.bin -OutFile loader.bin diff --git a/tools/update_ci.sh b/tools/update_ci.sh index 6ac03fdb2..45a088f0d 100755 --- a/tools/update_ci.sh +++ b/tools/update_ci.sh @@ -32,31 +32,28 @@ else fi ./usb_update.py --disable-boot -echo "waiting for device to reboot" -sleep 5 - -echo "waiting for device to reboot" +echo "waiting for device to reconnect" sleep 5 wget https://ci.betrusted.io/$REVISION/xous$LOCALE.img -O /tmp/xous.img ./usb_update.py -k /tmp/xous.img rm /tmp/xous.img -echo "waiting for device to reboot" +echo "waiting for device to reconnect" sleep 5 wget https://ci.betrusted.io/$REVISION/ec_fw.bin -O /tmp/ec_fw.bin ./usb_update.py -e /tmp/ec_fw.bin rm /tmp/ec_fw.bin -echo "waiting for device to reboot" +echo "waiting for device to reconnect" sleep 5 wget https://ci.betrusted.io/$REVISION/wf200_fw.bin -O /tmp/wf200_fw.bin ./usb_update.py -w /tmp/wf200_fw.bin rm /tmp/wf200_fw.bin -echo "waiting for device to reboot" +echo "waiting for device to reconnect" sleep 5 wget https://ci.betrusted.io/$REVISION/loader.bin -O /tmp/loader.bin diff --git a/tools/update_release.ps1 b/tools/update_release.ps1 index 4df2227a9..11ae3a8bf 100644 --- a/tools/update_release.ps1 +++ b/tools/update_release.ps1 @@ -15,28 +15,28 @@ if ($decision -eq 0) { } python usb_update.py --disable-boot -Write-Output "waiting for device to reboot" +Write-Output "waiting for device to reconnect" Start-Sleep 5 Invoke-WebRequest https://ci.betrusted.io/releases/latest/xous-$LOCALE.img -OutFile xous.img python usb_update.py -k xous.img Remove-Item xous.img -Write-Output "waiting for device to reboot" +Write-Output "waiting for device to reconnect" Start-Sleep 5 Invoke-WebRequest https://ci.betrusted.io/releases/latest/ec_fw.bin -OutFile ec_fw.bin python usb_update.py -e ec_fw.bin Remove-Item ec_fw.bin -Write-Output "waiting for device to reboot" +Write-Output "waiting for device to reconnect" Start-Sleep 5 Invoke-WebRequest https://ci.betrusted.io/releases/latest/wf200_fw.bin -OutFile wf200_fw.bin python usb_update.py -w wf200_fw.bin Remove-Item wf200_fw.bin -Write-Output "waiting for device to reboot" +Write-Output "waiting for device to reconnect" Start-Sleep 5 Invoke-WebRequest https://ci.betrusted.io/releases/latest/loader.bin -OutFile loader.bin