diff --git a/README.md b/README.md index cacf68c9..5e8bc192 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,10 @@ Hard resetting via RTS pin... ``` 5. cd into the directory where the release zip file was expanded. -6. Install the correct firmware for your board with "device-install.sh firmware-_board_-_country_.bin". For instance "./device-install.sh firmware-HELTEC-US-0.0.3.bin". +6. Install the correct firmware for your board with `device-install.sh firmware-_board_-_country_.bin`. + - Example: `./device-install.sh firmware-HELTEC-US-0.0.3.bin`. +7. To update run `device-update.sh firmware-_board_-_country_.bin` + - Example: `./device-update.sh firmware-HELTEC-US-0.0.3.bin`. Note: If you have previously installed meshtastic, you don't need to run this full script instead just run "esptool.py --baud 921600 write*flash 0x10000 firmware-\_board*-_country_.bin". This will be faster, also all of your current preferences will be preserved. diff --git a/bin/build-all.sh b/bin/build-all.sh index 44a7d875..edea28cd 100755 --- a/bin/build-all.sh +++ b/bin/build-all.sh @@ -64,6 +64,6 @@ Generated by bin/buildall.sh --> XML rm -f $ARCHIVEDIR/firmware-$VERSION.zip -zip --junk-paths $ARCHIVEDIR/firmware-$VERSION.zip $OUTDIR/bins/firmware-*-$VERSION.* images/system-info.bin bin/device-install.sh +zip --junk-paths $ARCHIVEDIR/firmware-$VERSION.zip $OUTDIR/bins/firmware-*-$VERSION.* images/system-info.bin bin/device-install.sh bin/device-update.sh -echo BUILT ALL \ No newline at end of file +echo BUILT ALL diff --git a/bin/device-update.sh b/bin/device-update.sh new file mode 100755 index 00000000..b8a8dcf9 --- /dev/null +++ b/bin/device-update.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +set -e + +FILENAME=$1 + +echo "Trying to update $FILENAME" +esptool.py --baud 921600 writeflash 0x10000 $FILENAME diff --git a/lib/BluetoothOTA/src/BluetoothUtil.cpp b/lib/BluetoothOTA/src/BluetoothUtil.cpp index 0da8df85..ccaf4163 100644 --- a/lib/BluetoothOTA/src/BluetoothUtil.cpp +++ b/lib/BluetoothOTA/src/BluetoothUtil.cpp @@ -184,7 +184,7 @@ class MySecurity : public BLESecurityCallbacks void onPassKeyNotify(uint32_t pass_key) { - Serial.printf("onPassKeyNotify %u\n", pass_key); + Serial.printf("onPassKeyNotify %06u\n", pass_key); startCb(pass_key); }