Merge branch 'master' into pager-shutdown

slightly rephrase the power off display message
Fix device-install.bat baud rate (#7486 )
2025-09-05 11:09:20 +00:00 · 2025-09-01 09:28:34 +02:00 · 2025-09-01 09:26:57 +02:00 · 2025-09-01 14:16:24 +10:00
2 changed files with 2 additions and 3 deletions
--- a/bin/device-install.bat
+++ b/bin/device-install.bat
@ -100,7 +100,6 @@ IF NOT "!FILENAME:update=!"=="!FILENAME!" (
 )

 :skip-filename
-SET "ESPTOOL_BAUD=1200"

 CALL :LOG_MESSAGE DEBUG "Determine the correct esptool command to use..."
 IF NOT "__%PYTHON%__"=="____" (
@ -142,7 +141,7 @@ CALL :LOG_MESSAGE INFO "Using esptool baud: !ESPTOOL_BAUD!."

 IF %BPS_RESET% EQU 1 (
    @REM Attempt to change mode via 1200bps Reset.
-    CALL :RUN_ESPTOOL !ESPTOOL_BAUD! --after no_reset read_flash_status
+    CALL :RUN_ESPTOOL 1200 --after no_reset read_flash_status
    GOTO eof
 )

--- a/src/Power.cpp
+++ b/src/Power.cpp
@ -747,7 +747,7 @@ void Power::shutdown()
 #if HAS_SCREEN
    if (screen) {
 #ifdef T_DECK_PRO
-        screen->showSimpleBanner("Device is turned off.\nConnect USB to start!", 0); // T-Deck Pro has no power button
+        screen->showSimpleBanner("Device is powered off.\nConnect USB to start!", 0); // T-Deck Pro has no power button
 #else
        screen->showSimpleBanner("Shutting Down...", 0); // stays on screen
 #endif
Author	SHA1	Message	Date
Manuel	403ad91f9e	Merge branch 'master' into pager-shutdown	2025-09-01 09:28:34 +02:00
Manuel	5769f57ed8	slightly rephrase the power off display message	2025-09-01 09:26:57 +02:00
Tom Fifield	44688e8363	Fix device-install.bat baud rate (#7486 ) Some checks are pending CI / build-rp2040 (push) Blocked by required conditions Details CI / build-rp2350 (push) Blocked by required conditions Details CI / build-stm32 (push) Blocked by required conditions Details CI / build-debian-src (push) Waiting to run Details CI / package-pio-deps-native-tft (push) Waiting to run Details CI / test-native (push) Waiting to run Details CI / docker-deb-amd64 (push) Waiting to run Details CI / docker-deb-amd64-tft (push) Waiting to run Details CI / docker-alp-amd64 (push) Waiting to run Details CI / docker-alp-amd64-tft (push) Waiting to run Details CI / docker-deb-arm64 (push) Waiting to run Details CI / docker-deb-armv7 (push) Waiting to run Details CI / gather-artifacts (esp32) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c3) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c6) (push) Blocked by required conditions Details CI / gather-artifacts (esp32s3) (push) Blocked by required conditions Details CI / gather-artifacts (nrf52840) (push) Blocked by required conditions Details CI / gather-artifacts (rp2040) (push) Blocked by required conditions Details CI / gather-artifacts (rp2350) (push) Blocked by required conditions Details CI / gather-artifacts (stm32) (push) Blocked by required conditions Details CI / release-artifacts (push) Blocked by required conditions Details CI / release-firmware (esp32) (push) Blocked by required conditions Details CI / release-firmware (esp32c3) (push) Blocked by required conditions Details CI / release-firmware (esp32c6) (push) Blocked by required conditions Details CI / release-firmware (esp32s3) (push) Blocked by required conditions Details CI / release-firmware (nrf52840) (push) Blocked by required conditions Details CI / release-firmware (rp2040) (push) Blocked by required conditions Details CI / release-firmware (rp2350) (push) Blocked by required conditions Details CI / release-firmware (stm32) (push) Blocked by required conditions Details CI / publish-firmware (push) Blocked by required conditions Details As reported by @gruberaaron , work to improve the 1200bps reset for esptool caused all runs of device-install.bat to use 1200bps as the baud rate. This change removes the general SET "ESPTOOL_BAUD=1200" that was causing the issues and places the baud settings for reset mode inside the conditional. Fixes https://github.com/meshtastic/firmware/issues/7172	2025-09-01 14:16:24 +10:00