From f7afa9a81e998bb117fe5506471eaf26dc78af5b Mon Sep 17 00:00:00 2001
From: Kalle Lilja <15094562+ThatKalle@users.noreply.github.com>
Date: Thu, 6 Mar 2025 23:58:08 +0100
Subject: [PATCH 001/116] [Task]: 2.6 device-install scripts (#6248)

* update device-install.bat

* add device-install unittest

* update device-update.bat

* update uf2-convert.bat

* update regen-protos.bat

* update rem

* bump version

* update device-install.sh

* add esptool

* move esptool to setup.sh

* trunk check+fmt

* update uf2-convert.bat
---
 .devcontainer/setup.sh      |   3 +
 bin/device-install.bat      | 433 ++++++++++++++++++++++++------------
 bin/device-install.sh       | 226 +++++++++----------
 bin/device-install_test.ps1 | 111 +++++++++
 bin/device-update.bat       | 205 +++++++++++++----
 bin/regen-protos.bat        |  11 +-
 bin/uf2-convert.bat         | 126 ++++++++++-
 7 files changed, 812 insertions(+), 303 deletions(-)
 create mode 100644 bin/device-install_test.ps1

diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh
index 0b2665f84..7c7487cc8 100755
--- a/.devcontainer/setup.sh
+++ b/.devcontainer/setup.sh
@@ -1,3 +1,6 @@
 #!/usr/bin/env sh
 
 git submodule update --init
+
+pip install --no-cache-dir setuptools
+pipx install esptool
diff --git a/bin/device-install.bat b/bin/device-install.bat
index 4d13d9f3b..3e2ea49aa 100755
--- a/bin/device-install.bat
+++ b/bin/device-install.bat
@@ -1,149 +1,292 @@
 @ECHO OFF
 SETLOCAL EnableDelayedExpansion
-set "SCRIPTNAME=%~nx0"
-set "PYTHON=python"
-set "WEB_APP=0"
-set "TFT8=0"
-set "TFT16=0"
-SET "TFT_BUILD=0"
-SET "DO_SPECIAL_OTA=0"
+TITLE Meshtastic device-install
 
-:: Determine the correct esptool command to use
-where esptool >nul 2>&1
-if %ERRORLEVEL% EQU 0 (
-    set "ESPTOOL_CMD=esptool"
-) else (
-    set "ESPTOOL_CMD=%PYTHON% -m esptool"
-)
-
-goto GETOPTS
-:HELP
-echo Usage: %SCRIPTNAME% [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME] [--web] [--tft] [--tft-16mb]
-echo Flash image file to device, but first erasing and writing system information
-echo.
-echo     -h               Display this help and exit
-echo     -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerrous).
-echo     -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: %PYTHON%)
-echo     -f FILENAME      The .bin file to flash.  Custom to your device type and region.
-echo     --web            Flash WEB APP.
-echo     --tft            Flash MUI 8mb
-echo     --tft-16mb       Flash MUI 16mb
-goto EOF
-
-:GETOPTS
-if /I "%~1"=="-h" goto HELP & exit /b
-if /I "%~1"=="--help" goto HELP & exit /b
-if "%~1"=="-p" set "ESPTOOL_PORT=%~2" & SHIFT & SHIFT & goto GETOPTS
-if "%~1"=="-P" set "PYTHON=%~2" & SHIFT & SHIFT & goto GETOPTS
-if /I "%~1"=="-f" set "FILENAME=%~2" & SHIFT & SHIFT & goto GETOPTS
-if /I "%~1"=="--web" set "WEB_APP=1" & SHIFT & goto GETOPTS
-if /I "%~1"=="--tft" set "TFT8=1" & SHIFT & goto GETOPTS
-if /I "%~1"=="--tft-16mb" set "TFT16=1" & SHIFT & goto GETOPTS
-SHIFT
-IF NOT "%~1"=="" goto GETOPTS
-
-IF "__%FILENAME%__" == "____" (
-    echo "Missing FILENAME"
-    goto HELP
-)
-
-:: Check if FILENAME contains "-tft-" and either TFT8 or TFT16 is 1 (--tft, -tft-16mb)
-IF NOT "%FILENAME:-tft-=%"=="%FILENAME%" (
-    SET "TFT_BUILD=1"
-    IF NOT "%TFT8%"=="1" IF NOT "%TFT16%"=="1" (
-        echo Error: Either --tft or --tft-16mb must be set to use a TFT build.
-        goto EOF
-    )
-    IF "%TFT8%"=="1" IF "%TFT16%"=="1" (
-        echo Error: Both --tft and --tft-16mb must NOT be set at the same time.
-        goto EOF
-    )
-)
-
-:: Extract BASENAME from %FILENAME% for later use.
-SET BASENAME=%FILENAME:firmware-=%
-
-IF EXIST %FILENAME% IF x%FILENAME:update=%==x%FILENAME% (
-    @REM Default littlefs* offset (--web).
-    SET "OFFSET=0x300000"
-
-    @REM Default OTA Offset
-    SET "OTA_OFFSET=0x260000"
-
-    @REM littlefs* offset for MUI 8mb (--tft) and OTA OFFSET.
-    IF "%TFT8%"=="1" IF "%TFT_BUILD%"=="1" (
-        SET "OFFSET=0x670000"
-        SET "OTA_OFFSET=0x340000"
-    ) else (
-        echo Ignoring --tft, not a TFT Build.
-    )
-
-    @REM littlefs* offset for MUI 16mb (--tft-16mb) and OTA OFFSET.
-    IF "%TFT16%"=="1" IF "%TFT_BUILD%"=="1" (
-        SET "OFFSET=0xc90000"
-        SET "OTA_OFFSET=0x650000"
-    ) else (
-        echo Ignoring --tft-16mb, not a TFT Build.
-    )
-
-    echo Trying to flash update %FILENAME%, but first erasing and writing system information"
-    %ESPTOOL_CMD% --baud 115200 erase_flash
-    %ESPTOOL_CMD% --baud 115200 write_flash 0x00 "%FILENAME%"
-
-    @REM Account for S3 and C3 board's different OTA partition
-    IF NOT "%FILENAME%"=="%FILENAME:s3=%" SET "DO_SPECIAL_OTA=1"
-    IF NOT "%FILENAME%"=="%FILENAME:v3=%" SET "DO_SPECIAL_OTA=1"
-    IF NOT "%FILENAME%"=="%FILENAME:t-deck=%" SET "DO_SPECIAL_OTA=1"
-    IF NOT "%FILENAME%"=="%FILENAME:wireless-paper=%" SET "DO_SPECIAL_OTA=1"
-    IF NOT "%FILENAME%"=="%FILENAME:wireless-tracker=%" SET "DO_SPECIAL_OTA=1"
-    IF NOT "%FILENAME%"=="%FILENAME:station-g2=%" SET "DO_SPECIAL_OTA=1"
-    IF NOT "%FILENAME%"=="%FILENAME:unphone=%" SET "DO_SPECIAL_OTA=1"
-    IF NOT "%FILENAME%"=="%FILENAME:esp32c3=%" SET "DO_SPECIAL_OTA=1"
-
-    IF "!DO_SPECIAL_OTA!"=="1" (
-        IF NOT "%FILENAME%"=="%FILENAME:esp32c3=%" (
-            %ESPTOOL_CMD% --baud 115200 write_flash !OTA_OFFSET! bleota-c3.bin
-        ) ELSE (
-            %ESPTOOL_CMD% --baud 115200 write_flash !OTA_OFFSET! bleota-s3.bin
-        )
-    ) ELSE (
-        %ESPTOOL_CMD% --baud 115200 write_flash !OTA_OFFSET! bleota.bin
-    )
-
-    @REM Check if WEB_APP (--web) is enabled and add "littlefswebui-" to BASENAME else "littlefs-".
-    IF "%WEB_APP%"=="1" (
-        @REM Check it the file exist before trying to write it.
-        IF EXIST "littlefswebui-%BASENAME%" (
-            %ESPTOOL_CMD% --baud 115200 write_flash !OFFSET! "littlefswebui-%BASENAME%"
-        ) else (
-            echo Error: file "littlefswebui-%BASENAME%" wasn't found, littlefswebui not written.
-            goto EOF
-        )
-    ) else (
-        @REM Check it the file exist before trying to write it.
-        IF EXIST "littlefs-%BASENAME%" (
-            %ESPTOOL_CMD% --baud 115200 write_flash !OFFSET! "littlefs-%BASENAME%"
-        ) else (
-            echo Error: file "littlefs-%BASENAME%" wasn't found, littlefs not written.
-            goto EOF
-        )
-    )
-) else (
-    echo "Invalid file: %FILENAME%"
-    goto HELP
-)
-
-:EOF
-@REM Cleanup vars.
-SET "SCRIPTNAME="
+SET "SCRIPT_NAME=%~nx0"
+SET "DEBUG=0"
 SET "PYTHON="
-SET "WEB_APP="
-SET "TFT8="
-Set "TFT16="
-SET "OFFSET="
-SET "OTA_OFFSET="
-SET "DO_SPECIAL_OTA="
-SET "FILENAME="
-SET "BASENAME="
-endlocal
-exit /b 0
\ No newline at end of file
+SET "WEB_APP=0"
+SET "TFT_BUILD=0"
+SET "TFT8=0"
+SET "TFT16=0"
+SET "ESPTOOL_BAUD=115200"
+SET "ESPTOOL_CMD="
+SET "LOGCOUNTER=0"
+
+GOTO getopts
+:help
+ECHO Flash image file to device, but first erasing and writing system information.
+ECHO.
+ECHO Usage: %SCRIPT_NAME% -f filename [-p PORT] [-P python] (--web)
+ECHO.
+ECHO Options:
+ECHO     -f filename      The .bin file to flash.  Custom to your device type and region. (required)
+ECHO                      The file must be located in this current directory.
+ECHO     -p PORT          Set the environment variable for ESPTOOL_PORT.
+ECHO                      If not set, ESPTOOL iterates all ports (Dangerous).
+ECHO     -P python        Specify alternate python interpreter to use to invoke esptool. (default: python)
+ECHO                      If supplied the script will use python.
+ECHO                      If not supplied the script will try to find esptool in Path.
+ECHO     --web            Enable WebUI. (default: false)
+ECHO.
+ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4.bin -p COM11
+ECHO Example: %SCRIPT_NAME% -f littlefs-unphone-2.6.0.0b106d4.bin -p COM11 --web
+GOTO eof
+
+:version
+ECHO %SCRIPT_NAME% [Version 2.6.0]
+ECHO Meshtastic
+GOTO eof
+
+:getopts
+IF "%~1"=="" GOTO endopts
+IF /I "%~1"=="-?" GOTO help
+IF /I "%~1"=="-h" GOTO help
+IF /I "%~1"=="--help" GOTO help
+IF /I "%~1"=="-v" GOTO version
+IF /I "%~1"=="--version" GOTO version
+IF /I "%~1"=="--debug" SET "DEBUG=1" & CALL :LOG_MESSAGE DEBUG "DEBUG mode: enabled."
+IF /I "%~1"=="-f" SET "FILENAME=%~2" & SHIFT
+IF "%~1"=="-p" SET "ESPTOOL_PORT=%~2" & SHIFT
+IF /I "%~1"=="--port" SET "ESPTOOL_PORT=%~2" & SHIFT
+IF "%~1"=="-P" SET "PYTHON=%~2" & SHIFT
+IF /I "%~1"=="--web" SET "WEB_APP=1"
+SHIFT
+GOTO getopts
+:endopts
+
+CALL :LOG_MESSAGE DEBUG "Checking FILENAME parameter..."
+IF "__!FILENAME!__"=="____" (
+    CALL :LOG_MESSAGE DEBUG "Missing -f filename input."
+    GOTO help
+) ELSE (
+    IF NOT "__!FILENAME: =!__"=="__!FILENAME!__" (
+        CALL :LOG_MESSAGE ERROR "Filename containing spaces are not supported."
+        GOTO help
+    )
+    @REM Remove ".\" or "./" file prefix if present.
+    SET "FILENAME=!FILENAME:.\=!"
+    SET "FILENAME=!FILENAME:./=!"
+)
+
+CALL :LOG_MESSAGE DEBUG "Filename: !FILENAME!"
+CALL :LOG_MESSAGE DEBUG "Checking if !FILENAME! exists..."
+IF NOT EXIST !FILENAME! (
+    CALL :LOG_MESSAGE ERROR "File does not exist: !FILENAME!. Terminating."
+    GOTO eof
+)
+
+IF NOT "!FILENAME:update=!"=="!FILENAME!" (
+    CALL :LOG_MESSAGE DEBUG "We are working with a *update* file. !FILENAME!"
+    CALL :LOG_MESSAGE INFO "Use script device-update.bat to flash update !FILENAME!."
+    GOTO eof
+) ELSE (
+    CALL :LOG_MESSAGE DEBUG "We are NOT working with a *update* file. !FILENAME!"
+)
+
+CALL :LOG_MESSAGE DEBUG "Determine the correct esptool command to use..."
+IF NOT "__%PYTHON%__"=="____" (
+    SET "ESPTOOL_CMD=!PYTHON! -m esptool"
+    CALL :LOG_MESSAGE DEBUG "Python interpreter supplied."
+) ELSE (
+    CALL :LOG_MESSAGE DEBUG "Python interpreter NOT supplied. Looking for esptool...
+    WHERE esptool >nul 2>&1
+    IF %ERRORLEVEL% EQU 0 (
+        @REM WHERE exits with code 0 if esptool is found.
+        SET "ESPTOOL_CMD=esptool"
+    ) ELSE (
+        SET "ESPTOOL_CMD=python -m esptool"
+        CALL :RESET_ERROR
+    )
+)
+
+CALL :LOG_MESSAGE DEBUG "Checking esptool command !ESPTOOL_CMD!..."
+!ESPTOOL_CMD! >nul 2>&1
+IF %ERRORLEVEL% GTR 2 (
+    @REM esptool exits with code 1 if help is displayed.
+    CALL :LOG_MESSAGE ERROR "esptool not found: !ESPTOOL_CMD!"
+    EXIT /B 1
+    GOTO eof
+)
+IF %DEBUG% EQU 1 (
+    CALL :LOG_MESSAGE DEBUG "Skipping ESPTOOL_CMD steps."
+    SET "ESPTOOL_CMD=REM !ESPTOOL_CMD!"
+)
+
+CALL :LOG_MESSAGE DEBUG "Using esptool command: !ESPTOOL_CMD!"
+IF "__!ESPTOOL_PORT!__" == "____" (
+    CALL :LOG_MESSAGE WARN "Using esptool port: UNSET."
+) ELSE (
+    CALL :LOG_MESSAGE INFO "Using esptool port: !ESPTOOL_PORT!."
+)
+CALL :LOG_MESSAGE INFO "Using esptool baud: !ESPTOOL_BAUD!."
+
+@REM Check if FILENAME contains "-tft-" and set target partitionScheme accordingly.
+@REM https://github.com/meshtastic/web-flasher/blob/main/types/resources.ts#L3
+IF NOT "!FILENAME:-tft-=!"=="!FILENAME!" (
+    CALL :LOG_MESSAGE DEBUG "We are working with a *-tft-* file. !FILENAME!"
+    IF %WEB_APP% EQU 1 (
+        CALL :LOG_MESSAGE ERROR "Cannot enable WebUI (--web) and MUI." & GOTO eof
+    )
+    SET "TFT_BUILD=1"
+    GOTO tft
+) ELSE (
+    CALL :LOG_MESSAGE DEBUG "We are NOT working with a *-tft-* file. !FILENAME!"
+    GOTO no_tft
+)
+
+:tft
+SET "TFT8MB=picomputer-s3 unphone seeed-sensecap-indicator"
+FOR %%a IN (%TFT8MB%) DO (
+    IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
+        @REM We are working with any of %TFT8MB%.
+        SET "TFT8=1"
+        GOTO end_loop_tft8mb
+    )
+)
+:end_loop_tft8mb
+
+SET "TFT16MB=t-deck"
+FOR %%a IN (%TFT16MB%) DO (
+    IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
+        @REM We are working with any of %TFT16MB%.
+        SET "TFT16=1"
+        GOTO end_loop_tft16mb
+    )
+)
+:end_loop_tft16mb
+
+IF %TFT8% EQU 1 CALL :LOG_MESSAGE INFO "tft and MUI 8mb selected."
+IF %TFT16% EQU 1 CALL :LOG_MESSAGE INFO "tft and MUI 16mb selected."
+
+:no_tft
+
+@REM Extract BASENAME from %FILENAME% for later use.
+SET "BASENAME=!FILENAME:firmware-=!"
+CALL :LOG_MESSAGE DEBUG "Computed firmware basename: !BASENAME!"
+
+@REM Account for S3 and C3 board's different OTA partition.
+SET "S3=s3 v3 t-deck wireless-paper wireless-tracker station-g2 unphone"
+FOR %%a IN (%S3%) DO (
+    IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
+        @REM We are working with any of %S3%.
+        SET "OTA_FILENAME=bleota-s3.bin"
+        GOTO :end_loop_s3
+    )
+)
+
+SET "C3=esp32c3"
+FOR %%a IN (%C3%) DO (
+    IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
+        @REM We are working with any of %C3%.
+        SET "OTA_FILENAME=bleota-c3.bin"
+        GOTO :end_loop_c3
+    )
+)
+
+@REM Everything else
+SET "OTA_FILENAME=bleota.bin"
+:end_loop_s3
+:end_loop_c3
+CALL :LOG_MESSAGE DEBUG "Set OTA_FILENAME to: !OTA_FILENAME!"
+
+@REM Check if (--web) is enabled and prefix BASENAME with "littlefswebui-" else "littlefs-".
+IF %WEB_APP% EQU 1 (
+    CALL :LOG_MESSAGE INFO "WebUI selected."
+    SET "SPIFFS_FILENAME=littlefswebui-%BASENAME%"
+) ELSE (
+    SET "SPIFFS_FILENAME=littlefs-%BASENAME%"
+)
+CALL :LOG_MESSAGE DEBUG "Set SPIFFS_FILENAME to: !SPIFFS_FILENAME!"
+
+@REM Default offsets.
+@REM https://github.com/meshtastic/web-flasher/blob/main/stores/firmwareStore.ts#L202
+SET "OTA_OFFSET=0x260000"
+SET "SPIFFS_OFFSET=0x300000"
+
+@REM Offsets for MUI 8mb.
+IF %TFT8% EQU 1 IF %TFT_BUILD% EQU 1 (
+    SET "OTA_OFFSET=0x340000"
+    SET "SPIFFS_OFFSET=0x670000"
+)
+
+@REM Offsets for MUI 16mb.
+IF %TFT16% EQU 1 IF %TFT_BUILD% EQU 1 (
+    SET "OTA_OFFSET=0x650000"
+    SET "SPIFFS_OFFSET=0xc90000"
+)
+
+CALL :LOG_MESSAGE DEBUG "Set OTA_OFFSET to: !OTA_OFFSET!"
+CALL :LOG_MESSAGE DEBUG "Set SPIFFS_OFFSET to: !SPIFFS_OFFSET!"
+
+@REM Ensure target files exist before flashing operations.
+IF NOT EXIST !FILENAME! CALL :LOG_MESSAGE ERROR "File does not exist: "!FILENAME!". Terminating." & EXIT /B 2 & GOTO eof
+IF NOT EXIST !OTA_FILENAME! CALL :LOG_MESSAGE ERROR "File does not exist: "!OTA_FILENAME!". Terminating." & EXIT /B 2 & GOTO eof
+IF NOT EXIST !SPIFFS_FILENAME! CALL :LOG_MESSAGE ERROR "File does not exist: "!SPIFFS_FILENAME!". Terminating." & EXIT /B 2 & GOTO eof
+
+@REM Flashing operations.
+CALL :LOG_MESSAGE INFO "Trying to flash "!FILENAME!", but first erasing and writing system information..."
+CALL :RUN_ESPTOOL !ESPTOOL_BAUD! erase_flash || GOTO eof
+CALL :RUN_ESPTOOL !ESPTOOL_BAUD! write_flash 0x00 "!FILENAME!" || GOTO eof
+
+CALL :LOG_MESSAGE INFO "Trying to flash BLEOTA "!OTA_FILENAME!" at OTA_OFFSET !OTA_OFFSET!..."
+CALL :RUN_ESPTOOL !ESPTOOL_BAUD! write_flash !OTA_OFFSET! "!OTA_FILENAME!" || GOTO eof
+
+CALL :LOG_MESSAGE INFO "Trying to flash SPIFFS "!SPIFFS_FILENAME!" at SPIFFS_OFFSET !SPIFFS_OFFSET!..."
+CALL :RUN_ESPTOOL !ESPTOOL_BAUD! write_flash !SPIFFS_OFFSET! "!SPIFFS_FILENAME!" || GOTO eof
+
+CALL :LOG_MESSAGE INFO "Script complete!."
+
+:eof
+ENDLOCAL
+EXIT /B %ERRORLEVEL%
+
+
+:RUN_ESPTOOL
+@REM Subroutine used to run ESPTOOL_CMD with arguments.
+@REM Also handles %ERRORLEVEL%.
+@REM CALL :RUN_ESPTOOL [Baud] [erase_flash|write_flash] [OFFSET] [Filename]
+@REM.
+@REM Example:: CALL :RUN_ESPTOOL 115200 write_flash 0x10000 "firmwarefile.bin"
+IF %DEBUG% EQU 1 CALL :LOG_MESSAGE DEBUG "About to run command: !ESPTOOL_CMD! --baud %~1 %~2 %~3 %~4"
+CALL :RESET_ERROR
+!ESPTOOL_CMD! --baud %~1 %~2 %~3 %~4
+IF %ERRORLEVEL% NEQ 0 (
+    CALL :LOG_MESSAGE ERROR "Error running command: !ESPTOOL_CMD! --baud %~1 %~2 %~3 %~4"
+    EXIT /B %ERRORLEVEL%
+)
+GOTO :eof
+
+:LOG_MESSAGE
+@REM Subroutine used to print log messages in four different levels.
+@REM DEBUG messages only get printed if [-d] flag is passed to script.
+@REM CALL :LOG_MESSAGE [ERROR|INFO|WARN|DEBUG] "Message"
+@REM.
+@REM Example:: CALL :LOG_MESSAGE INFO "Message."
+SET /A LOGCOUNTER=LOGCOUNTER+1
+IF "%1" == "ERROR" CALL :GET_TIMESTAMP & ECHO %1 ^| !TIMESTAMP! !LOGCOUNTER! %~2
+IF "%1" == "INFO" CALL :GET_TIMESTAMP & ECHO %1  ^| !TIMESTAMP! !LOGCOUNTER! %~2
+IF "%1" == "WARN" CALL :GET_TIMESTAMP & ECHO %1  ^| !TIMESTAMP! !LOGCOUNTER! %~2
+IF "%1" == "DEBUG" IF %DEBUG% EQU 1 CALL :GET_TIMESTAMP & ECHO %1 ^| !TIMESTAMP! !LOGCOUNTER! %~2
+GOTO :eof
+
+:GET_TIMESTAMP
+@REM Subroutine used to set !TIMESTAMP! to HH:MM:ss.
+@REM CALL :GET_TIMESTAMP
+@REM.
+@REM Updates: !TIMESTAMP!
+FOR /F "tokens=1,2,3 delims=:,." %%a IN ("%TIME%") DO (
+    SET "HH=%%a"
+    SET "MM=%%b"
+    SET "ss=%%c"
+)
+SET "TIMESTAMP=!HH!:!MM!:!ss!"
+GOTO :eof
+
+:RESET_ERROR
+@REM Subroutine to reset %ERRORLEVEL% to 0.
+@REM CALL :RESET_ERROR
+@REM.
+@REM Updates: %ERRORLEVEL%
+EXIT /B 0
+GOTO :eof
diff --git a/bin/device-install.sh b/bin/device-install.sh
index 96a204a5a..c1ba33c4a 100755
--- a/bin/device-install.sh
+++ b/bin/device-install.sh
@@ -8,158 +8,152 @@ TFT_BUILD=false
 
 # Determine the correct esptool command to use
 if "$PYTHON" -m esptool version >/dev/null 2>&1; then
-    ESPTOOL_CMD="$PYTHON -m esptool"
+	ESPTOOL_CMD="$PYTHON -m esptool"
 elif command -v esptool >/dev/null 2>&1; then
-    ESPTOOL_CMD="esptool"
+	ESPTOOL_CMD="esptool"
 elif command -v esptool.py >/dev/null 2>&1; then
-    ESPTOOL_CMD="esptool.py"
+	ESPTOOL_CMD="esptool.py"
 else
-    echo "Error: esptool not found"
-    exit 1
+	echo "Error: esptool not found"
+	exit 1
 fi
 
 set -e
 
 # Usage info
 show_help() {
-    cat <<EOF
-Usage: $(basename $0) [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME] [--web] [--tft] [--tft-16mb]
-Flash image file to device, but first erasing and writing system information"
+	cat <<EOF
+Usage: $(basename $0) [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME] [--web]
+Flash image file to device, but first erasing and writing system information.
 
-    -h               Display this help and exit
+    -h               Display this help and exit.
     -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerous).
     -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: "$PYTHON")
     -f FILENAME      The .bin file to flash.  Custom to your device type and region.
-    --web            Flash WEB APP.
-    --tft            Flash MUI 8mb
-    --tft-16mb       Flash MUI 16mb
+    --web            Enable WebUI. (Default: false)
 
 EOF
 }
 # Parse arguments using a single while loop
 while [ $# -gt 0 ]; do
-    case "$1" in
-        -h|--help)
-            show_help
-            exit 0
-            ;;
-        -p)
-            ESPTOOL_PORT="$2"
-            shift # Shift past the option argument
-            ;;
-        -P)
-            PYTHON="$2"
-            shift
-            ;;
-        -f)
-            FILENAME="$2"
-            shift
-            ;;
-        --web)
-            WEB_APP=true
-            ;;
-        --tft)
-            TFT8=true
-            ;;
-        --tft-16mb)
-            TFT16=true
-            ;;
-        --) # Stop parsing options
-            shift
-            break
-            ;;
-        *)
-            echo "Unknown argument: $1" >&2
-            exit 1
-            ;;
-    esac
-    shift # Move to the next argument
+	case "$1" in
+	-h | --help)
+		show_help
+		exit 0
+		;;
+	-p)
+		ESPTOOL_PORT="$2"
+		shift # Shift past the option argument
+		;;
+	-P)
+		PYTHON="$2"
+		shift
+		;;
+	-f)
+		FILENAME="$2"
+		shift
+		;;
+	--web)
+		WEB_APP=true
+		;;
+	--) # Stop parsing options
+		shift
+		break
+		;;
+	*)
+		echo "Unknown argument: $1" >&2
+		exit 1
+		;;
+	esac
+	shift # Move to the next argument
 done
 
 [ -z "$FILENAME" -a -n "$1" ] && {
-    FILENAME=$1
-    shift
+	FILENAME=$1
+	shift
 }
 
-# Check if FILENAME contains "-tft-" and either TFT8 or TFT16 is 1 (--tft, -tft-16mb)
-if [[ "${FILENAME//-tft-/}" != "$FILENAME" ]]; then
-    TFT_BUILD=true
-    if [[ "$TFT8" != true && "$TFT16" != true ]]; then
-        echo "Error: Either --tft or --tft-16mb must be set to use a TFT build."
-        exit 1
-    fi
-    if [[ "$TFT8" == true && "$TFT16" == true ]]; then
-        echo "Error: Both --tft and --tft-16mb must NOT be set at the same time."
-        exit 1
-    fi
+# Check if FILENAME contains "-tft-" and set target partitionScheme accordingly.
+if [[ ${FILENAME//-tft-/} != "$FILENAME" ]]; then
+	TFT_BUILD=true
+	if [[ $WEB_APP == true ]] && [[ $TFT_BUILD == true ]]; then
+		echo "Cannot enable WebUI (--web) and MUI."
+		exit 1
+	fi
+
+	if [[ $FILENAME == *"picomputer-s3"* || $FILENAME == *"unphone"* || $FILENAME == *"seeed-sensecap-indicator"* ]]; then
+		TFT8=true
+	fi
+
+	if [[ $FILENAME == *"t-deck"* ]]; then
+		TFT16=true
+	fi
 fi
 
 # Extract BASENAME from %FILENAME% for later use.
 BASENAME="${FILENAME/firmware-/}"
 
 if [ -f "${FILENAME}" ] && [ -n "${FILENAME##*"update"*}" ]; then
-    # Default littlefs* offset (--web).
-    OFFSET=0x300000
+	# Default littlefs* offset (--web).
+	OFFSET=0x300000
 
-    # Default OTA Offset
-    OTA_OFFSET=0x260000
+	# Default OTA Offset
+	OTA_OFFSET=0x260000
 
-    # littlefs* offset for MUI 8mb (--tft) and OTA OFFSET.
-    if [ "$TFT8" = true ]; then
-        if [ "$TFT_BUILD" = true ]; then
-            OFFSET=0x670000
-            OTA_OFFSET=0x340000
-        else
-            echo "Ignoring --tft, not a TFT Build."
-        fi
-    fi
+	# littlefs* offset for MUI 8mb and OTA OFFSET.
+	if [ "$TFT8" = true ] && [ "$TFT_BUILD" = true ]; then
+		OFFSET=0x670000
+		OTA_OFFSET=0x340000
+	fi
 
-    # littlefs* offset for MUI 16mb (--tft-16mb) and OTA OFFSET.
-    if [ "$TFT16" = true ]; then
-        if [ "$TFT_BUILD" = true ]; then
-            OFFSET=0xc90000
-            OTA_OFFSET=0x650000
-        else
-            echo "Ignoring --tft-16mb, not a TFT Build."
-        fi
-    fi
+	# littlefs* offset for MUI 16mb and OTA OFFSET.
+	if [ "$TFT16" = true ] && [ "$TFT_BUILD" = true ]; then
+		OFFSET=0xc90000
+		OTA_OFFSET=0x650000
+	fi
 
-    echo "Trying to flash ${FILENAME}, but first erasing and writing system information"
-    $ESPTOOL_CMD erase_flash
-    $ESPTOOL_CMD write_flash 0x00 "${FILENAME}"
-    # Account for S3 board's different OTA partition
-    if [ -n "${FILENAME##*"s3"*}" ] && [ -n "${FILENAME##*"-v3"*}" ] && [ -n "${FILENAME##*"t-deck"*}" ] && [ -n "${FILENAME##*"wireless-paper"*}" ] && [ -n "${FILENAME##*"wireless-tracker"*}" ] && [ -n "${FILENAME##*"station-g2"*}" ] && [ -n "${FILENAME##*"unphone"*}" ]; then
-        if [ -n "${FILENAME##*"esp32c3"*}" ]; then
-            $ESPTOOL_CMD write_flash $OTA_OFFSET bleota.bin
-        else
-            $ESPTOOL_CMD write_flash $OTA_OFFSET bleota-c3.bin
-        fi
-    else
-        $ESPTOOL_CMD write_flash $OTA_OFFSET bleota-s3.bin
-    fi
+	# Account for S3 board's different OTA partition
+	if [ -n "${FILENAME##*"s3"*}" ] && [ -n "${FILENAME##*"-v3"*}" ] && [ -n "${FILENAME##*"t-deck"*}" ] && [ -n "${FILENAME##*"wireless-paper"*}" ] && [ -n "${FILENAME##*"wireless-tracker"*}" ] && [ -n "${FILENAME##*"station-g2"*}" ] && [ -n "${FILENAME##*"unphone"*}" ]; then
+		if [ -n "${FILENAME##*"esp32c3"*}" ]; then
+			OTAFILE=bleota.bin
+		else
+			OTAFILE=bleota-c3.bin
+		fi
+	else
+		OTAFILE=bleota-s3.bin
+	fi
 
-    # Check if WEB_APP (--web) is enabled and add "littlefswebui-" to BASENAME else "littlefs-".
-    if [ "$WEB_APP" = true ]; then
-        # Check it the file exist before trying to write it.
-        if [ -f "littlefswebui-${BASENAME}" ]; then
-            $ESPTOOL_CMD write_flash $OFFSET "littlefswebui-${BASENAME}"
-        else
-            echo "Error: file "littlefswebui-${BASENAME}" wasn't found, littlefs not written."
-            exit 1
-        fi
-    else
-        # Check it the file exist before trying to write it.
-        if [ -f "littlefs-${BASENAME}" ]; then
-            $ESPTOOL_CMD write_flash $OFFSET "littlefs-${BASENAME}"
-        else
-            echo "Error: file "littlefs-${BASENAME}" wasn't found, littlefs not written."
-            exit 1
-        fi
-    fi
+	# Check if WEB_APP (--web) is enabled and add "littlefswebui-" to BASENAME else "littlefs-".
+	if [ "$WEB_APP" = true ]; then
+		SPIFFSFILE=littlefswebui-${BASENAME}
+	else
+		SPIFFSFILE=littlefs-${BASENAME}
+	fi
+
+	if [[ ! -f $FILENAME ]]; then
+		echo "Error: file ${FILENAME} wasn't found. Terminating."
+		exit 1
+	fi
+	if [[ ! -f $OTAFILE ]]; then
+		echo "Error: file ${OTAFILE} wasn't found. Terminating."
+		exit 1
+	fi
+	if [[ ! -f $SPIFFSFILE ]]; then
+		echo "Error: file ${SPIFFSFILE} wasn't found. Terminating."
+		exit 1
+	fi
+
+	echo "Trying to flash ${FILENAME}, but first erasing and writing system information"
+	$ESPTOOL_CMD erase_flash
+	$ESPTOOL_CMD write_flash 0x00 "${FILENAME}"
+	echo "Trying to flash ${OTAFILE} at offset ${OTA_OFFSET}"
+	$ESPTOOL_CMD write_flash $OTA_OFFSET "${OTAFILE}"
+	echo "Trying to flash ${SPIFFSFILE}, at offset ${OFFSET}"
+	$ESPTOOL_CMD write_flash $OFFSET "${SPIFFSFILE}"
 
 else
-    show_help
-    echo "Invalid file: ${FILENAME}"
+	show_help
+	echo "Invalid file: ${FILENAME}"
 fi
 
 exit 0
diff --git a/bin/device-install_test.ps1 b/bin/device-install_test.ps1
new file mode 100644
index 000000000..d7d3e6178
--- /dev/null
+++ b/bin/device-install_test.ps1
@@ -0,0 +1,111 @@
+<#
+    .SYNOPSIS
+    Unit-test for .\device-install.bat.
+
+    .DESCRIPTION
+    This script performs a positive unit-test on .\device-install.bat by creating the expected .bin
+    files for a device followed by running the .bat script without flashing the firmware (--debug).
+    If any errors are hit they are presented in the standard output. Investigate accordingly.
+
+    This script needs to be placed in the same directory as .\device-install.bat.
+
+    .EXAMPLE
+    .\device-install_test.ps1
+
+    .EXAMPLE
+    .\device-install_test.ps1 -Verbose
+
+    .LINK
+    .\device-install.bat --help
+#>
+
+[CmdletBinding()]
+param()
+
+function New-EmptyFile() {
+    [CmdletBinding()]
+    param (
+        [Parameter(Position=0,Mandatory=$true)]
+        # Specifies the file name.
+        [string]$FileName,
+        [Parameter(Position=1)]
+        # Specifies the target path. (Get-Location).Path is the default.
+        [string]$Directory = (Get-Location).Path
+    )
+
+    $filePath = Join-Path -Path $Directory -ChildPath $FileName
+
+    Write-Verbose -Message "Create empty test file if it doesn't exist: $($FileName)"
+    New-Item -Path "$filePath" -ItemType File -ErrorAction SilentlyContinue | Out-Null
+}
+
+function Remove-EmptyFile() {
+    [CmdletBinding()]
+    param (
+        [Parameter(Position=0,Mandatory=$true)]
+        # Specifies the file name.
+        [string]$FileName,
+        [Parameter(Position=1)]
+        # Specifies the target path. (Get-Location).Path is the default.
+        [string]$Directory = (Get-Location).Path
+    )
+
+    $filePath = Join-Path -Path $Directory -ChildPath $FileName
+
+    Write-Verbose -Message "Deleted empty test file: $($FileName)"
+    Remove-Item -Path "$filePath" | Out-Null
+}
+
+
+$TestCases = New-Object -TypeName PSObject -Property @{
+    # Use this PSObject to define testcases according to this syntax:
+    # "testname" = @("firmware-testname","bleota","littlefs-testname","args")
+    "t-deck" = @("firmware-t-deck-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefs-t-deck-2.6.0.0b106d4.bin","")
+    "t-deck_web" = @("firmware-t-deck-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefswebui-t-deck-2.6.0.0b106d4.bin","--web")
+    "t-deck-tft" = @("firmware-t-deck-tft-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefs-t-deck-tft-2.6.0.0b106d4.bin","")
+    "heltec-ht62-esp32c3" = @("firmware-heltec-ht62-esp32c3-sx1262-2.6.0.0b106d4.bin", "bleota-c3.bin", "littlefs-heltec-ht62-esp32c3-sx1262-2.6.0.0b106d4.bin","")
+    "tlora-c6" = @("firmware-tlora-c6-2.6.0.0b106d4.bin", "bleota.bin", "littlefs-tlora-c6-2.6.0.0b106d4.bin","")
+    "heltec-v3_web" = @("firmware-heltec-v3-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefswebui-heltec-v3-2.6.0.0b106d4.bin","--web")
+    "seeed-sensecap-indicator-tft" = @("firmware-seeed-sensecap-indicator-tft-2.6.0.0b106d4.bin", "bleota.bin", "littlefs-seeed-sensecap-indicator-tft-2.6.0.0b106d4.bin","")
+    "picomputer-s3-tft" = @("firmware-picomputer-s3-tft-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefs-picomputer-s3-tft-2.6.0.0b106d4.bin","")
+}
+
+foreach ($TestCase in $TestCases.PSObject.Properties) {
+    $Name = $TestCase.Name
+    $Files = $TestCase.Value
+    $Errors = $null
+    $Counter = 0
+
+    Write-Host -Object "Testcase: $Name`:" -ForegroundColor Green
+    foreach ($File in $Files) {
+        if ($File.EndsWith(".bin")) {
+            New-EmptyFile -FileName $File
+        }
+    }
+
+    Write-Host -Object "Performing test on $Name..." -ForegroundColor Blue
+    $Test = Invoke-Expression -Command "cmd /c .\device-install.bat --debug -f $($TestCases."$Name"[0]) $($TestCases."$Name"[3])"
+
+    foreach ($Line in $Test) {
+        if ($Line -match "Set OTA_OFFSET to" -or `
+            $Line -match "Set SPIFFS_OFFSET to") {
+            Write-Host -Object "$($Line -replace "^.*?Set","Set")" -ForegroundColor Blue
+        } elseif ($VerbosePreference -eq "Continue") {
+            Write-Host -Object $Line
+        }
+        if ($Line -match "ERROR") {
+            $Errors += $Line
+            $Counter++
+        }
+    }
+    if ($null -ne $Errors) {
+        Write-Host -Object "$Counter ERROR(s) detected!" -ForegroundColor Red
+        if (-not ($VerbosePreference -eq "Continue")) {Write-Host -Object $Errors}
+    }
+
+    foreach ($File in $Files) {
+        if ($File.EndsWith(".bin")) {
+            Remove-EmptyFile -FileName $File
+        }
+    }
+}
diff --git a/bin/device-update.bat b/bin/device-update.bat
index a52f3d33f..ecfeec187 100755
--- a/bin/device-update.bat
+++ b/bin/device-update.bat
@@ -1,48 +1,175 @@
 @ECHO OFF
+SETLOCAL EnableDelayedExpansion
+TITLE Meshtastic device-update
 
-set PYTHON=python
+SET "SCRIPT_NAME=%~nx0"
+SET "DEBUG=0"
+SET "PYTHON="
+SET "ESPTOOL_BAUD=115200"
+SET "ESPTOOL_CMD="
+SET "LOGCOUNTER=0"
 
-:: Determine the correct esptool command to use
-where esptool >nul 2>&1
-if %ERRORLEVEL% EQU 0 (
-    set "ESPTOOL_CMD=esptool"
-) else (
-    set "ESPTOOL_CMD=%PYTHON% -m esptool"
-)
+GOTO getopts
+:help
+ECHO Flash image file to device, but leave existing system intact.
+ECHO.
+ECHO Usage: %SCRIPT_NAME% -f filename [-p PORT] [-P python]
+ECHO.
+ECHO Options:
+ECHO     -f filename      The .bin file to flash.  Custom to your device type and region. (required)
+ECHO                      The file must be located in this current directory.
+ECHO     -p PORT          Set the environment variable for ESPTOOL_PORT.
+ECHO                      If not set, ESPTOOL iterates all ports (Dangerous).
+ECHO     -P python        Specify alternate python interpreter to use to invoke esptool. (default: python)
+ECHO                      If supplied the script will use python.
+ECHO                      If not supplied the script will try to find esptool in Path.
+ECHO.
+ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4-update.bin -p COM11
+GOTO eof
 
-goto GETOPTS
-:HELP
-echo Usage: %~nx0 [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME^|FILENAME]
-echo Flash image file to device, leave existing system intact.
-echo.
-echo     -h               Display this help and exit
-echo     -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerrous).
-echo     -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: %PYTHON%)
-echo     -f FILENAME      The *update.bin file to flash.  Custom to your device type.
-goto EOF
+:version
+ECHO %SCRIPT_NAME% [Version 2.6.0]
+ECHO Meshtastic
+GOTO eof
 
-:GETOPTS
-if /I "%1"=="-h" goto HELP
-if /I "%1"=="--help" goto HELP
-if /I "%1"=="-F" set "FILENAME=%2" & SHIFT
-if /I "%1"=="-p" set ESPTOOL_PORT=%2 & SHIFT
-if /I "%1"=="-P" set PYTHON=%2 & SHIFT
+:getopts
+IF "%~1"=="" GOTO endopts
+IF /I "%~1"=="-?" GOTO help
+IF /I "%~1"=="-h" GOTO help
+IF /I "%~1"=="--help" GOTO help
+IF /I "%~1"=="-v" GOTO version
+IF /I "%~1"=="--version" GOTO version
+IF /I "%~1"=="--debug" SET "DEBUG=1" & CALL :LOG_MESSAGE DEBUG "DEBUG mode: enabled."
+IF /I "%~1"=="-f" SET "FILENAME=%~2" & SHIFT
+IF "%~1"=="-p" SET "ESPTOOL_PORT=%~2" & SHIFT
+IF /I "%~1"=="--port" SET "ESPTOOL_PORT=%~2" & SHIFT
+IF "%~1"=="-P" SET "PYTHON=%~2" & SHIFT
 SHIFT
-IF NOT "__%1__"=="____" goto GETOPTS
+GOTO getopts
+:endopts
 
-IF "__%FILENAME%__" == "____" (
-    echo "Missing FILENAME"
-    goto HELP
-)
-IF EXIST %FILENAME% IF NOT x%FILENAME:update=%==x%FILENAME% (
-    echo Trying to flash update %FILENAME%
-    %ESPTOOL_CMD% --baud 115200 write_flash 0x10000 %FILENAME%
-) else (
-    echo "Invalid file: %FILENAME%"
-    goto HELP
-) else (
-    echo "Invalid file: %FILENAME%"
-    goto HELP
+CALL :LOG_MESSAGE DEBUG "Checking FILENAME parameter..."
+IF "__!FILENAME!__"=="____" (
+    CALL :LOG_MESSAGE DEBUG "Missing -f filename input."
+    GOTO help
+) ELSE (
+    IF NOT "__!FILENAME: =!__"=="__!FILENAME!__" (
+        CALL :LOG_MESSAGE ERROR "Filename containing spaces are not supported."
+        GOTO help
+    )
+    @REM Remove ".\" or "./" file prefix if present.
+    SET "FILENAME=!FILENAME:.\=!"
+    SET "FILENAME=!FILENAME:./=!"
 )
 
-:EOF
+CALL :LOG_MESSAGE DEBUG "Filename: !FILENAME!"
+CALL :LOG_MESSAGE DEBUG "Checking if !FILENAME! exists..."
+IF NOT EXIST !FILENAME! (
+    CALL :LOG_MESSAGE ERROR "File does not exist: !FILENAME!. Terminating."
+    GOTO eof
+)
+
+IF "!FILENAME:update=!"=="!FILENAME!" (
+    CALL :LOG_MESSAGE DEBUG "We are NOT working with a *update* file. !FILENAME!"
+    CALL :LOG_MESSAGE INFO "Use script device-install.bat to flash update !FILENAME!."
+    GOTO eof
+) ELSE (
+    CALL :LOG_MESSAGE DEBUG "We are working with a *update* file. !FILENAME!"
+)
+
+CALL :LOG_MESSAGE DEBUG "Determine the correct esptool command to use..."
+IF NOT "__%PYTHON%__"=="____" (
+    SET "ESPTOOL_CMD=!PYTHON! -m esptool"
+    CALL :LOG_MESSAGE DEBUG "Python interpreter supplied."
+) ELSE (
+    CALL :LOG_MESSAGE DEBUG "Python interpreter NOT supplied. Looking for esptool...
+    WHERE esptool >nul 2>&1
+    IF %ERRORLEVEL% EQU 0 (
+        @REM WHERE exits with code 0 if esptool is found.
+        SET "ESPTOOL_CMD=esptool"
+    ) ELSE (
+        SET "ESPTOOL_CMD=python -m esptool"
+        CALL :RESET_ERROR
+    )
+)
+
+CALL :LOG_MESSAGE DEBUG "Checking esptool command !ESPTOOL_CMD!..."
+!ESPTOOL_CMD! >nul 2>&1
+IF %ERRORLEVEL% GTR 2 (
+    @REM esptool exits with code 1 if help is displayed.
+    CALL :LOG_MESSAGE ERROR "esptool not found: !ESPTOOL_CMD!"
+    EXIT /B 1
+    GOTO eof
+)
+IF %DEBUG% EQU 1 (
+    CALL :LOG_MESSAGE DEBUG "Skipping ESPTOOL_CMD steps."
+    SET "ESPTOOL_CMD=REM !ESPTOOL_CMD!"
+)
+
+CALL :LOG_MESSAGE DEBUG "Using esptool command: !ESPTOOL_CMD!"
+IF "__!ESPTOOL_PORT!__" == "____" (
+    CALL :LOG_MESSAGE WARN "Using esptool port: UNSET."
+) ELSE (
+    CALL :LOG_MESSAGE INFO "Using esptool port: !ESPTOOL_PORT!."
+)
+CALL :LOG_MESSAGE INFO "Using esptool baud: !ESPTOOL_BAUD!."
+
+@REM Flashing operations.
+CALL :LOG_MESSAGE INFO "Trying to flash update "!FILENAME!" at OFFSET 0x10000..."
+CALL :RUN_ESPTOOL !ESPTOOL_BAUD! write_flash 0x10000 "!FILENAME!" || GOTO eof
+
+CALL :LOG_MESSAGE INFO "Script complete!."
+
+:eof
+ENDLOCAL
+EXIT /B %ERRORLEVEL%
+
+
+:RUN_ESPTOOL
+@REM Subroutine used to run ESPTOOL_CMD with arguments.
+@REM Also handles %ERRORLEVEL%.
+@REM CALL :RUN_ESPTOOL [Baud] [erase_flash|write_flash] [OFFSET] [Filename]
+@REM.
+@REM Example:: CALL :RUN_ESPTOOL 115200 write_flash 0x10000 "firmwarefile.bin"
+IF %DEBUG% EQU 1 CALL :LOG_MESSAGE DEBUG "About to run command: !ESPTOOL_CMD! --baud %~1 %~2 %~3 %~4"
+CALL :RESET_ERROR
+!ESPTOOL_CMD! --baud %~1 %~2 %~3 %~4
+IF %ERRORLEVEL% NEQ 0 (
+    CALL :LOG_MESSAGE ERROR "Error running command: !ESPTOOL_CMD! --baud %~1 %~2 %~3 %~4"
+    EXIT /B %ERRORLEVEL%
+)
+GOTO :eof
+
+:LOG_MESSAGE
+@REM Subroutine used to print log messages in four different levels.
+@REM DEBUG messages only get printed if [-d] flag is passed to script.
+@REM CALL :LOG_MESSAGE [ERROR|INFO|WARN|DEBUG] "Message"
+@REM.
+@REM Example:: CALL :LOG_MESSAGE INFO "Message."
+SET /A LOGCOUNTER=LOGCOUNTER+1
+IF "%1" == "ERROR" CALL :GET_TIMESTAMP & ECHO %1 ^| !TIMESTAMP! !LOGCOUNTER! %~2
+IF "%1" == "INFO" CALL :GET_TIMESTAMP & ECHO %1  ^| !TIMESTAMP! !LOGCOUNTER! %~2
+IF "%1" == "WARN" CALL :GET_TIMESTAMP & ECHO %1  ^| !TIMESTAMP! !LOGCOUNTER! %~2
+IF "%1" == "DEBUG" IF %DEBUG% EQU 1 CALL :GET_TIMESTAMP & ECHO %1 ^| !TIMESTAMP! !LOGCOUNTER! %~2
+GOTO :eof
+
+:GET_TIMESTAMP
+@REM Subroutine used to set !TIMESTAMP! to HH:MM:ss.
+@REM CALL :GET_TIMESTAMP
+@REM.
+@REM Updates: !TIMESTAMP!
+FOR /F "tokens=1,2,3 delims=:,." %%a IN ("%TIME%") DO (
+    SET "HH=%%a"
+    SET "MM=%%b"
+    SET "ss=%%c"
+)
+SET "TIMESTAMP=!HH!:!MM!:!ss!"
+GOTO :eof
+
+:RESET_ERROR
+@REM Subroutine to reset %ERRORLEVEL% to 0.
+@REM CALL :RESET_ERROR
+@REM.
+@REM Updates: %ERRORLEVEL%
+EXIT /B 0
+GOTO :eof
diff --git a/bin/regen-protos.bat b/bin/regen-protos.bat
index 7fa8f333d..0bbfbe38a 100644
--- a/bin/regen-protos.bat
+++ b/bin/regen-protos.bat
@@ -1 +1,10 @@
-cd protobufs && ..\nanopb-0.4.9\generator-bin\protoc.exe --experimental_allow_proto3_optional "--nanopb_out=-S.cpp -v:..\src\mesh\generated" -I=..\protobufs\ ..\protobufs\meshtastic\*.proto
+@ECHO OFF
+SETLOCAL
+
+cd protobufs
+..\nanopb-0.4.9\generator-bin\protoc.exe --experimental_allow_proto3_optional "--nanopb_out=-S.cpp -v:..\src\mesh\generated" -I=..\protobufs\ ..\protobufs\meshtastic\*.proto
+GOTO eof
+
+:eof
+ENDLOCAL
+EXIT /B %ERRORLEVEL%
diff --git a/bin/uf2-convert.bat b/bin/uf2-convert.bat
index 242bec3ab..5e36617e3 100644
--- a/bin/uf2-convert.bat
+++ b/bin/uf2-convert.bat
@@ -1,2 +1,124 @@
-@echo off
-if [%1]==[] (echo "Please specify a platformio NRF target (i.e. rak4631) as the first argument.") else (python3 .\bin\uf2conv.py .\.pio\build\%1\firmware.hex -c -o .\.pio\build\%1\firmware.uf2 -f 0xADA52840)
\ No newline at end of file
+@ECHO OFF
+SETLOCAL EnableDelayedExpansion
+TITLE Meshtastic uf2-convert
+
+SET "SCRIPT_NAME=%~nx0"
+SET "DEBUG=0"
+SET "NRF=0"
+SET "UF2CONV_CMD=python3 .\bin\uf2conv.py"
+
+GOTO getopts
+:help
+ECHO.
+ECHO Usage: %SCRIPT_NAME% -t [t-echo^|rak4631^|nano-g2-ultra^|wio-tracker-wm1110^|canaryone^|
+ECHO                                 heltec-mesh-node-t114^|tracker-t1000-e^|rak_wismeshtap^|rak2560^|
+ECHO                                 nrf52_promicro_diy_tcxo]
+ECHO.
+ECHO Options:
+ECHO     -t target        Specify a platformio NRF target to build for. (required)
+ECHO.
+ECHO Example: %SCRIPT_NAME% -t rak4631
+GOTO eof
+
+:version
+ECHO %SCRIPT_NAME% [Version 2.6.0]
+ECHO Meshtastic
+GOTO eof
+
+:getopts
+IF "%~1"=="" GOTO endopts
+IF /I "%~1"=="-?" GOTO help
+IF /I "%~1"=="-h" GOTO help
+IF /I "%~1"=="--help" GOTO help
+IF /I "%~1"=="-v" GOTO version
+IF /I "%~1"=="--version" GOTO version
+IF /I "%~1"=="--debug" SET "DEBUG=1" & CALL :LOG_MESSAGE DEBUG "DEBUG mode: enabled."
+IF /I "%~1"=="-t" SET "TARGETNAME=%~2" & SHIFT
+IF /I "%~1"=="--target" SET "TARGETNAME=%~2" & SHIFT
+SHIFT
+GOTO getopts
+:endopts
+
+CALL :LOG_MESSAGE DEBUG "Checking TARGETNAME parameter..."
+IF "__!TARGETNAME!__"=="____" (
+    CALL :LOG_MESSAGE DEBUG "Missing -t target input."
+    GOTO help
+)
+
+IF %DEBUG% EQU 1 SET "UF2CONV_CMD=REM python3 .\bin\uf2conv.py"
+
+SET "NRFTARGETS=t-echo rak4631 nano-g2-ultra wio-tracker-wm1110 canaryone heltec-mesh-node-t114 tracker-t1000-e rak_wismeshtap rak2560 nrf52_promicro_diy_tcxo"
+FOR %%a IN (%NRFTARGETS%) DO (
+    IF /I "%%a"=="!TARGETNAME!" (
+        @REM We are working with any of %NRFTARGETS%.
+        SET "NRF=1"
+        GOTO end_loop_nrf
+    )
+)
+:end_loop_nrf
+
+@REM Building operations.
+IF !NRF! EQU 1 (
+    CALL :LOG_MESSAGE INFO "Trying to build for !TARGETNAME!..."
+    CALL :RUN_UF2CONV !TARGETNAME! || GOTO eof
+) ELSE (
+    CALL :LOG_MESSAGE WARN "!TARGETNAME! is not supported..."
+    GOTO eof
+)
+
+CALL :LOG_MESSAGE INFO "Script complete!."
+
+
+:eof
+ENDLOCAL
+EXIT /B %ERRORLEVEL%
+
+
+:RUN_UF2CONV
+@REM Subroutine used to run .\bin\uf2conv.py with arguments.
+@REM Also handles %ERRORLEVEL%.
+@REM CALL :RUN_UF2CONV [target]
+@REM.
+@REM Example:: CALL :RUN_UF2CONV rak4631
+IF %DEBUG% EQU 1 CALL :LOG_MESSAGE DEBUG "About to run command: !UF2CONV_CMD! .\.pio\build\%~1\firmware.hex -c -o .\.pio\build\%~1\firmware.uf2 -f 0xADA52840"
+CALL :RESET_ERROR
+!UF2CONV_CMD! .\.pio\build\%~1\firmware.hex -c -o .\.pio\build\%~1\firmware.uf2 -f 0xADA52840
+IF %ERRORLEVEL% NEQ 0 (
+    CALL :LOG_MESSAGE ERROR "Error running command: !UF2CONV_CMD! .\.pio\build\%~1\firmware.hex -c -o .\.pio\build\%~1\firmware.uf2 -f 0xADA52840"
+    EXIT /B %ERRORLEVEL%
+)
+GOTO :eof
+
+:LOG_MESSAGE
+@REM Subroutine used to print log messages in four different levels.
+@REM DEBUG messages only get printed if [-d] flag is passed to script.
+@REM CALL :LOG_MESSAGE [ERROR|INFO|WARN|DEBUG] "Message"
+@REM.
+@REM Example:: CALL :LOG_MESSAGE INFO "Message."
+SET /A LOGCOUNTER=LOGCOUNTER+1
+IF "%1" == "ERROR" CALL :GET_TIMESTAMP & ECHO %1 ^| !TIMESTAMP! !LOGCOUNTER! %~2
+IF "%1" == "INFO" CALL :GET_TIMESTAMP & ECHO %1  ^| !TIMESTAMP! !LOGCOUNTER! %~2
+IF "%1" == "WARN" CALL :GET_TIMESTAMP & ECHO %1  ^| !TIMESTAMP! !LOGCOUNTER! %~2
+IF "%1" == "DEBUG" IF %DEBUG% EQU 1 CALL :GET_TIMESTAMP & ECHO %1 ^| !TIMESTAMP! !LOGCOUNTER! %~2
+GOTO :eof
+
+:GET_TIMESTAMP
+@REM Subroutine used to set !TIMESTAMP! to HH:MM:ss.
+@REM CALL :GET_TIMESTAMP
+@REM.
+@REM Updates: !TIMESTAMP!
+FOR /F "tokens=1,2,3 delims=:,." %%a IN ("%TIME%") DO (
+    SET "HH=%%a"
+    SET "MM=%%b"
+    SET "ss=%%c"
+)
+SET "TIMESTAMP=!HH!:!MM!:!ss!"
+GOTO :eof
+
+:RESET_ERROR
+@REM Subroutine to reset %ERRORLEVEL% to 0.
+@REM CALL :RESET_ERROR
+@REM.
+@REM Updates: %ERRORLEVEL%
+EXIT /B 0
+GOTO :eof

From f0a2ae9ff3065fc8f5b6892436a7a5ce564eeb66 Mon Sep 17 00:00:00 2001
From: Tom Fifield <tom@tomfifield.net>
Date: Fri, 7 Mar 2025 08:52:54 +0800
Subject: [PATCH 002/116] Give Semgrep permission to write its report (#6253)

Previously semgrep had read-all permission. This patch limits read
slightly and adds write permissions to security-events.
---
 .github/workflows/sec_sast_semgrep_cron.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/sec_sast_semgrep_cron.yml b/.github/workflows/sec_sast_semgrep_cron.yml
index 944103562..a7cd7fa24 100644
--- a/.github/workflows/sec_sast_semgrep_cron.yml
+++ b/.github/workflows/sec_sast_semgrep_cron.yml
@@ -6,7 +6,10 @@ on:
   schedule:
     - cron: 0 1 * * 6
 
-permissions: read-all
+permissions:
+  actions: read
+  contents: read
+  security-events: write
 
 jobs:
   semgrep-full:

From 5c77d423450df8f459e75095acc5149b750aaf8d Mon Sep 17 00:00:00 2001
From: Chris Danis <cdanis@gmail.com>
Date: Thu, 6 Mar 2025 20:49:55 -0500
Subject: [PATCH 003/116] i2c: 0x45 can also be an SHT35 (#6249)

---
 src/configuration.h           | 1 +
 src/detect/ScanI2CTwoWire.cpp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/configuration.h b/src/configuration.h
index 6f5255ec9..a9717a637 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -135,6 +135,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LPS22HB_ADDR 0x5C
 #define LPS22HB_ADDR_ALT 0x5D
 #define SHT31_4x_ADDR 0x44
+#define SHT31_4x_ADDR_ALT 0x45
 #define PMSA0031_ADDR 0x12
 #define QMA6100P_ADDR 0x12
 #define AHT10_ADDR 0x38
diff --git a/src/detect/ScanI2CTwoWire.cpp b/src/detect/ScanI2CTwoWire.cpp
index 0eca5cad3..ab8b05411 100644
--- a/src/detect/ScanI2CTwoWire.cpp
+++ b/src/detect/ScanI2CTwoWire.cpp
@@ -349,7 +349,8 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                     }
                     break;
                 }
-            case SHT31_4x_ADDR:
+            case SHT31_4x_ADDR:     // same as OPT3001_ADDR_ALT
+            case SHT31_4x_ADDR_ALT: // same as OPT3001_ADDR
                 registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x89), 2);
                 if (registerValue == 0x11a2 || registerValue == 0x11da || registerValue == 0xe9c) {
                     type = SHT4X;
@@ -422,7 +423,6 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                 SCAN_SIMPLE_CASE(TCA9555_ADDR, TCA9555, "TCA9555", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(VEML7700_ADDR, VEML7700, "VEML7700", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(TSL25911_ADDR, TSL2591, "TSL2591", (uint8_t)addr.address);
-                SCAN_SIMPLE_CASE(OPT3001_ADDR, OPT3001, "OPT3001", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(MLX90632_ADDR, MLX90632, "MLX90632", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(NAU7802_ADDR, NAU7802, "NAU7802", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(MAX1704X_ADDR, MAX17048, "MAX17048", (uint8_t)addr.address);

From 563747c5cd32c051a7f548178b9f05bcc32f01fe Mon Sep 17 00:00:00 2001
From: Tom Fifield <tom@tomfifield.net>
Date: Fri, 7 Mar 2025 11:54:32 +0800
Subject: [PATCH 004/116] Flag semgrep to not run on self-hosted (#6256)

The semgrep action runs inside a docker container,
and docker in podman just doesn't work.
---
 .github/workflows/sec_sast_semgrep_cron.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sec_sast_semgrep_cron.yml b/.github/workflows/sec_sast_semgrep_cron.yml
index a7cd7fa24..db308c9f5 100644
--- a/.github/workflows/sec_sast_semgrep_cron.yml
+++ b/.github/workflows/sec_sast_semgrep_cron.yml
@@ -13,7 +13,7 @@ permissions:
 
 jobs:
   semgrep-full:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     container:
       image: semgrep/semgrep
 

From 60e46cd7650ccb04e70bc34645a718b358a64689 Mon Sep 17 00:00:00 2001
From: Mark Trevor Birss <markbirss@gmail.com>
Date: Fri, 7 Mar 2025 08:21:06 +0200
Subject: [PATCH 005/116] Update platformio.ini (#6245)

---
 .../crowpanel-esp32s3-5-epaper/platformio.ini | 58 ++++++++++++++++++-
 1 file changed, 55 insertions(+), 3 deletions(-)

diff --git a/variants/crowpanel-esp32s3-5-epaper/platformio.ini b/variants/crowpanel-esp32s3-5-epaper/platformio.ini
index 83d57a0ef..2393e168d 100644
--- a/variants/crowpanel-esp32s3-5-epaper/platformio.ini
+++ b/variants/crowpanel-esp32s3-5-epaper/platformio.ini
@@ -15,8 +15,6 @@ build_flags =
   -DBOARD_HAS_PSRAM
   -DGPS_POWER_TOGGLE
   -DEINK_DISPLAY_MODEL=GxEPD2_579_GDEY0579T93 ;https://www.good-display.com/product/439.html
-  ;-DEINK_DISPLAY_MODEL=GxEPD2_290_GDEY029T94 ;https://www.good-display.com/product/389.html
-  ;-DEINK_DISPLAY_MODEL=GxEPD2_420_GYE042A87   ; similar Panel: GDEY042T81 : https://www.good-display.com/product/386.html
   -DEINK_WIDTH=792
   -DEINK_HEIGHT=272
   -DUSE_EINK_DYNAMICDISPLAY            ; Enable Dynamic EInk
@@ -25,4 +23,58 @@ build_flags =
   ;-DEINK_LIMIT_RATE_RESPONSIVE_SEC=1 
 lib_deps =
   ${esp32s3_base.lib_deps}
-  https://github.com/markbirss/GxEPD2#markbirss-patch-1
+  https://github.com/meshtastic/GxEPD2
+
+[env:crowpanel-esp32s3-4-epaper]
+extends = esp32s3_base
+board_build.arduino.memory_type = qio_opi
+board_build.flash_mode = qio
+board_build.psram_type = opi
+board_upload.flash_size = 8MB
+board_upload.maximum_size = 8388608
+board = esp32-s3-devkitc-1
+upload_port = /dev/ttyUSB0
+board_level = extra
+upload_protocol = esptool
+build_flags = 
+  ${esp32_base.build_flags} -D CROWPANEL_ESP32S3_5_EPAPER -I variants/crowpanel-esp32s3-5-epaper
+  -D PRIVATE_HW
+  -DBOARD_HAS_PSRAM
+  -DGPS_POWER_TOGGLE
+  -DEINK_DISPLAY_MODEL=GxEPD2_420_GYE042A87   ; similar Panel: GDEY042T81 : https://www.good-display.com/product/386.html
+  -DEINK_WIDTH=400
+  -DEINK_HEIGHT=300
+  -DUSE_EINK_DYNAMICDISPLAY            ; Enable Dynamic EInk
+  -DEINK_LIMIT_FASTREFRESH=100          ; How many consecutive fast-refreshes are permitted
+  ;-DEINK_LIMIT_RATE_BACKGROUND_SEC=30  ; Minimum interval between BACKGROUND updates
+  ;-DEINK_LIMIT_RATE_RESPONSIVE_SEC=1 
+lib_deps =
+  ${esp32s3_base.lib_deps}
+  https://github.com/meshtastic/GxEPD2
+
+[env:crowpanel-esp32s3-2-epaper]
+extends = esp32s3_base
+board_build.arduino.memory_type = qio_opi
+board_build.flash_mode = qio
+board_build.psram_type = opi
+board_upload.flash_size = 8MB
+board_upload.maximum_size = 8388608
+board = esp32-s3-devkitc-1
+upload_port = /dev/ttyUSB0
+board_level = extra
+upload_protocol = esptool
+build_flags = 
+  ${esp32_base.build_flags} -D CROWPANEL_ESP32S3_5_EPAPER -I variants/crowpanel-esp32s3-5-epaper
+  -D PRIVATE_HW
+  -DBOARD_HAS_PSRAM
+  -DGPS_POWER_TOGGLE
+  -DEINK_DISPLAY_MODEL=GxEPD2_290_GDEY029T94 ;https://www.good-display.com/product/389.html
+  -DEINK_WIDTH=296
+  -DEINK_HEIGHT=128
+  -DUSE_EINK_DYNAMICDISPLAY            ; Enable Dynamic EInk
+  -DEINK_LIMIT_FASTREFRESH=100          ; How many consecutive fast-refreshes are permitted
+  ;-DEINK_LIMIT_RATE_BACKGROUND_SEC=30  ; Minimum interval between BACKGROUND updates
+  ;-DEINK_LIMIT_RATE_RESPONSIVE_SEC=1 
+lib_deps =
+  ${esp32s3_base.lib_deps}
+  https://github.com/meshtastic/GxEPD2

From 2a3e1f904d1cddcdbc89c86e58de019bbfed74dc Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 7 Mar 2025 09:12:08 +0100
Subject: [PATCH 006/116] Upgrade trunk (#6257)

Co-authored-by: sachaw <11172820+sachaw@users.noreply.github.com>
---
 .trunk/trunk.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
index b1df7e417..85211b0f2 100644
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -9,12 +9,12 @@ plugins:
 lint:
   enabled:
     - prettier@3.5.3
-    - trufflehog@3.88.14
+    - trufflehog@3.88.15
     - yamllint@1.35.1
     - bandit@1.8.3
-    - checkov@3.2.379
+    - checkov@3.2.382
     - terrascan@1.19.9
-    - trivy@0.59.1
+    - trivy@0.60.0
     - taplo@0.9.3
     - ruff@0.9.9
     - isort@6.0.1

From 284598ed5643cf139d8cfa092219dfb498371d55 Mon Sep 17 00:00:00 2001
From: Tom Fifield <tom@tomfifield.net>
Date: Fri, 7 Mar 2025 18:51:38 +0800
Subject: [PATCH 007/116] Add detection support for LTR390UV Sensor (#6009)

* Add detection support for LTR390UV Sensor

The LTR390 is a UV sensor. This patch adds detection support, for
a future patch that will add the full sensor support.

* Update ScanI2C.h
---
 src/configuration.h           | 1 +
 src/detect/ScanI2C.h          | 1 +
 src/detect/ScanI2CTwoWire.cpp | 1 +
 src/main.cpp                  | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/configuration.h b/src/configuration.h
index a9717a637..fd4a5b196 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -151,6 +151,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MAX30102_ADDR 0x57
 #define MLX90614_ADDR_DEF 0x5A
 #define CGRADSENS_ADDR 0x66
+#define LTR390UV_ADDR 0x53
 
 // -----------------------------------------------------------------------------
 // ACCELEROMETER
diff --git a/src/detect/ScanI2C.h b/src/detect/ScanI2C.h
index 6828169a8..5b6bbe629 100644
--- a/src/detect/ScanI2C.h
+++ b/src/detect/ScanI2C.h
@@ -68,6 +68,7 @@ class ScanI2C
         NXP_SE050,
         DFROBOT_RAIN,
         DPS310,
+        LTR390UV,
     } DeviceType;
 
     // typedef uint8_t DeviceAddress;
diff --git a/src/detect/ScanI2CTwoWire.cpp b/src/detect/ScanI2CTwoWire.cpp
index ab8b05411..8b779277d 100644
--- a/src/detect/ScanI2CTwoWire.cpp
+++ b/src/detect/ScanI2CTwoWire.cpp
@@ -427,6 +427,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                 SCAN_SIMPLE_CASE(NAU7802_ADDR, NAU7802, "NAU7802", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(MAX1704X_ADDR, MAX17048, "MAX17048", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(DFROBOT_RAIN_ADDR, DFROBOT_RAIN, "DFRobot Rain Gauge", (uint8_t)addr.address);
+                SCAN_SIMPLE_CASE(LTR390UV_ADDR, LTR390UV, "LTR390UV", (uint8_t)addr.address);
 #ifdef HAS_TPS65233
                 SCAN_SIMPLE_CASE(TPS65233_ADDR, TPS65233, "TPS65233", (uint8_t)addr.address);
 #endif
diff --git a/src/main.cpp b/src/main.cpp
index e5e1a2537..6b8089eaa 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -641,6 +641,7 @@ void setup()
     scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::MAX30102, meshtastic_TelemetrySensorType_MAX30102);
     scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::CGRADSENS, meshtastic_TelemetrySensorType_RADSENS);
     scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::DFROBOT_RAIN, meshtastic_TelemetrySensorType_DFROBOT_RAIN);
+    scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::LTR390UV, meshtastic_TelemetrySensorType_LTR390UV);
     scannerToSensorsMap(i2cScanner, ScanI2C::DeviceType::DPS310, meshtastic_TelemetrySensorType_DPS310);
 
     i2cScanner.reset();

From 3fd47d9713e7d1b6866c48cf218e2435741651a2 Mon Sep 17 00:00:00 2001
From: Austin <vidplace7@gmail.com>
Date: Fri, 7 Mar 2025 07:38:15 -0500
Subject: [PATCH 008/116] Actions: Move version bump into release_channels
 (#6258)

---
 .github/workflows/build_debian_src.yml |  2 +-
 .github/workflows/main_matrix.yml      | 29 +++-------------
 .github/workflows/release_channels.yml | 46 ++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/build_debian_src.yml b/.github/workflows/build_debian_src.yml
index 714542047..5c441f085 100644
--- a/.github/workflows/build_debian_src.yml
+++ b/.github/workflows/build_debian_src.yml
@@ -4,7 +4,7 @@ on:
   workflow_call:
     secrets:
       PPA_GPG_PRIVATE_KEY:
-        required: true
+        required: false
     inputs:
       series:
         description: Ubuntu/Debian series to target
diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml
index da4b4e6f3..5b11926f2 100644
--- a/.github/workflows/main_matrix.yml
+++ b/.github/workflows/main_matrix.yml
@@ -136,6 +136,7 @@ jobs:
     secrets: inherit
 
   package-pio-deps-native-tft:
+    if: ${{ github.event_name == 'workflow_dispatch' }}
     uses: ./.github/workflows/package_pio_deps.yml
     with:
       pio_env: native-tft
@@ -329,13 +330,13 @@ jobs:
         with:
           pattern: platformio-deps-native-tft-${{ steps.version.outputs.long }}
           merge-multiple: true
-          path: ./output/pio-deps-native
+          path: ./output/pio-deps-native-tft
 
       - name: Zip linux sources
         working-directory: output
         run: |
           zip -j -9 -r ./meshtasticd-${{ steps.version.outputs.deb }}-src.zip ./debian-src
-          zip -9 -r ./platformio-deps-native-${{ steps.version.outputs.long }}.zip ./pio-deps-native
+          zip -9 -r ./platformio-deps-native-tft-${{ steps.version.outputs.long }}.zip ./pio-deps-native-tft
 
       # For diagnostics
       - name: Display structure of downloaded files
@@ -344,32 +345,10 @@ jobs:
       - name: Add linux sources to release
         run: |
           gh release upload v${{ steps.version.outputs.long }} ./output/meshtasticd-${{ steps.version.outputs.deb }}-src.zip
-          gh release upload v${{ steps.version.outputs.long }} ./output/platformio-deps-native-${{ steps.version.outputs.long }}.zip
+          gh release upload v${{ steps.version.outputs.long }} ./output/platformio-deps-native-tft-${{ steps.version.outputs.long }}.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Bump version.properties
-        run: >-
-          bin/bump_version.py
-
-      - name: Ensure debian deps are installed
-        shell: bash
-        run: |
-          sudo apt-get update -y --fix-missing
-          sudo apt-get install -y devscripts
-
-      - name: Update debian changelog
-        run: >-
-          debian/ci_changelog.sh
-
-      - name: Create version.properties pull request
-        uses: peter-evans/create-pull-request@v7
-        with:
-          title: Bump version.properties
-          add-paths: |
-            version.properties
-            debian/changelog
-
   release-firmware:
     strategy:
       fail-fast: false
diff --git a/.github/workflows/release_channels.yml b/.github/workflows/release_channels.yml
index 9cdabde9e..710e8e51d 100644
--- a/.github/workflows/release_channels.yml
+++ b/.github/workflows/release_channels.yml
@@ -43,3 +43,49 @@ jobs:
       copr_project: |-
         ${{ contains(github.event.release.name, 'Beta') && 'beta' || contains(github.event.release.name, 'Alpha') && 'alpha' }}
     secrets: inherit
+
+  # Create a PR to bump version when a release is Published
+  bump-version:
+    if: ${{ github.event.release.published }}
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      contents: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
+
+      - name: Get release version string
+        run: |
+          echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+          echo "deb=$(./bin/buildinfo.py deb)" >> $GITHUB_OUTPUT
+        id: version
+        env:
+          BUILD_LOCATION: local
+
+      - name: Bump version.properties
+        run: >-
+          bin/bump_version.py
+
+      - name: Ensure debian deps are installed
+        shell: bash
+        run: |
+          sudo apt-get update -y --fix-missing
+          sudo apt-get install -y devscripts
+
+      - name: Update debian changelog
+        run: >-
+          debian/ci_changelog.sh
+
+      - name: Create version.properties pull request
+        uses: peter-evans/create-pull-request@v7
+        with:
+          title: Bump version.properties
+          add-paths: |
+            version.properties
+            debian/changelog

From 16a0dce83c6defc8e6fb64a07e289f4978373b93 Mon Sep 17 00:00:00 2001
From: Austin <vidplace7@gmail.com>
Date: Fri, 7 Mar 2025 18:37:54 -0500
Subject: [PATCH 009/116] Ebyte E77 (STM32) DevKit support (#6255)

---
 variants/CDEBYTE_E77-MBL/platformio.ini | 41 +++++++++++++++++++++++++
 variants/CDEBYTE_E77-MBL/variant.h      | 23 ++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 variants/CDEBYTE_E77-MBL/platformio.ini
 create mode 100644 variants/CDEBYTE_E77-MBL/variant.h

diff --git a/variants/CDEBYTE_E77-MBL/platformio.ini b/variants/CDEBYTE_E77-MBL/platformio.ini
new file mode 100644
index 000000000..a8d90f676
--- /dev/null
+++ b/variants/CDEBYTE_E77-MBL/platformio.ini
@@ -0,0 +1,41 @@
+[env:CDEBYTE_E77-MBL]
+extends = stm32_base
+; `ebyte_e77_dev` was added in this commit. Remove when a new release is used in the base.
+platform = https://github.com/platformio/platform-ststm32.git#3208828db447f4373cd303b7f7393c8fc0dae623
+board = ebyte_e77_dev
+board_level = extra
+build_flags =
+  ${stm32_base.build_flags}
+  -Ivariants/CDEBYTE_E77-MBL
+  -DSERIAL_UART_INSTANCE=1
+  -DPIN_SERIAL_RX=PA3
+  -DPIN_SERIAL_TX=PA2
+  -DHAL_DAC_MODULE_ONLY
+  -DHAL_ADC_MODULE_DISABLED
+  -DHAL_COMP_MODULE_DISABLED
+  -DHAL_CRC_MODULE_DISABLED
+  -DHAL_CRYP_MODULE_DISABLED
+  -DHAL_GTZC_MODULE_DISABLED
+  -DHAL_HSEM_MODULE_DISABLED
+  -DHAL_I2C_MODULE_DISABLED
+  -DHAL_I2S_MODULE_DISABLED
+  -DHAL_IPCC_MODULE_DISABLED
+  -DHAL_IRDA_MODULE_DISABLED
+  -DHAL_IWDG_MODULE_DISABLED
+  -DHAL_LPTIM_MODULE_DISABLED
+  -DHAL_PKA_MODULE_DISABLED
+  -DHAL_RNG_MODULE_DISABLED
+  -DHAL_RTC_MODULE_DISABLED
+  -DHAL_SMARTCARD_MODULE_DISABLED
+  -DHAL_SMBUS_MODULE_DISABLED
+  -DHAL_TIM_MODULE_DISABLED
+  -DHAL_WWDG_MODULE_DISABLED
+  -DHAL_EXTI_MODULE_DISABLED
+  -DHAL_SAI_MODULE_DISABLED
+  -DHAL_ICACHE_MODULE_DISABLED
+  -DRADIOLIB_EXCLUDE_SX128X=1
+  -DRADIOLIB_EXCLUDE_SX127X=1
+  -DRADIOLIB_EXCLUDE_LR11X0=1
+; -D PIO_FRAMEWORK_ARDUINO_NANOLIB_FLOAT_PRINTF
+
+upload_port = stlink
\ No newline at end of file
diff --git a/variants/CDEBYTE_E77-MBL/variant.h b/variants/CDEBYTE_E77-MBL/variant.h
new file mode 100644
index 000000000..7331dcedc
--- /dev/null
+++ b/variants/CDEBYTE_E77-MBL/variant.h
@@ -0,0 +1,23 @@
+/*
+EByte E77-MBL series
+https://www.cdebyte.com/products/E77-900MBL-01
+https://www.cdebyte.com/products/E77-400MBL-01
+https://github.com/olliw42/mLRS-docu/blob/master/docs/EBYTE_E77_MBL.md
+*/
+
+/*
+This variant is a work in progress.
+Do not expect a working Meshtastic device with this target.
+*/
+
+#ifndef _VARIANT_EBYTE_E77_
+#define _VARIANT_EBYTE_E77_
+
+#define USE_STM32WLx
+#define MAX_NUM_NODES 10
+
+#define LED_PIN PB4 // LED1
+// #define LED_PIN PB3 // LED2
+#define LED_STATE_ON 1
+
+#endif

From 7f17747d8c3f60760ee905a725d47217e40661c6 Mon Sep 17 00:00:00 2001
From: Chris Danis <cdanis@gmail.com>
Date: Fri, 7 Mar 2025 20:33:23 -0500
Subject: [PATCH 010/116] NodeInfo exchange: don't bother if too far away
 (#6260)

When we receive a NodeInfo from a new node, if it is more than 2 hops
beyond our configured hop limit away from us, don't bother to send a
NodeInfo back to it.

In my dense urban environment, I see many nodes that are >= 5 hops away,
but sending their NodeInfo with a hopStart of 6 or 7.  In most cases
I can imagine, this seems like a waste of airtime.
---
 src/mesh/MeshService.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/mesh/MeshService.cpp b/src/mesh/MeshService.cpp
index 0ef21d4ca..3bb1f2776 100644
--- a/src/mesh/MeshService.cpp
+++ b/src/mesh/MeshService.cpp
@@ -88,8 +88,16 @@ int MeshService::handleFromRadio(const meshtastic_MeshPacket *mp)
     } else if (mp->which_payload_variant == meshtastic_MeshPacket_decoded_tag && !nodeDB->getMeshNode(mp->from)->has_user &&
                nodeInfoModule && !isPreferredRebroadcaster && !nodeDB->isFull()) {
         if (airTime->isTxAllowedChannelUtil(true)) {
-            LOG_INFO("Heard new node on ch. %d, send NodeInfo and ask for response", mp->channel);
-            nodeInfoModule->sendOurNodeInfo(mp->from, true, mp->channel);
+            // Hops used by the request. If somebody in between running modified firmware modified it, ignore it
+            auto hopStart = mp->hop_start;
+            auto hopLimit = mp->hop_limit;
+            uint8_t hopsUsed = hopStart < hopLimit ? config.lora.hop_limit : hopStart - hopLimit;
+            if (hopsUsed > config.lora.hop_limit + 2) {
+                LOG_DEBUG("Skip send NodeInfo: %d hops away is too far away", hopsUsed);
+            } else {
+                LOG_INFO("Heard new node on ch. %d, send NodeInfo and ask for response", mp->channel);
+                nodeInfoModule->sendOurNodeInfo(mp->from, true, mp->channel);
+            }
         } else {
             LOG_DEBUG("Skip sending NodeInfo > 25%% ch. util");
         }

From 94de2315c1f485dcdd3b4a48966f402af19af20a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 8 Mar 2025 06:22:11 -0600
Subject: [PATCH 011/116] [create-pull-request] automated change (#6266)

Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
---
 protobufs                                    |  2 +-
 src/mesh/generated/meshtastic/portnums.pb.h  |  3 +++
 src/mesh/generated/meshtastic/telemetry.pb.h | 28 ++++++++++++++------
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/protobufs b/protobufs
index c261bd71a..035a8017b 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit c261bd71aaf416f3bcef5dbc774d06b797fc58c6
+Subproject commit 035a8017b87379f17624f7bba9b6a5b127bc026c
diff --git a/src/mesh/generated/meshtastic/portnums.pb.h b/src/mesh/generated/meshtastic/portnums.pb.h
index d7dc47785..4e7c43e58 100644
--- a/src/mesh/generated/meshtastic/portnums.pb.h
+++ b/src/mesh/generated/meshtastic/portnums.pb.h
@@ -128,6 +128,9 @@ typedef enum _meshtastic_PortNum {
     meshtastic_PortNum_MAP_REPORT_APP = 73,
     /* PowerStress based monitoring support (for automated power consumption testing) */
     meshtastic_PortNum_POWERSTRESS_APP = 74,
+    /* Reticulum Network Stack Tunnel App
+ ENCODING: Fragmented RNS Packet. Handled by Meshtastic RNS interface */
+    meshtastic_PortNum_RETICULUM_TUNNEL_APP = 76,
     /* Private applications should use portnums >= 256.
  To simplify initial development and testing you can use "PRIVATE_APP"
  in your code without needing to rebuild protobuf files (via [regen-protos.sh](https://github.com/meshtastic/firmware/blob/master/bin/regen-protos.sh)) */
diff --git a/src/mesh/generated/meshtastic/telemetry.pb.h b/src/mesh/generated/meshtastic/telemetry.pb.h
index aa39a1ce4..69cdd33fe 100644
--- a/src/mesh/generated/meshtastic/telemetry.pb.h
+++ b/src/mesh/generated/meshtastic/telemetry.pb.h
@@ -85,7 +85,9 @@ typedef enum _meshtastic_TelemetrySensorType {
     /* DFRobot Gravity tipping bucket rain gauge */
     meshtastic_TelemetrySensorType_DFROBOT_RAIN = 35,
     /* Infineon DPS310 High accuracy pressure and temperature */
-    meshtastic_TelemetrySensorType_DPS310 = 36
+    meshtastic_TelemetrySensorType_DPS310 = 36,
+    /* RAKWireless RAK12035 Soil Moisture Sensor Module */
+    meshtastic_TelemetrySensorType_RAK12035 = 37
 } meshtastic_TelemetrySensorType;
 
 /* Struct definitions */
@@ -172,6 +174,12 @@ typedef struct _meshtastic_EnvironmentMetrics {
     /* Rainfall in the last 24 hours in mm */
     bool has_rainfall_24h;
     float rainfall_24h;
+    /* Soil moisture measured (% 1-100) */
+    bool has_soil_moisture;
+    uint8_t soil_moisture;
+    /* Soil temperature measured (*C) */
+    bool has_soil_temperature;
+    float soil_temperature;
 } meshtastic_EnvironmentMetrics;
 
 /* Power Metrics (voltage / current / etc) */
@@ -316,8 +324,8 @@ extern "C" {
 
 /* Helper constants for enums */
 #define _meshtastic_TelemetrySensorType_MIN meshtastic_TelemetrySensorType_SENSOR_UNSET
-#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_DPS310
-#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_DPS310+1))
+#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_RAK12035
+#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_RAK12035+1))
 
 
 
@@ -330,7 +338,7 @@ extern "C" {
 
 /* Initializer values for message structs */
 #define meshtastic_DeviceMetrics_init_default    {false, 0, false, 0, false, 0, false, 0, false, 0}
-#define meshtastic_EnvironmentMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
+#define meshtastic_EnvironmentMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_PowerMetrics_init_default     {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_AirQualityMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_LocalStats_init_default       {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
@@ -338,7 +346,7 @@ extern "C" {
 #define meshtastic_Telemetry_init_default        {0, 0, {meshtastic_DeviceMetrics_init_default}}
 #define meshtastic_Nau7802Config_init_default    {0, 0}
 #define meshtastic_DeviceMetrics_init_zero       {false, 0, false, 0, false, 0, false, 0, false, 0}
-#define meshtastic_EnvironmentMetrics_init_zero  {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
+#define meshtastic_EnvironmentMetrics_init_zero  {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_PowerMetrics_init_zero        {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_AirQualityMetrics_init_zero   {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_LocalStats_init_zero          {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
@@ -372,6 +380,8 @@ extern "C" {
 #define meshtastic_EnvironmentMetrics_radiation_tag 18
 #define meshtastic_EnvironmentMetrics_rainfall_1h_tag 19
 #define meshtastic_EnvironmentMetrics_rainfall_24h_tag 20
+#define meshtastic_EnvironmentMetrics_soil_moisture_tag 21
+#define meshtastic_EnvironmentMetrics_soil_temperature_tag 22
 #define meshtastic_PowerMetrics_ch1_voltage_tag  1
 #define meshtastic_PowerMetrics_ch1_current_tag  2
 #define meshtastic_PowerMetrics_ch2_voltage_tag  3
@@ -445,7 +455,9 @@ X(a, STATIC,   OPTIONAL, FLOAT,    wind_gust,        16) \
 X(a, STATIC,   OPTIONAL, FLOAT,    wind_lull,        17) \
 X(a, STATIC,   OPTIONAL, FLOAT,    radiation,        18) \
 X(a, STATIC,   OPTIONAL, FLOAT,    rainfall_1h,      19) \
-X(a, STATIC,   OPTIONAL, FLOAT,    rainfall_24h,     20)
+X(a, STATIC,   OPTIONAL, FLOAT,    rainfall_24h,     20) \
+X(a, STATIC,   OPTIONAL, UINT32,   soil_moisture,    21) \
+X(a, STATIC,   OPTIONAL, FLOAT,    soil_temperature,  22)
 #define meshtastic_EnvironmentMetrics_CALLBACK NULL
 #define meshtastic_EnvironmentMetrics_DEFAULT NULL
 
@@ -544,12 +556,12 @@ extern const pb_msgdesc_t meshtastic_Nau7802Config_msg;
 #define MESHTASTIC_MESHTASTIC_TELEMETRY_PB_H_MAX_SIZE meshtastic_Telemetry_size
 #define meshtastic_AirQualityMetrics_size        78
 #define meshtastic_DeviceMetrics_size            27
-#define meshtastic_EnvironmentMetrics_size       103
+#define meshtastic_EnvironmentMetrics_size       113
 #define meshtastic_HealthMetrics_size            11
 #define meshtastic_LocalStats_size               60
 #define meshtastic_Nau7802Config_size            16
 #define meshtastic_PowerMetrics_size             30
-#define meshtastic_Telemetry_size                110
+#define meshtastic_Telemetry_size                120
 
 #ifdef __cplusplus
 } /* extern "C" */

From c54fc5b7c5e0b8719abd1ed3e9777a0b4425907d Mon Sep 17 00:00:00 2001
From: Austin <vidplace7@gmail.com>
Date: Sat, 8 Mar 2025 17:36:55 -0500
Subject: [PATCH 012/116] Thread in harmony (#6271)

---
 platformio.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index f41726503..310134c30 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -60,7 +60,7 @@ lib_deps =
 	mathertel/OneButton@2.6.1
 	https://github.com/meshtastic/arduino-fsm.git#7db3702bf0cfe97b783d6c72595e3f38e0b19159
 	https://github.com/meshtastic/TinyGPSPlus.git#71a82db35f3b973440044c476d4bcdc673b104f4
-	https://github.com/meshtastic/ArduinoThread.git#1ae8778c85d0a2a729f989e0b1e7d7c4dc84eef0
+	https://github.com/meshtastic/ArduinoThread.git#7c3ee9e1951551b949763b1f5280f8db1fa4068d
 	nanopb/Nanopb@0.4.91
 	erriez/ErriezCRC32@1.0.1
 
@@ -94,7 +94,7 @@ lib_deps =
 
 [device-ui_base]
 lib_deps =
-	https://github.com/meshtastic/device-ui.git#8c3183e177a1d6452ce12b4f328bd3357bf7e21b
+	https://github.com/meshtastic/device-ui.git#d7b18e98704f988fcda9e5fa7404e677b3d11f8c
 
 ; Common libs for environmental measurements in telemetry module
 ; (not included in native / portduino)

From 5de6bc1851a1c985b43705ebfd8786ad39eea872 Mon Sep 17 00:00:00 2001
From: todd-herbert <herbert.todd@gmail.com>
Date: Sun, 9 Mar 2025 14:06:32 +1300
Subject: [PATCH 013/116] Fix excluded_modules metadata with InkHUD (#6272)

---
 src/main.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 6b8089eaa..4634c7c14 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1225,8 +1225,12 @@ extern meshtastic_DeviceMetadata getDeviceMetadata()
 #if MESHTASTIC_EXCLUDE_AUDIO
     deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_AUDIO_CONFIG;
 #endif
-#if !HAS_SCREEN || NO_EXT_GPIO
-    deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_CANNEDMSG_CONFIG | meshtastic_ExcludedModules_EXTNOTIF_CONFIG;
+// Option to explicitly include canned messages for edge cases, e.g. niche graphics
+#if (!HAS_SCREEN && NO_EXT_GPIO) && !MESHTASTIC_INCLUDE_CANNEDMSG
+    deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_CANNEDMSG_CONFIG;
+#endif
+#if NO_EXT_GPIO
+    deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_EXTNOTIF_CONFIG;
 #endif
 // Only edge case here is if we apply this a device with built in Accelerometer and want to detect interrupts
 // We'll have to macro guard against those targets potentially

From 3c1f92ce84eb90a629ed3f0faa9444b70e468c82 Mon Sep 17 00:00:00 2001
From: Kalle Lilja <15094562+ThatKalle@users.noreply.github.com>
Date: Sun, 9 Mar 2025 12:43:16 +0100
Subject: [PATCH 014/116] Update device-install scripts (#6267)

* fix example

* check for firmware- filename

* add powershell formatter setting

* add crlf for ps1

* formatting

* check for firmware- filename

---------

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
---
 .gitattributes              |  1 +
 .vscode/settings.json       |  3 +++
 bin/device-install.bat      | 10 +++++++---
 bin/device-install.sh       |  7 ++++++-
 bin/device-install_test.ps1 | 31 ++++++++++++++++---------------
 5 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 584097061..79d1800fc 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,5 @@
 * text=auto eol=lf
 *.{cmd,[cC][mM][dD]} text eol=crlf
 *.{bat,[bB][aA][tT]} text eol=crlf
+*.{ps1,[pP][sS]} text eol=crlf
 *.{sh,[sS][hH]} text eol=lf
diff --git a/.vscode/settings.json b/.vscode/settings.json
index bf9b82111..81deca8f9 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -7,5 +7,8 @@
   "cmake.configureOnOpen": false,
   "[cpp]": {
     "editor.defaultFormatter": "trunk.io"
+  },
+  "[powershell]": {
+    "editor.defaultFormatter": "ms-vscode.powershell"
   }
 }
diff --git a/bin/device-install.bat b/bin/device-install.bat
index 3e2ea49aa..926338464 100755
--- a/bin/device-install.bat
+++ b/bin/device-install.bat
@@ -20,7 +20,7 @@ ECHO.
 ECHO Usage: %SCRIPT_NAME% -f filename [-p PORT] [-P python] (--web)
 ECHO.
 ECHO Options:
-ECHO     -f filename      The .bin file to flash.  Custom to your device type and region. (required)
+ECHO     -f filename      The firmware .bin file to flash.  Custom to your device type and region. (required)
 ECHO                      The file must be located in this current directory.
 ECHO     -p PORT          Set the environment variable for ESPTOOL_PORT.
 ECHO                      If not set, ESPTOOL iterates all ports (Dangerous).
@@ -30,7 +30,7 @@ ECHO                      If not supplied the script will try to find esptool in
 ECHO     --web            Enable WebUI. (default: false)
 ECHO.
 ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4.bin -p COM11
-ECHO Example: %SCRIPT_NAME% -f littlefs-unphone-2.6.0.0b106d4.bin -p COM11 --web
+ECHO Example: %SCRIPT_NAME% -f firmware-unphone-2.6.0.0b106d4.bin -p COM11 --web
 GOTO eof
 
 :version
@@ -60,16 +60,20 @@ IF "__!FILENAME!__"=="____" (
     CALL :LOG_MESSAGE DEBUG "Missing -f filename input."
     GOTO help
 ) ELSE (
+    CALL :LOG_MESSAGE DEBUG "Filename: !FILENAME!"
     IF NOT "__!FILENAME: =!__"=="__!FILENAME!__" (
         CALL :LOG_MESSAGE ERROR "Filename containing spaces are not supported."
         GOTO help
     )
+    IF "__!FILENAME:firmware-=!__"=="__!FILENAME!__" (
+        CALL :LOG_MESSAGE ERROR "Filename must be a firmware-* file."
+        GOTO help
+    )
     @REM Remove ".\" or "./" file prefix if present.
     SET "FILENAME=!FILENAME:.\=!"
     SET "FILENAME=!FILENAME:./=!"
 )
 
-CALL :LOG_MESSAGE DEBUG "Filename: !FILENAME!"
 CALL :LOG_MESSAGE DEBUG "Checking if !FILENAME! exists..."
 IF NOT EXIST !FILENAME! (
     CALL :LOG_MESSAGE ERROR "File does not exist: !FILENAME!. Terminating."
diff --git a/bin/device-install.sh b/bin/device-install.sh
index c1ba33c4a..61c72bc2e 100755
--- a/bin/device-install.sh
+++ b/bin/device-install.sh
@@ -29,7 +29,7 @@ Flash image file to device, but first erasing and writing system information.
     -h               Display this help and exit.
     -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerous).
     -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: "$PYTHON")
-    -f FILENAME      The .bin file to flash.  Custom to your device type and region.
+    -f FILENAME      The firmware .bin file to flash.  Custom to your device type and region.
     --web            Enable WebUI. (Default: false)
 
 EOF
@@ -73,6 +73,11 @@ done
 	shift
 }
 
+if [[ $FILENAME != firmware-* ]]; then
+  echo "Filename must be a firmware-* file."
+  exit 1
+fi
+
 # Check if FILENAME contains "-tft-" and set target partitionScheme accordingly.
 if [[ ${FILENAME//-tft-/} != "$FILENAME" ]]; then
 	TFT_BUILD=true
diff --git a/bin/device-install_test.ps1 b/bin/device-install_test.ps1
index d7d3e6178..ae4a61cb7 100644
--- a/bin/device-install_test.ps1
+++ b/bin/device-install_test.ps1
@@ -25,10 +25,10 @@ param()
 function New-EmptyFile() {
     [CmdletBinding()]
     param (
-        [Parameter(Position=0,Mandatory=$true)]
+        [Parameter(Position = 0, Mandatory = $true)]
         # Specifies the file name.
         [string]$FileName,
-        [Parameter(Position=1)]
+        [Parameter(Position = 1)]
         # Specifies the target path. (Get-Location).Path is the default.
         [string]$Directory = (Get-Location).Path
     )
@@ -42,10 +42,10 @@ function New-EmptyFile() {
 function Remove-EmptyFile() {
     [CmdletBinding()]
     param (
-        [Parameter(Position=0,Mandatory=$true)]
+        [Parameter(Position = 0, Mandatory = $true)]
         # Specifies the file name.
         [string]$FileName,
-        [Parameter(Position=1)]
+        [Parameter(Position = 1)]
         # Specifies the target path. (Get-Location).Path is the default.
         [string]$Directory = (Get-Location).Path
     )
@@ -60,14 +60,14 @@ function Remove-EmptyFile() {
 $TestCases = New-Object -TypeName PSObject -Property @{
     # Use this PSObject to define testcases according to this syntax:
     # "testname" = @("firmware-testname","bleota","littlefs-testname","args")
-    "t-deck" = @("firmware-t-deck-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefs-t-deck-2.6.0.0b106d4.bin","")
-    "t-deck_web" = @("firmware-t-deck-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefswebui-t-deck-2.6.0.0b106d4.bin","--web")
-    "t-deck-tft" = @("firmware-t-deck-tft-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefs-t-deck-tft-2.6.0.0b106d4.bin","")
-    "heltec-ht62-esp32c3" = @("firmware-heltec-ht62-esp32c3-sx1262-2.6.0.0b106d4.bin", "bleota-c3.bin", "littlefs-heltec-ht62-esp32c3-sx1262-2.6.0.0b106d4.bin","")
-    "tlora-c6" = @("firmware-tlora-c6-2.6.0.0b106d4.bin", "bleota.bin", "littlefs-tlora-c6-2.6.0.0b106d4.bin","")
-    "heltec-v3_web" = @("firmware-heltec-v3-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefswebui-heltec-v3-2.6.0.0b106d4.bin","--web")
-    "seeed-sensecap-indicator-tft" = @("firmware-seeed-sensecap-indicator-tft-2.6.0.0b106d4.bin", "bleota.bin", "littlefs-seeed-sensecap-indicator-tft-2.6.0.0b106d4.bin","")
-    "picomputer-s3-tft" = @("firmware-picomputer-s3-tft-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefs-picomputer-s3-tft-2.6.0.0b106d4.bin","")
+    "t-deck"                       = @("firmware-t-deck-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefs-t-deck-2.6.0.0b106d4.bin", "")
+    "t-deck_web"                   = @("firmware-t-deck-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefswebui-t-deck-2.6.0.0b106d4.bin", "--web")
+    "t-deck-tft"                   = @("firmware-t-deck-tft-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefs-t-deck-tft-2.6.0.0b106d4.bin", "")
+    "heltec-ht62-esp32c3"          = @("firmware-heltec-ht62-esp32c3-sx1262-2.6.0.0b106d4.bin", "bleota-c3.bin", "littlefs-heltec-ht62-esp32c3-sx1262-2.6.0.0b106d4.bin", "")
+    "tlora-c6"                     = @("firmware-tlora-c6-2.6.0.0b106d4.bin", "bleota.bin", "littlefs-tlora-c6-2.6.0.0b106d4.bin", "")
+    "heltec-v3_web"                = @("firmware-heltec-v3-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefswebui-heltec-v3-2.6.0.0b106d4.bin", "--web")
+    "seeed-sensecap-indicator-tft" = @("firmware-seeed-sensecap-indicator-tft-2.6.0.0b106d4.bin", "bleota.bin", "littlefs-seeed-sensecap-indicator-tft-2.6.0.0b106d4.bin", "")
+    "picomputer-s3-tft"            = @("firmware-picomputer-s3-tft-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefs-picomputer-s3-tft-2.6.0.0b106d4.bin", "")
 }
 
 foreach ($TestCase in $TestCases.PSObject.Properties) {
@@ -88,9 +88,10 @@ foreach ($TestCase in $TestCases.PSObject.Properties) {
 
     foreach ($Line in $Test) {
         if ($Line -match "Set OTA_OFFSET to" -or `
-            $Line -match "Set SPIFFS_OFFSET to") {
+                $Line -match "Set SPIFFS_OFFSET to") {
             Write-Host -Object "$($Line -replace "^.*?Set","Set")" -ForegroundColor Blue
-        } elseif ($VerbosePreference -eq "Continue") {
+        }
+        elseif ($VerbosePreference -eq "Continue") {
             Write-Host -Object $Line
         }
         if ($Line -match "ERROR") {
@@ -100,7 +101,7 @@ foreach ($TestCase in $TestCases.PSObject.Properties) {
     }
     if ($null -ne $Errors) {
         Write-Host -Object "$Counter ERROR(s) detected!" -ForegroundColor Red
-        if (-not ($VerbosePreference -eq "Continue")) {Write-Host -Object $Errors}
+        if (-not ($VerbosePreference -eq "Continue")) { Write-Host -Object $Errors }
     }
 
     foreach ($File in $Files) {

From 78b4eff568dd82d660a035a2c03dedea7e187de7 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Mon, 10 Mar 2025 11:57:39 -0500
Subject: [PATCH 015/116] Bump

---
 version.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.properties b/version.properties
index 4cb750c2c..79fae04ed 100644
--- a/version.properties
+++ b/version.properties
@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 6
-build = 0
\ No newline at end of file
+build = 1

From 7c3eddebc251aebcf2bd3ecbee493ea31f65566f Mon Sep 17 00:00:00 2001
From: Manuel <71137295+mverch67@users.noreply.github.com>
Date: Mon, 10 Mar 2025 22:42:29 +0100
Subject: [PATCH 016/116] device-ui: exFat support (#6279)

---
 platformio.ini                  | 2 +-
 variants/t-deck/platformio.ini  | 1 +
 variants/t-deck/variant.h       | 2 +-
 variants/unphone/platformio.ini | 1 +
 variants/unphone/variant.h      | 1 -
 5 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 310134c30..7f71d2f58 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -94,7 +94,7 @@ lib_deps =
 
 [device-ui_base]
 lib_deps =
-	https://github.com/meshtastic/device-ui.git#d7b18e98704f988fcda9e5fa7404e677b3d11f8c
+	https://github.com/meshtastic/device-ui.git#74e739ed4532ca10393df9fc89ae5a22f0bab2b1
 
 ; Common libs for environmental measurements in telemetry module
 ; (not included in native / portduino)
diff --git a/variants/t-deck/platformio.ini b/variants/t-deck/platformio.ini
index 0761e3251..a0005c9c6 100644
--- a/variants/t-deck/platformio.ini
+++ b/variants/t-deck/platformio.ini
@@ -39,6 +39,7 @@ build_flags =
   -D INPUTDRIVER_ENCODER_BTN=0
   -D INPUTDRIVER_BUTTON_TYPE=0
   -D MAX_NUM_NODES=250
+  -D HAS_SDCARD
   -D HAS_SCREEN=0
   -D HAS_TFT=1
   -D USE_I2S_BUZZER
diff --git a/variants/t-deck/variant.h b/variants/t-deck/variant.h
index 8ffc4ea44..5b2c13a91 100644
--- a/variants/t-deck/variant.h
+++ b/variants/t-deck/variant.h
@@ -42,7 +42,7 @@
 #define GPS_TX_PIN 43
 
 // Have SPI interface SD card slot
-#define HAS_SDCARD 1
+// #define HAS_SDCARD // --> needs to be in platform.ini for device-ui
 #define SPI_MOSI (41)
 #define SPI_SCK (40)
 #define SPI_MISO (38)
diff --git a/variants/unphone/platformio.ini b/variants/unphone/platformio.ini
index d436314c3..88f6e7469 100644
--- a/variants/unphone/platformio.ini
+++ b/variants/unphone/platformio.ini
@@ -46,6 +46,7 @@ build_flags =
   -D MAX_THREADS=40
   -D HAS_SCREEN=0
   -D HAS_TFT=1
+  -D HAS_SDCARD
   -D DISPLAY_SET_RESOLUTION
   -D RAM_SIZE=3072
 	-D LV_LVGL_H_INCLUDE_SIMPLE
diff --git a/variants/unphone/variant.h b/variants/unphone/variant.h
index e846b064a..7b39a5aa5 100644
--- a/variants/unphone/variant.h
+++ b/variants/unphone/variant.h
@@ -48,7 +48,6 @@
 #undef GPS_RX_PIN
 #undef GPS_TX_PIN
 
-#define HAS_SDCARD 1
 #define SD_SPI_FREQUENCY 25000000
 #define SDCARD_CS 43
 

From 186e5096075b110fdcdb9ad13706df2d86ef0ad5 Mon Sep 17 00:00:00 2001
From: Mark Trevor Birss <markbirss@gmail.com>
Date: Tue, 11 Mar 2025 13:11:11 +0200
Subject: [PATCH 017/116] Update esp32-s3-pico.json (#6284)

* Update esp32-s3-pico.json

* Update esp32-s3-pico.json
---
 boards/esp32-s3-pico.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/boards/esp32-s3-pico.json b/boards/esp32-s3-pico.json
index 8f8c6fdb7..c092bfb74 100644
--- a/boards/esp32-s3-pico.json
+++ b/boards/esp32-s3-pico.json
@@ -7,13 +7,15 @@
     "core": "esp32",
     "extra_flags": [
       "-DARDUINO_ESP32S3_DEV",
-      "-DARDUINO_USB_MODE=1",
       "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1"
+      "-DARDUINO_EVENT_RUNNING_CORE=1",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DBOARD_HAS_PSRAM"
     ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "qio",
+    "psram_type": "qio",
     "hwids": [["0x303A", "0x1001"]],
     "mcu": "esp32s3",
     "variant": "esp32s3"

From 8795a63427f992324a0d856674c768719265400f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 11 Mar 2025 06:26:45 -0500
Subject: [PATCH 018/116] Upgrade trunk (#6283)

Co-authored-by: sachaw <11172820+sachaw@users.noreply.github.com>
---
 .trunk/trunk.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
index 85211b0f2..0b7121128 100644
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -16,7 +16,7 @@ lint:
     - terrascan@1.19.9
     - trivy@0.60.0
     - taplo@0.9.3
-    - ruff@0.9.9
+    - ruff@0.9.10
     - isort@6.0.1
     - markdownlint@0.44.0
     - oxipng@9.1.4

From cb6dfb66d2f8aac0bd642f1dbafc2e403221c62d Mon Sep 17 00:00:00 2001
From: Mark Trevor Birss <markbirss@gmail.com>
Date: Tue, 11 Mar 2025 14:56:12 +0200
Subject: [PATCH 019/116] Update ME25LS01/MS24SF1 comment out upload port
 (#6285)

* Update platformio.ini

* Update platformio.ini

* Update platformio.ini
---
 variants/ME25LS01-4Y10TD/platformio.ini       | 2 +-
 variants/ME25LS01-4Y10TD_e-ink/platformio.ini | 2 +-
 variants/MS24SF1/platformio.ini               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/variants/ME25LS01-4Y10TD/platformio.ini b/variants/ME25LS01-4Y10TD/platformio.ini
index 479a4e79c..bd764e107 100644
--- a/variants/ME25LS01-4Y10TD/platformio.ini
+++ b/variants/ME25LS01-4Y10TD/platformio.ini
@@ -12,4 +12,4 @@ lib_deps =
   ${nrf52840_base.lib_deps}
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 upload_protocol = nrfutil
-upload_port = /dev/ttyACM1
\ No newline at end of file
+;upload_port = /dev/ttyACM1
diff --git a/variants/ME25LS01-4Y10TD_e-ink/platformio.ini b/variants/ME25LS01-4Y10TD_e-ink/platformio.ini
index 62314040a..fb9bd27d5 100644
--- a/variants/ME25LS01-4Y10TD_e-ink/platformio.ini
+++ b/variants/ME25LS01-4Y10TD_e-ink/platformio.ini
@@ -16,4 +16,4 @@ lib_deps =
   zinggjm/GxEPD2@^1.6.2
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 upload_protocol = nrfutil
-upload_port = /dev/ttyACM1
+;upload_port = /dev/ttyACM1
diff --git a/variants/MS24SF1/platformio.ini b/variants/MS24SF1/platformio.ini
index 5cbd078d0..e109a3270 100644
--- a/variants/MS24SF1/platformio.ini
+++ b/variants/MS24SF1/platformio.ini
@@ -12,4 +12,4 @@ lib_deps =
   ${nrf52840_base.lib_deps}
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 upload_protocol = nrfutil
-upload_port = /dev/ttyACM1
+;upload_port = /dev/ttyACM1

From e9effb9fff1f6ef0e8aa8c4e7f160bcf594da50c Mon Sep 17 00:00:00 2001
From: Mark Trevor Birss <markbirss@gmail.com>
Date: Tue, 11 Mar 2025 15:45:20 +0200
Subject: [PATCH 020/116] Update platformio.ini (#6286)

---
 variants/crowpanel-esp32s3-5-epaper/platformio.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/variants/crowpanel-esp32s3-5-epaper/platformio.ini b/variants/crowpanel-esp32s3-5-epaper/platformio.ini
index 2393e168d..7e95a5fcf 100644
--- a/variants/crowpanel-esp32s3-5-epaper/platformio.ini
+++ b/variants/crowpanel-esp32s3-5-epaper/platformio.ini
@@ -6,7 +6,7 @@ board_build.psram_type = opi
 board_upload.flash_size = 8MB
 board_upload.maximum_size = 8388608
 board = esp32-s3-devkitc-1
-upload_port = /dev/ttyUSB0
+;upload_port = /dev/ttyUSB0
 board_level = extra
 upload_protocol = esptool
 build_flags = 
@@ -33,7 +33,7 @@ board_build.psram_type = opi
 board_upload.flash_size = 8MB
 board_upload.maximum_size = 8388608
 board = esp32-s3-devkitc-1
-upload_port = /dev/ttyUSB0
+;upload_port = /dev/ttyUSB0
 board_level = extra
 upload_protocol = esptool
 build_flags = 
@@ -60,7 +60,7 @@ board_build.psram_type = opi
 board_upload.flash_size = 8MB
 board_upload.maximum_size = 8388608
 board = esp32-s3-devkitc-1
-upload_port = /dev/ttyUSB0
+;upload_port = /dev/ttyUSB0
 board_level = extra
 upload_protocol = esptool
 build_flags = 

From f4c79530ecd9330de101762f9588f4a78c9fe7bc Mon Sep 17 00:00:00 2001
From: Kalle Lilja <15094562+ThatKalle@users.noreply.github.com>
Date: Tue, 11 Mar 2025 19:05:51 +0100
Subject: [PATCH 021/116] update gitattributes for windows (#6289)

---
 .gitattributes | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 79d1800fc..1c945f060 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,5 @@
 * text=auto eol=lf
-*.{cmd,[cC][mM][dD]} text eol=crlf
-*.{bat,[bB][aA][tT]} text eol=crlf
-*.{ps1,[pP][sS]} text eol=crlf
+*.cmd text eol=crlf
+*.bat text eol=crlf
+*.ps1 text eol=crlf
 *.{sh,[sS][hH]} text eol=lf

From ec59f7d7dd3a937144e7c656a8bba5f2a174e92f Mon Sep 17 00:00:00 2001
From: Manuel <71137295+mverch67@users.noreply.github.com>
Date: Wed, 12 Mar 2025 00:59:44 +0100
Subject: [PATCH 022/116] fix packet queue full (#6292)

---
 src/mesh/api/PacketAPI.cpp | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/mesh/api/PacketAPI.cpp b/src/mesh/api/PacketAPI.cpp
index 45bbe19d3..4f0fbaf97 100644
--- a/src/mesh/api/PacketAPI.cpp
+++ b/src/mesh/api/PacketAPI.cpp
@@ -89,18 +89,20 @@ bool PacketAPI::receivePacket(void)
 
 bool PacketAPI::sendPacket(void)
 {
-    // fill dummy buffer; we don't use it, we directly send the fromRadio structure
-    uint32_t len = getFromRadio(txBuf);
-    if (len != 0) {
-        static uint32_t id = 0;
-        fromRadioScratch.id = ++id;
-        bool result = server->sendPacket(DataPacket<meshtastic_FromRadio>(id, fromRadioScratch));
-        if (!result) {
-            LOG_ERROR("send queue full");
+    if (server->available()) {
+        // fill dummy buffer; we don't use it, we directly send the fromRadio structure
+        uint32_t len = getFromRadio(txBuf);
+        if (len != 0) {
+            static uint32_t id = 0;
+            fromRadioScratch.id = ++id;
+            bool result = server->sendPacket(DataPacket<meshtastic_FromRadio>(id, fromRadioScratch));
+            if (!result) {
+                LOG_ERROR("send queue full");
+            }
+            return result;
         }
-        return result;
-    } else
-        return false;
+    }
+    return false;
 }
 
 bool PacketAPI::notifyProgrammingMode(void)

From 508ab171d69ce6a4b967c278bb4a1ad072e8ab88 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 12 Mar 2025 06:22:24 -0500
Subject: [PATCH 023/116] Upgrade trunk (#6295)

Co-authored-by: sachaw <11172820+sachaw@users.noreply.github.com>
---
 .trunk/trunk.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
index 0b7121128..ffb924a4d 100644
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -9,8 +9,8 @@ plugins:
 lint:
   enabled:
     - prettier@3.5.3
-    - trufflehog@3.88.15
-    - yamllint@1.35.1
+    - trufflehog@3.88.16
+    - yamllint@1.36.0
     - bandit@1.8.3
     - checkov@3.2.382
     - terrascan@1.19.9

From 2473af6995cb0a434b3dc40f59a94b03880a4d9c Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Wed, 12 Mar 2025 12:43:55 -0500
Subject: [PATCH 024/116] 45 days stale

---
 .github/workflows/stale_bot.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/stale_bot.yml b/.github/workflows/stale_bot.yml
index 19b7cf7fd..5ae6bdfc9 100644
--- a/.github/workflows/stale_bot.yml
+++ b/.github/workflows/stale_bot.yml
@@ -18,5 +18,6 @@ jobs:
       - name: Stale PR+Issues
         uses: actions/stale@v9.1.0
         with:
+          days-before-stale: 45
           exempt-issue-labels: pinned,3.0
           exempt-pr-labels: pinned,3.0

From 499ea56e3b825d45808d5f613c84196789ea1cd5 Mon Sep 17 00:00:00 2001
From: Kalle Lilja <15094562+ThatKalle@users.noreply.github.com>
Date: Wed, 12 Mar 2025 21:32:34 +0100
Subject: [PATCH 025/116] update devcontainer (#6299)

---
 .devcontainer/Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index d599f447f..4b9f069ab 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -30,6 +30,9 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     gnupg2 \
     libusb-1.0-0-dev \
     libi2c-dev \
+    libxcb-xkb-dev \
+    libxkbcommon-dev \
+    libinput-dev \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 RUN pipx install platformio

From 8efe8a2ea3407ab5d77a772b8b5d5bd08b0fb6be Mon Sep 17 00:00:00 2001
From: paragonnov <qkdxorjs1002@naver.com>
Date: Thu, 13 Mar 2025 19:14:41 +0900
Subject: [PATCH 026/116] Fix KR920's Tx power limitation (#6307)

---
 src/mesh/RadioInterface.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mesh/RadioInterface.cpp b/src/mesh/RadioInterface.cpp
index 695c5be77..36f4a5342 100644
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -73,9 +73,10 @@ const RegionInfo regions[] = {
     RDEF(RU, 868.7f, 869.2f, 100, 0, 20, true, false, false),
 
     /*
-        ???
+        https://www.law.go.kr/LSW/admRulLsInfoP.do?admRulId=53943&efYd=0
+        https://resources.lora-alliance.org/technical-specifications/rp002-1-0-4-regional-parameters
      */
-    RDEF(KR, 920.0f, 923.0f, 100, 0, 0, true, false, false),
+    RDEF(KR, 920.0f, 923.0f, 100, 0, 23, true, false, false),
 
     /*
         Taiwan, 920-925Mhz, limited to 0.5W indoor or coastal, 1.0W outdoor.

From 4d34b3d73c7fbe257ab7974f7e7cb80e4539c977 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Mar 2025 08:32:49 -0500
Subject: [PATCH 027/116] Bump dorny/test-reporter from 1.9.1 to 2.0.0 in
 /.github/workflows (#6309)

Bumps [dorny/test-reporter](https://github.com/dorny/test-reporter) from 1.9.1 to 2.0.0.
- [Release notes](https://github.com/dorny/test-reporter/releases)
- [Changelog](https://github.com/dorny/test-reporter/blob/main/CHANGELOG.md)
- [Commits](https://github.com/dorny/test-reporter/compare/v1.9.1...v2.0.0)

---
updated-dependencies:
- dependency-name: dorny/test-reporter
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/test_native.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test_native.yml b/.github/workflows/test_native.yml
index c7b0ef34c..c3643dcbd 100644
--- a/.github/workflows/test_native.yml
+++ b/.github/workflows/test_native.yml
@@ -143,7 +143,7 @@ jobs:
           merge-multiple: true
 
       - name: Test Report
-        uses: dorny/test-reporter@v1.9.1
+        uses: dorny/test-reporter@v2.0.0
         with:
           name: PlatformIO Tests
           path: testreport.xml

From f198d5d49fd0057bf47b8b1d1c4a6d50e08757ff Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 14 Mar 2025 06:58:08 -0500
Subject: [PATCH 028/116] Upgrade trunk to 1.22.11 (#6316)

Co-authored-by: sachaw <11172820+sachaw@users.noreply.github.com>
---
 .trunk/trunk.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
index ffb924a4d..b42e2be31 100644
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -1,6 +1,6 @@
 version: 0.1
 cli:
-  version: 1.22.10
+  version: 1.22.11
 plugins:
   sources:
     - id: trunk
@@ -12,7 +12,7 @@ lint:
     - trufflehog@3.88.16
     - yamllint@1.36.0
     - bandit@1.8.3
-    - checkov@3.2.382
+    - checkov@3.2.384
     - terrascan@1.19.9
     - trivy@0.60.0
     - taplo@0.9.3

From f66784ed2a1a86bd0043137968844e7ecfe45b32 Mon Sep 17 00:00:00 2001
From: Chris Danis <cdanis@gmail.com>
Date: Fri, 14 Mar 2025 11:10:38 -0400
Subject: [PATCH 029/116] Don't allow is_managed without any valid admin_keys
 (#6310)

---
 src/modules/AdminModule.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp
index ac25f57a5..ac0a8c0de 100644
--- a/src/modules/AdminModule.cpp
+++ b/src/modules/AdminModule.cpp
@@ -637,6 +637,14 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)
 #if !MESHTASTIC_EXCLUDE_PKI
         crypto->setDHPrivateKey(config.security.private_key.bytes);
 #endif
+        if (config.security.is_managed && !(config.security.admin_key[0].size == 32 || config.security.admin_key[1].size == 32 ||
+                                            config.security.admin_key[2].size == 32)) {
+            config.security.is_managed = false;
+            const char *warning = "You must provide at least one admin public key to enable managed mode";
+            LOG_WARN(warning);
+            sendWarning(warning);
+        }
+
         if (config.security.debug_log_api_enabled == c.payload_variant.security.debug_log_api_enabled &&
             config.security.serial_enabled == c.payload_variant.security.serial_enabled)
             requiresReboot = false;

From 79233fe99debeeb0b2d9cd765ff6e814b09c4af4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Sat, 15 Mar 2025 11:30:58 +0100
Subject: [PATCH 030/116] mainline tlora v3 (#6322)

---
 variants/tlora_v3_3_0_tcxo/platformio.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/variants/tlora_v3_3_0_tcxo/platformio.ini b/variants/tlora_v3_3_0_tcxo/platformio.ini
index 4066d64b0..8d060a087 100644
--- a/variants/tlora_v3_3_0_tcxo/platformio.ini
+++ b/variants/tlora_v3_3_0_tcxo/platformio.ini
@@ -1,7 +1,6 @@
 [env:tlora-v3-3-0-tcxo]
 extends = esp32_base
 board = ttgo-lora32-v21
-board_level = extra
 build_flags = 
   ${esp32_base.build_flags}
   -D TLORA_V2_1_16

From 99e42b4d2285a6fcb6dc915118fb2ccf1da2c032 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 15 Mar 2025 07:03:53 -0500
Subject: [PATCH 031/116] [create-pull-request] automated change (#6323)

Co-authored-by: caveman99 <25002+caveman99@users.noreply.github.com>
---
 protobufs                                    |  2 +-
 src/mesh/generated/meshtastic/admin.pb.h     |  2 +-
 src/mesh/generated/meshtastic/config.pb.h    |  4 ++--
 src/mesh/generated/meshtastic/device_ui.pb.h |  2 ++
 src/mesh/generated/meshtastic/mesh.pb.h      | 11 +++++++++--
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/protobufs b/protobufs
index 035a8017b..14ec20586 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit 035a8017b87379f17624f7bba9b6a5b127bc026c
+Subproject commit 14ec205865592fcfa798065bb001a549fc77b438
diff --git a/src/mesh/generated/meshtastic/admin.pb.h b/src/mesh/generated/meshtastic/admin.pb.h
index 02d50127e..efe60f493 100644
--- a/src/mesh/generated/meshtastic/admin.pb.h
+++ b/src/mesh/generated/meshtastic/admin.pb.h
@@ -34,7 +34,7 @@ typedef enum _meshtastic_AdminMessage_ConfigType {
     meshtastic_AdminMessage_ConfigType_BLUETOOTH_CONFIG = 6,
     /* TODO: REPLACE */
     meshtastic_AdminMessage_ConfigType_SECURITY_CONFIG = 7,
-    /*  */
+    /* Session key config */
     meshtastic_AdminMessage_ConfigType_SESSIONKEY_CONFIG = 8,
     /* device-ui config */
     meshtastic_AdminMessage_ConfigType_DEVICEUI_CONFIG = 9
diff --git a/src/mesh/generated/meshtastic/config.pb.h b/src/mesh/generated/meshtastic/config.pb.h
index 4747ddb5a..848f8df86 100644
--- a/src/mesh/generated/meshtastic/config.pb.h
+++ b/src/mesh/generated/meshtastic/config.pb.h
@@ -374,7 +374,7 @@ typedef struct _meshtastic_Config_PositionConfig {
 /* Power Config\
  See [Power Config](/docs/settings/config/power) for additional power config details. */
 typedef struct _meshtastic_Config_PowerConfig {
-    /* Description: Will sleep everything as much as possible, for the tracker and sensor role this will also include the lora radio. 
+    /* Description: Will sleep everything as much as possible, for the tracker and sensor role this will also include the lora radio.
  Don't use this setting if you want to use your device with the phone apps or are using a device without a user button.
  Technical Details: Works for ESP32 devices and NRF52 devices in the Sensor or Tracker roles */
     bool is_power_saving;
@@ -426,7 +426,7 @@ typedef struct _meshtastic_Config_NetworkConfig {
     char wifi_ssid[33];
     /* If set, will be use to authenticate to the named wifi */
     char wifi_psk[65];
-    /* NTP server to use if WiFi is conneced, defaults to `0.pool.ntp.org` */
+    /* NTP server to use if WiFi is conneced, defaults to `meshtastic.pool.ntp.org` */
     char ntp_server[33];
     /* Enable Ethernet */
     bool eth_enabled;
diff --git a/src/mesh/generated/meshtastic/device_ui.pb.h b/src/mesh/generated/meshtastic/device_ui.pb.h
index 8cfc0b8cd..5692a2749 100644
--- a/src/mesh/generated/meshtastic/device_ui.pb.h
+++ b/src/mesh/generated/meshtastic/device_ui.pb.h
@@ -53,6 +53,8 @@ typedef enum _meshtastic_Language {
     meshtastic_Language_NORWEGIAN = 14,
     /* Slovenian */
     meshtastic_Language_SLOVENIAN = 15,
+    /* Ukrainian */
+    meshtastic_Language_UKRAINIAN = 16,
     /* Simplified Chinese (experimental) */
     meshtastic_Language_SIMPLIFIED_CHINESE = 30,
     /* Traditional Chinese (experimental) */
diff --git a/src/mesh/generated/meshtastic/mesh.pb.h b/src/mesh/generated/meshtastic/mesh.pb.h
index 193a61901..991aeb8d2 100644
--- a/src/mesh/generated/meshtastic/mesh.pb.h
+++ b/src/mesh/generated/meshtastic/mesh.pb.h
@@ -159,7 +159,7 @@ typedef enum _meshtastic_HardwareModel {
     meshtastic_HardwareModel_TD_LORAC = 60,
     /* CDEBYTE EoRa-S3 board using their own MM modules, clone of LILYGO T3S3 */
     meshtastic_HardwareModel_CDEBYTE_EORA_S3 = 61,
-    /* TWC_MESH_V4 
+    /* TWC_MESH_V4
  Adafruit NRF52840 feather express with SX1262, SSD1306 OLED and NEO6M GPS */
     meshtastic_HardwareModel_TWC_MESH_V4 = 62,
     /* NRF52_PROMICRO_DIY
@@ -228,6 +228,13 @@ typedef enum _meshtastic_HardwareModel {
     meshtastic_HardwareModel_MESHLINK = 87,
     /* Seeed XIAO nRF52840 + Wio SX1262 kit */
     meshtastic_HardwareModel_XIAO_NRF52_KIT = 88,
+    /* Elecrow ThinkNode M1 & M2
+ https://www.elecrow.com/wiki/ThinkNode-M1_Transceiver_Device(Meshtastic)_Power_By_nRF52840.html
+ https://www.elecrow.com/wiki/ThinkNode-M2_Transceiver_Device(Meshtastic)_Power_By_NRF52840.html (this actually uses ESP32-S3) */
+    meshtastic_HardwareModel_THINKNODE_M1 = 89,
+    meshtastic_HardwareModel_THINKNODE_M2 = 90,
+    /* Lilygo T-ETH-Elite */
+    meshtastic_HardwareModel_T_ETH_ELITE = 91,
     /* ------------------------------------------------------------------------------------------------------------------------------------------
  Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.
  ------------------------------------------------------------------------------------------------------------------------------------------ */
@@ -769,7 +776,7 @@ typedef struct _meshtastic_MeshPacket {
     meshtastic_MeshPacket_public_key_t public_key;
     /* Indicates whether the packet was en/decrypted using PKI */
     bool pki_encrypted;
-    /* Last byte of the node number of the node that should be used as the next hop in routing. 
+    /* Last byte of the node number of the node that should be used as the next hop in routing.
  Set by the firmware internally, clients are not supposed to set this. */
     uint8_t next_hop;
     /* Last byte of the node number of the node that will relay/relayed this packet.

From 1640fb105dad55a1d227d3978da1342fb8059ec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Sat, 15 Mar 2025 14:15:35 +0100
Subject: [PATCH 032/116] new device: Lilygo T-Eth-Elite (#6321)

---
 src/DebugConfiguration.h            |  9 +++-
 src/Power.cpp                       |  5 ++
 src/gps/GPS.cpp                     |  6 ++-
 src/main.cpp                        |  4 +-
 src/mesh/InterfacesTemplates.cpp    |  2 +-
 src/mesh/api/WiFiServerAPI.h        |  5 ++
 src/mesh/api/ethServerAPI.cpp       |  2 +-
 src/mesh/api/ethServerAPI.h         |  2 +
 src/mesh/http/WebServer.cpp         |  9 +++-
 src/mesh/udp/UdpMulticastThread.h   |  5 ++
 src/mesh/wifi/WiFiAPClient.cpp      | 48 +++++++++++++++--
 src/mesh/wifi/WiFiAPClient.h        | 12 ++++-
 src/modules/AdminModule.cpp         |  2 +-
 src/mqtt/MQTT.cpp                   |  9 ++++
 src/mqtt/MQTT.h                     |  2 +-
 src/platform/esp32/architecture.h   |  2 +
 src/platform/esp32/main-esp32.cpp   |  4 +-
 variants/t-eth-elite/pins_arduino.h | 26 +++++++++
 variants/t-eth-elite/platformio.ini | 16 ++++++
 variants/t-eth-elite/rfswitch.h     | 11 ++++
 variants/t-eth-elite/variant.h      | 83 +++++++++++++++++++++++++++++
 21 files changed, 247 insertions(+), 17 deletions(-)
 create mode 100644 variants/t-eth-elite/pins_arduino.h
 create mode 100644 variants/t-eth-elite/platformio.ini
 create mode 100644 variants/t-eth-elite/rfswitch.h
 create mode 100644 variants/t-eth-elite/variant.h

diff --git a/src/DebugConfiguration.h b/src/DebugConfiguration.h
index 7987e7fa1..a34710eb0 100644
--- a/src/DebugConfiguration.h
+++ b/src/DebugConfiguration.h
@@ -121,10 +121,15 @@ extern "C" void logLegacy(const char *level, const char *fmt, ...);
 // Default Bluetooth PIN
 #define defaultBLEPin 123456
 
-#if HAS_ETHERNET
+#if HAS_ETHERNET && !defined(USE_WS5500)
 #include <RAK13800_W5100S.h>
 #endif // HAS_ETHERNET
 
+#if HAS_ETHERNET && defined(USE_WS5500)
+#include <ETHClass2.h>
+#define ETH ETH2
+#endif // HAS_ETHERNET
+
 #if HAS_WIFI
 #include <WiFi.h>
 #endif // HAS_WIFI
@@ -164,4 +169,4 @@ class Syslog
     bool vlogf(uint16_t pri, const char *appName, const char *fmt, va_list args) __attribute__((format(printf, 3, 0)));
 };
 
-#endif // HAS_ETHERNET || HAS_WIFI
\ No newline at end of file
+#endif // HAS_NETWORKING
\ No newline at end of file
diff --git a/src/Power.cpp b/src/Power.cpp
index 8d5fe1c32..5768e9908 100644
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -32,6 +32,11 @@
 #include <WiFi.h>
 #endif
 
+#if HAS_ETHERNET && defined(USE_WS5500)
+#include <ETHClass2.h>
+#define ETH ETH2
+#endif // HAS_ETHERNET
+
 #endif
 
 #ifndef DELAY_FOREVER
diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp
index 7dcb77fcc..7f490ea3c 100644
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -1104,12 +1104,16 @@ int32_t GPS::runOnce()
     return (powerState == GPS_ACTIVE) ? GPS_THREAD_INTERVAL : 5000;
 }
 
-// clear the GPS rx buffer as quickly as possible
+// clear the GPS rx/tx buffer as quickly as possible
 void GPS::clearBuffer()
 {
+#ifdef ARCH_ESP32
+    _serial_gps->flush(false);
+#else
     int x = _serial_gps->available();
     while (x--)
         _serial_gps->read();
+#endif
 }
 
 /// Prepare the GPS for the cpu entering deep or light sleep, expect to be gone for at least 100s of msecs
diff --git a/src/main.cpp b/src/main.cpp
index 4634c7c14..797d911d1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -55,12 +55,12 @@ NimbleBluetooth *nimbleBluetooth = nullptr;
 NRF52Bluetooth *nrf52Bluetooth = nullptr;
 #endif
 
-#if HAS_WIFI
+#if HAS_WIFI || defined(USE_WS5500)
 #include "mesh/api/WiFiServerAPI.h"
 #include "mesh/wifi/WiFiAPClient.h"
 #endif
 
-#if HAS_ETHERNET
+#if HAS_ETHERNET && !defined(USE_WS5500)
 #include "mesh/api/ethServerAPI.h"
 #include "mesh/eth/ethClient.h"
 #endif
diff --git a/src/mesh/InterfacesTemplates.cpp b/src/mesh/InterfacesTemplates.cpp
index 2720e8525..57abbf0ee 100644
--- a/src/mesh/InterfacesTemplates.cpp
+++ b/src/mesh/InterfacesTemplates.cpp
@@ -25,7 +25,7 @@ template class LR11x0Interface<LR1121>;
 template class SX126xInterface<STM32WLx>;
 #endif
 
-#if HAS_ETHERNET
+#if HAS_ETHERNET && !defined(USE_WS5500)
 #include "api/ethServerAPI.h"
 template class ServerAPI<EthernetClient>;
 template class APIServerPort<ethServerAPI, EthernetServer>;
diff --git a/src/mesh/api/WiFiServerAPI.h b/src/mesh/api/WiFiServerAPI.h
index 6e60bb678..5f2019983 100644
--- a/src/mesh/api/WiFiServerAPI.h
+++ b/src/mesh/api/WiFiServerAPI.h
@@ -3,6 +3,11 @@
 #include "ServerAPI.h"
 #include <WiFi.h>
 
+#if HAS_ETHERNET && defined(USE_WS5500)
+#include <ETHClass2.h>
+#define ETH ETH2
+#endif // HAS_ETHERNET
+
 /**
  * Provides both debug printing and, if the client starts sending protobufs to us, switches to send/receive protobufs
  * (and starts dropping debug printing - FIXME, eventually those prints should be encapsulated in protobufs).
diff --git a/src/mesh/api/ethServerAPI.cpp b/src/mesh/api/ethServerAPI.cpp
index a8701848a..0ccf92df7 100644
--- a/src/mesh/api/ethServerAPI.cpp
+++ b/src/mesh/api/ethServerAPI.cpp
@@ -1,7 +1,7 @@
 #include "configuration.h"
 #include <Arduino.h>
 
-#if HAS_ETHERNET
+#if HAS_ETHERNET && !defined(USE_WS5500)
 
 #include "ethServerAPI.h"
 
diff --git a/src/mesh/api/ethServerAPI.h b/src/mesh/api/ethServerAPI.h
index 9d25a2fc1..c616c87be 100644
--- a/src/mesh/api/ethServerAPI.h
+++ b/src/mesh/api/ethServerAPI.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ServerAPI.h"
+#ifndef USE_WS5500
 #include <RAK13800_W5100S.h>
 
 /**
@@ -23,3 +24,4 @@ class ethServerPort : public APIServerPort<ethServerAPI, EthernetServer>
 };
 
 void initApiServer(int port = SERVER_API_DEFAULT_PORT);
+#endif
diff --git a/src/mesh/http/WebServer.cpp b/src/mesh/http/WebServer.cpp
index d9856e157..5f6ad9eb3 100644
--- a/src/mesh/http/WebServer.cpp
+++ b/src/mesh/http/WebServer.cpp
@@ -12,6 +12,11 @@
 #include <WebServer.h>
 #include <WiFi.h>
 
+#if HAS_ETHERNET && defined(USE_WS5500)
+#include <ETHClass2.h>
+#define ETH ETH2
+#endif // HAS_ETHERNET
+
 #ifdef ARCH_ESP32
 #include "esp_task_wdt.h"
 #endif
@@ -166,14 +171,14 @@ WebServerThread *webServerThread;
 
 WebServerThread::WebServerThread() : concurrency::OSThread("WebServer")
 {
-    if (!config.network.wifi_enabled) {
+    if (!config.network.wifi_enabled && !config.network.eth_enabled) {
         disable();
     }
 }
 
 int32_t WebServerThread::runOnce()
 {
-    if (!config.network.wifi_enabled) {
+    if (!config.network.wifi_enabled && !config.network.eth_enabled) {
         disable();
     }
 
diff --git a/src/mesh/udp/UdpMulticastThread.h b/src/mesh/udp/UdpMulticastThread.h
index 9128d3b5c..69b1d2282 100644
--- a/src/mesh/udp/UdpMulticastThread.h
+++ b/src/mesh/udp/UdpMulticastThread.h
@@ -7,6 +7,11 @@
 #include <AsyncUDP.h>
 #include <WiFi.h>
 
+#if HAS_ETHERNET && defined(USE_WS5500)
+#include <ETHClass2.h>
+#define ETH ETH2
+#endif // HAS_ETHERNET
+
 #define UDP_MULTICAST_DEFAUL_PORT 4403 // Default port for UDP multicast is same as TCP api server
 #define UDP_MULTICAST_THREAD_INTERVAL_MS 15000
 
diff --git a/src/mesh/wifi/WiFiAPClient.cpp b/src/mesh/wifi/WiFiAPClient.cpp
index ee50ee56f..92388d52a 100644
--- a/src/mesh/wifi/WiFiAPClient.cpp
+++ b/src/mesh/wifi/WiFiAPClient.cpp
@@ -9,6 +9,12 @@
 #include "mesh/api/WiFiServerAPI.h"
 #include "target_specific.h"
 #include <WiFi.h>
+
+#if HAS_ETHERNET && defined(USE_WS5500)
+#include <ETHClass2.h>
+#define ETH ETH2
+#endif // HAS_ETHERNET
+
 #include <WiFiUdp.h>
 #ifdef ARCH_ESP32
 #if !MESHTASTIC_EXCLUDE_WEBSERVER
@@ -52,11 +58,28 @@ Syslog syslog(syslogClient);
 
 Periodic *wifiReconnect;
 
+#ifdef USE_WS5500
+// Startup Ethernet
+bool initEthernet()
+{
+    if ((config.network.eth_enabled) && (ETH.begin(ETH_PHY_W5500, 1, ETH_CS_PIN, ETH_INT_PIN, ETH_RST_PIN, SPI3_HOST,
+                                                   ETH_SCLK_PIN, ETH_MISO_PIN, ETH_MOSI_PIN))) {
+        WiFi.onEvent(WiFiEvent);
+#if !MESHTASTIC_EXCLUDE_WEBSERVER
+        createSSLCert(); // For WebServer
+#endif
+        return true;
+    }
+
+    return false;
+}
+#endif
+
 static void onNetworkConnected()
 {
     if (!APStartupComplete) {
         // Start web server
-        LOG_INFO("Start WiFi network services");
+        LOG_INFO("Start network services");
 
         // start mdns
         if (!MDNS.begin("Meshtastic")) {
@@ -188,6 +211,10 @@ bool isWifiAvailable()
 
     if (config.network.wifi_enabled && (config.network.wifi_ssid[0])) {
         return true;
+#ifdef USE_WS5500
+    } else if (config.network.eth_enabled) {
+        return true;
+#endif
     } else {
         return false;
     }
@@ -282,7 +309,7 @@ bool initWifi()
 // Called by the Espressif SDK to
 static void WiFiEvent(WiFiEvent_t event)
 {
-    LOG_DEBUG("WiFi-Event %d: ", event);
+    LOG_DEBUG("Network-Event %d: ", event);
 
     switch (event) {
     case ARDUINO_EVENT_WIFI_READY:
@@ -377,19 +404,32 @@ static void WiFiEvent(WiFiEvent_t event)
         LOG_INFO("Ethernet started");
         break;
     case ARDUINO_EVENT_ETH_STOP:
+        syslog.disable();
         LOG_INFO("Ethernet stopped");
         break;
     case ARDUINO_EVENT_ETH_CONNECTED:
         LOG_INFO("Ethernet connected");
         break;
     case ARDUINO_EVENT_ETH_DISCONNECTED:
+        syslog.disable();
         LOG_INFO("Ethernet disconnected");
         break;
     case ARDUINO_EVENT_ETH_GOT_IP:
-        LOG_INFO("Obtained IP address (ARDUINO_EVENT_ETH_GOT_IP)");
+#ifdef USE_WS5500
+        LOG_INFO("Obtained IP address: %s, %u Mbps, %s", ETH.localIP().toString().c_str(), ETH.linkSpeed(),
+                 ETH.fullDuplex() ? "FULL_DUPLEX" : "HALF_DUPLEX");
+        onNetworkConnected();
+#endif
         break;
     case ARDUINO_EVENT_ETH_GOT_IP6:
-        LOG_INFO("Obtained IP6 address (ARDUINO_EVENT_ETH_GOT_IP6)");
+#ifdef USE_WS5500
+#if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
+        LOG_INFO("Obtained Local IP6 address: %s", ETH.linkLocalIPv6().toString().c_str());
+        LOG_INFO("Obtained GlobalIP6 address: %s", ETH.globalIPv6().toString().c_str());
+#else
+        LOG_INFO("Obtained IP6 address: %s", ETH.localIPv6().toString().c_str());
+#endif
+#endif
         break;
     case ARDUINO_EVENT_SC_SCAN_DONE:
         LOG_INFO("SmartConfig: Scan done");
diff --git a/src/mesh/wifi/WiFiAPClient.h b/src/mesh/wifi/WiFiAPClient.h
index 5f4e2f5c9..078c40193 100644
--- a/src/mesh/wifi/WiFiAPClient.h
+++ b/src/mesh/wifi/WiFiAPClient.h
@@ -9,6 +9,11 @@
 #include <WiFi.h>
 #endif
 
+#if HAS_ETHERNET && defined(USE_WS5500)
+#include <ETHClass2.h>
+#define ETH ETH2
+#endif // HAS_ETHERNET
+
 extern bool needReconnect;
 extern concurrency::Periodic *wifiReconnect;
 
@@ -19,4 +24,9 @@ void deinitWifi();
 
 bool isWifiAvailable();
 
-uint8_t getWifiDisconnectReason();
\ No newline at end of file
+uint8_t getWifiDisconnectReason();
+
+#ifdef USE_WS5500
+// Startup Ethernet
+bool initEthernet();
+#endif
\ No newline at end of file
diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp
index ac0a8c0de..a765fb0b1 100644
--- a/src/modules/AdminModule.cpp
+++ b/src/modules/AdminModule.cpp
@@ -988,7 +988,7 @@ void AdminModule::handleGetDeviceConnectionStatus(const meshtastic_MeshPacket &r
     }
 #endif
 
-#if HAS_ETHERNET
+#if HAS_ETHERNET && !defined(USE_WS5500)
     conn.has_ethernet = true;
     conn.ethernet.has_status = true;
     if (Ethernet.linkStatus() == LinkON) {
diff --git a/src/mqtt/MQTT.cpp b/src/mqtt/MQTT.cpp
index 5f16f909f..226bee44d 100644
--- a/src/mqtt/MQTT.cpp
+++ b/src/mqtt/MQTT.cpp
@@ -19,6 +19,10 @@
 #include "mesh/wifi/WiFiAPClient.h"
 #include <WiFi.h>
 #endif
+#if HAS_ETHERNET && defined(USE_WS5500)
+#include <ETHClass2.h>
+#define ETH ETH2
+#endif // HAS_ETHERNET
 #include "Default.h"
 #if !defined(ARCH_NRF52) || NRF52_USE_JSON
 #include "serialization/JSON.h"
@@ -295,6 +299,11 @@ bool connectPubSub(const PubSubConfig &config, PubSubClient &pubSub, Client &cli
 
 inline bool isConnectedToNetwork()
 {
+#ifdef USE_WS5500
+    if (ETH.connected())
+        return true;
+#endif
+
 #if HAS_WIFI
     return WiFi.isConnected();
 #elif HAS_ETHERNET
diff --git a/src/mqtt/MQTT.h b/src/mqtt/MQTT.h
index 5cda90218..0c260dc9c 100644
--- a/src/mqtt/MQTT.h
+++ b/src/mqtt/MQTT.h
@@ -14,7 +14,7 @@
 #include <WiFiClientSecure.h>
 #endif
 #endif
-#if HAS_ETHERNET
+#if HAS_ETHERNET && !defined(USE_WS5500)
 #include <EthernetClient.h>
 #endif
 
diff --git a/src/platform/esp32/architecture.h b/src/platform/esp32/architecture.h
index 742b295b5..e4f8b49a0 100644
--- a/src/platform/esp32/architecture.h
+++ b/src/platform/esp32/architecture.h
@@ -176,6 +176,8 @@
 #define HW_VENDOR meshtastic_HardwareModel_SEEED_XIAO_S3
 #elif defined(MESH_TAB)
 #define HW_VENDOR meshtastic_HardwareModel_MESH_TAB
+#elif defined(T_ETH_ELITE)
+#define HW_VENDOR meshtastic_HardwareModel_T_ETH_ELITE
 #endif
 
 // -----------------------------------------------------------------------------
diff --git a/src/platform/esp32/main-esp32.cpp b/src/platform/esp32/main-esp32.cpp
index 679222af5..3b3557e95 100644
--- a/src/platform/esp32/main-esp32.cpp
+++ b/src/platform/esp32/main-esp32.cpp
@@ -26,7 +26,9 @@
 #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !MESHTASTIC_EXCLUDE_BLUETOOTH
 void setBluetoothEnable(bool enable)
 {
-#if HAS_WIFI
+#ifdef USE_WS5500
+    if ((config.bluetooth.enabled == true) && (config.network.wifi_enabled == false))
+#elif HAS_WIFI
     if (!isWifiAvailable() && config.bluetooth.enabled == true)
 #else
     if (config.bluetooth.enabled == true)
diff --git a/variants/t-eth-elite/pins_arduino.h b/variants/t-eth-elite/pins_arduino.h
new file mode 100644
index 000000000..cddd8d0b9
--- /dev/null
+++ b/variants/t-eth-elite/pins_arduino.h
@@ -0,0 +1,26 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define USB_VID 0x303a
+#define USB_PID 0x1001
+
+// The default Wire will be mapped to PMU and RTC
+static const uint8_t SDA = 17;
+static const uint8_t SCL = 18;
+
+// Default SPI will be mapped to Radio
+static const uint8_t SS = 40;
+static const uint8_t MOSI = 11;
+static const uint8_t MISO = 9;
+static const uint8_t SCK = 10;
+
+#define SPI_MOSI (11)
+#define SPI_SCK (10)
+#define SPI_MISO (9)
+#define SPI_CS (12)
+
+#define SDCARD_CS SPI_CS
+
+#endif /* Pins_Arduino_h */
\ No newline at end of file
diff --git a/variants/t-eth-elite/platformio.ini b/variants/t-eth-elite/platformio.ini
new file mode 100644
index 000000000..8c2f3bc37
--- /dev/null
+++ b/variants/t-eth-elite/platformio.ini
@@ -0,0 +1,16 @@
+[env:t-eth-elite]
+extends = esp32s3_base
+board = esp32s3box
+board_check = true
+build_flags = 
+  ${esp32s3_base.build_flags}
+  -D T_ETH_ELITE
+  -I variants/t-eth-elite
+  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
+
+lib_ignore = 
+    Ethernet
+
+lib_deps = 
+  ${esp32s3_base.lib_deps}
+  https://github.com/meshtastic/ETHClass2#v1.0.0
diff --git a/variants/t-eth-elite/rfswitch.h b/variants/t-eth-elite/rfswitch.h
new file mode 100644
index 000000000..589f24767
--- /dev/null
+++ b/variants/t-eth-elite/rfswitch.h
@@ -0,0 +1,11 @@
+#include "RadioLib.h"
+
+static const uint32_t rfswitch_dio_pins[] = {RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC};
+
+static const Module::RfSwitchMode_t rfswitch_table[] = {
+    // mode                  DIO5  DIO6
+    {LR11x0::MODE_STBY, {LOW, LOW}},  {LR11x0::MODE_RX, {HIGH, LOW}},
+    {LR11x0::MODE_TX, {LOW, HIGH}},   {LR11x0::MODE_TX_HP, {LOW, HIGH}},
+    {LR11x0::MODE_TX_HF, {LOW, LOW}}, {LR11x0::MODE_GNSS, {LOW, LOW}},
+    {LR11x0::MODE_WIFI, {LOW, LOW}},  END_OF_MODE_TABLE,
+};
diff --git a/variants/t-eth-elite/variant.h b/variants/t-eth-elite/variant.h
new file mode 100644
index 000000000..b7ac05872
--- /dev/null
+++ b/variants/t-eth-elite/variant.h
@@ -0,0 +1,83 @@
+#define HAS_SDCARD
+#define SDCARD_USE_SPI1
+
+#define HAS_GPS 1
+#define GPS_RX_PIN 39
+#define GPS_TX_PIN 42
+#define GPS_BAUDRATE_FIXED 1
+#define GPS_BAUDRATE 9600
+
+#define I2C_SDA 17 // I2C pins for this board
+#define I2C_SCL 18
+
+#define HAS_SCREEN 1 // Allow for OLED Screens on I2C Header of shield
+
+#define LED_PIN 38   // If defined we will blink this LED
+#define BUTTON_PIN 0 // If defined, this will be used for user button presses,
+
+#define BUTTON_NEED_PULLUP
+
+// TTGO uses a common pinout for their SX1262 vs RF95 modules - both can be enabled and we will probe at runtime for RF95 and if
+// not found then probe for SX1262
+#define USE_RF95 // RFM95/SX127x
+#define USE_SX1262
+#define USE_SX1280
+#define USE_LR1121
+
+#define LORA_SCK 10
+#define LORA_MISO 9
+#define LORA_MOSI 11
+#define LORA_CS 40
+#define LORA_RESET 46
+
+// per SX1276_Receive_Interrupt/utilities.h
+#define LORA_DIO0 8
+#define LORA_DIO1 16
+#define LORA_DIO2 RADIOLIB_NC
+
+// per SX1262_Receive_Interrupt/utilities.h
+#ifdef USE_SX1262
+#define SX126X_CS LORA_CS
+#define SX126X_DIO1 8
+#define SX126X_BUSY 16
+#define SX126X_RESET LORA_RESET
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8
+#endif
+
+// per SX128x_Receive_Interrupt/utilities.h
+#ifdef USE_SX1280
+#define SX128X_CS LORA_CS
+#define SX128X_DIO1 8
+#define SX128X_DIO2 33
+#define SX128X_DIO3 34
+#define SX128X_BUSY 16
+#define SX128X_RESET LORA_RESET
+#define SX128X_RXEN 13
+#define SX128X_TXEN 38
+#define SX128X_MAX_POWER 3
+#endif
+
+// LR1121
+#ifdef USE_LR1121
+#define LR1121_IRQ_PIN 8
+#define LR1121_NRESET_PIN LORA_RESET
+#define LR1121_BUSY_PIN 16
+#define LR1121_SPI_NSS_PIN LORA_CS
+#define LR1121_SPI_SCK_PIN LORA_SCK
+#define LR1121_SPI_MOSI_PIN LORA_MOSI
+#define LR1121_SPI_MISO_PIN LORA_MISO
+#define LR11X0_DIO3_TCXO_VOLTAGE 3.0
+#define LR11X0_DIO_AS_RF_SWITCH
+#endif
+
+#define HAS_ETHERNET 1
+#define USE_WS5500 1 // this driver uses the same stack as the ESP32 Wifi driver
+
+#define ETH_MISO_PIN 47
+#define ETH_MOSI_PIN 21
+#define ETH_SCLK_PIN 48
+#define ETH_CS_PIN 45
+#define ETH_INT_PIN 14
+#define ETH_RST_PIN -1
+#define ETH_ADDR 1
\ No newline at end of file

From dc100e4d3e3dfbf58d3ead8141a49cddb0cbdc19 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Sun, 16 Mar 2025 08:19:17 -0500
Subject: [PATCH 033/116] Cleanup

---
 src/SafeFile.cpp              |  8 ++++-
 src/mesh/MeshService.cpp      |  6 ++--
 src/mesh/MeshService.h        |  2 +-
 src/mesh/NodeDB.cpp           | 18 ++---------
 src/mesh/NodeDB.h             |  2 +-
 src/mesh/RadioInterface.cpp   |  2 +-
 src/mesh/Router.cpp           | 61 +++++++++++++++++++++++------------
 src/mesh/Router.h             |  5 ++-
 src/modules/RoutingModule.cpp |  5 ---
 src/mqtt/MQTT.cpp             |  3 +-
 10 files changed, 61 insertions(+), 51 deletions(-)

diff --git a/src/SafeFile.cpp b/src/SafeFile.cpp
index c942aa0ee..45b96ad07 100644
--- a/src/SafeFile.cpp
+++ b/src/SafeFile.cpp
@@ -11,12 +11,18 @@ static File openFile(const char *filename, bool fullAtomic)
     FSCom.remove(filename);
     return FSCom.open(filename, FILE_O_WRITE);
 #endif
-    if (!fullAtomic)
+    if (!fullAtomic) {
         FSCom.remove(filename); // Nuke the old file to make space (ignore if it !exists)
+    }
 
     String filenameTmp = filename;
     filenameTmp += ".tmp";
 
+    // FIXME: If we are doing a full atomic write, we may need to remove the old tmp file now
+    // if (fullAtomic) {
+    //     FSCom.remove(filename);
+    // }
+
     // clear any previous LFS errors
     return FSCom.open(filenameTmp.c_str(), FILE_O_WRITE);
 }
diff --git a/src/mesh/MeshService.cpp b/src/mesh/MeshService.cpp
index 3bb1f2776..f293559ad 100644
--- a/src/mesh/MeshService.cpp
+++ b/src/mesh/MeshService.cpp
@@ -125,17 +125,15 @@ void MeshService::loop()
 }
 
 /// The radioConfig object just changed, call this to force the hw to change to the new settings
-bool MeshService::reloadConfig(int saveWhat)
+void MeshService::reloadConfig(int saveWhat)
 {
     // If we can successfully set this radio to these settings, save them to disk
 
     // This will also update the region as needed
-    bool didReset = nodeDB->resetRadioConfig(); // Don't let the phone send us fatally bad settings
+    nodeDB->resetRadioConfig(); // Don't let the phone send us fatally bad settings
 
     configChanged.notifyObservers(NULL); // This will cause radio hardware to change freqs etc
     nodeDB->saveToDisk(saveWhat);
-
-    return didReset;
 }
 
 /// The owner User record just got updated, update our node DB and broadcast the info into the mesh
diff --git a/src/mesh/MeshService.h b/src/mesh/MeshService.h
index 42f701d5c..e2e430c03 100644
--- a/src/mesh/MeshService.h
+++ b/src/mesh/MeshService.h
@@ -118,7 +118,7 @@ class MeshService
     /** The radioConfig object just changed, call this to force the hw to change to the new settings
      * @return true if client devices should be sent a new set of radio configs
      */
-    bool reloadConfig(int saveWhat = SEGMENT_CONFIG | SEGMENT_MODULECONFIG | SEGMENT_DEVICESTATE | SEGMENT_CHANNELS);
+    void reloadConfig(int saveWhat = SEGMENT_CONFIG | SEGMENT_MODULECONFIG | SEGMENT_DEVICESTATE | SEGMENT_CHANNELS);
 
     /// The owner User record just got updated, update our node DB and broadcast the info into the mesh
     void reloadOwner(bool shouldSave = true);
diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
index 62ab675bc..b40c7153a 100644
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -400,18 +400,12 @@ bool isBroadcast(uint32_t dest)
     return dest == NODENUM_BROADCAST || dest == NODENUM_BROADCAST_NO_LORA;
 }
 
-bool NodeDB::resetRadioConfig(bool factory_reset, bool is_fresh_install)
+void NodeDB::resetRadioConfig(bool is_fresh_install)
 {
-    bool didFactoryReset = false;
-
     if (is_fresh_install) {
         radioGeneration++;
     }
 
-    if (factory_reset) {
-        didFactoryReset = factoryReset();
-    }
-
     if (channelFile.channels_count != MAX_NUM_CHANNELS) {
         LOG_INFO("Set default channel and radio preferences!");
 
@@ -422,14 +416,6 @@ bool NodeDB::resetRadioConfig(bool factory_reset, bool is_fresh_install)
 
     // Update the global myRegion
     initRegion();
-
-    if (didFactoryReset) {
-        LOG_INFO("Reboot due to factory reset");
-        screen->startAlert("Rebooting...");
-        rebootAtMsec = millis() + (5 * 1000);
-    }
-
-    return didFactoryReset;
 }
 
 bool NodeDB::factoryReset(bool eraseBleBonds)
@@ -591,7 +577,7 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
         config.device.node_info_broadcast_secs = default_node_info_broadcast_secs;
     config.security.serial_enabled = true;
     config.security.admin_channel_enabled = false;
-    resetRadioConfig(false, true); // This also triggers NodeInfo/Position requests since we're fresh
+    resetRadioConfig(true); // This also triggers NodeInfo/Position requests since we're fresh
     strncpy(config.network.ntp_server, "meshtastic.pool.ntp.org", 32);
 
 #if (defined(T_DECK) || defined(T_WATCH_S3) || defined(UNPHONE) || defined(PICOMPUTER_S3) || defined(SENSECAP_INDICATOR)) &&     \
diff --git a/src/mesh/NodeDB.h b/src/mesh/NodeDB.h
index 25f1e9083..a31f33250 100644
--- a/src/mesh/NodeDB.h
+++ b/src/mesh/NodeDB.h
@@ -103,7 +103,7 @@ class NodeDB
      * @param is_fresh_install set to true after a fresh install, to trigger NodeInfo/Position requests
      * @return true if the config was completely reset, in that case, we should send it back to the client
      */
-    bool resetRadioConfig(bool factory_reset = false, bool is_fresh_install = false);
+    void resetRadioConfig(bool is_fresh_install = false);
 
     /// given a subpacket sniffed from the network, update our DB state
     /// we updateGUI and updateGUIforNode if we think our this change is big enough for a redraw
diff --git a/src/mesh/RadioInterface.cpp b/src/mesh/RadioInterface.cpp
index 36f4a5342..2e50c0168 100644
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -656,7 +656,7 @@ size_t RadioInterface::beginSending(meshtastic_MeshPacket *p)
 
     // if the sender nodenum is zero, that means uninitialized
     assert(radioBuffer.header.from);
-
+    assert(p->encrypted.size <= sizeof(radioBuffer.payload));
     memcpy(radioBuffer.payload, p->encrypted.bytes, p->encrypted.size);
 
     sendingPacket = p;
diff --git a/src/mesh/Router.cpp b/src/mesh/Router.cpp
index 9e1e41d53..9503109db 100644
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -198,6 +198,14 @@ ErrorCode Router::sendLocal(meshtastic_MeshPacket *p, RxSource src)
         return send(p);
     }
 }
+/**
+ * Send a packet on a suitable interface.
+ */
+ErrorCode Router::rawSend(meshtastic_MeshPacket *p)
+{
+    assert(iface); // This should have been detected already in sendLocal (or we just received a packet from outside)
+    return iface->send(p);
+}
 
 /**
  * Send a packet on a suitable interface.  This routine will
@@ -319,27 +327,27 @@ void Router::sniffReceived(const meshtastic_MeshPacket *p, const meshtastic_Rout
     // FIXME, update nodedb here for any packet that passes through us
 }
 
-bool perhapsDecode(meshtastic_MeshPacket *p)
+DecodeState perhapsDecode(meshtastic_MeshPacket *p)
 {
     concurrency::LockGuard g(cryptLock);
 
     if (config.device.role == meshtastic_Config_DeviceConfig_Role_REPEATER &&
         config.device.rebroadcast_mode == meshtastic_Config_DeviceConfig_RebroadcastMode_ALL_SKIP_DECODING)
-        return false;
+        return DecodeState::DECODE_FAILURE;
 
     if (config.device.rebroadcast_mode == meshtastic_Config_DeviceConfig_RebroadcastMode_KNOWN_ONLY &&
         (nodeDB->getMeshNode(p->from) == NULL || !nodeDB->getMeshNode(p->from)->has_user)) {
         LOG_DEBUG("Node 0x%x not in nodeDB-> Rebroadcast mode KNOWN_ONLY will ignore packet", p->from);
-        return false;
+        return DecodeState::DECODE_FAILURE;
     }
 
     if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag)
-        return true; // If packet was already decoded just return
+        return DecodeState::DECODE_SUCCESS; // If packet was already decoded just return
 
     size_t rawSize = p->encrypted.size;
     if (rawSize > sizeof(bytes)) {
         LOG_ERROR("Packet too large to attempt decryption! (rawSize=%d > 256)", rawSize);
-        return false;
+        return DecodeState::DECODE_FATAL;
     }
     bool decrypted = false;
     ChannelIndex chIndex = 0;
@@ -353,18 +361,22 @@ bool perhapsDecode(meshtastic_MeshPacket *p)
         if (crypto->decryptCurve25519(p->from, nodeDB->getMeshNode(p->from)->user.public_key, p->id, rawSize, p->encrypted.bytes,
                                       bytes)) {
             LOG_INFO("PKI Decryption worked!");
-            memset(&p->decoded, 0, sizeof(p->decoded));
+
+            meshtastic_Data decodedtmp;
+            memset(&decodedtmp, 0, sizeof(decodedtmp));
             rawSize -= MESHTASTIC_PKC_OVERHEAD;
-            if (pb_decode_from_bytes(bytes, rawSize, &meshtastic_Data_msg, &p->decoded) &&
-                p->decoded.portnum != meshtastic_PortNum_UNKNOWN_APP) {
+            if (pb_decode_from_bytes(bytes, rawSize, &meshtastic_Data_msg, &decodedtmp) &&
+                decodedtmp.portnum != meshtastic_PortNum_UNKNOWN_APP) {
                 decrypted = true;
                 LOG_INFO("Packet decrypted using PKI!");
                 p->pki_encrypted = true;
                 memcpy(&p->public_key.bytes, nodeDB->getMeshNode(p->from)->user.public_key.bytes, 32);
                 p->public_key.size = 32;
+                memcpy(&p->decoded, &decodedtmp, sizeof(meshtastic_Data_msg));
+                p->which_payload_variant = meshtastic_MeshPacket_decoded_tag; // change type to decoded
             } else {
                 LOG_ERROR("PKC Decrypted, but pb_decode failed!");
-                return false;
+                return DecodeState::DECODE_FAILURE;
             }
         } else {
             LOG_WARN("PKC decrypt attempted but failed!");
@@ -387,12 +399,15 @@ bool perhapsDecode(meshtastic_MeshPacket *p)
                 // printBytes("plaintext", bytes, p->encrypted.size);
 
                 // Take those raw bytes and convert them back into a well structured protobuf we can understand
-                memset(&p->decoded, 0, sizeof(p->decoded));
-                if (!pb_decode_from_bytes(bytes, rawSize, &meshtastic_Data_msg, &p->decoded)) {
+                meshtastic_Data decodedtmp;
+                memset(&decodedtmp, 0, sizeof(decodedtmp));
+                if (!pb_decode_from_bytes(bytes, rawSize, &meshtastic_Data_msg, &decodedtmp)) {
                     LOG_ERROR("Invalid protobufs in received mesh packet id=0x%08x (bad psk?)!", p->id);
-                } else if (p->decoded.portnum == meshtastic_PortNum_UNKNOWN_APP) {
+                } else if (decodedtmp.portnum == meshtastic_PortNum_UNKNOWN_APP) {
                     LOG_ERROR("Invalid portnum (bad psk?)!");
                 } else {
+                    p->decoded = decodedtmp;
+                    p->which_payload_variant = meshtastic_MeshPacket_decoded_tag; // change type to decoded
                     decrypted = true;
                     break;
                 }
@@ -401,8 +416,7 @@ bool perhapsDecode(meshtastic_MeshPacket *p)
     }
     if (decrypted) {
         // parsing was successful
-        p->which_payload_variant = meshtastic_MeshPacket_decoded_tag; // change type to decoded
-        p->channel = chIndex;                                         // change to store the index instead of the hash
+        p->channel = chIndex; // change to store the index instead of the hash
         if (p->decoded.has_bitfield)
             p->decoded.want_response |= p->decoded.bitfield & BITFIELD_WANT_RESPONSE_MASK;
 
@@ -434,10 +448,10 @@ bool perhapsDecode(meshtastic_MeshPacket *p)
             LOG_TRACE("%s", MeshPacketSerializer::JsonSerialize(p, false).c_str());
         }
 #endif
-        return true;
+        return DecodeState::DECODE_SUCCESS;
     } else {
         LOG_WARN("No suitable channel found for decoding, hash was 0x%x!", p->channel);
-        return false;
+        return DecodeState::DECODE_FAILURE;
     }
 }
 
@@ -592,8 +606,13 @@ void Router::handleReceived(meshtastic_MeshPacket *p, RxSource src)
     meshtastic_MeshPacket *p_encrypted = packetPool.allocCopy(*p);
 
     // Take those raw bytes and convert them back into a well structured protobuf we can understand
-    bool decoded = perhapsDecode(p);
-    if (decoded) {
+    auto decodedState = perhapsDecode(p);
+    if (decodedState == DecodeState::DECODE_FATAL) {
+        // Fatal decoding error, we can't do anything with this packet
+        LOG_WARN("Fatal decode error, dropping packet");
+        cancelSending(p->from, p->id);
+        skipHandle = true;
+    } else if (decodedState == DecodeState::DECODE_SUCCESS) {
         // parsing was successful, queue for our recipient
         if (src == RX_SRC_LOCAL)
             printPacket("handleReceived(LOCAL)", p);
@@ -636,10 +655,12 @@ void Router::handleReceived(meshtastic_MeshPacket *p, RxSource src)
 #if !MESHTASTIC_EXCLUDE_MQTT
         // Mark as pki_encrypted if it is not yet decoded and MQTT encryption is also enabled, hash matches and it's a DM not to
         // us (because we would be able to decrypt it)
-        if (!decoded && moduleConfig.mqtt.encryption_enabled && p->channel == 0x00 && !isBroadcast(p->to) && !isToUs(p))
+        if (decodedState == DecodeState::DECODE_FAILURE && moduleConfig.mqtt.encryption_enabled && p->channel == 0x00 &&
+            !isBroadcast(p->to) && !isToUs(p))
             p_encrypted->pki_encrypted = true;
         // After potentially altering it, publish received message to MQTT if we're not the original transmitter of the packet
-        if ((decoded || p_encrypted->pki_encrypted) && moduleConfig.mqtt.enabled && !isFromUs(p) && mqtt)
+        if ((decodedState == DecodeState::DECODE_SUCCESS || p_encrypted->pki_encrypted) && moduleConfig.mqtt.enabled &&
+            !isFromUs(p) && mqtt)
             mqtt->onSend(*p_encrypted, *p, p->channel);
 #endif
     }
diff --git a/src/mesh/Router.h b/src/mesh/Router.h
index bf6b77226..58ca50f3d 100644
--- a/src/mesh/Router.h
+++ b/src/mesh/Router.h
@@ -85,6 +85,7 @@ class Router : protected concurrency::OSThread, protected PacketHistory
      * NOTE: This method will free the provided packet (even if we return an error code)
      */
     virtual ErrorCode send(meshtastic_MeshPacket *p);
+    virtual ErrorCode rawSend(meshtastic_MeshPacket *p);
 
     /* Statistics for the amount of duplicate received packets and the amount of times we cancel a relay because someone did it
         before us */
@@ -139,12 +140,14 @@ class Router : protected concurrency::OSThread, protected PacketHistory
     void abortSendAndNak(meshtastic_Routing_Error err, meshtastic_MeshPacket *p);
 };
 
+enum DecodeState { DECODE_SUCCESS, DECODE_FAILURE, DECODE_FATAL };
+
 /** FIXME - move this into a mesh packet class
  * Remove any encryption and decode the protobufs inside this packet (if necessary).
  *
  * @return true for success, false for corrupt packet.
  */
-bool perhapsDecode(meshtastic_MeshPacket *p);
+DecodeState perhapsDecode(meshtastic_MeshPacket *p);
 
 /** Return 0 for success or a Routing_Error code for failure
  */
diff --git a/src/modules/RoutingModule.cpp b/src/modules/RoutingModule.cpp
index 34ef2ddd1..e7e92c79a 100644
--- a/src/modules/RoutingModule.cpp
+++ b/src/modules/RoutingModule.cpp
@@ -46,11 +46,6 @@ meshtastic_MeshPacket *RoutingModule::allocReply()
         return NULL;
     assert(currentRequest);
 
-    // We only consider making replies if the request was a legit routing packet (not just something we were sniffing)
-    if (currentRequest->decoded.portnum == meshtastic_PortNum_ROUTING_APP) {
-        assert(0); // 1.2 refactoring fixme, Not sure if anything needs this yet?
-        // return allocDataProtobuf(u);
-    }
     return NULL;
 }
 
diff --git a/src/mqtt/MQTT.cpp b/src/mqtt/MQTT.cpp
index 226bee44d..799f953b4 100644
--- a/src/mqtt/MQTT.cpp
+++ b/src/mqtt/MQTT.cpp
@@ -117,7 +117,8 @@ inline void onReceiveProto(char *topic, byte *payload, size_t length)
         // likely they discovered each other via a channel we have downlink enabled for
         if (isToUs(p.get()) || (tx && tx->has_user && rx && rx->has_user))
             router->enqueueReceivedMessage(p.release());
-    } else if (router && perhapsDecode(p.get())) // ignore messages if we don't have the channel key
+    } else if (router &&
+               perhapsDecode(p.get()) == DecodeState::DECODE_SUCCESS) // ignore messages if we don't have the channel key
         router->enqueueReceivedMessage(p.release());
 }
 

From 64b9cfe1994a6fb17743e3d17c558c6f7b214d3b Mon Sep 17 00:00:00 2001
From: dylanli <dylan3000dylan@gmail.com>
Date: Sun, 16 Mar 2025 23:04:24 +0800
Subject: [PATCH 034/116] update  seeed-xiao-nrf52840-kit  board defination
 (#6318)

- Due to the lack of pins, we have temporarily removed the button. There are some technical solutions that can solve this problem, and we are currently exploring and researching them
---
 variants/seeed_xiao_nrf52840_kit/variant.h | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/variants/seeed_xiao_nrf52840_kit/variant.h b/variants/seeed_xiao_nrf52840_kit/variant.h
index eae5e04fd..9d6345f0a 100644
--- a/variants/seeed_xiao_nrf52840_kit/variant.h
+++ b/variants/seeed_xiao_nrf52840_kit/variant.h
@@ -57,11 +57,15 @@ extern "C" {
 #define D9 (9ul)
 #define D10 (10ul)
 
+/*Due to the lack of pins,and have to make sure gps standby work well we have temporarily removed the button. 
+There are some technical solutions that can solve this problem, 
+and we are currently exploring and researching them*/
+
+// #define BUTTON_PIN D0 // This is the Program Button
+// // #define BUTTON_NEED_PULLUP   1
+// #define BUTTON_ACTIVE_LOW true
+// #define BUTTON_ACTIVE_PULLUP false
 
-#define BUTTON_PIN D0 // This is the Program Button
-// #define BUTTON_NEED_PULLUP   1
-#define BUTTON_ACTIVE_LOW true
-#define BUTTON_ACTIVE_PULLUP false
 /*
  * Analog pins
  */
@@ -135,14 +139,14 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 // GPS L76KB
 #define GPS_L76K
 #ifdef GPS_L76K
-#define PIN_GPS_RX 32+12 // 44
-#define PIN_GPS_TX 32+11 // 43
+#define PIN_GPS_RX D6   
+#define PIN_GPS_TX D7
 #define HAS_GPS 1
 #define GPS_BAUDRATE 9600
 #define GPS_THREAD_INTERVAL 50
 #define PIN_SERIAL1_RX PIN_GPS_TX
 #define PIN_SERIAL1_TX PIN_GPS_RX
-#define PIN_GPS_STANDBY 2
+#define PIN_GPS_STANDBY D0
 #endif
 
 

From 2525111c39cd5081d794f3ebabaae2310395fc66 Mon Sep 17 00:00:00 2001
From: HarukiToreda <116696711+HarukiToreda@users.noreply.github.com>
Date: Sun, 16 Mar 2025 11:15:33 -0400
Subject: [PATCH 035/116] E-ink partial refresh limitation removed for free
 text screen (#6201)

---
 src/graphics/EInkDynamicDisplay.cpp | 8 ++++++++
 src/graphics/EInkDynamicDisplay.h   | 5 +++++
 src/modules/CannedMessageModule.cpp | 5 +++++
 3 files changed, 18 insertions(+)

diff --git a/src/graphics/EInkDynamicDisplay.cpp b/src/graphics/EInkDynamicDisplay.cpp
index 47012ca47..4a062cf7e 100644
--- a/src/graphics/EInkDynamicDisplay.cpp
+++ b/src/graphics/EInkDynamicDisplay.cpp
@@ -324,6 +324,14 @@ void EInkDynamicDisplay::checkConsecutiveFastRefreshes()
     if (refresh != UNSPECIFIED)
         return;
 
+    // Bypass limit if UNLIMITED_FAST mode is active
+    if (frameFlags & UNLIMITED_FAST) {
+        refresh = FAST;
+        reason = NO_OBJECTIONS;
+        LOG_DEBUG("refresh=FAST, reason=UNLIMITED_FAST_MODE_ACTIVE, frameFlags=0x%x", frameFlags);
+        return;
+    }
+    
     // If too many FAST refreshes consecutively - force a FULL refresh
     if (fastRefreshCount >= EINK_LIMIT_FASTREFRESH) {
         refresh = FULL;
diff --git a/src/graphics/EInkDynamicDisplay.h b/src/graphics/EInkDynamicDisplay.h
index 9e131dca7..d5e29e3f0 100644
--- a/src/graphics/EInkDynamicDisplay.h
+++ b/src/graphics/EInkDynamicDisplay.h
@@ -23,6 +23,10 @@ class EInkDynamicDisplay : public EInkDisplay, protected concurrency::NotifiedWo
     EInkDynamicDisplay(uint8_t address, int sda, int scl, OLEDDISPLAY_GEOMETRY geometry, HW_I2C i2cBus);
     ~EInkDynamicDisplay();
 
+    // Methods to enable or disable unlimited fast refresh mode
+    void enableUnlimitedFastMode() { addFrameFlag(UNLIMITED_FAST); }
+    void disableUnlimitedFastMode() { frameFlags = (frameFlagTypes)(frameFlags & ~UNLIMITED_FAST); }
+
     // What kind of frame is this
     enum frameFlagTypes : uint8_t {
         BACKGROUND = (1 << 0),  // For frames via display()
@@ -30,6 +34,7 @@ class EInkDynamicDisplay : public EInkDisplay, protected concurrency::NotifiedWo
         COSMETIC = (1 << 2),    // For splashes
         DEMAND_FAST = (1 << 3), // Special case only
         BLOCKING = (1 << 4),    // Modifier - block while refresh runs
+        UNLIMITED_FAST = (1 << 5)
     };
     void addFrameFlag(frameFlagTypes flag);
 
diff --git a/src/modules/CannedMessageModule.cpp b/src/modules/CannedMessageModule.cpp
index 5fb32fff5..5f623720a 100644
--- a/src/modules/CannedMessageModule.cpp
+++ b/src/modules/CannedMessageModule.cpp
@@ -1057,6 +1057,11 @@ void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *st
         display->drawString(10 + x, 0 + y + FONT_HEIGHT_SMALL, "Canned Message\nModule disabled.");
     } else if (cannedMessageModule->runState == CANNED_MESSAGE_RUN_STATE_FREETEXT) {
         requestFocus(); // Tell Screen::setFrames to move to our module's frame
+#if defined(USE_EINK) && defined(USE_EINK_DYNAMICDISPLAY)
+        EInkDynamicDisplay* einkDisplay = static_cast<EInkDynamicDisplay*>(display);
+        einkDisplay->enableUnlimitedFastMode();  // Enable unlimited fast refresh while typing
+#endif
+
 #if defined(USE_VIRTUAL_KEYBOARD)
         drawKeyboard(display, state, 0, 0);
 #else

From 2d565c292106a87ebb4b7d022a52f297b0bda41b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Sun, 16 Mar 2025 16:18:12 +0100
Subject: [PATCH 036/116] trunk'd

---
 .trunk/trunk.yaml                            |  6 +++---
 src/graphics/EInkDynamicDisplay.cpp          |  2 +-
 src/modules/CannedMessageModule.cpp          |  4 ++--
 variants/seeed_xiao_nrf52840_kit/variant.cpp |  5 +----
 variants/seeed_xiao_nrf52840_kit/variant.h   | 21 +++++++-------------
 5 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
index b42e2be31..b0561679a 100644
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -9,14 +9,14 @@ plugins:
 lint:
   enabled:
     - prettier@3.5.3
-    - trufflehog@3.88.16
+    - trufflehog@3.88.17
     - yamllint@1.36.0
     - bandit@1.8.3
-    - checkov@3.2.384
+    - checkov@3.2.386
     - terrascan@1.19.9
     - trivy@0.60.0
     - taplo@0.9.3
-    - ruff@0.9.10
+    - ruff@0.10.0
     - isort@6.0.1
     - markdownlint@0.44.0
     - oxipng@9.1.4
diff --git a/src/graphics/EInkDynamicDisplay.cpp b/src/graphics/EInkDynamicDisplay.cpp
index 4a062cf7e..8e4adf87e 100644
--- a/src/graphics/EInkDynamicDisplay.cpp
+++ b/src/graphics/EInkDynamicDisplay.cpp
@@ -331,7 +331,7 @@ void EInkDynamicDisplay::checkConsecutiveFastRefreshes()
         LOG_DEBUG("refresh=FAST, reason=UNLIMITED_FAST_MODE_ACTIVE, frameFlags=0x%x", frameFlags);
         return;
     }
-    
+
     // If too many FAST refreshes consecutively - force a FULL refresh
     if (fastRefreshCount >= EINK_LIMIT_FASTREFRESH) {
         refresh = FULL;
diff --git a/src/modules/CannedMessageModule.cpp b/src/modules/CannedMessageModule.cpp
index 5f623720a..2a5ec00ab 100644
--- a/src/modules/CannedMessageModule.cpp
+++ b/src/modules/CannedMessageModule.cpp
@@ -1058,8 +1058,8 @@ void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *st
     } else if (cannedMessageModule->runState == CANNED_MESSAGE_RUN_STATE_FREETEXT) {
         requestFocus(); // Tell Screen::setFrames to move to our module's frame
 #if defined(USE_EINK) && defined(USE_EINK_DYNAMICDISPLAY)
-        EInkDynamicDisplay* einkDisplay = static_cast<EInkDynamicDisplay*>(display);
-        einkDisplay->enableUnlimitedFastMode();  // Enable unlimited fast refresh while typing
+        EInkDynamicDisplay *einkDisplay = static_cast<EInkDynamicDisplay *>(display);
+        einkDisplay->enableUnlimitedFastMode(); // Enable unlimited fast refresh while typing
 #endif
 
 #if defined(USE_VIRTUAL_KEYBOARD)
diff --git a/variants/seeed_xiao_nrf52840_kit/variant.cpp b/variants/seeed_xiao_nrf52840_kit/variant.cpp
index f7e175f2d..22072312a 100644
--- a/variants/seeed_xiao_nrf52840_kit/variant.cpp
+++ b/variants/seeed_xiao_nrf52840_kit/variant.cpp
@@ -1,8 +1,8 @@
 #include "variant.h"
+#include "configuration.h"
 #include "nrf.h"
 #include "wiring_constants.h"
 #include "wiring_digital.h"
-#include "configuration.h"
 #include <map>
 #include <memory>
 #include <stddef.h>
@@ -58,8 +58,6 @@ const uint32_t g_ADigitalPinMap[] = {
     31, // D32 is P0.10 (VBAT)
 };
 
-
-
 /*
   Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
   Copyright (c) 2016 Sandeep Mistry All right reserved.
@@ -80,7 +78,6 @@ const uint32_t g_ADigitalPinMap[] = {
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-
 void initVariant()
 {
     // LED1 & LED2
diff --git a/variants/seeed_xiao_nrf52840_kit/variant.h b/variants/seeed_xiao_nrf52840_kit/variant.h
index 9d6345f0a..20362cb52 100644
--- a/variants/seeed_xiao_nrf52840_kit/variant.h
+++ b/variants/seeed_xiao_nrf52840_kit/variant.h
@@ -43,7 +43,6 @@ extern "C" {
  * Buttons
  */
 
-
 // Digital PINs
 #define D0 (0ul)
 #define D1 (1ul)
@@ -57,8 +56,8 @@ extern "C" {
 #define D9 (9ul)
 #define D10 (10ul)
 
-/*Due to the lack of pins,and have to make sure gps standby work well we have temporarily removed the button. 
-There are some technical solutions that can solve this problem, 
+/*Due to the lack of pins,and have to make sure gps standby work well we have temporarily removed the button.
+There are some technical solutions that can solve this problem,
 and we are currently exploring and researching them*/
 
 // #define BUTTON_PIN D0 // This is the Program Button
@@ -86,7 +85,6 @@ static const uint8_t A4 = PIN_A4;
 static const uint8_t A5 = PIN_A5;
 #define ADC_RESOLUTION 12
 
-
 #define PIN_SERIAL2_RX (-1)
 #define PIN_SERIAL2_TX (-1)
 
@@ -99,7 +97,6 @@ static const uint8_t A5 = PIN_A5;
 #define PIN_SPI_MOSI (10)
 #define PIN_SPI_SCK (8)
 
-
 static const uint8_t SS = D4;
 static const uint8_t MOSI = PIN_SPI_MOSI;
 static const uint8_t MISO = PIN_SPI_MISO;
@@ -117,29 +114,27 @@ static const uint8_t SCK = PIN_SPI_SCK;
 
 #define SX126X_TXEN RADIOLIB_NC
 
-
 #define SX126X_RXEN D4
-#define SX126X_DIO2_AS_RF_SWITCH        // DIO2 is used to control the RF switch really necessary!!!
+#define SX126X_DIO2_AS_RF_SWITCH // DIO2 is used to control the RF switch really necessary!!!
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8
 
 /*
  * Wire Interfaces
  */
 
-#define I2C_NO_RESCAN              // I2C is a bit finicky, don't scan too much
+#define I2C_NO_RESCAN           // I2C is a bit finicky, don't scan too much
 #define WIRE_INTERFACES_COUNT 1 // 2
 
-#define PIN_WIRE_SDA (24)           //change to use the correct pins if needed
-#define PIN_WIRE_SCL (25)           //change to use the correct pins if needed
+#define PIN_WIRE_SDA (24) // change to use the correct pins if needed
+#define PIN_WIRE_SCL (25) // change to use the correct pins if needed
 
 static const uint8_t SDA = PIN_WIRE_SDA;
 static const uint8_t SCL = PIN_WIRE_SCL;
 
-
 // GPS L76KB
 #define GPS_L76K
 #ifdef GPS_L76K
-#define PIN_GPS_RX D6   
+#define PIN_GPS_RX D6
 #define PIN_GPS_TX D7
 #define HAS_GPS 1
 #define GPS_BAUDRATE 9600
@@ -149,8 +144,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 #define PIN_GPS_STANDBY D0
 #endif
 
-
-
 // Battery
 
 #define BAT_READ                                                                                                                 \

From 96ba94843b25f787148e3353a7476ed175518b3b Mon Sep 17 00:00:00 2001
From: Jorropo <jorropo.pgm@gmail.com>
Date: Mon, 17 Mar 2025 01:36:02 +0100
Subject: [PATCH 037/116] Send UDP packets to multicast address rather than
 broadcast address (#6331)

A smart router or switch is able to snoop the multicast address to
only send the packets to nodes listening on the multicast address.

Before all machines reachable on the L2 layer would receive the packet.
---
 src/mesh/udp/UdpMulticastThread.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesh/udp/UdpMulticastThread.h b/src/mesh/udp/UdpMulticastThread.h
index 69b1d2282..675d4ce15 100644
--- a/src/mesh/udp/UdpMulticastThread.h
+++ b/src/mesh/udp/UdpMulticastThread.h
@@ -56,7 +56,7 @@ class UdpMulticastThread : public concurrency::OSThread
         LOG_DEBUG("Broadcasting packet over UDP (id=%u)", mp->id);
         uint8_t buffer[meshtastic_MeshPacket_size];
         size_t encodedLength = pb_encode_to_bytes(buffer, sizeof(buffer), &meshtastic_MeshPacket_msg, mp);
-        udp.broadcastTo(buffer, encodedLength, UDP_MULTICAST_DEFAUL_PORT);
+        udp.writeTo(buffer, encodedLength, udpIpAddress, UDP_MULTICAST_DEFAUL_PORT);
         return true;
     }
 

From af8b64e84ee60175d7a0e43c6c3458e3a3558708 Mon Sep 17 00:00:00 2001
From: Jorropo <jorropo.pgm@gmail.com>
Date: Mon, 17 Mar 2025 01:36:33 +0100
Subject: [PATCH 038/116] pass pointer to UDP multicast packet to protobuf
 decoder (#6333)

The packet.readBytes API is not available on all targets:
- RP2040 & RP2340
- yet to be written portduino API

Instead pass the data buffer as-is.
It also removes a memcpy which do not need to exists.

I've tested it successfully on a tbeam.

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
---
 src/mesh/udp/UdpMulticastThread.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/mesh/udp/UdpMulticastThread.h b/src/mesh/udp/UdpMulticastThread.h
index 675d4ce15..e5eb28d00 100644
--- a/src/mesh/udp/UdpMulticastThread.h
+++ b/src/mesh/udp/UdpMulticastThread.h
@@ -35,10 +35,8 @@ class UdpMulticastThread : public concurrency::OSThread
         size_t packetLength = packet.length();
         LOG_DEBUG("UDP broadcast from: %s, len=%u", packet.remoteIP().toString().c_str(), packetLength);
         meshtastic_MeshPacket mp;
-        uint8_t bytes[meshtastic_MeshPacket_size]; // Allocate buffer for the data
-        size_t packetSize = packet.readBytes(bytes, packet.length());
-        LOG_DEBUG("Decoding MeshPacket from UDP len=%u", packetSize);
-        bool isPacketDecoded = pb_decode_from_bytes(bytes, packetLength, &meshtastic_MeshPacket_msg, &mp);
+        LOG_DEBUG("Decoding MeshPacket from UDP len=%u", packetLength);
+        bool isPacketDecoded = pb_decode_from_bytes(packet.data(), packetLength, &meshtastic_MeshPacket_msg, &mp);
         if (isPacketDecoded && router) {
             UniquePacketPoolPacket p = packetPool.allocUniqueCopy(mp);
             // Unset received SNR/RSSI

From 9cc13e628a4960e71d700d03629c2752945fbccb Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Mon, 17 Mar 2025 19:24:47 -0500
Subject: [PATCH 039/116] Stubbed out backup / restore methods for now and
 fixed bug

---
 src/mesh/NodeDB.cpp         | 88 +++++++++++++++++++++++++++++++++++++
 src/mesh/NodeDB.h           |  8 +++-
 src/mesh/Router.cpp         |  2 +-
 src/modules/AdminModule.cpp | 36 +++++++++++++++
 4 files changed, 132 insertions(+), 2 deletions(-)

diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
index b40c7153a..e8efa7566 100644
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -1598,6 +1598,94 @@ UserLicenseStatus NodeDB::getLicenseStatus(uint32_t nodeNum)
     return info->user.is_licensed ? UserLicenseStatus::Licensed : UserLicenseStatus::NotLicensed;
 }
 
+bool NodeDB::backupPreferences(meshtastic_AdminMessage_BackupLocation location)
+{
+    bool success = false;
+    lastBackupAttempt = millis();
+#ifdef FSCom
+    if (location == meshtastic_AdminMessage_BackupLocation_FLASH) {
+        meshtastic_BackupPreferences backup = meshtastic_BackupPreferences_init_zero;
+        backup.version = DEVICESTATE_CUR_VER;
+        backup.timestamp = getValidTime(RTCQuality::RTCQualityDevice, false);
+        backup.has_config = true;
+        backup.config = config;
+        backup.has_module_config = true;
+        backup.module_config = moduleConfig;
+        backup.has_channels = true;
+        backup.channels = channelFile;
+        backup.has_owner = true;
+        backup.owner = owner;
+
+        size_t backupSize;
+        pb_get_encoded_size(&backupSize, meshtastic_BackupPreferences_fields, &backup);
+
+        spiLock->lock();
+        FSCom.mkdir("/backups");
+        spiLock->unlock();
+        success = saveProto(backupFileName, backupSize, &meshtastic_BackupPreferences_msg, &backup);
+
+        if (success) {
+            LOG_INFO("Saved backup preferences");
+        } else {
+            LOG_ERROR("Failed to save backup preferences to file");
+        }
+    } else if (location == meshtastic_AdminMessage_BackupLocation_SD) {
+        // TODO: After more mainline SD card support
+    }
+#endif
+    return success;
+}
+
+bool NodeDB::restorePreferences(meshtastic_AdminMessage_BackupLocation location, int restoreWhat)
+{
+    bool success = false;
+#ifdef FSCom
+    if (location == meshtastic_AdminMessage_BackupLocation_FLASH) {
+        spiLock->lock();
+        if (!FSCom.exists(backupFileName)) {
+            spiLock->unlock();
+            LOG_WARN("Could not restore. No backup file found");
+            return false;
+        } else {
+            spiLock->unlock();
+        }
+        meshtastic_BackupPreferences backup = meshtastic_BackupPreferences_init_zero;
+        success = loadProto(backupFileName, meshtastic_BackupPreferences_size, sizeof(meshtastic_BackupPreferences),
+                            &meshtastic_BackupPreferences_msg, &backup);
+        if (success) {
+            if (restoreWhat & SEGMENT_CONFIG) {
+                config = backup.config;
+                LOG_DEBUG("Restored config");
+            }
+            if (restoreWhat & SEGMENT_MODULECONFIG) {
+                moduleConfig = backup.module_config;
+                LOG_DEBUG("Restored module config");
+            }
+            if (restoreWhat & SEGMENT_DEVICESTATE) {
+                devicestate.owner = backup.owner;
+                LOG_DEBUG("Restored device state");
+            }
+            if (restoreWhat & SEGMENT_CHANNELS) {
+                channelFile = backup.channels;
+                LOG_DEBUG("Restored channels");
+            }
+
+            success = saveToDisk(restoreWhat);
+            if (success) {
+                LOG_INFO("Restored preferences from backup");
+            } else {
+                LOG_ERROR("Failed to save restored preferences to flash");
+            }
+        } else {
+            LOG_ERROR("Failed to restore preferences from backup file");
+        }
+    } else if (location == meshtastic_AdminMessage_BackupLocation_SD) {
+        // TODO: After more mainline SD card support
+    }
+    return success;
+#endif
+}
+
 /// Record an error that should be reported via analytics
 void recordCriticalError(meshtastic_CriticalErrorCode code, uint32_t address, const char *filename)
 {
diff --git a/src/mesh/NodeDB.h b/src/mesh/NodeDB.h
index a31f33250..291c3804b 100644
--- a/src/mesh/NodeDB.h
+++ b/src/mesh/NodeDB.h
@@ -48,6 +48,7 @@ static constexpr const char *configFileName = "/prefs/config.proto";
 static constexpr const char *uiconfigFileName = "/prefs/uiconfig.proto";
 static constexpr const char *moduleConfigFileName = "/prefs/module.proto";
 static constexpr const char *channelFileName = "/prefs/channels.proto";
+static constexpr const char *backupFileName = "/backups/backup.proto";
 
 /// Given a node, return how many seconds in the past (vs now) that we last heard from it
 uint32_t sinceLastSeen(const meshtastic_NodeInfoLite *n);
@@ -202,8 +203,13 @@ class NodeDB
 
     bool hasValidPosition(const meshtastic_NodeInfoLite *n);
 
+    bool backupPreferences(meshtastic_AdminMessage_BackupLocation location);
+    bool restorePreferences(meshtastic_AdminMessage_BackupLocation location,
+                            int restoreWhat = SEGMENT_CONFIG | SEGMENT_MODULECONFIG | SEGMENT_DEVICESTATE | SEGMENT_CHANNELS);
+
   private:
-    uint32_t lastNodeDbSave = 0; // when we last saved our db to flash
+    uint32_t lastNodeDbSave = 0;    // when we last saved our db to flash
+    uint32_t lastBackupAttempt = 0; // when we last tried a backup automatically or manually
     /// Find a node in our DB, create an empty NodeInfoLite if missing
     meshtastic_NodeInfoLite *getOrCreateMeshNode(NodeNum n);
 
diff --git a/src/mesh/Router.cpp b/src/mesh/Router.cpp
index 9503109db..992f38ff4 100644
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -372,7 +372,7 @@ DecodeState perhapsDecode(meshtastic_MeshPacket *p)
                 p->pki_encrypted = true;
                 memcpy(&p->public_key.bytes, nodeDB->getMeshNode(p->from)->user.public_key.bytes, 32);
                 p->public_key.size = 32;
-                memcpy(&p->decoded, &decodedtmp, sizeof(meshtastic_Data_msg));
+                p->decoded = decodedtmp;
                 p->which_payload_variant = meshtastic_MeshPacket_decoded_tag; // change type to decoded
             } else {
                 LOG_ERROR("PKC Decrypted, but pb_decode failed!");
diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp
index a765fb0b1..ae25ea3fc 100644
--- a/src/modules/AdminModule.cpp
+++ b/src/modules/AdminModule.cpp
@@ -370,6 +370,42 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
             LOG_DEBUG("Failed to delete file");
         }
         spiLock->unlock();
+#endif
+        break;
+    }
+    case meshtastic_AdminMessage_backup_preferences_tag: {
+        LOG_INFO("Client requesting to backup preferences");
+        if (nodeDB->backupPreferences(r->backup_preferences)) {
+            myReply = allocErrorResponse(meshtastic_Routing_Error_NONE, &mp);
+        } else {
+            myReply = allocErrorResponse(meshtastic_Routing_Error_BAD_REQUEST, &mp);
+        }
+        break;
+    }
+    case meshtastic_AdminMessage_restore_preferences_tag: {
+        LOG_INFO("Client requesting to restore preferences");
+        if (nodeDB->restorePreferences(r->backup_preferences,
+                                       SEGMENT_DEVICESTATE | SEGMENT_CONFIG | SEGMENT_MODULECONFIG | SEGMENT_CHANNELS)) {
+            myReply = allocErrorResponse(meshtastic_Routing_Error_NONE, &mp);
+            LOG_DEBUG("Rebooting after successful restore of preferences");
+            reboot(1000);
+            disableBluetooth();
+        } else {
+            myReply = allocErrorResponse(meshtastic_Routing_Error_BAD_REQUEST, &mp);
+        }
+        break;
+    }
+    case meshtastic_AdminMessage_remove_backup_preferences_tag: {
+        LOG_INFO("Client requesting to remove backup preferences");
+#ifdef FSCom
+        if (r->remove_backup_preferences == meshtastic_AdminMessage_BackupLocation_FLASH) {
+            spiLock->lock();
+            FSCom.remove(backupFileName);
+            spiLock->unlock();
+        } else if (r->remove_backup_preferences == meshtastic_AdminMessage_BackupLocation_SD) {
+            // TODO: After more mainline SD card support
+            LOG_ERROR("SD backup removal not implemented yet");
+        }
 #endif
         break;
     }

From 2876eec7ed9004271115495063151a028c0777e8 Mon Sep 17 00:00:00 2001
From: Austin <vidplace7@gmail.com>
Date: Mon, 17 Mar 2025 21:14:01 -0400
Subject: [PATCH 040/116] MeshToad - USB 1W 'MeshStick' (#6339)

---
 bin/config.d/lora-usb-meshtoad-e22.yaml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 bin/config.d/lora-usb-meshtoad-e22.yaml

diff --git a/bin/config.d/lora-usb-meshtoad-e22.yaml b/bin/config.d/lora-usb-meshtoad-e22.yaml
new file mode 100644
index 000000000..b6cb61c6b
--- /dev/null
+++ b/bin/config.d/lora-usb-meshtoad-e22.yaml
@@ -0,0 +1,17 @@
+Lora:
+  Module: sx1262
+  CS: 0
+  IRQ: 6
+  Reset: 2
+  Busy: 4
+  RXen: 1
+  DIO2_AS_RF_SWITCH: true
+  DIO3_TCXO_VOLTAGE: true
+  spidev: ch341
+  USB_PID: 0x5512
+  USB_VID: 0x1A86
+  # Optional: Reduce power to 10 dBm to
+  # avoid over-drawing the USB port
+  # SX126X_MAX_POWER: 10
+  # Optional: Set the serial number for multi-radio support
+  # USB_Serialnum: 13374201

From 8efc9702d34fb579f22ae8e782949ef47340e348 Mon Sep 17 00:00:00 2001
From: Kalle Lilja <15094562+ThatKalle@users.noreply.github.com>
Date: Tue, 18 Mar 2025 02:16:16 +0100
Subject: [PATCH 041/116] device-install/update: fix esptool --port (#6341)

* fix errorlevel check

* add esptool --port if supplied

* match device-install

* add --port if supplied

* update logmessage

* bump version

---------

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
---
 bin/device-install.bat |  5 +++--
 bin/device-install.sh  |  4 ++--
 bin/device-update.bat  | 11 ++++++-----
 bin/device-update.sh   |  4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/bin/device-install.bat b/bin/device-install.bat
index 926338464..7eb5c1b30 100755
--- a/bin/device-install.bat
+++ b/bin/device-install.bat
@@ -34,7 +34,7 @@ ECHO Example: %SCRIPT_NAME% -f firmware-unphone-2.6.0.0b106d4.bin -p COM11 --web
 GOTO eof
 
 :version
-ECHO %SCRIPT_NAME% [Version 2.6.0]
+ECHO %SCRIPT_NAME% [Version 2.6.1]
 ECHO Meshtastic
 GOTO eof
 
@@ -106,7 +106,7 @@ IF NOT "__%PYTHON%__"=="____" (
 
 CALL :LOG_MESSAGE DEBUG "Checking esptool command !ESPTOOL_CMD!..."
 !ESPTOOL_CMD! >nul 2>&1
-IF %ERRORLEVEL% GTR 2 (
+IF %ERRORLEVEL% GEQ 2 (
     @REM esptool exits with code 1 if help is displayed.
     CALL :LOG_MESSAGE ERROR "esptool not found: !ESPTOOL_CMD!"
     EXIT /B 1
@@ -121,6 +121,7 @@ CALL :LOG_MESSAGE DEBUG "Using esptool command: !ESPTOOL_CMD!"
 IF "__!ESPTOOL_PORT!__" == "____" (
     CALL :LOG_MESSAGE WARN "Using esptool port: UNSET."
 ) ELSE (
+    SET "ESPTOOL_CMD=!ESPTOOL_CMD! --port !ESPTOOL_PORT!"
     CALL :LOG_MESSAGE INFO "Using esptool port: !ESPTOOL_PORT!."
 )
 CALL :LOG_MESSAGE INFO "Using esptool baud: !ESPTOOL_BAUD!."
diff --git a/bin/device-install.sh b/bin/device-install.sh
index 61c72bc2e..56e1abdb2 100755
--- a/bin/device-install.sh
+++ b/bin/device-install.sh
@@ -42,8 +42,8 @@ while [ $# -gt 0 ]; do
 		exit 0
 		;;
 	-p)
-		ESPTOOL_PORT="$2"
-		shift # Shift past the option argument
+		ESPTOOL_CMD="$ESPTOOL_CMD --port $2"
+		shift
 		;;
 	-P)
 		PYTHON="$2"
diff --git a/bin/device-update.bat b/bin/device-update.bat
index ecfeec187..d9a4bd19a 100755
--- a/bin/device-update.bat
+++ b/bin/device-update.bat
@@ -16,7 +16,7 @@ ECHO.
 ECHO Usage: %SCRIPT_NAME% -f filename [-p PORT] [-P python]
 ECHO.
 ECHO Options:
-ECHO     -f filename      The .bin file to flash.  Custom to your device type and region. (required)
+ECHO     -f filename      The update .bin file to flash.  Custom to your device type and region. (required)
 ECHO                      The file must be located in this current directory.
 ECHO     -p PORT          Set the environment variable for ESPTOOL_PORT.
 ECHO                      If not set, ESPTOOL iterates all ports (Dangerous).
@@ -28,7 +28,7 @@ ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4-update.bin -p C
 GOTO eof
 
 :version
-ECHO %SCRIPT_NAME% [Version 2.6.0]
+ECHO %SCRIPT_NAME% [Version 2.6.1]
 ECHO Meshtastic
 GOTO eof
 
@@ -53,6 +53,7 @@ IF "__!FILENAME!__"=="____" (
     CALL :LOG_MESSAGE DEBUG "Missing -f filename input."
     GOTO help
 ) ELSE (
+    CALL :LOG_MESSAGE DEBUG "Filename: !FILENAME!"
     IF NOT "__!FILENAME: =!__"=="__!FILENAME!__" (
         CALL :LOG_MESSAGE ERROR "Filename containing spaces are not supported."
         GOTO help
@@ -62,7 +63,6 @@ IF "__!FILENAME!__"=="____" (
     SET "FILENAME=!FILENAME:./=!"
 )
 
-CALL :LOG_MESSAGE DEBUG "Filename: !FILENAME!"
 CALL :LOG_MESSAGE DEBUG "Checking if !FILENAME! exists..."
 IF NOT EXIST !FILENAME! (
     CALL :LOG_MESSAGE ERROR "File does not exist: !FILENAME!. Terminating."
@@ -71,7 +71,7 @@ IF NOT EXIST !FILENAME! (
 
 IF "!FILENAME:update=!"=="!FILENAME!" (
     CALL :LOG_MESSAGE DEBUG "We are NOT working with a *update* file. !FILENAME!"
-    CALL :LOG_MESSAGE INFO "Use script device-install.bat to flash update !FILENAME!."
+    CALL :LOG_MESSAGE INFO "Use script device-install.bat to flash !FILENAME!."
     GOTO eof
 ) ELSE (
     CALL :LOG_MESSAGE DEBUG "We are working with a *update* file. !FILENAME!"
@@ -95,7 +95,7 @@ IF NOT "__%PYTHON%__"=="____" (
 
 CALL :LOG_MESSAGE DEBUG "Checking esptool command !ESPTOOL_CMD!..."
 !ESPTOOL_CMD! >nul 2>&1
-IF %ERRORLEVEL% GTR 2 (
+IF %ERRORLEVEL% GEQ 2 (
     @REM esptool exits with code 1 if help is displayed.
     CALL :LOG_MESSAGE ERROR "esptool not found: !ESPTOOL_CMD!"
     EXIT /B 1
@@ -110,6 +110,7 @@ CALL :LOG_MESSAGE DEBUG "Using esptool command: !ESPTOOL_CMD!"
 IF "__!ESPTOOL_PORT!__" == "____" (
     CALL :LOG_MESSAGE WARN "Using esptool port: UNSET."
 ) ELSE (
+    SET "ESPTOOL_CMD=!ESPTOOL_CMD! --port !ESPTOOL_PORT!"
     CALL :LOG_MESSAGE INFO "Using esptool port: !ESPTOOL_PORT!."
 )
 CALL :LOG_MESSAGE INFO "Using esptool baud: !ESPTOOL_BAUD!."
diff --git a/bin/device-update.sh b/bin/device-update.sh
index 67281dc4f..ae7b52ea2 100755
--- a/bin/device-update.sh
+++ b/bin/device-update.sh
@@ -35,8 +35,8 @@ while getopts ":hp:P:f:" opt; do
             show_help
             exit 0
             ;;
-        p)  export ESPTOOL_PORT=${OPTARG}
-	    ;;
+        p)  ESPTOOL_CMD="$ESPTOOL_CMD --port ${OPTARG}"
+	        ;;
         P)  PYTHON=${OPTARG}
             ;;
         f)  FILENAME=${OPTARG}

From 6673cb929226c4b6abf256ad96993585b2231f15 Mon Sep 17 00:00:00 2001
From: Austin <vidplace7@gmail.com>
Date: Tue, 18 Mar 2025 21:19:51 -0400
Subject: [PATCH 042/116] Increase MAX_NUM_NODES on high-flash ESP32_S3 (#6311)

---
 arch/nrf52/nrf52.ini                          |  1 -
 bin/device-install.bat                        | 52 ++++++-----
 bin/device-install.sh                         | 86 ++++++++++++++-----
 src/mesh/mesh-pb-constants.h                  | 22 ++++-
 variants/CDEBYTE_E77-MBL/variant.h            |  1 -
 .../crowpanel-esp32s3-5-epaper/platformio.ini |  3 +
 variants/diy/platformio.ini                   |  3 +-
 variants/dreamcatcher/platformio.ini          |  6 +-
 variants/esp32-s3-pico/platformio.ini         |  1 +
 .../heltec_capsule_sensor_v3/platformio.ini   |  2 +-
 variants/heltec_v3/platformio.ini             |  4 +-
 .../heltec_vision_master_e213/platformio.ini  |  4 +-
 .../heltec_vision_master_e290/platformio.ini  |  2 +
 .../heltec_vision_master_t190/platformio.ini  |  4 +-
 variants/heltec_wireless_paper/platformio.ini |  2 +
 .../heltec_wireless_paper_v1/platformio.ini   |  1 +
 .../heltec_wireless_tracker/platformio.ini    |  1 +
 .../platformio.ini                            |  1 +
 variants/heltec_wsl_v3/platformio.ini         |  3 +-
 variants/icarus/platformio.ini                |  4 +-
 variants/m5stack_cores3/platformio.ini        |  1 +
 variants/mesh-tab/platformio.ini              |  1 -
 variants/picomputer-s3/platformio.ini         |  3 +-
 variants/rak3172/variant.h                    |  1 -
 .../seeed-sensecap-indicator/platformio.ini   |  3 +-
 variants/seeed_xiao_s3/platformio.ini         |  2 +-
 variants/station-g2/platformio.ini            |  5 +-
 variants/t-deck/platformio.ini                |  3 +-
 variants/t-eth-elite/platformio.ini           |  3 +-
 variants/t-watch-s3/platformio.ini            |  1 +
 variants/tbeam-s3-core/platformio.ini         |  1 +
 variants/tracksenger/platformio.ini           |  3 +
 variants/unphone/platformio.ini               |  3 +-
 variants/wio-e5/variant.h                     |  1 -
 34 files changed, 155 insertions(+), 79 deletions(-)

diff --git a/arch/nrf52/nrf52.ini b/arch/nrf52/nrf52.ini
index 606cabac6..d4e88af1f 100644
--- a/arch/nrf52/nrf52.ini
+++ b/arch/nrf52/nrf52.ini
@@ -17,7 +17,6 @@ build_flags =
   -DLFS_NO_ASSERT                      ; Disable LFS assertions , see https://github.com/meshtastic/firmware/pull/3818
   -DMESHTASTIC_EXCLUDE_AUDIO=1
   -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
-  -DMAX_NUM_NODES=80
 
 build_src_filter = 
   ${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/api/> -<mesh/http/> -<modules/esp32> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp>
diff --git a/bin/device-install.bat b/bin/device-install.bat
index 7eb5c1b30..3ffca0b63 100755
--- a/bin/device-install.bat
+++ b/bin/device-install.bat
@@ -7,12 +7,19 @@ SET "DEBUG=0"
 SET "PYTHON="
 SET "WEB_APP=0"
 SET "TFT_BUILD=0"
-SET "TFT8=0"
-SET "TFT16=0"
+SET "BIGDB8=0"
+SET "BIGDB16=0"
 SET "ESPTOOL_BAUD=115200"
 SET "ESPTOOL_CMD="
 SET "LOGCOUNTER=0"
 
+@REM FIXME: Determine mcu from PlatformIO variant, this is unmaintainable.
+SET "S3=s3 v3 t-deck wireless-paper wireless-tracker station-g2 unphone"
+SET "C3=esp32c3"
+@REM FIXME: Determine flash size from PlatformIO variant, this is unmaintainable.
+SET "BIGDB_8MB=picomputer-s3 unphone seeed-sensecap-indicator crowpanel-esp32s3 heltec_capsule_sensor_v3 heltec-v3 heltec-vision-master-e213 heltec-vision-master-e290 heltec-vision-master-t190 heltec-wireless-paper heltec-wireless-tracker heltec-wsl-v3 icarus seeed-xiao-s3 tbeam-s3-core tracksenger"
+SET "BIGDB_16MB=t-deck mesh-tab t-energy-s3 dreamcatcher ESP32-S3-Pico m5stack-cores3 station-g2 t-eth-elite t-watch-s3"
+
 GOTO getopts
 :help
 ECHO Flash image file to device, but first erasing and writing system information.
@@ -134,44 +141,36 @@ IF NOT "!FILENAME:-tft-=!"=="!FILENAME!" (
         CALL :LOG_MESSAGE ERROR "Cannot enable WebUI (--web) and MUI." & GOTO eof
     )
     SET "TFT_BUILD=1"
-    GOTO tft
 ) ELSE (
     CALL :LOG_MESSAGE DEBUG "We are NOT working with a *-tft-* file. !FILENAME!"
-    GOTO no_tft
 )
 
-:tft
-SET "TFT8MB=picomputer-s3 unphone seeed-sensecap-indicator"
-FOR %%a IN (%TFT8MB%) DO (
+FOR %%a IN (%BIGDB_8MB%) DO (
     IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
-        @REM We are working with any of %TFT8MB%.
-        SET "TFT8=1"
-        GOTO end_loop_tft8mb
+        @REM We are working with any of %BIGDB_8MB%.
+        SET "BIGDB8=1"
+        GOTO end_loop_bigdb_8mb
     )
 )
-:end_loop_tft8mb
+:end_loop_bigdb_8mb
 
-SET "TFT16MB=t-deck"
-FOR %%a IN (%TFT16MB%) DO (
+FOR %%a IN (%BIGDB_16MB%) DO (
     IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
-        @REM We are working with any of %TFT16MB%.
-        SET "TFT16=1"
-        GOTO end_loop_tft16mb
+        @REM We are working with any of %BIGDB_16MB%.
+        SET "BIGDB16=1"
+        GOTO end_loop_bigdb_16mb
     )
 )
-:end_loop_tft16mb
+:end_loop_bigdb_16mb
 
-IF %TFT8% EQU 1 CALL :LOG_MESSAGE INFO "tft and MUI 8mb selected."
-IF %TFT16% EQU 1 CALL :LOG_MESSAGE INFO "tft and MUI 16mb selected."
-
-:no_tft
+IF %BIGDB8% EQU 1 CALL :LOG_MESSAGE INFO "BigDB 8mb partition selected."
+IF %BIGDB16% EQU 1 CALL :LOG_MESSAGE INFO "BigDB 16mb partition selected."
 
 @REM Extract BASENAME from %FILENAME% for later use.
 SET "BASENAME=!FILENAME:firmware-=!"
 CALL :LOG_MESSAGE DEBUG "Computed firmware basename: !BASENAME!"
 
 @REM Account for S3 and C3 board's different OTA partition.
-SET "S3=s3 v3 t-deck wireless-paper wireless-tracker station-g2 unphone"
 FOR %%a IN (%S3%) DO (
     IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
         @REM We are working with any of %S3%.
@@ -180,7 +179,6 @@ FOR %%a IN (%S3%) DO (
     )
 )
 
-SET "C3=esp32c3"
 FOR %%a IN (%C3%) DO (
     IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
         @REM We are working with any of %C3%.
@@ -209,14 +207,14 @@ CALL :LOG_MESSAGE DEBUG "Set SPIFFS_FILENAME to: !SPIFFS_FILENAME!"
 SET "OTA_OFFSET=0x260000"
 SET "SPIFFS_OFFSET=0x300000"
 
-@REM Offsets for MUI 8mb.
-IF %TFT8% EQU 1 IF %TFT_BUILD% EQU 1 (
+@REM Offsets for BigDB 8mb.
+IF %BIGDB8% EQU 1 (
     SET "OTA_OFFSET=0x340000"
     SET "SPIFFS_OFFSET=0x670000"
 )
 
-@REM Offsets for MUI 16mb.
-IF %TFT16% EQU 1 IF %TFT_BUILD% EQU 1 (
+@REM Offsets for BigDB 16mb.
+IF %BIGDB16% EQU 1 (
     SET "OTA_OFFSET=0x650000"
     SET "SPIFFS_OFFSET=0xc90000"
 )
diff --git a/bin/device-install.sh b/bin/device-install.sh
index 56e1abdb2..b5322b9d1 100755
--- a/bin/device-install.sh
+++ b/bin/device-install.sh
@@ -2,9 +2,48 @@
 
 PYTHON=${PYTHON:-$(which python3 python | head -n 1)}
 WEB_APP=false
-TFT8=false
-TFT16=false
 TFT_BUILD=false
+MCU=""
+
+# Variant groups
+BIGDB_8MB=(
+	"picomputer-s3"
+	"unphone"
+	"seeed-sensecap-indicator"
+	"crowpanel-esp32s3"
+	"heltec_capsule_sensor_v3"
+	"heltec-v3"
+	"heltec-vision-master-e213"
+	"heltec-vision-master-e290"
+	"heltec-vision-master-t190"
+	"heltec-wireless-paper"
+	"heltec-wireless-tracker"
+	"heltec-wsl-v3"
+	"icarus"
+	"seeed-xiao-s3"
+	"tbeam-s3-core"
+	"tracksenger"
+)
+BIGDB_16MB=(
+	"t-deck"
+	"mesh-tab"
+	"t-energy-s3"
+	"dreamcatcher"
+	"ESP32-S3-Pico"
+	"m5stack-cores3"
+	"station-g2"
+	"t-eth-elite"
+	"t-watch-s3"
+)
+S3_VARIANTS=(
+	"s3"
+	"-v3"
+	"t-deck"
+	"wireless-paper"
+	"wireless-tracker"
+	"station-g2"
+	"unphone"
+)
 
 # Determine the correct esptool command to use
 if "$PYTHON" -m esptool version >/dev/null 2>&1; then
@@ -78,21 +117,13 @@ if [[ $FILENAME != firmware-* ]]; then
   exit 1
 fi
 
-# Check if FILENAME contains "-tft-" and set target partitionScheme accordingly.
+# Check if FILENAME contains "-tft-" and prevent web/mui comingling.
 if [[ ${FILENAME//-tft-/} != "$FILENAME" ]]; then
 	TFT_BUILD=true
 	if [[ $WEB_APP == true ]] && [[ $TFT_BUILD == true ]]; then
 		echo "Cannot enable WebUI (--web) and MUI."
 		exit 1
 	fi
-
-	if [[ $FILENAME == *"picomputer-s3"* || $FILENAME == *"unphone"* || $FILENAME == *"seeed-sensecap-indicator"* ]]; then
-		TFT8=true
-	fi
-
-	if [[ $FILENAME == *"t-deck"* ]]; then
-		TFT16=true
-	fi
 fi
 
 # Extract BASENAME from %FILENAME% for later use.
@@ -105,20 +136,31 @@ if [ -f "${FILENAME}" ] && [ -n "${FILENAME##*"update"*}" ]; then
 	# Default OTA Offset
 	OTA_OFFSET=0x260000
 
-	# littlefs* offset for MUI 8mb and OTA OFFSET.
-	if [ "$TFT8" = true ] && [ "$TFT_BUILD" = true ]; then
-		OFFSET=0x670000
-		OTA_OFFSET=0x340000
-	fi
+	# littlefs* offset for BigDB 8mb and OTA OFFSET.
+	for variant in "${BIGDB_8MB[@]}"; do
+		if [ -n "${FILENAME##*"$variant"*}" ]; then
+			OFFSET=0x670000
+			OTA_OFFSET=0x340000
+		fi
+	done
 
-	# littlefs* offset for MUI 16mb and OTA OFFSET.
-	if [ "$TFT16" = true ] && [ "$TFT_BUILD" = true ]; then
-		OFFSET=0xc90000
-		OTA_OFFSET=0x650000
-	fi
+	# littlefs* offset for BigDB 16mb and OTA OFFSET.
+	for variant in "${BIGDB_16MB[@]}"; do
+		if [ -n "${FILENAME##*"$variant"*}" ]; then
+			OFFSET=0xc90000
+			OTA_OFFSET=0x650000
+		fi
+	done
 
 	# Account for S3 board's different OTA partition
-	if [ -n "${FILENAME##*"s3"*}" ] && [ -n "${FILENAME##*"-v3"*}" ] && [ -n "${FILENAME##*"t-deck"*}" ] && [ -n "${FILENAME##*"wireless-paper"*}" ] && [ -n "${FILENAME##*"wireless-tracker"*}" ] && [ -n "${FILENAME##*"station-g2"*}" ] && [ -n "${FILENAME##*"unphone"*}" ]; then
+	# FIXME: Use PlatformIO info to determine MCU type, this is unmaintainable
+	for variant in "${S3_VARIANTS[@]}"; do
+		if [ -n "${FILENAME##*"$variant"*}" ]; then
+			MCU="esp32s3"
+		fi
+	done
+
+	if [ "$MCU" != "esp32s3" ]; then
 		if [ -n "${FILENAME##*"esp32c3"*}" ]; then
 			OTAFILE=bleota.bin
 		else
diff --git a/src/mesh/mesh-pb-constants.h b/src/mesh/mesh-pb-constants.h
index f91c48560..1c86653dc 100644
--- a/src/mesh/mesh-pb-constants.h
+++ b/src/mesh/mesh-pb-constants.h
@@ -18,10 +18,30 @@
 #define MAX_RX_TOPHONE 32
 #endif
 
-/// max number of nodes allowed in the mesh
+/// max number of nodes allowed in the nodeDB
 #ifndef MAX_NUM_NODES
+#if defined(ARCH_STM32WL)
+#define MAX_NUM_NODES 10
+#elif defined(ARCH_NRF52)
+#define MAX_NUM_NODES 80
+#elif defined(CONFIG_IDF_TARGET_ESP32S3)
+#include "Esp.h"
+static inline int get_max_num_nodes()
+{
+    uint32_t flash_size = ESP.getFlashChipSize() / (1024 * 1024); // Convert Bytes to MB
+    if (flash_size >= 15) {
+        return 250;
+    } else if (flash_size >= 7) {
+        return 200;
+    } else {
+        return 100;
+    }
+}
+#define MAX_NUM_NODES get_max_num_nodes()
+#else
 #define MAX_NUM_NODES 100
 #endif
+#endif
 
 /// Max number of channels allowed
 #define MAX_NUM_CHANNELS (member_size(meshtastic_ChannelFile, channels) / member_size(meshtastic_ChannelFile, channels[0]))
diff --git a/variants/CDEBYTE_E77-MBL/variant.h b/variants/CDEBYTE_E77-MBL/variant.h
index 7331dcedc..52801dac7 100644
--- a/variants/CDEBYTE_E77-MBL/variant.h
+++ b/variants/CDEBYTE_E77-MBL/variant.h
@@ -14,7 +14,6 @@ Do not expect a working Meshtastic device with this target.
 #define _VARIANT_EBYTE_E77_
 
 #define USE_STM32WLx
-#define MAX_NUM_NODES 10
 
 #define LED_PIN PB4 // LED1
 // #define LED_PIN PB3 // LED2
diff --git a/variants/crowpanel-esp32s3-5-epaper/platformio.ini b/variants/crowpanel-esp32s3-5-epaper/platformio.ini
index 7e95a5fcf..36816d616 100644
--- a/variants/crowpanel-esp32s3-5-epaper/platformio.ini
+++ b/variants/crowpanel-esp32s3-5-epaper/platformio.ini
@@ -5,6 +5,7 @@ board_build.flash_mode = qio
 board_build.psram_type = opi
 board_upload.flash_size = 8MB
 board_upload.maximum_size = 8388608
+board_build.partitions = default_8MB.csv
 board = esp32-s3-devkitc-1
 ;upload_port = /dev/ttyUSB0
 board_level = extra
@@ -32,6 +33,7 @@ board_build.flash_mode = qio
 board_build.psram_type = opi
 board_upload.flash_size = 8MB
 board_upload.maximum_size = 8388608
+board_build.partitions = default_8MB.csv
 board = esp32-s3-devkitc-1
 ;upload_port = /dev/ttyUSB0
 board_level = extra
@@ -59,6 +61,7 @@ board_build.flash_mode = qio
 board_build.psram_type = opi
 board_upload.flash_size = 8MB
 board_upload.maximum_size = 8388608
+board_build.partitions = default_8MB.csv
 board = esp32-s3-devkitc-1
 ;upload_port = /dev/ttyUSB0
 board_level = extra
diff --git a/variants/diy/platformio.ini b/variants/diy/platformio.ini
index 229f48bbf..825c464a2 100644
--- a/variants/diy/platformio.ini
+++ b/variants/diy/platformio.ini
@@ -88,6 +88,7 @@ debug_tool = jlink
 [env:t-energy-s3_e22]
 extends = esp32s3_base
 board = esp32-s3-devkitc-1
+board_build.partitions = default_16MB.csv
 board_level = extra
 board_upload.flash_size = 16MB ;Specify the FLASH capacity as 16MB
 board_build.arduino.memory_type = qio_opi ;Enable internal PSRAM
@@ -100,4 +101,4 @@ build_flags =
   -D BOARD_HAS_PSRAM
   -D ARDUINO_USB_MODE=0
   -D ARDUINO_USB_CDC_ON_BOOT=1
-  -I variants/diy/t-energy-s3_e22
\ No newline at end of file
+  -I variants/diy/t-energy-s3_e22
diff --git a/variants/dreamcatcher/platformio.ini b/variants/dreamcatcher/platformio.ini
index c57849d96..6527d89be 100644
--- a/variants/dreamcatcher/platformio.ini
+++ b/variants/dreamcatcher/platformio.ini
@@ -1,6 +1,7 @@
 [env:dreamcatcher] ; 2301, latest revision
 extends = esp32s3_base
 board = esp32s3box
+board_build.partitions = default_16MB.csv
 board_level = extra
 
 build_flags = 
@@ -8,7 +9,7 @@ build_flags =
   -D PRIVATE_HW
   -D OTHERNET_DC_REV=2301
   -I variants/dreamcatcher
-  -DARDUINO_USB_CDC_ON_BOOT=1
+  -D ARDUINO_USB_CDC_ON_BOOT=1
 
 lib_deps = ${esp32s3_base.lib_deps}
   earlephilhower/ESP8266Audio@^1.9.9
@@ -17,6 +18,7 @@ lib_deps = ${esp32s3_base.lib_deps}
 [env:dreamcatcher-2206] 
 extends = esp32s3_base
 board = esp32s3box
+board_build.partitions = default_16MB.csv
 board_level = extra
 
 build_flags = 
@@ -24,4 +26,4 @@ build_flags =
   -D PRIVATE_HW
   -D OTHERNET_DC_REV=2206
   -I variants/dreamcatcher
-  -DARDUINO_USB_CDC_ON_BOOT=1
\ No newline at end of file
+  -D ARDUINO_USB_CDC_ON_BOOT=1
diff --git a/variants/esp32-s3-pico/platformio.ini b/variants/esp32-s3-pico/platformio.ini
index 20a41ba56..69969c601 100644
--- a/variants/esp32-s3-pico/platformio.ini
+++ b/variants/esp32-s3-pico/platformio.ini
@@ -4,6 +4,7 @@ board_level = extra
 extends = esp32s3_base
 upload_protocol = esptool
 board = esp32-s3-pico
+board_build.partitions = default_16MB.csv
 
 board_upload.use_1200bps_touch = yes
 board_upload.wait_for_upload_port = yes
diff --git a/variants/heltec_capsule_sensor_v3/platformio.ini b/variants/heltec_capsule_sensor_v3/platformio.ini
index b5ffb65c2..8d1c039c1 100644
--- a/variants/heltec_capsule_sensor_v3/platformio.ini
+++ b/variants/heltec_capsule_sensor_v3/platformio.ini
@@ -2,7 +2,7 @@
 extends = esp32s3_base
 board = heltec_wifi_lora_32_V3
 board_check = true
-
+board_build.partitions = default_8MB.csv
 build_flags = 
   ${esp32s3_base.build_flags} -I variants/heltec_capsule_sensor_v3
   -D HELTEC_CAPSULE_SENSOR_V3
diff --git a/variants/heltec_v3/platformio.ini b/variants/heltec_v3/platformio.ini
index e8f73e1ef..4be96b019 100644
--- a/variants/heltec_v3/platformio.ini
+++ b/variants/heltec_v3/platformio.ini
@@ -2,7 +2,7 @@
 extends = esp32s3_base
 board = heltec_wifi_lora_32_V3
 board_check = true
-# Temporary until espressif creates a release with this new target
+board_build.partitions = default_8MB.csv
 build_flags = 
   ${esp32s3_base.build_flags} -D HELTEC_V3 -I variants/heltec_v3
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
\ No newline at end of file
+  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
diff --git a/variants/heltec_vision_master_e213/platformio.ini b/variants/heltec_vision_master_e213/platformio.ini
index 6ba597200..4bed30324 100644
--- a/variants/heltec_vision_master_e213/platformio.ini
+++ b/variants/heltec_vision_master_e213/platformio.ini
@@ -1,8 +1,9 @@
 [env:heltec-vision-master-e213]
 extends = esp32s3_base
 board = heltec_vision_master_e213
+board_build.partitions = default_8MB.csv
 build_flags = 
-  ${esp32s3_base.build_flags} 
+  ${esp32s3_base.build_flags}
   -Ivariants/heltec_vision_master_e213 
   -DHELTEC_VISION_MASTER_E213
   -DUSE_EINK
@@ -22,6 +23,7 @@ upload_speed = 115200
 [env:heltec-vision-master-e213-inkhud]
 extends = esp32s3_base, inkhud
 board = heltec_vision_master_e213
+board_build.partitions = default_8MB.csv
 build_src_filter =
   ${esp32_base.build_src_filter}
   ${inkhud.build_src_filter}
diff --git a/variants/heltec_vision_master_e290/platformio.ini b/variants/heltec_vision_master_e290/platformio.ini
index cfea81a7e..d28c2015b 100644
--- a/variants/heltec_vision_master_e290/platformio.ini
+++ b/variants/heltec_vision_master_e290/platformio.ini
@@ -2,6 +2,7 @@
 [env:heltec-vision-master-e290]
 extends = esp32s3_base
 board = heltec_vision_master_e290
+board_build.partitions = default_8MB.csv
 build_flags = 
   ${esp32s3_base.build_flags} 
   -I variants/heltec_vision_master_e290
@@ -26,6 +27,7 @@ upload_speed = 115200
 [env:heltec-vision-master-e290-inkhud]
 extends = esp32s3_base, inkhud
 board = heltec_vision_master_e290
+board_build.partitions = default_8MB.csv
 build_src_filter = 
   ${esp32_base.build_src_filter} 
   ${inkhud.build_src_filter}
diff --git a/variants/heltec_vision_master_t190/platformio.ini b/variants/heltec_vision_master_t190/platformio.ini
index 0c504d62b..53b56f57d 100644
--- a/variants/heltec_vision_master_t190/platformio.ini
+++ b/variants/heltec_vision_master_t190/platformio.ini
@@ -1,11 +1,11 @@
 [env:heltec-vision-master-t190]
 extends = esp32s3_base
 board = heltec_vision_master_t190
+board_build.partitions = default_8MB.csv
 build_flags = 
   ${esp32s3_base.build_flags} 
   -Ivariants/heltec_vision_master_t190
-  -DHELTEC_VISION_MASTER_T190  
- ; -D PRIVATE_HW 
+  -DHELTEC_VISION_MASTER_T190
 lib_deps =
   ${esp32s3_base.lib_deps}
   lewisxhe/PCF8563_Library@^1.0.1
diff --git a/variants/heltec_wireless_paper/platformio.ini b/variants/heltec_wireless_paper/platformio.ini
index 9979e1c1d..bd25a932a 100644
--- a/variants/heltec_wireless_paper/platformio.ini
+++ b/variants/heltec_wireless_paper/platformio.ini
@@ -2,6 +2,7 @@
 [env:heltec-wireless-paper]
 extends = esp32s3_base
 board = heltec_wifi_lora_32_V3
+board_build.partitions = default_8MB.csv
 build_flags = 
   ${esp32s3_base.build_flags} 
   -I variants/heltec_wireless_paper
@@ -23,6 +24,7 @@ upload_speed = 115200
 [env:heltec-wireless-paper-inkhud]
 extends = esp32s3_base, inkhud
 board = heltec_wifi_lora_32_V3
+board_build.partitions = default_8MB.csv
 build_src_filter =
   ${esp32_base.build_src_filter} 
   ${inkhud.build_src_filter}
diff --git a/variants/heltec_wireless_paper_v1/platformio.ini b/variants/heltec_wireless_paper_v1/platformio.ini
index 2ce7559f9..ec5fe2408 100644
--- a/variants/heltec_wireless_paper_v1/platformio.ini
+++ b/variants/heltec_wireless_paper_v1/platformio.ini
@@ -2,6 +2,7 @@
 extends = esp32s3_base
 board_level = extra
 board = heltec_wifi_lora_32_V3
+board_build.partitions = default_8MB.csv
 build_flags = 
   ${esp32s3_base.build_flags} 
   -I variants/heltec_wireless_paper_v1 
diff --git a/variants/heltec_wireless_tracker/platformio.ini b/variants/heltec_wireless_tracker/platformio.ini
index 4f686d289..5c19c37e6 100644
--- a/variants/heltec_wireless_tracker/platformio.ini
+++ b/variants/heltec_wireless_tracker/platformio.ini
@@ -1,6 +1,7 @@
 [env:heltec-wireless-tracker]
 extends = esp32s3_base
 board = heltec_wireless_tracker
+board_build.partitions = default_8MB.csv
 upload_protocol = esptool
 
 build_flags = 
diff --git a/variants/heltec_wireless_tracker_V1_0/platformio.ini b/variants/heltec_wireless_tracker_V1_0/platformio.ini
index 5f512b816..08b0ae95c 100644
--- a/variants/heltec_wireless_tracker_V1_0/platformio.ini
+++ b/variants/heltec_wireless_tracker_V1_0/platformio.ini
@@ -2,6 +2,7 @@
 extends = esp32s3_base
 board_level = extra
 board = heltec_wireless_tracker
+board_build.partitions = default_8MB.csv
 upload_protocol = esptool
 build_flags = 
   ${esp32s3_base.build_flags} -I variants/heltec_wireless_tracker_V1_0
diff --git a/variants/heltec_wsl_v3/platformio.ini b/variants/heltec_wsl_v3/platformio.ini
index c95659156..bc3e6ada1 100644
--- a/variants/heltec_wsl_v3/platformio.ini
+++ b/variants/heltec_wsl_v3/platformio.ini
@@ -1,7 +1,8 @@
 [env:heltec-wsl-v3] 
 extends = esp32s3_base
 board = heltec_wifi_lora_32_V3
+board_build.partitions = default_8MB.csv
 # Temporary until espressif creates a release with this new target
 build_flags = 
   ${esp32s3_base.build_flags} -D HELTEC_WSL_V3 -I variants/heltec_wsl_v3
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
\ No newline at end of file
+  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
diff --git a/variants/icarus/platformio.ini b/variants/icarus/platformio.ini
index b1dc01fc1..b4ea125cf 100644
--- a/variants/icarus/platformio.ini
+++ b/variants/icarus/platformio.ini
@@ -4,6 +4,7 @@ board = icarus
 board_level = extra
 board_check = true
 board_build.mcu = esp32s3
+board_build.partitions = default_8MB.csv
 upload_protocol = esptool
 upload_speed = 921600
 platform_packages = platformio/framework-arduinoespressif32@https://github.com/PowerFeather/powerfeather-meshtastic-arduino-lib/releases/download/2.0.16a/esp32-2.0.16.zip
@@ -15,5 +16,4 @@ build_unflags =
 build_flags = 
   ${esp32s3_base.build_flags} -D PRIVATE_HW -I variants/icarus
   -DBOARD_HAS_PSRAM 
-
-  -DARDUINO_USB_MODE=0
\ No newline at end of file
+  -DARDUINO_USB_MODE=0
diff --git a/variants/m5stack_cores3/platformio.ini b/variants/m5stack_cores3/platformio.ini
index fc73fabae..2253e75e2 100644
--- a/variants/m5stack_cores3/platformio.ini
+++ b/variants/m5stack_cores3/platformio.ini
@@ -3,6 +3,7 @@
 extends = esp32s3_base
 board = m5stack-cores3
 board_check = true
+board_build.partitions = default_16MB.csv
 upload_protocol = esptool
 
 build_flags = ${esp32_base.build_flags} 
diff --git a/variants/mesh-tab/platformio.ini b/variants/mesh-tab/platformio.ini
index 9e3429ac5..728fa5100 100644
--- a/variants/mesh-tab/platformio.ini
+++ b/variants/mesh-tab/platformio.ini
@@ -28,7 +28,6 @@ build_flags = ${esp32s3_base.build_flags}
   -D USE_LOG_DEBUG
   -D LOG_DEBUG_INC=\"DebugConfiguration.h\"
   -D RADIOLIB_SPI_PARANOID=0
-  -D MAX_NUM_NODES=250
   -D MAX_THREADS=40
   -D HAS_SCREEN=0
   -D HAS_TFT=1
diff --git a/variants/picomputer-s3/platformio.ini b/variants/picomputer-s3/platformio.ini
index 7f769253c..df2d0dfdc 100644
--- a/variants/picomputer-s3/platformio.ini
+++ b/variants/picomputer-s3/platformio.ini
@@ -2,6 +2,7 @@
 extends = esp32s3_base
 board = bpi_picow_esp32_s3
 board_check = true
+board_build.partitions = default_8MB.csv
 ;OpenOCD flash method
 ;upload_protocol = esp-builtin
 ;Normal method
@@ -22,7 +23,6 @@ build_src_filter =
 
 [env:picomputer-s3-tft]
 extends = env:picomputer-s3
-board_build.partitions = default_8MB.csv ; just for test
 
 build_flags =
   ${env:picomputer-s3.build_flags}
@@ -35,7 +35,6 @@ build_flags =
   -D INPUTDRIVER_MATRIX_TYPE=1
   -D USE_PIN_BUZZER=PIN_BUZZER
   -D USE_SX127x
-  -D MAX_NUM_NODES=200
   -D HAS_SCREEN=0
   -D HAS_TFT=1
   -D RAM_SIZE=1024
diff --git a/variants/rak3172/variant.h b/variants/rak3172/variant.h
index 21de65b2c..dd12fe393 100644
--- a/variants/rak3172/variant.h
+++ b/variants/rak3172/variant.h
@@ -7,6 +7,5 @@ Do not expect a working Meshtastic device with this target.
 #define _VARIANT_RAK3172_
 
 #define USE_STM32WLx
-#define MAX_NUM_NODES 10
 
 #endif
\ No newline at end of file
diff --git a/variants/seeed-sensecap-indicator/platformio.ini b/variants/seeed-sensecap-indicator/platformio.ini
index d351713d7..da11953b7 100644
--- a/variants/seeed-sensecap-indicator/platformio.ini
+++ b/variants/seeed-sensecap-indicator/platformio.ini
@@ -6,6 +6,7 @@ platform_packages =
 
 board = seeed-sensecap-indicator
 board_check = true
+board_build.partitions = default_8MB.csv
 upload_protocol = esptool
 
 build_flags = ${esp32_base.build_flags}
@@ -32,7 +33,6 @@ lib_deps = ${esp32s3_base.lib_deps}
 extends = env:seeed-sensecap-indicator
 board_level = main
 upload_speed = 460800
-board_build.partitions = default_8MB.csv ; must be here for some reason, board.json is not enough !?
 
 build_flags =
   ${env:seeed-sensecap-indicator.build_flags}
@@ -46,7 +46,6 @@ build_flags =
   -D INPUTDRIVER_BUTTON_TYPE=38
   -D HAS_TELEMETRY=0
   -D CONFIG_DISABLE_HAL_LOCKS=1
-  -D MAX_NUM_NODES=250
   -D HAS_SCREEN=0
   -D HAS_TFT=1
   -D DISPLAY_SET_RESOLUTION
diff --git a/variants/seeed_xiao_s3/platformio.ini b/variants/seeed_xiao_s3/platformio.ini
index 3d10d7136..9d935e2e0 100644
--- a/variants/seeed_xiao_s3/platformio.ini
+++ b/variants/seeed_xiao_s3/platformio.ini
@@ -2,7 +2,7 @@
 extends = esp32s3_base
 board = seeed-xiao-s3
 board_check = true
-board_build.mcu = esp32s3
+board_build.partitions = default_8MB.csv
 upload_protocol = esptool
 upload_speed = 921600
 lib_deps =
diff --git a/variants/station-g2/platformio.ini b/variants/station-g2/platformio.ini
index b674c8bae..4ddd28f1c 100755
--- a/variants/station-g2/platformio.ini
+++ b/variants/station-g2/platformio.ini
@@ -2,6 +2,7 @@
 extends = esp32s3_base
 board = station-g2
 board_check = true
+board_build.partitions = default_16MB.csv
 board_build.mcu = esp32s3
 upload_protocol = esptool
 ;upload_port = /dev/ttyACM0
@@ -13,6 +14,6 @@ build_unflags =
   -DARDUINO_USB_MODE=1
 build_flags = 
   ${esp32s3_base.build_flags} -D STATION_G2 -I variants/station-g2
-  -DBOARD_HAS_PSRAM 
+  -DBOARD_HAS_PSRAM
   -DSTATION_G2
-  -DARDUINO_USB_MODE=0
\ No newline at end of file
+  -DARDUINO_USB_MODE=0
diff --git a/variants/t-deck/platformio.ini b/variants/t-deck/platformio.ini
index a0005c9c6..4671a5a9b 100644
--- a/variants/t-deck/platformio.ini
+++ b/variants/t-deck/platformio.ini
@@ -3,6 +3,7 @@
 extends = esp32s3_base
 board = t-deck
 board_check = true
+board_build.partitions = default_16MB.csv
 upload_protocol = esptool
 
 build_flags = ${esp32s3_base.build_flags} 
@@ -20,7 +21,6 @@ lib_deps = ${esp32s3_base.lib_deps}
 
 [env:t-deck-tft]
 extends = env:t-deck
-board_build.partitions = default_16MB.csv
 
 build_flags =
   ${env:t-deck.build_flags}
@@ -38,7 +38,6 @@ build_flags =
   -D INPUTDRIVER_ENCODER_DOWN=15
   -D INPUTDRIVER_ENCODER_BTN=0
   -D INPUTDRIVER_BUTTON_TYPE=0
-  -D MAX_NUM_NODES=250
   -D HAS_SDCARD
   -D HAS_SCREEN=0
   -D HAS_TFT=1
diff --git a/variants/t-eth-elite/platformio.ini b/variants/t-eth-elite/platformio.ini
index 8c2f3bc37..ec6c82a5d 100644
--- a/variants/t-eth-elite/platformio.ini
+++ b/variants/t-eth-elite/platformio.ini
@@ -2,11 +2,12 @@
 extends = esp32s3_base
 board = esp32s3box
 board_check = true
+board_build.partitions = default_16MB.csv
 build_flags = 
   ${esp32s3_base.build_flags}
   -D T_ETH_ELITE
   -I variants/t-eth-elite
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
+  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 
 lib_ignore = 
     Ethernet
diff --git a/variants/t-watch-s3/platformio.ini b/variants/t-watch-s3/platformio.ini
index 8f48cf6c4..f98237943 100644
--- a/variants/t-watch-s3/platformio.ini
+++ b/variants/t-watch-s3/platformio.ini
@@ -3,6 +3,7 @@
 extends = esp32s3_base
 board = t-watch-s3
 board_check = true
+board_build.partitions = default_16MB.csv
 upload_protocol = esptool
 
 build_flags = ${esp32_base.build_flags} 
diff --git a/variants/tbeam-s3-core/platformio.ini b/variants/tbeam-s3-core/platformio.ini
index e50d506b9..a7bdf963f 100644
--- a/variants/tbeam-s3-core/platformio.ini
+++ b/variants/tbeam-s3-core/platformio.ini
@@ -2,6 +2,7 @@
 [env:tbeam-s3-core]
 extends = esp32s3_base
 board = tbeam-s3-core
+board_build.partitions = default_8MB.csv
 board_check = true
 
 lib_deps =
diff --git a/variants/tracksenger/platformio.ini b/variants/tracksenger/platformio.ini
index 796a3b7d5..b36b9c45a 100644
--- a/variants/tracksenger/platformio.ini
+++ b/variants/tracksenger/platformio.ini
@@ -1,6 +1,7 @@
 [env:tracksenger]
 extends = esp32s3_base
 board = heltec_wireless_tracker
+board_build.partitions = default_8MB.csv
 upload_protocol = esp-builtin
 
 build_flags = 
@@ -16,6 +17,7 @@ lib_deps =
 [env:tracksenger-lcd]
 extends = esp32s3_base
 board = heltec_wireless_tracker
+board_build.partitions = default_8MB.csv
 upload_protocol = esp-builtin
 
 build_flags = 
@@ -31,6 +33,7 @@ lib_deps =
 [env:tracksenger-oled]
 extends = esp32s3_base
 board = heltec_wireless_tracker
+board_build.partitions = default_8MB.csv
 upload_protocol = esp-builtin
 
 build_flags = 
diff --git a/variants/unphone/platformio.ini b/variants/unphone/platformio.ini
index 88f6e7469..18efbb157 100644
--- a/variants/unphone/platformio.ini
+++ b/variants/unphone/platformio.ini
@@ -3,6 +3,7 @@
 [env:unphone]
 extends = esp32s3_base
 board = unphone
+board_build.partitions = default_8MB.csv
 upload_speed = 921600
 monitor_speed = 115200
 monitor_filters = esp32_exception_decoder
@@ -32,7 +33,6 @@ lib_deps = ${esp32s3_base.lib_deps}
 
 [env:unphone-tft]
 extends = env:unphone
-board_build.partitions = default_8MB.csv
 build_flags =
   ${env:unphone.build_flags}
   -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
@@ -42,7 +42,6 @@ build_flags =
   -D MESHTASTIC_EXCLUDE_SERIAL=1
   -D MESHTASTIC_EXCLUDE_SOCKETAPI=1
   -D INPUTDRIVER_BUTTON_TYPE=21
-  -D MAX_NUM_NODES=200
   -D MAX_THREADS=40
   -D HAS_SCREEN=0
   -D HAS_TFT=1
diff --git a/variants/wio-e5/variant.h b/variants/wio-e5/variant.h
index ac92915bb..1de424d1d 100644
--- a/variants/wio-e5/variant.h
+++ b/variants/wio-e5/variant.h
@@ -13,7 +13,6 @@ Do not expect a working Meshtastic device with this target.
 #define _VARIANT_WIOE5_
 
 #define USE_STM32WLx
-#define MAX_NUM_NODES 10
 
 #define LED_PIN PB5
 #define LED_STATE_ON 1

From 22aa2d7582df3f22caddff975d5e651407dd5472 Mon Sep 17 00:00:00 2001
From: Bob Reese <rbreesems@gmail.com>
Date: Tue, 18 Mar 2025 20:20:15 -0500
Subject: [PATCH 043/116] Fixed UF2 generation problem with sys.executable path
 has spaces in it (#6346)

---
 bin/platformio-custom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/platformio-custom.py b/bin/platformio-custom.py
index af228899f..600f9447f 100644
--- a/bin/platformio-custom.py
+++ b/bin/platformio-custom.py
@@ -83,7 +83,7 @@ if platform.name == "espressif32":
 
 if platform.name == "nordicnrf52":
     env.AddPostAction("$BUILD_DIR/${PROGNAME}.hex",
-                      env.VerboseAction(f"{sys.executable} ./bin/uf2conv.py $BUILD_DIR/firmware.hex -c -f 0xADA52840 -o $BUILD_DIR/firmware.uf2",
+                      env.VerboseAction(f"\"{sys.executable}\" ./bin/uf2conv.py $BUILD_DIR/firmware.hex -c -f 0xADA52840 -o $BUILD_DIR/firmware.uf2",
                                         "Generating UF2 file"))
 
 Import("projenv")

From 077759e15d734a1ac2b057b9c82a7c5346a6da33 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 19 Mar 2025 05:11:42 -0500
Subject: [PATCH 044/116] Upgrade trunk (#6347)

Co-authored-by: sachaw <11172820+sachaw@users.noreply.github.com>
---
 .trunk/trunk.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
index b0561679a..fc22d55ac 100644
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -10,13 +10,13 @@ lint:
   enabled:
     - prettier@3.5.3
     - trufflehog@3.88.17
-    - yamllint@1.36.0
+    - yamllint@1.36.2
     - bandit@1.8.3
     - checkov@3.2.386
     - terrascan@1.19.9
     - trivy@0.60.0
     - taplo@0.9.3
-    - ruff@0.10.0
+    - ruff@0.11.0
     - isort@6.0.1
     - markdownlint@0.44.0
     - oxipng@9.1.4

From f8ad02aab3cf92d4d3fa1b65ed8d41c1807f5766 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Wed, 19 Mar 2025 06:20:50 -0500
Subject: [PATCH 045/116] Update version.properties

---
 version.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.properties b/version.properties
index 79fae04ed..4c2cefef3 100644
--- a/version.properties
+++ b/version.properties
@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 6
-build = 1
+build = 2

From f41afb14b15aed9f565df93f341a5bff3120f11b Mon Sep 17 00:00:00 2001
From: Jorropo <jorropo.pgm@gmail.com>
Date: Thu, 20 Mar 2025 11:41:29 +0100
Subject: [PATCH 046/116] raise the multicast UDP TTL limit (#6343)

Since 96ba94843b25f787148e3353a7476ed175518b3b we don't spray packets to all machines on the network.

So we can allow ourself to raise the TTL limit, this allows users who run L3 IGMP Routing infrastructure to pass meshtastic frames over UDP.

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
---
 src/mesh/udp/UdpMulticastThread.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesh/udp/UdpMulticastThread.h b/src/mesh/udp/UdpMulticastThread.h
index e5eb28d00..ab1c7bc93 100644
--- a/src/mesh/udp/UdpMulticastThread.h
+++ b/src/mesh/udp/UdpMulticastThread.h
@@ -22,7 +22,7 @@ class UdpMulticastThread : public concurrency::OSThread
 
     void start()
     {
-        if (udp.listenMulticast(udpIpAddress, UDP_MULTICAST_DEFAUL_PORT)) {
+        if (udp.listenMulticast(udpIpAddress, UDP_MULTICAST_DEFAUL_PORT, 64)) {
             LOG_DEBUG("UDP Listening on IP: %s", WiFi.localIP().toString().c_str());
             udp.onPacket([this](AsyncUDPPacket packet) { onReceive(packet); });
         } else {

From d1068fd1e451146d2982b17ee27838a60fb26b5b Mon Sep 17 00:00:00 2001
From: Jorropo <jorropo.pgm@gmail.com>
Date: Thu, 20 Mar 2025 14:47:39 +0100
Subject: [PATCH 047/116] Add UDP multicast support on linux. (#6342)

* Add UDP multicast support on linux.

Closes #6326

We tested it an it works.

This is really hacky to say the least.

* Add libuv to Linux packaging

* Trunkadunk

* Correct ref

* Add libuv1-dev to setup-native

---------

Co-authored-by: vidplace7 <vidplace7@gmail.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
---
 .devcontainer/Dockerfile                |  1 +
 .github/actions/setup-native/action.yml |  2 +-
 Dockerfile                              |  4 ++--
 alpine.Dockerfile                       |  4 ++--
 arch/portduino/portduino.ini            |  4 +++-
 debian/control                          |  1 +
 meshtasticd.spec.rpkg                   |  1 +
 src/main.cpp                            |  5 +++++
 src/mesh/udp/UdpMulticastThread.h       | 15 ++++++++++++++-
 9 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 4b9f069ab..30af24bd2 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -29,6 +29,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     gpg \
     gnupg2 \
     libusb-1.0-0-dev \
+    libuv1-dev \
     libi2c-dev \
     libxcb-xkb-dev \
     libxkbcommon-dev \
diff --git a/.github/actions/setup-native/action.yml b/.github/actions/setup-native/action.yml
index 36c95d943..05f95cd40 100644
--- a/.github/actions/setup-native/action.yml
+++ b/.github/actions/setup-native/action.yml
@@ -11,4 +11,4 @@ runs:
     - name: Install libs needed for native build
       shell: bash
       run: |
-        sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev libi2c-dev
+        sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev libi2c-dev libuv1-dev
diff --git a/Dockerfile b/Dockerfile
index fd1bb6164..733a46325 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ ENV TZ=Etc/UTC
 ENV PIP_ROOT_USER_ACTION=ignore
 RUN apt-get update && apt-get install --no-install-recommends -y \
         wget g++ zip git ca-certificates \
-        libgpiod-dev libyaml-cpp-dev libbluetooth-dev libi2c-dev \
+        libgpiod-dev libyaml-cpp-dev libbluetooth-dev libi2c-dev libuv1-dev \
         libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev pkg-config \
     && apt-get clean && rm -rf /var/lib/apt/lists/* \
     && pip install --no-cache-dir -U platformio \
@@ -38,7 +38,7 @@ ENV TZ=Etc/UTC
 USER root
 
 RUN apt-get update && apt-get --no-install-recommends -y install \
-        libc-bin libc6 libgpiod2 libyaml-cpp0.7 libi2c0 libulfius2.7 libusb-1.0-0-dev liborcania2.3 libssl3 \
+        libc-bin libc6 libgpiod2 libyaml-cpp0.7 libi2c0 libuv1 libusb-1.0-0-dev liborcania2.3 libulfius2.7 libssl3 \
     && apt-get clean && rm -rf /var/lib/apt/lists/* \
     && mkdir -p /var/lib/meshtasticd \
     && mkdir -p /etc/meshtasticd/config.d \
diff --git a/alpine.Dockerfile b/alpine.Dockerfile
index b6d91a75a..17afc2964 100644
--- a/alpine.Dockerfile
+++ b/alpine.Dockerfile
@@ -9,7 +9,7 @@ FROM python:3.13-alpine3.21 AS builder
 ENV PIP_ROOT_USER_ACTION=ignore
 RUN apk --no-cache add \
         bash g++ libstdc++-dev linux-headers zip git ca-certificates libgpiod-dev yaml-cpp-dev bluez-dev \
-        libusb-dev i2c-tools-dev openssl-dev pkgconf argp-standalone \
+        libusb-dev i2c-tools-dev libuv-dev openssl-dev pkgconf argp-standalone \
     && rm -rf /var/cache/apk/* \
     && pip install --no-cache-dir -U platformio \
     && mkdir /tmp/firmware
@@ -32,7 +32,7 @@ FROM alpine:3.21
 USER root
 
 RUN apk --no-cache add \
-        libstdc++ libgpiod yaml-cpp libusb i2c-tools \
+        libstdc++ libgpiod yaml-cpp libusb i2c-tools libuv \
     && rm -rf /var/cache/apk/* \
     && mkdir -p /var/lib/meshtasticd \
     && mkdir -p /etc/meshtasticd/config.d \
diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini
index 7ea6a77a2..734a4f91e 100644
--- a/arch/portduino/portduino.ini
+++ b/arch/portduino/portduino.ini
@@ -1,6 +1,6 @@
 ; The Portduino based 'native' environment. Currently supported on Linux targets with real LoRa hardware (or simulated).
 [portduino_base]
-platform = https://github.com/meshtastic/platform-native.git#562d189828f09fbf4c4093b3c0104bae9d8e9ff9
+platform = https://github.com/meshtastic/platform-native.git#df71ed0040e9aad767a002829330965b78fc452a
 framework = arduino
 
 build_src_filter = 
@@ -34,10 +34,12 @@ build_flags =
   -Isrc/platform/portduino
   -DRADIOLIB_EEPROM_UNSUPPORTED
   -DPORTDUINO_LINUX_HARDWARE
+  -DHAS_UDP_MULTICAST
   -lpthread
   -lstdc++fs
   -lbluetooth
   -lgpiod
   -lyaml-cpp
   -li2c
+  -luv
   -std=c++17
diff --git a/debian/control b/debian/control
index b3a8eb58e..693cd6aa5 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Depends: debhelper-compat (= 13),
                libbluetooth-dev,
                libusb-1.0-0-dev,
                libi2c-dev,
+               libuv1-dev,
                openssl,
                libssl-dev,
                libulfius-dev,
diff --git a/meshtasticd.spec.rpkg b/meshtasticd.spec.rpkg
index 0a0f03557..a09261056 100644
--- a/meshtasticd.spec.rpkg
+++ b/meshtasticd.spec.rpkg
@@ -36,6 +36,7 @@ BuildRequires: pkgconfig(libgpiod)
 BuildRequires: pkgconfig(bluez)
 BuildRequires: pkgconfig(libusb-1.0)
 BuildRequires: libi2c-devel
+BuildRequires: pkgconfig(libuv)
 # Web components:
 BuildRequires: pkgconfig(openssl)
 BuildRequires: pkgconfig(liborcania)
diff --git a/src/main.cpp b/src/main.cpp
index 797d911d1..e9e0c9d4b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -822,6 +822,11 @@ void setup()
 #ifdef HAS_UDP_MULTICAST
     LOG_DEBUG("Start multicast thread");
     udpThread = new UdpMulticastThread();
+#ifdef ARCH_PORTDUINO
+    // FIXME: portduino does not ever call onNetworkConnected so call it here because I don't know what happen if I call
+    // onNetworkConnected there
+    udpThread->start();
+#endif
 #endif
     service = new MeshService();
     service->init();
diff --git a/src/mesh/udp/UdpMulticastThread.h b/src/mesh/udp/UdpMulticastThread.h
index ab1c7bc93..e2c3be369 100644
--- a/src/mesh/udp/UdpMulticastThread.h
+++ b/src/mesh/udp/UdpMulticastThread.h
@@ -23,7 +23,12 @@ class UdpMulticastThread : public concurrency::OSThread
     void start()
     {
         if (udp.listenMulticast(udpIpAddress, UDP_MULTICAST_DEFAUL_PORT, 64)) {
+#if !defined(ARCH_PORTDUINO)
+            // FIXME(PORTDUINO): arduino lacks IPAddress::toString()
             LOG_DEBUG("UDP Listening on IP: %s", WiFi.localIP().toString().c_str());
+#else
+            LOG_DEBUG("UDP Listening");
+#endif
             udp.onPacket([this](AsyncUDPPacket packet) { onReceive(packet); });
         } else {
             LOG_DEBUG("Failed to listen on UDP");
@@ -33,7 +38,10 @@ class UdpMulticastThread : public concurrency::OSThread
     void onReceive(AsyncUDPPacket packet)
     {
         size_t packetLength = packet.length();
+#ifndef ARCH_PORTDUINO
+        // FIXME(PORTDUINO): arduino lacks IPAddress::toString()
         LOG_DEBUG("UDP broadcast from: %s, len=%u", packet.remoteIP().toString().c_str(), packetLength);
+#endif
         meshtastic_MeshPacket mp;
         LOG_DEBUG("Decoding MeshPacket from UDP len=%u", packetLength);
         bool isPacketDecoded = pb_decode_from_bytes(packet.data(), packetLength, &meshtastic_MeshPacket_msg, &mp);
@@ -48,9 +56,14 @@ class UdpMulticastThread : public concurrency::OSThread
 
     bool onSend(const meshtastic_MeshPacket *mp)
     {
-        if (!mp || WiFi.status() != WL_CONNECTED) {
+        if (!mp || !udp) {
             return false;
         }
+#if !defined(ARCH_PORTDUINO)
+        if (WiFi.status() != WL_CONNECTED) {
+            return false;
+        }
+#endif
         LOG_DEBUG("Broadcasting packet over UDP (id=%u)", mp->id);
         uint8_t buffer[meshtastic_MeshPacket_size];
         size_t encodedLength = pb_encode_to_bytes(buffer, sizeof(buffer), &meshtastic_MeshPacket_msg, mp);

From 46235f6f8beb07b88639a3026525435c9877ee55 Mon Sep 17 00:00:00 2001
From: Austin <vidplace7@gmail.com>
Date: Thu, 20 Mar 2025 09:49:28 -0400
Subject: [PATCH 048/116] RP2xx0: Add UDP Multicast support (#6327)

---
 src/mesh/udp/UdpMulticastThread.h | 2 +-
 variants/rpipico2w/platformio.ini | 3 ++-
 variants/rpipicow/platformio.ini  | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/mesh/udp/UdpMulticastThread.h b/src/mesh/udp/UdpMulticastThread.h
index e2c3be369..7067cced9 100644
--- a/src/mesh/udp/UdpMulticastThread.h
+++ b/src/mesh/udp/UdpMulticastThread.h
@@ -83,4 +83,4 @@ class UdpMulticastThread : public concurrency::OSThread
     IPAddress udpIpAddress;
     AsyncUDP udp;
 };
-#endif // ARCH_ESP32
\ No newline at end of file
+#endif // HAS_UDP_MULTICAST
\ No newline at end of file
diff --git a/variants/rpipico2w/platformio.ini b/variants/rpipico2w/platformio.ini
index 351774221..282be1a42 100644
--- a/variants/rpipico2w/platformio.ini
+++ b/variants/rpipico2w/platformio.ini
@@ -23,8 +23,9 @@ build_flags = ${rp2350_base.build_flags}
   -DHAS_WIFI=1
   -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m33"
   -fexceptions  # for exception handling in MQTT
+  -DHAS_UDP_MULTICAST=1
 build_src_filter = ${rp2350_base.build_src_filter} +<mesh/wifi/>
 lib_deps =
   ${rp2350_base.lib_deps}
   ${networking_base.lib_deps}
-debug_build_flags = ${rp2350_base.build_flags}, -g
\ No newline at end of file
+debug_build_flags = ${rp2350_base.build_flags}, -g
diff --git a/variants/rpipicow/platformio.ini b/variants/rpipicow/platformio.ini
index 7a43ece3b..4b714434a 100644
--- a/variants/rpipicow/platformio.ini
+++ b/variants/rpipicow/platformio.ini
@@ -10,9 +10,10 @@ build_flags = ${rp2040_base.build_flags}
   -DHW_SPI1_DEVICE
   -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
   -fexceptions  # for exception handling in MQTT
+  -DHAS_UDP_MULTICAST=1
 build_src_filter = ${rp2040_base.build_src_filter} +<mesh/wifi/>
 lib_deps =
   ${rp2040_base.lib_deps}
   ${networking_base.lib_deps}
 debug_build_flags = ${rp2040_base.build_flags}, -g
-debug_tool = cmsis-dap ; for e.g. Picotool
\ No newline at end of file
+debug_tool = cmsis-dap ; for e.g. Picotool

From 0d95b1afcc56a5c027e6fc5a8465ac580d52f722 Mon Sep 17 00:00:00 2001
From: raulperdomo <36527079+raulperdomo@users.noreply.github.com>
Date: Thu, 20 Mar 2025 11:40:13 -0400
Subject: [PATCH 049/116] Added bounds checking to memcpy and use memory-safe
 strlcpy (#6351)

* Added bounds checking to memcpy and use memory-safe strlcpy for reading serial data in processWXSerial() function.

* Fixed linting with trunk
---
 src/modules/SerialModule.cpp | 134 ++++++++++++++++++-----------------
 1 file changed, 68 insertions(+), 66 deletions(-)

diff --git a/src/modules/SerialModule.cpp b/src/modules/SerialModule.cpp
index 811d1ec91..34ece2312 100644
--- a/src/modules/SerialModule.cpp
+++ b/src/modules/SerialModule.cpp
@@ -468,81 +468,83 @@ void SerialModule::processWXSerial()
                     // Extract the current line
                     char line[meshtastic_Constants_DATA_PAYLOAD_LEN];
                     memset(line, '\0', sizeof(line));
-                    memcpy(line, &serialBytes[lineStart], lineEnd - lineStart);
-                    if (strstr(line, "Wind") != NULL) // we have a wind line
-                    {
-                        gotwind = true;
-                        // Find the positions of "=" signs in the line
-                        char *windDirPos = strstr(line, "WindDir      = ");
-                        char *windSpeedPos = strstr(line, "WindSpeed    = ");
-                        char *windGustPos = strstr(line, "WindGust     = ");
+                    if (lineEnd - lineStart < sizeof(line) - 1) {
+                        memcpy(line, &serialBytes[lineStart], lineEnd - lineStart);
+                        if (strstr(line, "Wind") != NULL) // we have a wind line
+                        {
+                            gotwind = true;
+                            // Find the positions of "=" signs in the line
+                            char *windDirPos = strstr(line, "WindDir      = ");
+                            char *windSpeedPos = strstr(line, "WindSpeed    = ");
+                            char *windGustPos = strstr(line, "WindGust     = ");
 
-                        if (windDirPos != NULL) {
-                            // Extract data after "=" for WindDir
-                            strcpy(windDir, windDirPos + 15); // Add 15 to skip "WindDir = "
-                            double radians = GeoCoord::toRadians(strtof(windDir, nullptr));
-                            dir_sum_sin += sin(radians);
-                            dir_sum_cos += cos(radians);
-                            dirCount++;
-                        } else if (windSpeedPos != NULL) {
-                            // Extract data after "=" for WindSpeed
-                            strcpy(windVel, windSpeedPos + 15); // Add 15 to skip "WindSpeed = "
-                            float newv = strtof(windVel, nullptr);
-                            velSum += newv;
-                            velCount++;
-                            if (newv < lull || lull == -1)
-                                lull = newv;
+                            if (windDirPos != NULL) {
+                                // Extract data after "=" for WindDir
+                                strlcpy(windDir, windDirPos + 15, sizeof(windDir)); // Add 15 to skip "WindDir = "
+                                double radians = GeoCoord::toRadians(strtof(windDir, nullptr));
+                                dir_sum_sin += sin(radians);
+                                dir_sum_cos += cos(radians);
+                                dirCount++;
+                            } else if (windSpeedPos != NULL) {
+                                // Extract data after "=" for WindSpeed
+                                strlcpy(windVel, windSpeedPos + 15, sizeof(windVel)); // Add 15 to skip "WindSpeed = "
+                                float newv = strtof(windVel, nullptr);
+                                velSum += newv;
+                                velCount++;
+                                if (newv < lull || lull == -1)
+                                    lull = newv;
 
-                        } else if (windGustPos != NULL) {
-                            strcpy(windGust, windGustPos + 15); // Add 15 to skip "WindSpeed = "
-                            float newg = strtof(windGust, nullptr);
-                            if (newg > gust)
-                                gust = newg;
-                        }
+                            } else if (windGustPos != NULL) {
+                                strlcpy(windGust, windGustPos + 15, sizeof(windGust)); // Add 15 to skip "WindSpeed = "
+                                float newg = strtof(windGust, nullptr);
+                                if (newg > gust)
+                                    gust = newg;
+                            }
 
-                        // these are also voltage data we care about possibly
-                    } else if (strstr(line, "BatVoltage") != NULL) { // we have a battVoltage line
-                        char *batVoltagePos = strstr(line, "BatVoltage     = ");
-                        if (batVoltagePos != NULL) {
-                            strcpy(batVoltage, batVoltagePos + 17); // 18 for ws 80, 17 for ws85
-                            batVoltageF = strtof(batVoltage, nullptr);
-                            break; // last possible data we want so break
-                        }
-                    } else if (strstr(line, "CapVoltage") != NULL) { // we have a cappVoltage line
-                        char *capVoltagePos = strstr(line, "CapVoltage     = ");
-                        if (capVoltagePos != NULL) {
-                            strcpy(capVoltage, capVoltagePos + 17); // 18 for ws 80, 17 for ws85
-                            capVoltageF = strtof(capVoltage, nullptr);
-                        }
-                        // GXTS04Temp   = 24.4
-                    } else if (strstr(line, "GXTS04Temp") != NULL) { // we have a temperature line
-                        char *tempPos = strstr(line, "GXTS04Temp   = ");
-                        if (tempPos != NULL) {
-                            strcpy(temperature, tempPos + 15); // 15 spaces for ws85
-                            temperatureF = strtof(temperature, nullptr);
-                        }
+                            // these are also voltage data we care about possibly
+                        } else if (strstr(line, "BatVoltage") != NULL) { // we have a battVoltage line
+                            char *batVoltagePos = strstr(line, "BatVoltage     = ");
+                            if (batVoltagePos != NULL) {
+                                strlcpy(batVoltage, batVoltagePos + 17, sizeof(batVoltage)); // 18 for ws 80, 17 for ws85
+                                batVoltageF = strtof(batVoltage, nullptr);
+                                break; // last possible data we want so break
+                            }
+                        } else if (strstr(line, "CapVoltage") != NULL) { // we have a cappVoltage line
+                            char *capVoltagePos = strstr(line, "CapVoltage     = ");
+                            if (capVoltagePos != NULL) {
+                                strlcpy(capVoltage, capVoltagePos + 17, sizeof(capVoltage)); // 18 for ws 80, 17 for ws85
+                                capVoltageF = strtof(capVoltage, nullptr);
+                            }
+                            // GXTS04Temp   = 24.4
+                        } else if (strstr(line, "GXTS04Temp") != NULL) { // we have a temperature line
+                            char *tempPos = strstr(line, "GXTS04Temp   = ");
+                            if (tempPos != NULL) {
+                                strlcpy(temperature, tempPos + 15, sizeof(temperature)); // 15 spaces for ws85
+                                temperatureF = strtof(temperature, nullptr);
+                            }
 
-                    } else if (strstr(line, "RainIntSum") != NULL) { // we have a rainsum line
-                        // LOG_INFO(line);
-                        char *pos = strstr(line, "RainIntSum     = ");
-                        if (pos != NULL) {
-                            strcpy(rainStr, pos + 17); // 17 spaces for ws85
-                            rainSum = int(strtof(rainStr, nullptr));
-                        }
-
-                    } else if (strstr(line, "Rain") != NULL) {  // we have a rain line
-                        if (strstr(line, "WaveRain") == NULL) { // skip WaveRain lines though.
+                        } else if (strstr(line, "RainIntSum") != NULL) { // we have a rainsum line
                             // LOG_INFO(line);
-                            char *pos = strstr(line, "Rain           = ");
+                            char *pos = strstr(line, "RainIntSum     = ");
                             if (pos != NULL) {
-                                strcpy(rainStr, pos + 17); // 17 spaces for ws85
-                                rain = strtof(rainStr, nullptr);
+                                strlcpy(rainStr, pos + 17, sizeof(rainStr)); // 17 spaces for ws85
+                                rainSum = int(strtof(rainStr, nullptr));
+                            }
+
+                        } else if (strstr(line, "Rain") != NULL) {  // we have a rain line
+                            if (strstr(line, "WaveRain") == NULL) { // skip WaveRain lines though.
+                                // LOG_INFO(line);
+                                char *pos = strstr(line, "Rain           = ");
+                                if (pos != NULL) {
+                                    strlcpy(rainStr, pos + 17, sizeof(rainStr)); // 17 spaces for ws85
+                                    rain = strtof(rainStr, nullptr);
+                                }
                             }
                         }
-                    }
 
-                    // Update lineStart for the next line
-                    lineStart = lineEnd + 1;
+                        // Update lineStart for the next line
+                        lineStart = lineEnd + 1;
+                    }
                 }
             }
             break;

From 31c0e8fa2ca0cce903e73749454324c672c18b4c Mon Sep 17 00:00:00 2001
From: Mike <mikhael.skvortsov@gmail.com>
Date: Thu, 20 Mar 2025 21:39:33 +0300
Subject: [PATCH 050/116] Support WiFi OTA (#6352)

* Support WiFi OTA

* Fix trunk warnings

* Make getVersion() check for project name too

---------

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
---
 src/mesh/NodeDB.cpp               | 10 ++++
 src/modules/AdminModule.cpp       | 25 ++++++---
 src/platform/esp32/WiFiOTA.cpp    | 92 +++++++++++++++++++++++++++++++
 src/platform/esp32/WiFiOTA.h      | 18 ++++++
 src/platform/esp32/main-esp32.cpp | 17 ++++--
 5 files changed, 149 insertions(+), 13 deletions(-)
 create mode 100644 src/platform/esp32/WiFiOTA.cpp
 create mode 100644 src/platform/esp32/WiFiOTA.h

diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
index e8efa7566..a9130c3a9 100644
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -51,6 +51,10 @@
 #include <utility/bonding.h>
 #endif
 
+#if defined(ARCH_ESP32) && !MESHTASTIC_EXCLUDE_WIFI
+#include <WiFiOTA.h>
+#endif
+
 NodeDB *nodeDB = nullptr;
 
 // we have plenty of ram so statically alloc this tempbuf (for now)
@@ -635,6 +639,12 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
     config.display.wake_on_tap_or_motion = true;
 #endif
 
+#if defined(ARCH_ESP32) && !MESHTASTIC_EXCLUDE_WIFI
+    if (WiFiOTA::isUpdated()) {
+        WiFiOTA::recoverConfig(&config.network);
+    }
+#endif
+
     initConfigIntervals();
 }
 
diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp
index ae25ea3fc..c04c26a5a 100644
--- a/src/modules/AdminModule.cpp
+++ b/src/modules/AdminModule.cpp
@@ -10,6 +10,9 @@
 #if defined(ARCH_ESP32) && !MESHTASTIC_EXCLUDE_BLUETOOTH
 #include "BleOta.h"
 #endif
+#if defined(ARCH_ESP32) && !MESHTASTIC_EXCLUDE_WIFI
+#include "WiFiOTA.h"
+#endif
 #include "Router.h"
 #include "configuration.h"
 #include "main.h"
@@ -194,19 +197,23 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
     }
     case meshtastic_AdminMessage_reboot_ota_seconds_tag: {
         int32_t s = r->reboot_ota_seconds;
-#if defined(ARCH_ESP32) && !MESHTASTIC_EXCLUDE_BLUETOOTH
-        if (BleOta::getOtaAppVersion().isEmpty()) {
-            LOG_INFO("No OTA firmware available, scheduling regular reboot in %d seconds", s);
-            screen->startAlert("Rebooting...");
-        } else {
+#if defined(ARCH_ESP32)
+#if !MESHTASTIC_EXCLUDE_BLUETOOTH
+        if (!BleOta::getOtaAppVersion().isEmpty()) {
             screen->startFirmwareUpdateScreen();
             BleOta::switchToOtaApp();
-            LOG_INFO("Reboot to OTA in %d seconds", s);
+            LOG_INFO("Rebooting to BLE OTA");
         }
-#else
-        LOG_INFO("Not on ESP32, scheduling regular reboot in %d seconds", s);
-        screen->startAlert("Rebooting...");
 #endif
+#if !MESHTASTIC_EXCLUDE_WIFI
+        if (WiFiOTA::trySwitchToOTA()) {
+            screen->startFirmwareUpdateScreen();
+            WiFiOTA::saveConfig(&config.network);
+            LOG_INFO("Rebooting to WiFi OTA");
+        }
+#endif
+#endif
+        LOG_INFO("Reboot in %d seconds", s);
         rebootAtMsec = (s < 0) ? 0 : (millis() + s * 1000);
         break;
     }
diff --git a/src/platform/esp32/WiFiOTA.cpp b/src/platform/esp32/WiFiOTA.cpp
new file mode 100644
index 000000000..eac124dda
--- /dev/null
+++ b/src/platform/esp32/WiFiOTA.cpp
@@ -0,0 +1,92 @@
+#include "WiFiOTA.h"
+#include "configuration.h"
+#include <Preferences.h>
+#include <esp_ota_ops.h>
+
+namespace WiFiOTA
+{
+
+static const char *nvsNamespace = "ota-wifi";
+static const char *appProjectName = "OTA-WiFi";
+
+static bool updated = false;
+
+bool isUpdated()
+{
+    return updated;
+}
+
+void initialize()
+{
+    Preferences prefs;
+    prefs.begin(nvsNamespace);
+    if (prefs.getBool("updated")) {
+        LOG_INFO("First boot after OTA update");
+        updated = true;
+        prefs.putBool("updated", false);
+    }
+    prefs.end();
+}
+
+void recoverConfig(meshtastic_Config_NetworkConfig *network)
+{
+    LOG_INFO("Recovering WiFi settings after OTA update");
+
+    Preferences prefs;
+    prefs.begin(nvsNamespace, true);
+    String ssid = prefs.getString("ssid");
+    String psk = prefs.getString("psk");
+    prefs.end();
+
+    network->wifi_enabled = true;
+    strncpy(network->wifi_ssid, ssid.c_str(), sizeof(network->wifi_ssid));
+    strncpy(network->wifi_psk, psk.c_str(), sizeof(network->wifi_psk));
+}
+
+void saveConfig(meshtastic_Config_NetworkConfig *network)
+{
+    LOG_INFO("Saving WiFi settings for upcoming OTA update");
+
+    Preferences prefs;
+    prefs.begin(nvsNamespace);
+    prefs.putString("ssid", network->wifi_ssid);
+    prefs.putString("psk", network->wifi_psk);
+    prefs.putBool("updated", false);
+    prefs.end();
+}
+
+const esp_partition_t *getAppPartition()
+{
+    return esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_OTA_1, NULL);
+}
+
+bool getAppDesc(const esp_partition_t *part, esp_app_desc_t *app_desc)
+{
+    if (esp_ota_get_partition_description(part, app_desc) != ESP_OK)
+        return false;
+    if (strcmp(app_desc->project_name, appProjectName) != 0)
+        return false;
+    return true;
+}
+
+bool trySwitchToOTA()
+{
+    const esp_partition_t *part = getAppPartition();
+    esp_app_desc_t app_desc;
+    if (!getAppDesc(part, &app_desc))
+        return false;
+    if (esp_ota_set_boot_partition(part) != ESP_OK)
+        return false;
+    return true;
+}
+
+String getVersion()
+{
+    const esp_partition_t *part = getAppPartition();
+    esp_app_desc_t app_desc;
+    if (!getAppDesc(part, &app_desc))
+        return String();
+    return String(app_desc.version);
+}
+
+} // namespace WiFiOTA
diff --git a/src/platform/esp32/WiFiOTA.h b/src/platform/esp32/WiFiOTA.h
new file mode 100644
index 000000000..61860ed5e
--- /dev/null
+++ b/src/platform/esp32/WiFiOTA.h
@@ -0,0 +1,18 @@
+#ifndef WIFIOTA_H
+#define WIFIOTA_H
+
+#include "mesh-pb-constants.h"
+#include <Arduino.h>
+
+namespace WiFiOTA
+{
+void initialize();
+bool isUpdated();
+
+void recoverConfig(meshtastic_Config_NetworkConfig *network);
+void saveConfig(meshtastic_Config_NetworkConfig *network);
+bool trySwitchToOTA();
+String getVersion();
+} // namespace WiFiOTA
+
+#endif // WIFIOTA_H
diff --git a/src/platform/esp32/main-esp32.cpp b/src/platform/esp32/main-esp32.cpp
index 3b3557e95..d0fe31f21 100644
--- a/src/platform/esp32/main-esp32.cpp
+++ b/src/platform/esp32/main-esp32.cpp
@@ -9,6 +9,8 @@
 #include "nimble/NimbleBluetooth.h"
 #endif
 
+#include <WiFiOTA.h>
+
 #if HAS_WIFI
 #include "mesh/wifi/WiFiAPClient.h"
 #endif
@@ -139,12 +141,19 @@ void esp32Setup()
 #if !MESHTASTIC_EXCLUDE_BLUETOOTH
     String BLEOTA = BleOta::getOtaAppVersion();
     if (BLEOTA.isEmpty()) {
-        LOG_INFO("No OTA firmware available");
+        LOG_INFO("No BLE OTA firmware available");
     } else {
-        LOG_INFO("OTA firmware version %s", BLEOTA.c_str());
+        LOG_INFO("BLE OTA firmware version %s", BLEOTA.c_str());
     }
-#else
-    LOG_INFO("No OTA firmware available");
+#endif
+#if !MESHTASTIC_EXCLUDE_WIFI
+    String version = WiFiOTA::getVersion();
+    if (version.isEmpty()) {
+        LOG_INFO("No WiFi OTA firmware available");
+    } else {
+        LOG_INFO("WiFi OTA firmware version %s", version.c_str());
+    }
+    WiFiOTA::initialize();
 #endif
 
     // enableModemSleep();

From ae27aaaf4304d43828a6d2597993ee3b46038ab2 Mon Sep 17 00:00:00 2001
From: Tom Fifield <tom@tomfifield.net>
Date: Fri, 21 Mar 2025 21:54:42 +1100
Subject: [PATCH 051/116] Remove unnecessary null pointer checks (#6358)

As reported by @elfring, we had several points in our code where
it was unnecessary to check pointers were non-null before deleting them.

Fixes https://github.com/meshtastic/firmware/issues/6170
---
 src/AudioThread.h                | 6 ++----
 src/mesh/CryptoEngine.cpp        | 6 ++----
 src/motion/AccelerometerThread.h | 8 +++-----
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/AudioThread.h b/src/AudioThread.h
index 6d560ec55..04ff64a6e 100644
--- a/src/AudioThread.h
+++ b/src/AudioThread.h
@@ -41,10 +41,8 @@ class AudioThread : public concurrency::OSThread
             delete i2sRtttl;
             i2sRtttl = nullptr;
         }
-        if (rtttlFile != nullptr) {
-            delete rtttlFile;
-            rtttlFile = nullptr;
-        }
+        delete rtttlFile;
+        rtttlFile = nullptr;
 
         setCPUFast(false);
     }
diff --git a/src/mesh/CryptoEngine.cpp b/src/mesh/CryptoEngine.cpp
index 4613a6218..6dffbe2b7 100644
--- a/src/mesh/CryptoEngine.cpp
+++ b/src/mesh/CryptoEngine.cpp
@@ -161,10 +161,8 @@ void CryptoEngine::hash(uint8_t *bytes, size_t numBytes)
 
 void CryptoEngine::aesSetKey(const uint8_t *key_bytes, size_t key_len)
 {
-    if (aes) {
-        delete aes;
-        aes = nullptr;
-    }
+    delete aes;
+    aes = nullptr;
     if (key_len != 0) {
         aes = new AESSmall256();
         aes->setKey(key_bytes, key_len);
diff --git a/src/motion/AccelerometerThread.h b/src/motion/AccelerometerThread.h
index 6e517d6b0..dd6413d64 100755
--- a/src/motion/AccelerometerThread.h
+++ b/src/motion/AccelerometerThread.h
@@ -160,13 +160,11 @@ class AccelerometerThread : public concurrency::OSThread
     void clean()
     {
         isInitialised = false;
-        if (sensor != nullptr) {
-            delete sensor;
-            sensor = nullptr;
-        }
+        delete sensor;
+        sensor = nullptr;
     }
 };
 
 #endif
 
-#endif
\ No newline at end of file
+#endif

From e4d3ec1f596bb03ba1187d77dfe9599bca7f6174 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 21 Mar 2025 05:54:57 -0500
Subject: [PATCH 052/116] Upgrade trunk (#6360)

Co-authored-by: sachaw <11172820+sachaw@users.noreply.github.com>
---
 .trunk/trunk.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
index fc22d55ac..c451bb66d 100644
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -9,10 +9,10 @@ plugins:
 lint:
   enabled:
     - prettier@3.5.3
-    - trufflehog@3.88.17
+    - trufflehog@3.88.18
     - yamllint@1.36.2
     - bandit@1.8.3
-    - checkov@3.2.386
+    - checkov@3.2.388
     - terrascan@1.19.9
     - trivy@0.60.0
     - taplo@0.9.3

From cff93adb5e5b4606a7225354ccb108fda34486b0 Mon Sep 17 00:00:00 2001
From: Tom Fifield <tom@tomfifield.net>
Date: Fri, 21 Mar 2025 21:58:52 +1100
Subject: [PATCH 053/116] [WIP] LS20031 setup support (#5737)

LS20031 is a MTK3339-based chip. Therefore, it should share some
heritage with other MTK3333 or MTK3339 chips. Re-use the L76B
commands for setup.
---
 src/gps/GPS.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp
index 7f490ea3c..c33cb2975 100644
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -1200,12 +1200,12 @@ GnssModel_t GPS::probe(int serialSpeed)
     PROBE_SIMPLE("LC86", "$PQTMVERNO*58", "$PQTMVERNO,LC86", GNSS_MODEL_AG3352, 500);
     PROBE_SIMPLE("L76K", "$PCAS06,0*1B", "$GPTXT,01,01,02,SW=", GNSS_MODEL_MTK, 500);
 
-    // Close all NMEA sentences, valid for L76B MTK platform (Waveshare Pico GPS)
+    // Close all NMEA sentences, valid for MTK3333 and MTK3339 platforms
     _serial_gps->write("$PMTK514,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0*2E\r\n");
     delay(20);
     std::vector<ChipInfo> mtk = {{"L76B", "Quectel-L76B", GNSS_MODEL_MTK_L76B},
                                  {"PA1616S", "1616S", GNSS_MODEL_MTK_PA1616S},
-                                 {"LS20031", "MC-1513", GNSS_MODEL_LS20031}};
+                                 {"LS20031", "MC-1513", GNSS_MODEL_MTK_L76B}};
     PROBE_FAMILY("MTK Family", "$PMTK605*31", mtk, 500);
 
     uint8_t cfg_rate[] = {0xB5, 0x62, 0x06, 0x08, 0x00, 0x00, 0x00, 0x00};

From 5acaf8f897db6c4d77af370a9db6ee471aa27b3b Mon Sep 17 00:00:00 2001
From: Tom Fifield <tom@tomfifield.net>
Date: Fri, 21 Mar 2025 21:59:20 +1100
Subject: [PATCH 054/116] Enable range test on Linux Native (#6356)

The Range Test Module was defined-out by architecture.

No reason it shouldn't work, so add PORTDUINO to the list of
architectures that compile this module.

Tested on Ubuntu. Enables without crashing, will send packets on
the set time. However, for now the CSV file download does not appear
to work.

Partially fixes https://github.com/meshtastic/firmware/issues/5618
---
 src/modules/RangeTestModule.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/RangeTestModule.cpp b/src/modules/RangeTestModule.cpp
index cad1d51f1..6f3d69acf 100644
--- a/src/modules/RangeTestModule.cpp
+++ b/src/modules/RangeTestModule.cpp
@@ -31,7 +31,7 @@ uint32_t packetSequence = 0;
 
 int32_t RangeTestModule::runOnce()
 {
-#if defined(ARCH_ESP32) || defined(ARCH_NRF52)
+#if defined(ARCH_ESP32) || defined(ARCH_NRF52) || defined(ARCH_PORTDUINO)
 
     /*
         Uncomment the preferences below if you want to use the module
@@ -130,7 +130,7 @@ void RangeTestModuleRadio::sendPayload(NodeNum dest, bool wantReplies)
 
 ProcessMessage RangeTestModuleRadio::handleReceived(const meshtastic_MeshPacket &mp)
 {
-#if defined(ARCH_ESP32) || defined(ARCH_NRF52)
+#if defined(ARCH_ESP32) || defined(ARCH_NRF52) || defined(ARCH_PORTDUINO)
 
     if (moduleConfig.range_test.enabled) {
 

From fd7a1f2ccb3f561c03215993c87cacb967188660 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 21 Mar 2025 14:28:23 +0100
Subject: [PATCH 055/116] [create-pull-request] automated change (#6365)

---
 protobufs                               | 2 +-
 src/mesh/generated/meshtastic/mesh.pb.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/protobufs b/protobufs
index 14ec20586..b4e24c3a8 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit 14ec205865592fcfa798065bb001a549fc77b438
+Subproject commit b4e24c3a868f9e5fd782d2e256b05456d578923b
diff --git a/src/mesh/generated/meshtastic/mesh.pb.h b/src/mesh/generated/meshtastic/mesh.pb.h
index 991aeb8d2..daee04f90 100644
--- a/src/mesh/generated/meshtastic/mesh.pb.h
+++ b/src/mesh/generated/meshtastic/mesh.pb.h
@@ -235,6 +235,8 @@ typedef enum _meshtastic_HardwareModel {
     meshtastic_HardwareModel_THINKNODE_M2 = 90,
     /* Lilygo T-ETH-Elite */
     meshtastic_HardwareModel_T_ETH_ELITE = 91,
+    /* Heltec HRI-3621 industrial probe */
+    meshtastic_HardwareModel_HELTEC_SENSOR_HUB = 92,
     /* ------------------------------------------------------------------------------------------------------------------------------------------
  Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.
  ------------------------------------------------------------------------------------------------------------------------------------------ */

From 848a3ed6a1860e31d9454a03f52e8a93ee5aabf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Fri, 21 Mar 2025 16:12:27 +0100
Subject: [PATCH 056/116] implement littlefs for stm32 (#5987)

Co-authored-by: GUVWAF <78759985+GUVWAF@users.noreply.github.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
Co-authored-by: Daniel Peter Chokola <dan.chokola@gmail.com>
Co-authored-by: Mark Trevor Birss <markbirss@gmail.com>
Co-authored-by: Austin <vidplace7@gmail.com>
---
 arch/stm32/stm32.ini                         |   28 +-
 extra_scripts/extra_stm32.py                 |   22 +
 src/FSCommon.cpp                             |   60 +-
 src/FSCommon.h                               |   12 +-
 src/mesh/STM32WLE5JCInterface.cpp            |    6 +-
 src/modules/Modules.cpp                      |    2 +
 src/platform/stm32wl/LittleFS.cpp            |  198 ++
 src/platform/stm32wl/LittleFS.h              |   41 +
 src/platform/stm32wl/STM32_LittleFS.cpp      |  283 ++
 src/platform/stm32wl/STM32_LittleFS.h        |  107 +
 src/platform/stm32wl/STM32_LittleFS_File.cpp |  394 +++
 src/platform/stm32wl/STM32_LittleFS_File.h   |  108 +
 src/platform/stm32wl/littlefs/lfs.c          | 2531 ++++++++++++++++++
 src/platform/stm32wl/littlefs/lfs.h          |  476 ++++
 src/platform/stm32wl/littlefs/lfs_util.c     |   28 +
 src/platform/stm32wl/littlefs/lfs_util.h     |  199 ++
 src/shutdown.h                               |    2 +
 variants/CDEBYTE_E77-MBL/platformio.ini      |   35 +-
 variants/rak3172/platformio.ini              |   39 +-
 variants/rak3172/variant.h                   |   10 +-
 variants/wio-e5/platformio.ini               |   35 +-
 variants/wio-e5/variant.h                    |    5 +
 22 files changed, 4466 insertions(+), 155 deletions(-)
 create mode 100755 extra_scripts/extra_stm32.py
 create mode 100644 src/platform/stm32wl/LittleFS.cpp
 create mode 100644 src/platform/stm32wl/LittleFS.h
 create mode 100644 src/platform/stm32wl/STM32_LittleFS.cpp
 create mode 100644 src/platform/stm32wl/STM32_LittleFS.h
 create mode 100644 src/platform/stm32wl/STM32_LittleFS_File.cpp
 create mode 100644 src/platform/stm32wl/STM32_LittleFS_File.h
 create mode 100644 src/platform/stm32wl/littlefs/lfs.c
 create mode 100644 src/platform/stm32wl/littlefs/lfs.h
 create mode 100644 src/platform/stm32wl/littlefs/lfs_util.c
 create mode 100644 src/platform/stm32wl/littlefs/lfs_util.h

diff --git a/arch/stm32/stm32.ini b/arch/stm32/stm32.ini
index efa1ab0e4..d5e615f5f 100644
--- a/arch/stm32/stm32.ini
+++ b/arch/stm32/stm32.ini
@@ -1,13 +1,14 @@
 [stm32_base]
 extends = arduino_base
-platform = platformio/ststm32
-platform_packages = platformio/framework-arduinoststm32@^4.20900.0
+platform = ststm32
+platform_packages = platformio/framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32.git#2.9.0
+extra_scripts =
+  ${env.extra_scripts}
+  post:extra_scripts/extra_stm32.py
 
 build_type = release
 
-;board_build.flash_offset = 0x08000000
-
-build_flags = 
+build_flags =
   ${arduino_base.build_flags}
   -flto
   -Isrc/platform/stm32wl -g
@@ -18,27 +19,24 @@ build_flags =
   -DMESHTASTIC_EXCLUDE_SCREEN
   -DMESHTASTIC_EXCLUDE_MQTT
   -DMESHTASTIC_EXCLUDE_BLUETOOTH
-  -DMESHTASTIC_EXCLUDE_PKI
   -DMESHTASTIC_EXCLUDE_GPS
-;  -DVECT_TAB_OFFSET=0x08000000
-  -DconfigUSE_CMSIS_RTOS_V2=1
-;  -DSPI_MODE_0=SPI_MODE0
+  ;-DDEBUG_MUTE
   -fmerge-all-constants
   -ffunction-sections
   -fdata-sections
-  
-build_src_filter = 
+
+build_src_filter =
   ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/api/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mesh/eth/> -<input> -<buzz> -<modules/RemoteHardwareModule.cpp> -<platform/nrf52> -<platform/portduino> -<platform/rp2xx0> -<mesh/raspihttp>
 
 board_upload.offset_address = 0x08000000
 upload_protocol = stlink
+debug_tool = stlink
 
 lib_deps =
   ${env.lib_deps}
-  charlesbaynham/OSFS@^1.2.3
-  jgromes/RadioLib@7.0.2
-  https://github.com/caveman99/Crypto.git#f61ae26a53f7a2d0ba5511625b8bf8eff3a35d5e
+  ${radiolib_base.lib_deps}
+  https://github.com/caveman99/Crypto.git#eae9c768054118a9399690f8af202853d1ae8516
 
 lib_ignore =
   mathertel/OneButton@2.6.1
-  Wire
\ No newline at end of file
+  Wire
diff --git a/extra_scripts/extra_stm32.py b/extra_scripts/extra_stm32.py
new file mode 100755
index 000000000..f3bd8c514
--- /dev/null
+++ b/extra_scripts/extra_stm32.py
@@ -0,0 +1,22 @@
+# trunk-ignore-all(ruff/F821)
+# trunk-ignore-all(flake8/F821): For SConstruct imports
+
+Import("env")
+# Custom HEX from ELF
+env.AddPostAction(
+    "$BUILD_DIR/${PROGNAME}.elf",
+    env.VerboseAction(
+        " ".join(
+            [
+                "$OBJCOPY",
+                "-O",
+                "ihex",
+                "-R",
+                ".eeprom",
+                "$BUILD_DIR/${PROGNAME}.elf",
+                "$BUILD_DIR/${PROGNAME}.hex",
+            ]
+        ),
+        "Building $BUILD_DIR/${PROGNAME}.hex",
+    ),
+)
diff --git a/src/FSCommon.cpp b/src/FSCommon.cpp
index 31fe69c93..88f0764b5 100644
--- a/src/FSCommon.cpp
+++ b/src/FSCommon.cpp
@@ -29,30 +29,6 @@ SPIClass SPI1(HSPI);
 
 #endif // HAS_SDCARD
 
-#if defined(ARCH_STM32WL)
-
-uint16_t OSFS::startOfEEPROM = 1;
-uint16_t OSFS::endOfEEPROM = 2048;
-
-// 3) How do I read from the medium?
-void OSFS::readNBytes(uint16_t address, unsigned int num, byte *output)
-{
-    for (uint16_t i = address; i < address + num; i++) {
-        *output = EEPROM.read(i);
-        output++;
-    }
-}
-
-// 4) How to I write to the medium?
-void OSFS::writeNBytes(uint16_t address, unsigned int num, const byte *input)
-{
-    for (uint16_t i = address; i < address + num; i++) {
-        EEPROM.update(i, *input);
-        input++;
-    }
-}
-#endif
-
 /**
  * @brief Copies a file from one location to another.
  *
@@ -62,33 +38,7 @@ void OSFS::writeNBytes(uint16_t address, unsigned int num, const byte *input)
  */
 bool copyFile(const char *from, const char *to)
 {
-#ifdef ARCH_STM32WL
-    unsigned char cbuffer[2048];
-
-    // Var to hold the result of actions
-    OSFS::result r;
-
-    r = OSFS::getFile(from, cbuffer);
-
-    if (r == notfound) {
-        LOG_ERROR("Failed to open source file %s", from);
-        return false;
-    } else if (r == noerr) {
-        r = OSFS::newFile(to, cbuffer, true);
-        if (r == noerr) {
-            return true;
-        } else {
-            LOG_ERROR("OSFS Error %d", r);
-            return false;
-        }
-
-    } else {
-        LOG_ERROR("OSFS Error %d", r);
-        return false;
-    }
-    return true;
-
-#elif defined(FSCom)
+#ifdef FSCom
     // take SPI Lock
     concurrency::LockGuard g(spiLock);
     unsigned char cbuffer[16];
@@ -127,13 +77,7 @@ bool copyFile(const char *from, const char *to)
  */
 bool renameFile(const char *pathFrom, const char *pathTo)
 {
-#ifdef ARCH_STM32WL
-    if (copyFile(pathFrom, pathTo) && (OSFS::deleteFile(pathFrom) == OSFS::result::NO_ERROR)) {
-        return true;
-    } else {
-        return false;
-    }
-#elif defined(FSCom)
+#ifdef FSCom
 
 #ifdef ARCH_ESP32
     // take SPI Lock
diff --git a/src/FSCommon.h b/src/FSCommon.h
index 10ce4aeec..fdc0b76ec 100644
--- a/src/FSCommon.h
+++ b/src/FSCommon.h
@@ -15,13 +15,11 @@
 #endif
 
 #if defined(ARCH_STM32WL)
-// STM32WL series 2 Kbytes (8 rows of 256 bytes)
-#include <EEPROM.h>
-#include <OSFS.h>
-
-// Useful consts
-const OSFS::result noerr = OSFS::result::NO_ERROR;
-const OSFS::result notfound = OSFS::result::FILE_NOT_FOUND;
+// STM32WL
+#include "LittleFS.h"
+#define FSCom InternalFS
+#define FSBegin() FSCom.begin()
+using namespace STM32_LittleFS_Namespace;
 #endif
 
 #if defined(ARCH_RP2040)
diff --git a/src/mesh/STM32WLE5JCInterface.cpp b/src/mesh/STM32WLE5JCInterface.cpp
index ad1f675b6..6a340dd28 100644
--- a/src/mesh/STM32WLE5JCInterface.cpp
+++ b/src/mesh/STM32WLE5JCInterface.cpp
@@ -18,8 +18,10 @@ bool STM32WLE5JCInterface::init()
 {
     RadioLibInterface::init();
 
-    // https://github.com/Seeed-Studio/LoRaWan-E5-Node/blob/main/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c
+// https://github.com/Seeed-Studio/LoRaWan-E5-Node/blob/main/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c
+#if (!defined(_VARIANT_RAK3172_))
     setTCXOVoltage(1.7);
+#endif
 
     lora.setRfSwitchTable(rfswitch_pins, rfswitch_table);
 
@@ -42,4 +44,4 @@ bool STM32WLE5JCInterface::init()
     return res == RADIOLIB_ERR_NONE;
 }
 
-#endif // ARCH_STM32WL
\ No newline at end of file
+#endif // ARCH_STM32WL
diff --git a/src/modules/Modules.cpp b/src/modules/Modules.cpp
index f386147d0..e2a4a970c 100644
--- a/src/modules/Modules.cpp
+++ b/src/modules/Modules.cpp
@@ -7,7 +7,9 @@
 #include "input/SerialKeyboardImpl.h"
 #include "input/TrackballInterruptImpl1.h"
 #include "input/UpDownInterruptImpl1.h"
+#if !MESHTASTIC_EXCLUDE_I2C
 #include "input/cardKbI2cImpl.h"
+#endif
 #include "input/kbMatrixImpl.h"
 #endif
 #if !MESHTASTIC_EXCLUDE_ADMIN
diff --git a/src/platform/stm32wl/LittleFS.cpp b/src/platform/stm32wl/LittleFS.cpp
new file mode 100644
index 000000000..40f32eca8
--- /dev/null
+++ b/src/platform/stm32wl/LittleFS.cpp
@@ -0,0 +1,198 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 hathach for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "LittleFS.h"
+#include "stm32wlxx_hal_flash.h"
+
+/**********************************************************************************************************************
+ * Macro definitions
+ **********************************************************************************************************************/
+/** This macro is used to suppress compiler messages about a parameter not being used in a function. */
+#define LFS_UNUSED(p) (void)((p))
+
+#define STM32WL_PAGE_SIZE (FLASH_PAGE_SIZE)
+#define STM32WL_PAGE_COUNT (FLASH_PAGE_NB)
+#define STM32WL_FLASH_BASE (FLASH_BASE)
+
+/*
+ * FLASH_SIZE from stm32wle5xx.h will read the actual FLASH size from the chip.
+ * FLASH_END_ADDR is calculated from FLASH_SIZE.
+ * Use the last 28 KiB of the FLASH
+ */
+#define LFS_FLASH_TOTAL_SIZE (14 * 2048) /* needs to be a multiple of LFS_BLOCK_SIZE */
+#define LFS_BLOCK_SIZE (2048)
+#define LFS_FLASH_ADDR_END (FLASH_END_ADDR)
+#define LFS_FLASH_ADDR_BASE (LFS_FLASH_ADDR_END - LFS_FLASH_TOTAL_SIZE + 1)
+
+#if !CFG_DEBUG
+#define _LFS_DBG(fmt, ...)
+#else
+#define _LFS_DBG(fmt, ...) printf("%s:%d (%s): " fmt "\n", __FILE__, __LINE__, __func__, __VA_ARGS__)
+#endif
+
+//--------------------------------------------------------------------+
+// LFS Disk IO
+//--------------------------------------------------------------------+
+
+static int _internal_flash_read(const struct lfs_config *c, lfs_block_t block, lfs_off_t off, void *buffer, lfs_size_t size)
+{
+    LFS_UNUSED(c);
+
+    if (!buffer || !size) {
+        _LFS_DBG("%s Invalid parameter!\r\n", __func__);
+        return LFS_ERR_INVAL;
+    }
+
+    lfs_block_t address = LFS_FLASH_ADDR_BASE + (block * STM32WL_PAGE_SIZE + off);
+
+    memcpy(buffer, (void *)address, size);
+
+    return LFS_ERR_OK;
+}
+
+// Program a region in a block. The block must have previously
+// been erased. Negative error codes are propogated to the user.
+// May return LFS_ERR_CORRUPT if the block should be considered bad.
+static int _internal_flash_prog(const struct lfs_config *c, lfs_block_t block, lfs_off_t off, const void *buffer, lfs_size_t size)
+{
+    lfs_block_t address = LFS_FLASH_ADDR_BASE + (block * STM32WL_PAGE_SIZE + off);
+    HAL_StatusTypeDef hal_rc = HAL_OK;
+    uint32_t dw_count = size / 8;
+    uint64_t *bufp = (uint64_t *)buffer;
+
+    LFS_UNUSED(c);
+
+    _LFS_DBG("Programming %d bytes/%d doublewords at address 0x%08x/block %d, offset %d.", size, dw_count, address, block, off);
+    if (HAL_FLASH_Unlock() != HAL_OK) {
+        return LFS_ERR_IO;
+    }
+    for (uint32_t i = 0; i < dw_count; i++) {
+        if ((address < LFS_FLASH_ADDR_BASE) || (address > LFS_FLASH_ADDR_END)) {
+            _LFS_DBG("Wanted to program out of bound of FLASH: 0x%08x.\n", address);
+            HAL_FLASH_Lock();
+            return LFS_ERR_INVAL;
+        }
+        hal_rc = HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, address, *bufp);
+        if (hal_rc != HAL_OK) {
+            /* Error occurred while writing data in Flash memory.
+             * User can add here some code to deal with this error.
+             */
+            _LFS_DBG("Program error at (0x%08x), 0x%X, error: 0x%08x\n", address, hal_rc, HAL_FLASH_GetError());
+        }
+        address += 8;
+        bufp += 1;
+    }
+    if (HAL_FLASH_Lock() != HAL_OK) {
+        return LFS_ERR_IO;
+    }
+
+    return hal_rc == HAL_OK ? LFS_ERR_OK : LFS_ERR_IO; // If HAL_OK, return LFS_ERR_OK, else return LFS_ERR_IO
+}
+
+// Erase a block. A block must be erased before being programmed.
+// The state of an erased block is undefined. Negative error codes
+// are propogated to the user.
+// May return LFS_ERR_CORRUPT if the block should be considered bad.
+static int _internal_flash_erase(const struct lfs_config *c, lfs_block_t block)
+{
+    lfs_block_t address = LFS_FLASH_ADDR_BASE + (block * STM32WL_PAGE_SIZE);
+    HAL_StatusTypeDef hal_rc;
+    FLASH_EraseInitTypeDef EraseInitStruct = {.TypeErase = FLASH_TYPEERASE_PAGES, .Page = 0, .NbPages = 1};
+    uint32_t PAGEError = 0;
+
+    LFS_UNUSED(c);
+
+    if ((address < LFS_FLASH_ADDR_BASE) || (address > LFS_FLASH_ADDR_END)) {
+        _LFS_DBG("Wanted to erase out of bound of FLASH: 0x%08x.\n", address);
+        return LFS_ERR_INVAL;
+    }
+    /* calculate the absolute page, i.e. what the ST wants */
+    EraseInitStruct.Page = (address - STM32WL_FLASH_BASE) / STM32WL_PAGE_SIZE;
+    _LFS_DBG("Erasing block %d at 0x%08x... ", block, address);
+    HAL_FLASH_Unlock();
+    hal_rc = HAL_FLASHEx_Erase(&EraseInitStruct, &PAGEError);
+    HAL_FLASH_Lock();
+
+    return hal_rc == HAL_OK ? LFS_ERR_OK : LFS_ERR_IO; // If HAL_OK, return LFS_ERR_OK, else return LFS_ERR_IO
+}
+
+// Sync the state of the underlying block device. Negative error codes
+// are propogated to the user.
+static int _internal_flash_sync(const struct lfs_config *c)
+{
+    LFS_UNUSED(c);
+    // write function performs no caching.  No need for sync.
+
+    return LFS_ERR_OK;
+}
+
+static struct lfs_config _InternalFSConfig = {.context = NULL,
+
+                                              .read = _internal_flash_read,
+                                              .prog = _internal_flash_prog,
+                                              .erase = _internal_flash_erase,
+                                              .sync = _internal_flash_sync,
+
+                                              .read_size = LFS_BLOCK_SIZE,
+                                              .prog_size = LFS_BLOCK_SIZE,
+                                              .block_size = LFS_BLOCK_SIZE,
+                                              .block_count = LFS_FLASH_TOTAL_SIZE / LFS_BLOCK_SIZE,
+                                              .lookahead = 128,
+
+                                              .read_buffer = NULL,
+                                              .prog_buffer = NULL,
+                                              .lookahead_buffer = NULL,
+                                              .file_buffer = NULL};
+
+LittleFS InternalFS;
+
+//--------------------------------------------------------------------+
+//
+//--------------------------------------------------------------------+
+
+LittleFS::LittleFS(void) : STM32_LittleFS(&_InternalFSConfig) {}
+
+bool LittleFS::begin(void)
+{
+    if (FLASH_BASE >= LFS_FLASH_ADDR_BASE) {
+        /* There is not enough space on this device for a filesystem. */
+        return false;
+    }
+    // failed to mount, erase all pages then format and mount again
+    if (!STM32_LittleFS::begin()) {
+        // Erase all pages of internal flash region for Filesystem.
+        for (uint32_t addr = LFS_FLASH_ADDR_BASE; addr < (LFS_FLASH_ADDR_END + 1); addr += STM32WL_PAGE_SIZE) {
+            _internal_flash_erase(&_InternalFSConfig, (addr - LFS_FLASH_ADDR_BASE) / STM32WL_PAGE_SIZE);
+        }
+
+        // lfs format
+        this->format();
+
+        // mount again if still failed, give up
+        if (!STM32_LittleFS::begin())
+            return false;
+    }
+
+    return true;
+}
diff --git a/src/platform/stm32wl/LittleFS.h b/src/platform/stm32wl/LittleFS.h
new file mode 100644
index 000000000..6c3c47f91
--- /dev/null
+++ b/src/platform/stm32wl/LittleFS.h
@@ -0,0 +1,41 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 hathach for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef INTERNALFILESYSTEM_H_
+#define INTERNALFILESYSTEM_H_
+
+#include "STM32_LittleFS.h"
+
+class LittleFS : public STM32_LittleFS
+{
+  public:
+    LittleFS(void);
+
+    // overwrite to also perform low level format (sector erase of whole flash region)
+    bool begin(void);
+};
+
+extern LittleFS InternalFS;
+
+#endif /* INTERNALFILESYSTEM_H_ */
diff --git a/src/platform/stm32wl/STM32_LittleFS.cpp b/src/platform/stm32wl/STM32_LittleFS.cpp
new file mode 100644
index 000000000..97e79e61e
--- /dev/null
+++ b/src/platform/stm32wl/STM32_LittleFS.cpp
@@ -0,0 +1,283 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Ha Thach for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "STM32_LittleFS.h"
+#include <Arduino.h>
+#include <string.h>
+
+#define memclr(buffer, size) memset(buffer, 0, size)
+#define varclr(_var) memclr(_var, sizeof(*(_var)))
+
+using namespace STM32_LittleFS_Namespace;
+
+//--------------------------------------------------------------------+
+// Implementation
+//--------------------------------------------------------------------+
+
+STM32_LittleFS::STM32_LittleFS(void) : STM32_LittleFS(NULL) {}
+
+STM32_LittleFS::STM32_LittleFS(struct lfs_config *cfg)
+{
+    varclr(&_lfs);
+    _lfs_cfg = cfg;
+    _mounted = false;
+}
+
+STM32_LittleFS::~STM32_LittleFS() {}
+
+// Initialize and mount the file system
+// Return true if mounted successfully else probably corrupted.
+// User should format the disk and try again
+bool STM32_LittleFS::begin(struct lfs_config *cfg)
+{
+    _lockFS();
+
+    bool ret;
+    // not a loop, just an quick way to short-circuit on error
+    do {
+        if (_mounted) {
+            ret = true;
+            break;
+        }
+        if (cfg) {
+            _lfs_cfg = cfg;
+        }
+        if (nullptr == _lfs_cfg) {
+            ret = false;
+            break;
+        }
+        // actually attempt to mount, and log error if one occurs
+        int err = lfs_mount(&_lfs, _lfs_cfg);
+        PRINT_LFS_ERR(err);
+        _mounted = (err == LFS_ERR_OK);
+        ret = _mounted;
+    } while (0);
+
+    _unlockFS();
+    return ret;
+}
+
+// Tear down and unmount file system
+void STM32_LittleFS::end(void)
+{
+    _lockFS();
+
+    if (_mounted) {
+        _mounted = false;
+        int err = lfs_unmount(&_lfs);
+        PRINT_LFS_ERR(err);
+        (void)err;
+    }
+
+    _unlockFS();
+}
+
+bool STM32_LittleFS::format(void)
+{
+    _lockFS();
+
+    int err = LFS_ERR_OK;
+    bool attemptMount = _mounted;
+    // not a loop, just an quick way to short-circuit on error
+    do {
+        // if already mounted: umount first -> format -> remount
+        if (_mounted) {
+            _mounted = false;
+            err = lfs_unmount(&_lfs);
+            if (LFS_ERR_OK != err) {
+                PRINT_LFS_ERR(err);
+                break;
+            }
+        }
+        err = lfs_format(&_lfs, _lfs_cfg);
+        if (LFS_ERR_OK != err) {
+            PRINT_LFS_ERR(err);
+            break;
+        }
+
+        if (attemptMount) {
+            err = lfs_mount(&_lfs, _lfs_cfg);
+            if (LFS_ERR_OK != err) {
+                PRINT_LFS_ERR(err);
+                break;
+            }
+            _mounted = true;
+        }
+        // success!
+    } while (0);
+
+    _unlockFS();
+    return LFS_ERR_OK == err;
+}
+
+// Open a file or folder
+STM32_LittleFS_Namespace::File STM32_LittleFS::open(char const *filepath, uint8_t mode)
+{
+    // No lock is required here ... the File() object will synchronize with the mutex provided
+    return STM32_LittleFS_Namespace::File(filepath, mode, *this);
+}
+
+// Check if file or folder exists
+bool STM32_LittleFS::exists(char const *filepath)
+{
+    struct lfs_info info;
+    _lockFS();
+
+    bool ret = (0 == lfs_stat(&_lfs, filepath, &info));
+
+    _unlockFS();
+    return ret;
+}
+
+// Create a directory, create intermediate parent if needed
+bool STM32_LittleFS::mkdir(char const *filepath)
+{
+    bool ret = true;
+    const char *slash = filepath;
+    if (slash[0] == '/')
+        slash++; // skip root '/'
+
+    _lockFS();
+
+    // make intermediate parent directory(ies)
+    while (NULL != (slash = strchr(slash, '/'))) {
+        char parent[slash - filepath + 1] = {0};
+        memcpy(parent, filepath, slash - filepath);
+
+        int rc = lfs_mkdir(&_lfs, parent);
+        if (rc != LFS_ERR_OK && rc != LFS_ERR_EXIST) {
+            PRINT_LFS_ERR(rc);
+            ret = false;
+            break;
+        }
+        slash++;
+    }
+    // make the final requested directory
+    if (ret) {
+        int rc = lfs_mkdir(&_lfs, filepath);
+        if (rc != LFS_ERR_OK && rc != LFS_ERR_EXIST) {
+            PRINT_LFS_ERR(rc);
+            ret = false;
+        }
+    }
+
+    _unlockFS();
+    return ret;
+}
+
+// Remove a file
+bool STM32_LittleFS::remove(char const *filepath)
+{
+    _lockFS();
+
+    int err = lfs_remove(&_lfs, filepath);
+    PRINT_LFS_ERR(err);
+
+    _unlockFS();
+    return LFS_ERR_OK == err;
+}
+
+// Rename a file
+bool STM32_LittleFS::rename(char const *oldfilepath, char const *newfilepath)
+{
+    _lockFS();
+
+    int err = lfs_rename(&_lfs, oldfilepath, newfilepath);
+    PRINT_LFS_ERR(err);
+
+    _unlockFS();
+    return LFS_ERR_OK == err;
+}
+
+// Remove a folder
+bool STM32_LittleFS::rmdir(char const *filepath)
+{
+    _lockFS();
+
+    int err = lfs_remove(&_lfs, filepath);
+    PRINT_LFS_ERR(err);
+
+    _unlockFS();
+    return LFS_ERR_OK == err;
+}
+
+// Remove a folder recursively
+bool STM32_LittleFS::rmdir_r(char const *filepath)
+{
+    /* lfs is modified to remove non-empty folder,
+     According to below issue, comment these 2 line won't corrupt filesystem
+     at least when using LFS v1.  If moving to LFS v2, see tracked issue
+     to see if issues (such as the orphans in threaded linked list) are resolved.
+     https://github.com/ARMmbed/littlefs/issues/43
+     */
+    _lockFS();
+
+    int err = lfs_remove(&_lfs, filepath);
+    PRINT_LFS_ERR(err);
+
+    _unlockFS();
+    return LFS_ERR_OK == err;
+}
+
+//------------- Debug -------------//
+#if CFG_DEBUG
+
+const char *dbg_strerr_lfs(int32_t err)
+{
+    switch (err) {
+    case LFS_ERR_OK:
+        return "LFS_ERR_OK";
+    case LFS_ERR_IO:
+        return "LFS_ERR_IO";
+    case LFS_ERR_CORRUPT:
+        return "LFS_ERR_CORRUPT";
+    case LFS_ERR_NOENT:
+        return "LFS_ERR_NOENT";
+    case LFS_ERR_EXIST:
+        return "LFS_ERR_EXIST";
+    case LFS_ERR_NOTDIR:
+        return "LFS_ERR_NOTDIR";
+    case LFS_ERR_ISDIR:
+        return "LFS_ERR_ISDIR";
+    case LFS_ERR_NOTEMPTY:
+        return "LFS_ERR_NOTEMPTY";
+    case LFS_ERR_BADF:
+        return "LFS_ERR_BADF";
+    case LFS_ERR_INVAL:
+        return "LFS_ERR_INVAL";
+    case LFS_ERR_NOSPC:
+        return "LFS_ERR_NOSPC";
+    case LFS_ERR_NOMEM:
+        return "LFS_ERR_NOMEM";
+
+    default:
+        static char errcode[10];
+        sprintf(errcode, "%ld", err);
+        return errcode;
+    }
+
+    return NULL;
+}
+
+#endif
diff --git a/src/platform/stm32wl/STM32_LittleFS.h b/src/platform/stm32wl/STM32_LittleFS.h
new file mode 100644
index 000000000..2ab531ee5
--- /dev/null
+++ b/src/platform/stm32wl/STM32_LittleFS.h
@@ -0,0 +1,107 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Ha Thach for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef STM32_LITTLEFS_H_
+#define STM32_LITTLEFS_H_
+
+#include <Stream.h>
+
+// Internal Flash uses ARM Little FileSystem
+// https://github.com/ARMmbed/littlefs
+#include "../../freertosinc.h" // tied to FreeRTOS for serialization
+#include "STM32_LittleFS_File.h"
+#include "littlefs/lfs.h"
+
+class STM32_LittleFS
+{
+  public:
+    STM32_LittleFS(void);
+    STM32_LittleFS(struct lfs_config *cfg);
+    virtual ~STM32_LittleFS();
+
+    bool begin(struct lfs_config *cfg = NULL);
+    void end(void);
+
+    // Open the specified file/directory with the supplied mode (e.g. read or
+    // write, etc). Returns a File object for interacting with the file.
+    // Note that currently only one file can be open at a time.
+    STM32_LittleFS_Namespace::File open(char const *filename, uint8_t mode = STM32_LittleFS_Namespace::FILE_O_READ);
+
+    // Methods to determine if the requested file path exists.
+    bool exists(char const *filepath);
+
+    // Create the requested directory hierarchy--if intermediate directories
+    // do not exist they will be created.
+    bool mkdir(char const *filepath);
+
+    // Delete the file.
+    bool remove(char const *filepath);
+
+    // Rename the file.
+    bool rename(char const *oldfilepath, char const *newfilepath);
+
+    // Delete a folder (must be empty)
+    bool rmdir(char const *filepath);
+
+    // Delete a folder (recursively)
+    bool rmdir_r(char const *filepath);
+
+    // format file system
+    bool format(void);
+
+    /*------------------------------------------------------------------*/
+    /* INTERNAL USAGE ONLY
+     * Although declare as public, it is meant to be invoked by internal
+     * code. User should not call these directly
+     *------------------------------------------------------------------*/
+    lfs_t *_getFS(void) { return &_lfs; }
+    void _lockFS(void)
+    { /* no-op */
+    }
+    void _unlockFS(void)
+    { /* no-op */
+    }
+
+  protected:
+    bool _mounted;
+    struct lfs_config *_lfs_cfg;
+    lfs_t _lfs;
+};
+
+#if !CFG_DEBUG
+#define VERIFY_LFS(...) _GET_3RD_ARG(__VA_ARGS__, VERIFY_ERR_2ARGS, VERIFY_ERR_1ARGS)(__VA_ARGS__, NULL)
+#define PRINT_LFS_ERR(_err)
+#else
+#define VERIFY_LFS(...) _GET_3RD_ARG(__VA_ARGS__, VERIFY_ERR_2ARGS, VERIFY_ERR_1ARGS)(__VA_ARGS__, dbg_strerr_lfs)
+#define PRINT_LFS_ERR(_err)                                                                                                      \
+    do {                                                                                                                         \
+        if (_err) {                                                                                                              \
+            printf("%s:%d, LFS error: %d\n", __FILE__, __LINE__, _err);                                                          \
+        }                                                                                                                        \
+    } while (0) // LFS_ERR are of type int, VERIFY_MESS expects long_int
+
+const char *dbg_strerr_lfs(int32_t err);
+#endif
+
+#endif /* STM32_LITTLEFS_H_ */
diff --git a/src/platform/stm32wl/STM32_LittleFS_File.cpp b/src/platform/stm32wl/STM32_LittleFS_File.cpp
new file mode 100644
index 000000000..5e2d4c86c
--- /dev/null
+++ b/src/platform/stm32wl/STM32_LittleFS_File.cpp
@@ -0,0 +1,394 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Ha Thach for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "STM32_LittleFS.h"
+#include <Arduino.h>
+
+#define rtos_malloc malloc
+#define rtos_free free
+
+//--------------------------------------------------------------------+
+// MACRO TYPEDEF CONSTANT ENUM DECLARATION
+//--------------------------------------------------------------------+
+
+using namespace STM32_LittleFS_Namespace;
+
+File::File(STM32_LittleFS &fs)
+{
+    _fs = &fs;
+    _is_dir = false;
+    _name[0] = 0;
+    _name[LFS_NAME_MAX] = 0;
+    _dir_path = NULL;
+
+    _dir = NULL;
+    _file = NULL;
+}
+
+File::File(char const *filename, uint8_t mode, STM32_LittleFS &fs) : File(fs)
+{
+    // public constructor calls public API open(), which will obtain the mutex
+    this->open(filename, mode);
+}
+
+bool File::_open_file(char const *filepath, uint8_t mode)
+{
+    int flags = (mode == FILE_O_READ) ? LFS_O_RDONLY : (mode == FILE_O_WRITE) ? (LFS_O_RDWR | LFS_O_CREAT) : 0;
+
+    if (flags) {
+        _file = (lfs_file_t *)rtos_malloc(sizeof(lfs_file_t));
+        if (!_file)
+            return false;
+
+        int rc = lfs_file_open(_fs->_getFS(), _file, filepath, flags);
+
+        if (rc) {
+            // failed to open
+            PRINT_LFS_ERR(rc);
+            // free memory
+            rtos_free(_file);
+            _file = NULL;
+            return false;
+        }
+
+        // move to end of file
+        if (mode == FILE_O_WRITE)
+            lfs_file_seek(_fs->_getFS(), _file, 0, LFS_SEEK_END);
+
+        _is_dir = false;
+    }
+
+    return true;
+}
+
+bool File::_open_dir(char const *filepath)
+{
+    _dir = (lfs_dir_t *)rtos_malloc(sizeof(lfs_dir_t));
+    if (!_dir)
+        return false;
+
+    int rc = lfs_dir_open(_fs->_getFS(), _dir, filepath);
+
+    if (rc) {
+        // failed to open
+        PRINT_LFS_ERR(rc);
+        // free memory
+        rtos_free(_dir);
+        _dir = NULL;
+        return false;
+    }
+
+    _is_dir = true;
+
+    _dir_path = (char *)rtos_malloc(strlen(filepath) + 1);
+    strcpy(_dir_path, filepath);
+
+    return true;
+}
+
+bool File::open(char const *filepath, uint8_t mode)
+{
+    bool ret = false;
+    _fs->_lockFS();
+
+    ret = this->_open(filepath, mode);
+
+    _fs->_unlockFS();
+    return ret;
+}
+
+bool File::_open(char const *filepath, uint8_t mode)
+{
+    bool ret = false;
+
+    // close if currently opened
+    if (this->isOpen())
+        _close();
+
+    struct lfs_info info;
+    int rc = lfs_stat(_fs->_getFS(), filepath, &info);
+
+    if (LFS_ERR_OK == rc) {
+        // file existed, open file or directory accordingly
+        ret = (info.type == LFS_TYPE_REG) ? _open_file(filepath, mode) : _open_dir(filepath);
+    } else if (LFS_ERR_NOENT == rc) {
+        // file not existed, only proceed with FILE_O_WRITE mode
+        if (mode == FILE_O_WRITE)
+            ret = _open_file(filepath, mode);
+    } else {
+        PRINT_LFS_ERR(rc);
+    }
+
+    // save bare file name
+    if (ret) {
+        char const *splash = strrchr(filepath, '/');
+        strncpy(_name, splash ? (splash + 1) : filepath, LFS_NAME_MAX);
+    }
+    return ret;
+}
+
+size_t File::write(uint8_t ch)
+{
+    return write(&ch, 1);
+}
+
+size_t File::write(uint8_t const *buf, size_t size)
+{
+    lfs_ssize_t wrcount = 0;
+    _fs->_lockFS();
+
+    if (!this->_is_dir) {
+        wrcount = lfs_file_write(_fs->_getFS(), _file, buf, size);
+        if (wrcount < 0) {
+            wrcount = 0;
+        }
+    }
+
+    _fs->_unlockFS();
+    return wrcount;
+}
+
+int File::read(void)
+{
+    // this thin wrapper relies on called function to synchronize
+    int ret = -1;
+    uint8_t ch;
+    if (read(&ch, 1) > 0) {
+        ret = static_cast<int>(ch);
+    }
+    return ret;
+}
+
+int File::read(void *buf, uint16_t nbyte)
+{
+    int ret = 0;
+    _fs->_lockFS();
+
+    if (!this->_is_dir) {
+        ret = lfs_file_read(_fs->_getFS(), _file, buf, nbyte);
+    }
+
+    _fs->_unlockFS();
+    return ret;
+}
+
+int File::peek(void)
+{
+    int ret = -1;
+    _fs->_lockFS();
+
+    if (!this->_is_dir) {
+        uint32_t pos = lfs_file_tell(_fs->_getFS(), _file);
+        uint8_t ch = 0;
+        if (lfs_file_read(_fs->_getFS(), _file, &ch, 1) > 0) {
+            ret = static_cast<int>(ch);
+        }
+        (void)lfs_file_seek(_fs->_getFS(), _file, pos, LFS_SEEK_SET);
+    }
+
+    _fs->_unlockFS();
+    return ret;
+}
+
+int File::available(void)
+{
+    int ret = 0;
+    _fs->_lockFS();
+
+    if (!this->_is_dir) {
+        uint32_t size = lfs_file_size(_fs->_getFS(), _file);
+        uint32_t pos = lfs_file_tell(_fs->_getFS(), _file);
+        ret = size - pos;
+    }
+
+    _fs->_unlockFS();
+    return ret;
+}
+
+bool File::seek(uint32_t pos)
+{
+    bool ret = false;
+    _fs->_lockFS();
+
+    if (!this->_is_dir) {
+        ret = lfs_file_seek(_fs->_getFS(), _file, pos, LFS_SEEK_SET) >= 0;
+    }
+
+    _fs->_unlockFS();
+    return ret;
+}
+
+uint32_t File::position(void)
+{
+    uint32_t ret = 0;
+    _fs->_lockFS();
+
+    if (!this->_is_dir) {
+        ret = lfs_file_tell(_fs->_getFS(), _file);
+    }
+
+    _fs->_unlockFS();
+    return ret;
+}
+
+uint32_t File::size(void)
+{
+    uint32_t ret = 0;
+    _fs->_lockFS();
+
+    if (!this->_is_dir) {
+        ret = lfs_file_size(_fs->_getFS(), _file);
+    }
+
+    _fs->_unlockFS();
+    return ret;
+}
+
+bool File::truncate(uint32_t pos)
+{
+    int32_t ret = LFS_ERR_ISDIR;
+    _fs->_lockFS();
+    if (!this->_is_dir) {
+        ret = lfs_file_truncate(_fs->_getFS(), _file, pos);
+    }
+    _fs->_unlockFS();
+    return (ret == 0);
+}
+
+bool File::truncate(void)
+{
+    int32_t ret = LFS_ERR_ISDIR;
+    uint32_t pos;
+    _fs->_lockFS();
+    if (!this->_is_dir) {
+        pos = lfs_file_tell(_fs->_getFS(), _file);
+        ret = lfs_file_truncate(_fs->_getFS(), _file, pos);
+    }
+    _fs->_unlockFS();
+    return (ret == 0);
+}
+
+void File::flush(void)
+{
+    _fs->_lockFS();
+
+    if (!this->_is_dir) {
+        lfs_file_sync(_fs->_getFS(), _file);
+    }
+
+    _fs->_unlockFS();
+    return;
+}
+
+void File::close(void)
+{
+    _fs->_lockFS();
+    this->_close();
+    _fs->_unlockFS();
+}
+
+void File::_close(void)
+{
+    if (this->isOpen()) {
+        if (this->_is_dir) {
+            lfs_dir_close(_fs->_getFS(), _dir);
+            rtos_free(_dir);
+            _dir = NULL;
+
+            if (this->_dir_path)
+                rtos_free(_dir_path);
+            _dir_path = NULL;
+        } else {
+            lfs_file_close(this->_fs->_getFS(), _file);
+            rtos_free(_file);
+            _file = NULL;
+        }
+    }
+}
+
+File::operator bool(void)
+{
+    return isOpen();
+}
+
+bool File::isOpen(void)
+{
+    return (_file != NULL) || (_dir != NULL);
+}
+
+// WARNING -- although marked as `const`, the values pointed
+//            to may change.  For example, if the same File
+//            object has `open()` called with a different
+//            file or directory name, this same pointer will
+//            suddenly (unexpectedly?) have different values.
+char const *File::name(void)
+{
+    return this->_name;
+}
+
+bool File::isDirectory(void)
+{
+    return this->_is_dir;
+}
+
+File File::openNextFile(uint8_t mode)
+{
+    _fs->_lockFS();
+
+    File ret(*_fs);
+    if (this->_is_dir) {
+        struct lfs_info info;
+        int rc;
+
+        // lfs_dir_read returns 0 when reaching end of directory, 1 if found an entry
+        // Skip the "." and ".." entries ...
+        do {
+            rc = lfs_dir_read(_fs->_getFS(), _dir, &info);
+        } while (rc == 1 && (!strcmp(".", info.name) || !strcmp("..", info.name)));
+
+        if (rc == 1) {
+            // string cat name with current folder
+            char filepath[strlen(_dir_path) + 1 + strlen(info.name) + 1]; // potential for significant stack usage
+            strcpy(filepath, _dir_path);
+            if (!(_dir_path[0] == '/' && _dir_path[1] == 0))
+                strcat(filepath, "/"); // only add '/' if cwd is not root
+            strcat(filepath, info.name);
+
+            (void)ret._open(filepath, mode); // return value is ignored ... caller is expected to check isOpened()
+        } else if (rc < 0) {
+            PRINT_LFS_ERR(rc);
+        }
+    }
+    _fs->_unlockFS();
+    return ret;
+}
+
+void File::rewindDirectory(void)
+{
+    _fs->_lockFS();
+    if (this->_is_dir) {
+        lfs_dir_rewind(_fs->_getFS(), _dir);
+    }
+    _fs->_unlockFS();
+}
diff --git a/src/platform/stm32wl/STM32_LittleFS_File.h b/src/platform/stm32wl/STM32_LittleFS_File.h
new file mode 100644
index 000000000..0a021dc54
--- /dev/null
+++ b/src/platform/stm32wl/STM32_LittleFS_File.h
@@ -0,0 +1,108 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Ha Thach for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef STM32_LITTLEFS_FILE_H_
+#define STM32_LITTLEFS_FILE_H_
+
+#include "littlefs/lfs.h"
+
+// Forward declaration
+class STM32_LittleFS;
+
+namespace STM32_LittleFS_Namespace
+{
+
+// avoid conflict with other FileSystem FILE_READ/FILE_WRITE
+enum {
+    FILE_O_READ = 0,
+    FILE_O_WRITE = 1,
+};
+
+class File : public Stream
+{
+  public:
+    File(STM32_LittleFS &fs);
+    File(char const *filename, uint8_t mode, STM32_LittleFS &fs);
+
+  public:
+    bool open(char const *filename, uint8_t mode);
+
+    //------------- Stream API -------------//
+    virtual size_t write(uint8_t ch);
+    virtual size_t write(uint8_t const *buf, size_t size);
+    size_t write(const char *str)
+    {
+        if (str == NULL)
+            return 0;
+        return write((const uint8_t *)str, strlen(str));
+    }
+    size_t write(const char *buffer, size_t size) { return write((const uint8_t *)buffer, size); }
+
+    virtual int read(void);
+    int read(void *buf, uint16_t nbyte);
+
+    virtual int peek(void);
+    virtual int available(void);
+    virtual void flush(void);
+
+    bool seek(uint32_t pos);
+    uint32_t position(void);
+    uint32_t size(void);
+
+    bool truncate(uint32_t pos);
+    bool truncate(void);
+
+    void close(void);
+
+    operator bool(void);
+
+    bool isOpen(void);
+    char const *name(void);
+
+    bool isDirectory(void);
+    File openNextFile(uint8_t mode = FILE_O_READ);
+    void rewindDirectory(void);
+
+  private:
+    STM32_LittleFS *_fs;
+
+    bool _is_dir;
+
+    union {
+        lfs_file_t *_file;
+        lfs_dir_t *_dir;
+    };
+
+    char *_dir_path;
+    char _name[LFS_NAME_MAX + 1];
+
+    bool _open(char const *filepath, uint8_t mode);
+    bool _open_file(char const *filepath, uint8_t mode);
+    bool _open_dir(char const *filepath);
+    void _close(void);
+};
+
+} // namespace STM32_LittleFS_Namespace
+
+#endif /* STM32_LITTLEFS_FILE_H_ */
diff --git a/src/platform/stm32wl/littlefs/lfs.c b/src/platform/stm32wl/littlefs/lfs.c
new file mode 100644
index 000000000..522614486
--- /dev/null
+++ b/src/platform/stm32wl/littlefs/lfs.c
@@ -0,0 +1,2531 @@
+/*
+ * The little filesystem
+ *
+ * Copyright (c) 2017, Arm Limited. All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+#include "lfs.h"
+#include "lfs_util.h"
+
+#include <inttypes.h>
+
+/// Caching block device operations ///
+static int lfs_cache_read(lfs_t *lfs, lfs_cache_t *rcache, const lfs_cache_t *pcache, lfs_block_t block, lfs_off_t off,
+                          void *buffer, lfs_size_t size)
+{
+    uint8_t *data = buffer;
+    LFS_ASSERT(block < lfs->cfg->block_count);
+
+    while (size > 0) {
+        if (pcache && block == pcache->block && off >= pcache->off && off < pcache->off + lfs->cfg->prog_size) {
+            // is already in pcache?
+            lfs_size_t diff = lfs_min(size, lfs->cfg->prog_size - (off - pcache->off));
+            memcpy(data, &pcache->buffer[off - pcache->off], diff);
+
+            data += diff;
+            off += diff;
+            size -= diff;
+            continue;
+        }
+
+        if (block == rcache->block && off >= rcache->off && off < rcache->off + lfs->cfg->read_size) {
+            // is already in rcache?
+            lfs_size_t diff = lfs_min(size, lfs->cfg->read_size - (off - rcache->off));
+            memcpy(data, &rcache->buffer[off - rcache->off], diff);
+
+            data += diff;
+            off += diff;
+            size -= diff;
+            continue;
+        }
+
+        if (off % lfs->cfg->read_size == 0 && size >= lfs->cfg->read_size) {
+            // bypass cache?
+            lfs_size_t diff = size - (size % lfs->cfg->read_size);
+            int err = lfs->cfg->read(lfs->cfg, block, off, data, diff);
+            if (err) {
+                return err;
+            }
+
+            data += diff;
+            off += diff;
+            size -= diff;
+            continue;
+        }
+
+        // load to cache, first condition can no longer fail
+        rcache->block = block;
+        rcache->off = off - (off % lfs->cfg->read_size);
+        int err = lfs->cfg->read(lfs->cfg, rcache->block, rcache->off, rcache->buffer, lfs->cfg->read_size);
+        if (err) {
+            return err;
+        }
+    }
+
+    return 0;
+}
+
+static int lfs_cache_cmp(lfs_t *lfs, lfs_cache_t *rcache, const lfs_cache_t *pcache, lfs_block_t block, lfs_off_t off,
+                         const void *buffer, lfs_size_t size)
+{
+    const uint8_t *data = buffer;
+
+    for (lfs_off_t i = 0; i < size; i++) {
+        uint8_t c;
+        int err = lfs_cache_read(lfs, rcache, pcache, block, off + i, &c, 1);
+        if (err) {
+            return err;
+        }
+
+        if (c != data[i]) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+static int lfs_cache_crc(lfs_t *lfs, lfs_cache_t *rcache, const lfs_cache_t *pcache, lfs_block_t block, lfs_off_t off,
+                         lfs_size_t size, uint32_t *crc)
+{
+    for (lfs_off_t i = 0; i < size; i++) {
+        uint8_t c;
+        int err = lfs_cache_read(lfs, rcache, pcache, block, off + i, &c, 1);
+        if (err) {
+            return err;
+        }
+
+        lfs_crc(crc, &c, 1);
+    }
+
+    return 0;
+}
+
+static inline void lfs_cache_drop(lfs_t *lfs, lfs_cache_t *rcache)
+{
+    // do not zero, cheaper if cache is readonly or only going to be
+    // written with identical data (during relocates)
+    (void)lfs;
+    rcache->block = 0xffffffff;
+}
+
+static inline void lfs_cache_zero(lfs_t *lfs, lfs_cache_t *pcache)
+{
+    // zero to avoid information leak
+    memset(pcache->buffer, 0xff, lfs->cfg->prog_size);
+    pcache->block = 0xffffffff;
+}
+
+static int lfs_cache_flush(lfs_t *lfs, lfs_cache_t *pcache, lfs_cache_t *rcache)
+{
+    if (pcache->block != 0xffffffff) {
+        int err = lfs->cfg->prog(lfs->cfg, pcache->block, pcache->off, pcache->buffer, lfs->cfg->prog_size);
+        if (err) {
+            return err;
+        }
+
+        if (rcache) {
+            int res = lfs_cache_cmp(lfs, rcache, NULL, pcache->block, pcache->off, pcache->buffer, lfs->cfg->prog_size);
+            if (res < 0) {
+                return res;
+            }
+
+            if (!res) {
+                return LFS_ERR_CORRUPT;
+            }
+        }
+
+        lfs_cache_zero(lfs, pcache);
+    }
+
+    return 0;
+}
+
+static int lfs_cache_prog(lfs_t *lfs, lfs_cache_t *pcache, lfs_cache_t *rcache, lfs_block_t block, lfs_off_t off,
+                          const void *buffer, lfs_size_t size)
+{
+    const uint8_t *data = buffer;
+    LFS_ASSERT(block < lfs->cfg->block_count);
+
+    while (size > 0) {
+        if (block == pcache->block && off >= pcache->off && off < pcache->off + lfs->cfg->prog_size) {
+            // is already in pcache?
+            lfs_size_t diff = lfs_min(size, lfs->cfg->prog_size - (off - pcache->off));
+            memcpy(&pcache->buffer[off - pcache->off], data, diff);
+
+            data += diff;
+            off += diff;
+            size -= diff;
+
+            if (off % lfs->cfg->prog_size == 0) {
+                // eagerly flush out pcache if we fill up
+                int err = lfs_cache_flush(lfs, pcache, rcache);
+                if (err) {
+                    return err;
+                }
+            }
+
+            continue;
+        }
+
+        // pcache must have been flushed, either by programming and
+        // entire block or manually flushing the pcache
+        LFS_ASSERT(pcache->block == 0xffffffff);
+
+        if (off % lfs->cfg->prog_size == 0 && size >= lfs->cfg->prog_size) {
+            // bypass pcache?
+            lfs_size_t diff = size - (size % lfs->cfg->prog_size);
+            int err = lfs->cfg->prog(lfs->cfg, block, off, data, diff);
+            if (err) {
+                return err;
+            }
+
+            if (rcache) {
+                int res = lfs_cache_cmp(lfs, rcache, NULL, block, off, data, diff);
+                if (res < 0) {
+                    return res;
+                }
+
+                if (!res) {
+                    return LFS_ERR_CORRUPT;
+                }
+            }
+
+            data += diff;
+            off += diff;
+            size -= diff;
+            continue;
+        }
+
+        // prepare pcache, first condition can no longer fail
+        pcache->block = block;
+        pcache->off = off - (off % lfs->cfg->prog_size);
+    }
+
+    return 0;
+}
+
+/// General lfs block device operations ///
+static int lfs_bd_read(lfs_t *lfs, lfs_block_t block, lfs_off_t off, void *buffer, lfs_size_t size)
+{
+    // if we ever do more than writes to alternating pairs,
+    // this may need to consider pcache
+    return lfs_cache_read(lfs, &lfs->rcache, NULL, block, off, buffer, size);
+}
+
+static int lfs_bd_prog(lfs_t *lfs, lfs_block_t block, lfs_off_t off, const void *buffer, lfs_size_t size)
+{
+    return lfs_cache_prog(lfs, &lfs->pcache, NULL, block, off, buffer, size);
+}
+
+static int lfs_bd_cmp(lfs_t *lfs, lfs_block_t block, lfs_off_t off, const void *buffer, lfs_size_t size)
+{
+    return lfs_cache_cmp(lfs, &lfs->rcache, NULL, block, off, buffer, size);
+}
+
+static int lfs_bd_crc(lfs_t *lfs, lfs_block_t block, lfs_off_t off, lfs_size_t size, uint32_t *crc)
+{
+    return lfs_cache_crc(lfs, &lfs->rcache, NULL, block, off, size, crc);
+}
+
+static int lfs_bd_erase(lfs_t *lfs, lfs_block_t block)
+{
+    return lfs->cfg->erase(lfs->cfg, block);
+}
+
+static int lfs_bd_sync(lfs_t *lfs)
+{
+    lfs_cache_drop(lfs, &lfs->rcache);
+
+    int err = lfs_cache_flush(lfs, &lfs->pcache, NULL);
+    if (err) {
+        return err;
+    }
+
+    return lfs->cfg->sync(lfs->cfg);
+}
+
+/// Internal operations predeclared here ///
+int lfs_traverse(lfs_t *lfs, int (*cb)(void *, lfs_block_t), void *data);
+static int lfs_pred(lfs_t *lfs, const lfs_block_t dir[2], lfs_dir_t *pdir);
+static int lfs_parent(lfs_t *lfs, const lfs_block_t dir[2], lfs_dir_t *parent, lfs_entry_t *entry);
+static int lfs_moved(lfs_t *lfs, const void *e);
+static int lfs_relocate(lfs_t *lfs, const lfs_block_t oldpair[2], const lfs_block_t newpair[2]);
+int lfs_deorphan(lfs_t *lfs);
+
+/// Block allocator ///
+static int lfs_alloc_lookahead(void *p, lfs_block_t block)
+{
+    lfs_t *lfs = p;
+
+    lfs_block_t off = ((block - lfs->free.off) + lfs->cfg->block_count) % lfs->cfg->block_count;
+
+    if (off < lfs->free.size) {
+        lfs->free.buffer[off / 32] |= 1U << (off % 32);
+    }
+
+    return 0;
+}
+
+static int lfs_alloc(lfs_t *lfs, lfs_block_t *block)
+{
+    while (true) {
+        while (lfs->free.i != lfs->free.size) {
+            lfs_block_t off = lfs->free.i;
+            lfs->free.i += 1;
+            lfs->free.ack -= 1;
+
+            if (!(lfs->free.buffer[off / 32] & (1U << (off % 32)))) {
+                // found a free block
+                *block = (lfs->free.off + off) % lfs->cfg->block_count;
+
+                // eagerly find next off so an alloc ack can
+                // discredit old lookahead blocks
+                while (lfs->free.i != lfs->free.size && (lfs->free.buffer[lfs->free.i / 32] & (1U << (lfs->free.i % 32)))) {
+                    lfs->free.i += 1;
+                    lfs->free.ack -= 1;
+                }
+
+                return 0;
+            }
+        }
+
+        // check if we have looked at all blocks since last ack
+        if (lfs->free.ack == 0) {
+            LFS_WARN("No more free space %" PRIu32, lfs->free.i + lfs->free.off);
+            return LFS_ERR_NOSPC;
+        }
+
+        lfs->free.off = (lfs->free.off + lfs->free.size) % lfs->cfg->block_count;
+        lfs->free.size = lfs_min(lfs->cfg->lookahead, lfs->free.ack);
+        lfs->free.i = 0;
+
+        // find mask of free blocks from tree
+        memset(lfs->free.buffer, 0, lfs->cfg->lookahead / 8);
+        int err = lfs_traverse(lfs, lfs_alloc_lookahead, lfs);
+        if (err) {
+            return err;
+        }
+    }
+}
+
+static void lfs_alloc_ack(lfs_t *lfs)
+{
+    lfs->free.ack = lfs->cfg->block_count;
+}
+
+/// Endian swapping functions ///
+static void lfs_dir_fromle32(struct lfs_disk_dir *d)
+{
+    d->rev = lfs_fromle32(d->rev);
+    d->size = lfs_fromle32(d->size);
+    d->tail[0] = lfs_fromle32(d->tail[0]);
+    d->tail[1] = lfs_fromle32(d->tail[1]);
+}
+
+static void lfs_dir_tole32(struct lfs_disk_dir *d)
+{
+    d->rev = lfs_tole32(d->rev);
+    d->size = lfs_tole32(d->size);
+    d->tail[0] = lfs_tole32(d->tail[0]);
+    d->tail[1] = lfs_tole32(d->tail[1]);
+}
+
+static void lfs_entry_fromle32(struct lfs_disk_entry *d)
+{
+    d->u.dir[0] = lfs_fromle32(d->u.dir[0]);
+    d->u.dir[1] = lfs_fromle32(d->u.dir[1]);
+}
+
+static void lfs_entry_tole32(struct lfs_disk_entry *d)
+{
+    d->u.dir[0] = lfs_tole32(d->u.dir[0]);
+    d->u.dir[1] = lfs_tole32(d->u.dir[1]);
+}
+
+static void lfs_superblock_fromle32(struct lfs_disk_superblock *d)
+{
+    d->root[0] = lfs_fromle32(d->root[0]);
+    d->root[1] = lfs_fromle32(d->root[1]);
+    d->block_size = lfs_fromle32(d->block_size);
+    d->block_count = lfs_fromle32(d->block_count);
+    d->version = lfs_fromle32(d->version);
+}
+
+static void lfs_superblock_tole32(struct lfs_disk_superblock *d)
+{
+    d->root[0] = lfs_tole32(d->root[0]);
+    d->root[1] = lfs_tole32(d->root[1]);
+    d->block_size = lfs_tole32(d->block_size);
+    d->block_count = lfs_tole32(d->block_count);
+    d->version = lfs_tole32(d->version);
+}
+
+/// Metadata pair and directory operations ///
+static inline void lfs_pairswap(lfs_block_t pair[2])
+{
+    lfs_block_t t = pair[0];
+    pair[0] = pair[1];
+    pair[1] = t;
+}
+
+static inline bool lfs_pairisnull(const lfs_block_t pair[2])
+{
+    return pair[0] == 0xffffffff || pair[1] == 0xffffffff;
+}
+
+static inline int lfs_paircmp(const lfs_block_t paira[2], const lfs_block_t pairb[2])
+{
+    return !(paira[0] == pairb[0] || paira[1] == pairb[1] || paira[0] == pairb[1] || paira[1] == pairb[0]);
+}
+
+static inline bool lfs_pairsync(const lfs_block_t paira[2], const lfs_block_t pairb[2])
+{
+    return (paira[0] == pairb[0] && paira[1] == pairb[1]) || (paira[0] == pairb[1] && paira[1] == pairb[0]);
+}
+
+static inline lfs_size_t lfs_entry_size(const lfs_entry_t *entry)
+{
+    return 4 + entry->d.elen + entry->d.alen + entry->d.nlen;
+}
+
+static int lfs_dir_alloc(lfs_t *lfs, lfs_dir_t *dir)
+{
+    // allocate pair of dir blocks
+    for (int i = 0; i < 2; i++) {
+        int err = lfs_alloc(lfs, &dir->pair[i]);
+        if (err) {
+            return err;
+        }
+    }
+
+    // rather than clobbering one of the blocks we just pretend
+    // the revision may be valid
+    int err = lfs_bd_read(lfs, dir->pair[0], 0, &dir->d.rev, 4);
+    if (err && err != LFS_ERR_CORRUPT) {
+        return err;
+    }
+
+    if (err != LFS_ERR_CORRUPT) {
+        dir->d.rev = lfs_fromle32(dir->d.rev);
+    }
+
+    // set defaults
+    dir->d.rev += 1;
+    dir->d.size = sizeof(dir->d) + 4;
+    dir->d.tail[0] = 0xffffffff;
+    dir->d.tail[1] = 0xffffffff;
+    dir->off = sizeof(dir->d);
+
+    // don't write out yet, let caller take care of that
+    return 0;
+}
+
+static int lfs_dir_fetch(lfs_t *lfs, lfs_dir_t *dir, const lfs_block_t pair[2])
+{
+    // copy out pair, otherwise may be aliasing dir
+    const lfs_block_t tpair[2] = {pair[0], pair[1]};
+    bool valid = false;
+
+    // check both blocks for the most recent revision
+    for (int i = 0; i < 2; i++) {
+        struct lfs_disk_dir test;
+        int err = lfs_bd_read(lfs, tpair[i], 0, &test, sizeof(test));
+        lfs_dir_fromle32(&test);
+        if (err) {
+            if (err == LFS_ERR_CORRUPT) {
+                continue;
+            }
+            return err;
+        }
+
+        if (valid && lfs_scmp(test.rev, dir->d.rev) < 0) {
+            continue;
+        }
+
+        if ((0x7fffffff & test.size) < sizeof(test) + 4 || (0x7fffffff & test.size) > lfs->cfg->block_size) {
+            continue;
+        }
+
+        uint32_t crc = 0xffffffff;
+        lfs_dir_tole32(&test);
+        lfs_crc(&crc, &test, sizeof(test));
+        lfs_dir_fromle32(&test);
+        err = lfs_bd_crc(lfs, tpair[i], sizeof(test), (0x7fffffff & test.size) - sizeof(test), &crc);
+        if (err) {
+            if (err == LFS_ERR_CORRUPT) {
+                continue;
+            }
+            return err;
+        }
+
+        if (crc != 0) {
+            continue;
+        }
+
+        valid = true;
+
+        // setup dir in case it's valid
+        dir->pair[0] = tpair[(i + 0) % 2];
+        dir->pair[1] = tpair[(i + 1) % 2];
+        dir->off = sizeof(dir->d);
+        dir->d = test;
+    }
+
+    if (!valid) {
+        LFS_ERROR("Corrupted dir pair at %" PRIu32 " %" PRIu32, tpair[0], tpair[1]);
+        return LFS_ERR_CORRUPT;
+    }
+
+    return 0;
+}
+
+struct lfs_region {
+    lfs_off_t oldoff;
+    lfs_size_t oldlen;
+    const void *newdata;
+    lfs_size_t newlen;
+};
+
+static int lfs_dir_commit(lfs_t *lfs, lfs_dir_t *dir, const struct lfs_region *regions, int count)
+{
+    // increment revision count
+    dir->d.rev += 1;
+
+    // keep pairs in order such that pair[0] is most recent
+    lfs_pairswap(dir->pair);
+    for (int i = 0; i < count; i++) {
+        dir->d.size += regions[i].newlen - regions[i].oldlen;
+    }
+
+    const lfs_block_t oldpair[2] = {dir->pair[0], dir->pair[1]};
+    bool relocated = false;
+
+    while (true) {
+
+        int err = lfs_bd_erase(lfs, dir->pair[0]);
+        if (err) {
+            if (err == LFS_ERR_CORRUPT) {
+                goto relocate;
+            }
+            return err;
+        }
+
+        uint32_t crc = 0xffffffff;
+        lfs_dir_tole32(&dir->d);
+        lfs_crc(&crc, &dir->d, sizeof(dir->d));
+        err = lfs_bd_prog(lfs, dir->pair[0], 0, &dir->d, sizeof(dir->d));
+        lfs_dir_fromle32(&dir->d);
+        if (err) {
+            if (err == LFS_ERR_CORRUPT) {
+                goto relocate;
+            }
+            return err;
+        }
+
+        int i = 0;
+        lfs_off_t oldoff = sizeof(dir->d);
+        lfs_off_t newoff = sizeof(dir->d);
+        while (newoff < (0x7fffffff & dir->d.size) - 4) {
+            if (i < count && regions[i].oldoff == oldoff) {
+                lfs_crc(&crc, regions[i].newdata, regions[i].newlen);
+                err = lfs_bd_prog(lfs, dir->pair[0], newoff, regions[i].newdata, regions[i].newlen);
+                if (err) {
+                    if (err == LFS_ERR_CORRUPT) {
+                        goto relocate;
+                    }
+                    return err;
+                }
+
+                oldoff += regions[i].oldlen;
+                newoff += regions[i].newlen;
+                i += 1;
+            } else {
+                uint8_t data;
+                err = lfs_bd_read(lfs, oldpair[1], oldoff, &data, 1);
+                if (err) {
+                    return err;
+                }
+
+                lfs_crc(&crc, &data, 1);
+                err = lfs_bd_prog(lfs, dir->pair[0], newoff, &data, 1);
+                if (err) {
+                    if (err == LFS_ERR_CORRUPT) {
+                        goto relocate;
+                    }
+                    return err;
+                }
+
+                oldoff += 1;
+                newoff += 1;
+            }
+        }
+
+        crc = lfs_tole32(crc);
+        err = lfs_bd_prog(lfs, dir->pair[0], newoff, &crc, 4);
+        crc = lfs_fromle32(crc);
+        if (err) {
+            if (err == LFS_ERR_CORRUPT) {
+                goto relocate;
+            }
+            return err;
+        }
+
+        err = lfs_bd_sync(lfs);
+        if (err) {
+            if (err == LFS_ERR_CORRUPT) {
+                goto relocate;
+            }
+            return err;
+        }
+
+        // successful commit, check checksum to make sure
+        uint32_t ncrc = 0xffffffff;
+        err = lfs_bd_crc(lfs, dir->pair[0], 0, (0x7fffffff & dir->d.size) - 4, &ncrc);
+        if (err) {
+            return err;
+        }
+
+        if (ncrc != crc) {
+            goto relocate;
+        }
+
+        break;
+    relocate:
+        // commit was corrupted
+        LFS_DEBUG("Bad block at %" PRIu32, dir->pair[0]);
+
+        // drop caches and prepare to relocate block
+        relocated = true;
+        lfs_cache_drop(lfs, &lfs->pcache);
+
+        // can't relocate superblock, filesystem is now frozen
+        if (lfs_paircmp(oldpair, (const lfs_block_t[2]){0, 1}) == 0) {
+            LFS_WARN("Superblock %" PRIu32 " has become unwritable", oldpair[0]);
+            return LFS_ERR_CORRUPT;
+        }
+
+        // relocate half of pair
+        err = lfs_alloc(lfs, &dir->pair[0]);
+        if (err) {
+            return err;
+        }
+    }
+
+    if (relocated) {
+        // update references if we relocated
+        LFS_DEBUG("Relocating %" PRIu32 " %" PRIu32 " to %" PRIu32 " %" PRIu32, oldpair[0], oldpair[1], dir->pair[0],
+                  dir->pair[1]);
+        int err = lfs_relocate(lfs, oldpair, dir->pair);
+        if (err) {
+            return err;
+        }
+    }
+
+    // shift over any directories that are affected
+    for (lfs_dir_t *d = lfs->dirs; d; d = d->next) {
+        if (lfs_paircmp(d->pair, dir->pair) == 0) {
+            d->pair[0] = dir->pair[0];
+            d->pair[1] = dir->pair[1];
+        }
+    }
+
+    return 0;
+}
+
+static int lfs_dir_update(lfs_t *lfs, lfs_dir_t *dir, lfs_entry_t *entry, const void *data)
+{
+    lfs_entry_tole32(&entry->d);
+    int err = lfs_dir_commit(lfs, dir,
+                             (struct lfs_region[]){{entry->off, sizeof(entry->d), &entry->d, sizeof(entry->d)},
+                                                   {entry->off + sizeof(entry->d), entry->d.nlen, data, entry->d.nlen}},
+                             data ? 2 : 1);
+    lfs_entry_fromle32(&entry->d);
+    return err;
+}
+
+static int lfs_dir_append(lfs_t *lfs, lfs_dir_t *dir, lfs_entry_t *entry, const void *data)
+{
+    // check if we fit, if top bit is set we do not and move on
+    while (true) {
+        if (dir->d.size + lfs_entry_size(entry) <= lfs->cfg->block_size) {
+            entry->off = dir->d.size - 4;
+
+            lfs_entry_tole32(&entry->d);
+            int err = lfs_dir_commit(
+                lfs, dir,
+                (struct lfs_region[]){{entry->off, 0, &entry->d, sizeof(entry->d)}, {entry->off, 0, data, entry->d.nlen}}, 2);
+            lfs_entry_fromle32(&entry->d);
+            return err;
+        }
+
+        // we need to allocate a new dir block
+        if (!(0x80000000 & dir->d.size)) {
+            lfs_dir_t olddir = *dir;
+            int err = lfs_dir_alloc(lfs, dir);
+            if (err) {
+                return err;
+            }
+
+            dir->d.tail[0] = olddir.d.tail[0];
+            dir->d.tail[1] = olddir.d.tail[1];
+            entry->off = dir->d.size - 4;
+            lfs_entry_tole32(&entry->d);
+            err = lfs_dir_commit(
+                lfs, dir,
+                (struct lfs_region[]){{entry->off, 0, &entry->d, sizeof(entry->d)}, {entry->off, 0, data, entry->d.nlen}}, 2);
+            lfs_entry_fromle32(&entry->d);
+            if (err) {
+                return err;
+            }
+
+            olddir.d.size |= 0x80000000;
+            olddir.d.tail[0] = dir->pair[0];
+            olddir.d.tail[1] = dir->pair[1];
+            return lfs_dir_commit(lfs, &olddir, NULL, 0);
+        }
+
+        int err = lfs_dir_fetch(lfs, dir, dir->d.tail);
+        if (err) {
+            return err;
+        }
+    }
+}
+
+static int lfs_dir_remove(lfs_t *lfs, lfs_dir_t *dir, lfs_entry_t *entry)
+{
+    // check if we should just drop the directory block
+    if ((dir->d.size & 0x7fffffff) == sizeof(dir->d) + 4 + lfs_entry_size(entry)) {
+        lfs_dir_t pdir;
+        int res = lfs_pred(lfs, dir->pair, &pdir);
+        if (res < 0) {
+            return res;
+        }
+
+        if (pdir.d.size & 0x80000000) {
+            pdir.d.size &= dir->d.size | 0x7fffffff;
+            pdir.d.tail[0] = dir->d.tail[0];
+            pdir.d.tail[1] = dir->d.tail[1];
+            return lfs_dir_commit(lfs, &pdir, NULL, 0);
+        }
+    }
+
+    // shift out the entry
+    int err = lfs_dir_commit(lfs, dir,
+                             (struct lfs_region[]){
+                                 {entry->off, lfs_entry_size(entry), NULL, 0},
+                             },
+                             1);
+    if (err) {
+        return err;
+    }
+
+    // shift over any files/directories that are affected
+    for (lfs_file_t *f = lfs->files; f; f = f->next) {
+        if (lfs_paircmp(f->pair, dir->pair) == 0) {
+            if (f->poff == entry->off) {
+                f->pair[0] = 0xffffffff;
+                f->pair[1] = 0xffffffff;
+            } else if (f->poff > entry->off) {
+                f->poff -= lfs_entry_size(entry);
+            }
+        }
+    }
+
+    for (lfs_dir_t *d = lfs->dirs; d; d = d->next) {
+        if (lfs_paircmp(d->pair, dir->pair) == 0) {
+            if (d->off > entry->off) {
+                d->off -= lfs_entry_size(entry);
+                d->pos -= lfs_entry_size(entry);
+            }
+        }
+    }
+
+    return 0;
+}
+
+static int lfs_dir_next(lfs_t *lfs, lfs_dir_t *dir, lfs_entry_t *entry)
+{
+    while (dir->off + sizeof(entry->d) > (0x7fffffff & dir->d.size) - 4) {
+        if (!(0x80000000 & dir->d.size)) {
+            entry->off = dir->off;
+            return LFS_ERR_NOENT;
+        }
+
+        int err = lfs_dir_fetch(lfs, dir, dir->d.tail);
+        if (err) {
+            return err;
+        }
+
+        dir->off = sizeof(dir->d);
+        dir->pos += sizeof(dir->d) + 4;
+    }
+
+    int err = lfs_bd_read(lfs, dir->pair[0], dir->off, &entry->d, sizeof(entry->d));
+    lfs_entry_fromle32(&entry->d);
+    if (err) {
+        return err;
+    }
+
+    entry->off = dir->off;
+    dir->off += lfs_entry_size(entry);
+    dir->pos += lfs_entry_size(entry);
+    return 0;
+}
+
+static int lfs_dir_find(lfs_t *lfs, lfs_dir_t *dir, lfs_entry_t *entry, const char **path)
+{
+    const char *pathname = *path;
+    size_t pathlen;
+    entry->d.type = LFS_TYPE_DIR;
+    entry->d.elen = sizeof(entry->d) - 4;
+    entry->d.alen = 0;
+    entry->d.nlen = 0;
+    entry->d.u.dir[0] = lfs->root[0];
+    entry->d.u.dir[1] = lfs->root[1];
+
+    while (true) {
+    nextname:
+        // skip slashes
+        pathname += strspn(pathname, "/");
+        pathlen = strcspn(pathname, "/");
+
+        // skip '.' and root '..'
+        if ((pathlen == 1 && memcmp(pathname, ".", 1) == 0) || (pathlen == 2 && memcmp(pathname, "..", 2) == 0)) {
+            pathname += pathlen;
+            goto nextname;
+        }
+
+        // skip if matched by '..' in name
+        const char *suffix = pathname + pathlen;
+        size_t sufflen;
+        int depth = 1;
+        while (true) {
+            suffix += strspn(suffix, "/");
+            sufflen = strcspn(suffix, "/");
+            if (sufflen == 0) {
+                break;
+            }
+
+            if (sufflen == 2 && memcmp(suffix, "..", 2) == 0) {
+                depth -= 1;
+                if (depth == 0) {
+                    pathname = suffix + sufflen;
+                    goto nextname;
+                }
+            } else {
+                depth += 1;
+            }
+
+            suffix += sufflen;
+        }
+
+        // found path
+        if (pathname[0] == '\0') {
+            return 0;
+        }
+
+        // update what we've found
+        *path = pathname;
+
+        // continue on if we hit a directory
+        if (entry->d.type != LFS_TYPE_DIR) {
+            return LFS_ERR_NOTDIR;
+        }
+
+        int err = lfs_dir_fetch(lfs, dir, entry->d.u.dir);
+        if (err) {
+            return err;
+        }
+
+        // find entry matching name
+        while (true) {
+            err = lfs_dir_next(lfs, dir, entry);
+            if (err) {
+                return err;
+            }
+
+            if (((0x7f & entry->d.type) != LFS_TYPE_REG && (0x7f & entry->d.type) != LFS_TYPE_DIR) || entry->d.nlen != pathlen) {
+                continue;
+            }
+
+            int res = lfs_bd_cmp(lfs, dir->pair[0], entry->off + 4 + entry->d.elen + entry->d.alen, pathname, pathlen);
+            if (res < 0) {
+                return res;
+            }
+
+            // found match
+            if (res) {
+                break;
+            }
+        }
+
+        // check that entry has not been moved
+        if (entry->d.type & 0x80) {
+            int moved = lfs_moved(lfs, &entry->d.u);
+            if (moved < 0 || moved) {
+                return (moved < 0) ? moved : LFS_ERR_NOENT;
+            }
+
+            entry->d.type &= ~0x80;
+        }
+
+        // to next name
+        pathname += pathlen;
+    }
+}
+
+/// Top level directory operations ///
+int lfs_mkdir(lfs_t *lfs, const char *path)
+{
+    // deorphan if we haven't yet, needed at most once after poweron
+    if (!lfs->deorphaned) {
+        int err = lfs_deorphan(lfs);
+        if (err) {
+            return err;
+        }
+    }
+
+    // fetch parent directory
+    lfs_dir_t cwd;
+    lfs_entry_t entry;
+    int err = lfs_dir_find(lfs, &cwd, &entry, &path);
+    if (err != LFS_ERR_NOENT || strchr(path, '/') != NULL) {
+        return err ? err : LFS_ERR_EXIST;
+    }
+
+    // build up new directory
+    lfs_alloc_ack(lfs);
+
+    lfs_dir_t dir;
+    err = lfs_dir_alloc(lfs, &dir);
+    if (err) {
+        return err;
+    }
+    dir.d.tail[0] = cwd.d.tail[0];
+    dir.d.tail[1] = cwd.d.tail[1];
+
+    err = lfs_dir_commit(lfs, &dir, NULL, 0);
+    if (err) {
+        return err;
+    }
+
+    entry.d.type = LFS_TYPE_DIR;
+    entry.d.elen = sizeof(entry.d) - 4;
+    entry.d.alen = 0;
+    entry.d.nlen = strlen(path);
+    entry.d.u.dir[0] = dir.pair[0];
+    entry.d.u.dir[1] = dir.pair[1];
+
+    cwd.d.tail[0] = dir.pair[0];
+    cwd.d.tail[1] = dir.pair[1];
+
+    err = lfs_dir_append(lfs, &cwd, &entry, path);
+    if (err) {
+        return err;
+    }
+
+    lfs_alloc_ack(lfs);
+    return 0;
+}
+
+int lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path)
+{
+    dir->pair[0] = lfs->root[0];
+    dir->pair[1] = lfs->root[1];
+
+    lfs_entry_t entry;
+    int err = lfs_dir_find(lfs, dir, &entry, &path);
+    if (err) {
+        return err;
+    } else if (entry.d.type != LFS_TYPE_DIR) {
+        return LFS_ERR_NOTDIR;
+    }
+
+    err = lfs_dir_fetch(lfs, dir, entry.d.u.dir);
+    if (err) {
+        return err;
+    }
+
+    // setup head dir
+    // special offset for '.' and '..'
+    dir->head[0] = dir->pair[0];
+    dir->head[1] = dir->pair[1];
+    dir->pos = sizeof(dir->d) - 2;
+    dir->off = sizeof(dir->d);
+
+    // add to list of directories
+    dir->next = lfs->dirs;
+    lfs->dirs = dir;
+
+    return 0;
+}
+
+int lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir)
+{
+    // remove from list of directories
+    for (lfs_dir_t **p = &lfs->dirs; *p; p = &(*p)->next) {
+        if (*p == dir) {
+            *p = dir->next;
+            break;
+        }
+    }
+
+    return 0;
+}
+
+int lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info)
+{
+    memset(info, 0, sizeof(*info));
+
+    // special offset for '.' and '..'
+    if (dir->pos == sizeof(dir->d) - 2) {
+        info->type = LFS_TYPE_DIR;
+        strcpy(info->name, ".");
+        dir->pos += 1;
+        return 1;
+    } else if (dir->pos == sizeof(dir->d) - 1) {
+        info->type = LFS_TYPE_DIR;
+        strcpy(info->name, "..");
+        dir->pos += 1;
+        return 1;
+    }
+
+    lfs_entry_t entry;
+    while (true) {
+        int err = lfs_dir_next(lfs, dir, &entry);
+        if (err) {
+            return (err == LFS_ERR_NOENT) ? 0 : err;
+        }
+
+        if ((0x7f & entry.d.type) != LFS_TYPE_REG && (0x7f & entry.d.type) != LFS_TYPE_DIR) {
+            continue;
+        }
+
+        // check that entry has not been moved
+        if (entry.d.type & 0x80) {
+            int moved = lfs_moved(lfs, &entry.d.u);
+            if (moved < 0) {
+                return moved;
+            }
+
+            if (moved) {
+                continue;
+            }
+
+            entry.d.type &= ~0x80;
+        }
+
+        break;
+    }
+
+    info->type = entry.d.type;
+    if (info->type == LFS_TYPE_REG) {
+        info->size = entry.d.u.file.size;
+    }
+
+    int err = lfs_bd_read(lfs, dir->pair[0], entry.off + 4 + entry.d.elen + entry.d.alen, info->name, entry.d.nlen);
+    if (err) {
+        return err;
+    }
+
+    return 1;
+}
+
+int lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off)
+{
+    // simply walk from head dir
+    int err = lfs_dir_rewind(lfs, dir);
+    if (err) {
+        return err;
+    }
+    dir->pos = off;
+
+    while (off > (0x7fffffff & dir->d.size)) {
+        off -= 0x7fffffff & dir->d.size;
+        if (!(0x80000000 & dir->d.size)) {
+            return LFS_ERR_INVAL;
+        }
+
+        err = lfs_dir_fetch(lfs, dir, dir->d.tail);
+        if (err) {
+            return err;
+        }
+    }
+
+    dir->off = off;
+    return 0;
+}
+
+lfs_soff_t lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir)
+{
+    (void)lfs;
+    return dir->pos;
+}
+
+int lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir)
+{
+    // reload the head dir
+    int err = lfs_dir_fetch(lfs, dir, dir->head);
+    if (err) {
+        return err;
+    }
+
+    dir->pair[0] = dir->head[0];
+    dir->pair[1] = dir->head[1];
+    dir->pos = sizeof(dir->d) - 2;
+    dir->off = sizeof(dir->d);
+    return 0;
+}
+
+/// File index list operations ///
+static int lfs_ctz_index(lfs_t *lfs, lfs_off_t *off)
+{
+    lfs_off_t size = *off;
+    lfs_off_t b = lfs->cfg->block_size - 2 * 4;
+    lfs_off_t i = size / b;
+    if (i == 0) {
+        return 0;
+    }
+
+    i = (size - 4 * (lfs_popc(i - 1) + 2)) / b;
+    *off = size - b * i - 4 * lfs_popc(i);
+    return i;
+}
+
+static int lfs_ctz_find(lfs_t *lfs, lfs_cache_t *rcache, const lfs_cache_t *pcache, lfs_block_t head, lfs_size_t size,
+                        lfs_size_t pos, lfs_block_t *block, lfs_off_t *off)
+{
+    if (size == 0) {
+        *block = 0xffffffff;
+        *off = 0;
+        return 0;
+    }
+
+    lfs_off_t current = lfs_ctz_index(lfs, &(lfs_off_t){size - 1});
+    lfs_off_t target = lfs_ctz_index(lfs, &pos);
+
+    while (current > target) {
+        lfs_size_t skip = lfs_min(lfs_npw2(current - target + 1) - 1, lfs_ctz(current));
+
+        int err = lfs_cache_read(lfs, rcache, pcache, head, 4 * skip, &head, 4);
+        head = lfs_fromle32(head);
+        if (err) {
+            return err;
+        }
+
+        LFS_ASSERT(head >= 2 && head <= lfs->cfg->block_count);
+        current -= 1 << skip;
+    }
+
+    *block = head;
+    *off = pos;
+    return 0;
+}
+
+static int lfs_ctz_extend(lfs_t *lfs, lfs_cache_t *rcache, lfs_cache_t *pcache, lfs_block_t head, lfs_size_t size,
+                          lfs_block_t *block, lfs_off_t *off)
+{
+    while (true) {
+        // go ahead and grab a block
+        lfs_block_t nblock;
+        int err = lfs_alloc(lfs, &nblock);
+        if (err) {
+            return err;
+        }
+        LFS_ASSERT(nblock >= 2 && nblock <= lfs->cfg->block_count);
+
+        if (true) {
+            err = lfs_bd_erase(lfs, nblock);
+            if (err) {
+                if (err == LFS_ERR_CORRUPT) {
+                    goto relocate;
+                }
+                return err;
+            }
+
+            if (size == 0) {
+                *block = nblock;
+                *off = 0;
+                return 0;
+            }
+
+            size -= 1;
+            lfs_off_t index = lfs_ctz_index(lfs, &size);
+            size += 1;
+
+            // just copy out the last block if it is incomplete
+            if (size != lfs->cfg->block_size) {
+                for (lfs_off_t i = 0; i < size; i++) {
+                    uint8_t data;
+                    err = lfs_cache_read(lfs, rcache, NULL, head, i, &data, 1);
+                    if (err) {
+                        return err;
+                    }
+
+                    err = lfs_cache_prog(lfs, pcache, rcache, nblock, i, &data, 1);
+                    if (err) {
+                        if (err == LFS_ERR_CORRUPT) {
+                            goto relocate;
+                        }
+                        return err;
+                    }
+                }
+
+                *block = nblock;
+                *off = size;
+                return 0;
+            }
+
+            // append block
+            index += 1;
+            lfs_size_t skips = lfs_ctz(index) + 1;
+
+            for (lfs_off_t i = 0; i < skips; i++) {
+                head = lfs_tole32(head);
+                err = lfs_cache_prog(lfs, pcache, rcache, nblock, 4 * i, &head, 4);
+                head = lfs_fromle32(head);
+                if (err) {
+                    if (err == LFS_ERR_CORRUPT) {
+                        goto relocate;
+                    }
+                    return err;
+                }
+
+                if (i != skips - 1) {
+                    err = lfs_cache_read(lfs, rcache, NULL, head, 4 * i, &head, 4);
+                    head = lfs_fromle32(head);
+                    if (err) {
+                        return err;
+                    }
+                }
+
+                LFS_ASSERT(head >= 2 && head <= lfs->cfg->block_count);
+            }
+
+            *block = nblock;
+            *off = 4 * skips;
+            return 0;
+        }
+
+    relocate:
+        LFS_DEBUG("Bad block at %" PRIu32, nblock);
+
+        // just clear cache and try a new block
+        lfs_cache_drop(lfs, &lfs->pcache);
+    }
+}
+
+static int lfs_ctz_traverse(lfs_t *lfs, lfs_cache_t *rcache, const lfs_cache_t *pcache, lfs_block_t head, lfs_size_t size,
+                            int (*cb)(void *, lfs_block_t), void *data)
+{
+    if (size == 0) {
+        return 0;
+    }
+
+    lfs_off_t index = lfs_ctz_index(lfs, &(lfs_off_t){size - 1});
+
+    while (true) {
+        int err = cb(data, head);
+        if (err) {
+            return err;
+        }
+
+        if (index == 0) {
+            return 0;
+        }
+
+        lfs_block_t heads[2];
+        int count = 2 - (index & 1);
+        err = lfs_cache_read(lfs, rcache, pcache, head, 0, &heads, count * 4);
+        heads[0] = lfs_fromle32(heads[0]);
+        heads[1] = lfs_fromle32(heads[1]);
+        if (err) {
+            return err;
+        }
+
+        for (int i = 0; i < count - 1; i++) {
+            err = cb(data, heads[i]);
+            if (err) {
+                return err;
+            }
+        }
+
+        head = heads[count - 1];
+        index -= count;
+    }
+}
+
+/// Top level file operations ///
+int lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, const struct lfs_file_config *cfg)
+{
+    // deorphan if we haven't yet, needed at most once after poweron
+    if ((flags & 3) != LFS_O_RDONLY && !lfs->deorphaned) {
+        int err = lfs_deorphan(lfs);
+        if (err) {
+            return err;
+        }
+    }
+
+    // allocate entry for file if it doesn't exist
+    lfs_dir_t cwd;
+    lfs_entry_t entry;
+    int err = lfs_dir_find(lfs, &cwd, &entry, &path);
+    if (err && (err != LFS_ERR_NOENT || strchr(path, '/') != NULL)) {
+        return err;
+    }
+
+    if (err == LFS_ERR_NOENT) {
+        if (!(flags & LFS_O_CREAT)) {
+            return LFS_ERR_NOENT;
+        }
+
+        // create entry to remember name
+        entry.d.type = LFS_TYPE_REG;
+        entry.d.elen = sizeof(entry.d) - 4;
+        entry.d.alen = 0;
+        entry.d.nlen = strlen(path);
+        entry.d.u.file.head = 0xffffffff;
+        entry.d.u.file.size = 0;
+        err = lfs_dir_append(lfs, &cwd, &entry, path);
+        if (err) {
+            return err;
+        }
+    } else if (entry.d.type == LFS_TYPE_DIR) {
+        return LFS_ERR_ISDIR;
+    } else if (flags & LFS_O_EXCL) {
+        return LFS_ERR_EXIST;
+    }
+
+    // setup file struct
+    file->cfg = cfg;
+    file->pair[0] = cwd.pair[0];
+    file->pair[1] = cwd.pair[1];
+    file->poff = entry.off;
+    file->head = entry.d.u.file.head;
+    file->size = entry.d.u.file.size;
+    file->flags = flags;
+    file->pos = 0;
+
+    if (flags & LFS_O_TRUNC) {
+        if (file->size != 0) {
+            file->flags |= LFS_F_DIRTY;
+        }
+        file->head = 0xffffffff;
+        file->size = 0;
+    }
+
+    // allocate buffer if needed
+    file->cache.block = 0xffffffff;
+    if (file->cfg && file->cfg->buffer) {
+        file->cache.buffer = file->cfg->buffer;
+    } else if (lfs->cfg->file_buffer) {
+        if (lfs->files) {
+            // already in use
+            return LFS_ERR_NOMEM;
+        }
+        file->cache.buffer = lfs->cfg->file_buffer;
+    } else if ((file->flags & 3) == LFS_O_RDONLY) {
+        file->cache.buffer = lfs_malloc(lfs->cfg->read_size);
+        if (!file->cache.buffer) {
+            return LFS_ERR_NOMEM;
+        }
+    } else {
+        file->cache.buffer = lfs_malloc(lfs->cfg->prog_size);
+        if (!file->cache.buffer) {
+            return LFS_ERR_NOMEM;
+        }
+    }
+
+    // zero to avoid information leak
+    lfs_cache_drop(lfs, &file->cache);
+    if ((file->flags & 3) != LFS_O_RDONLY) {
+        lfs_cache_zero(lfs, &file->cache);
+    }
+
+    // add to list of files
+    file->next = lfs->files;
+    lfs->files = file;
+
+    return 0;
+}
+
+int lfs_file_open(lfs_t *lfs, lfs_file_t *file, const char *path, int flags)
+{
+    return lfs_file_opencfg(lfs, file, path, flags, NULL);
+}
+
+int lfs_file_close(lfs_t *lfs, lfs_file_t *file)
+{
+    int err = lfs_file_sync(lfs, file);
+
+    // remove from list of files
+    for (lfs_file_t **p = &lfs->files; *p; p = &(*p)->next) {
+        if (*p == file) {
+            *p = file->next;
+            break;
+        }
+    }
+
+    // clean up memory
+    if (!(file->cfg && file->cfg->buffer) && !lfs->cfg->file_buffer) {
+        lfs_free(file->cache.buffer);
+    }
+
+    return err;
+}
+
+static int lfs_file_relocate(lfs_t *lfs, lfs_file_t *file)
+{
+relocate:
+    LFS_DEBUG("Bad block at %" PRIu32, file->block);
+
+    // just relocate what exists into new block
+    lfs_block_t nblock;
+    int err = lfs_alloc(lfs, &nblock);
+    if (err) {
+        return err;
+    }
+
+    err = lfs_bd_erase(lfs, nblock);
+    if (err) {
+        if (err == LFS_ERR_CORRUPT) {
+            goto relocate;
+        }
+        return err;
+    }
+
+    // either read from dirty cache or disk
+    for (lfs_off_t i = 0; i < file->off; i++) {
+        uint8_t data;
+        err = lfs_cache_read(lfs, &lfs->rcache, &file->cache, file->block, i, &data, 1);
+        if (err) {
+            return err;
+        }
+
+        err = lfs_cache_prog(lfs, &lfs->pcache, &lfs->rcache, nblock, i, &data, 1);
+        if (err) {
+            if (err == LFS_ERR_CORRUPT) {
+                goto relocate;
+            }
+            return err;
+        }
+    }
+
+    // copy over new state of file
+    memcpy(file->cache.buffer, lfs->pcache.buffer, lfs->cfg->prog_size);
+    file->cache.block = lfs->pcache.block;
+    file->cache.off = lfs->pcache.off;
+    lfs_cache_zero(lfs, &lfs->pcache);
+
+    file->block = nblock;
+    return 0;
+}
+
+static int lfs_file_flush(lfs_t *lfs, lfs_file_t *file)
+{
+    if (file->flags & LFS_F_READING) {
+        // just drop read cache
+        lfs_cache_drop(lfs, &file->cache);
+        file->flags &= ~LFS_F_READING;
+    }
+
+    if (file->flags & LFS_F_WRITING) {
+        lfs_off_t pos = file->pos;
+
+        // copy over anything after current branch
+        lfs_file_t orig = {
+            .head = file->head,
+            .size = file->size,
+            .flags = LFS_O_RDONLY,
+            .pos = file->pos,
+            .cache = lfs->rcache,
+        };
+        lfs_cache_drop(lfs, &lfs->rcache);
+
+        while (file->pos < file->size) {
+            // copy over a byte at a time, leave it up to caching
+            // to make this efficient
+            uint8_t data;
+            lfs_ssize_t res = lfs_file_read(lfs, &orig, &data, 1);
+            if (res < 0) {
+                return res;
+            }
+
+            res = lfs_file_write(lfs, file, &data, 1);
+            if (res < 0) {
+                return res;
+            }
+
+            // keep our reference to the rcache in sync
+            if (lfs->rcache.block != 0xffffffff) {
+                lfs_cache_drop(lfs, &orig.cache);
+                lfs_cache_drop(lfs, &lfs->rcache);
+            }
+        }
+
+        // write out what we have
+        while (true) {
+            int err = lfs_cache_flush(lfs, &file->cache, &lfs->rcache);
+            if (err) {
+                if (err == LFS_ERR_CORRUPT) {
+                    goto relocate;
+                }
+                return err;
+            }
+
+            break;
+        relocate:
+            err = lfs_file_relocate(lfs, file);
+            if (err) {
+                return err;
+            }
+        }
+
+        // actual file updates
+        file->head = file->block;
+        file->size = file->pos;
+        file->flags &= ~LFS_F_WRITING;
+        file->flags |= LFS_F_DIRTY;
+
+        file->pos = pos;
+    }
+
+    return 0;
+}
+
+int lfs_file_sync(lfs_t *lfs, lfs_file_t *file)
+{
+    int err = lfs_file_flush(lfs, file);
+    if (err) {
+        return err;
+    }
+
+    if ((file->flags & LFS_F_DIRTY) && !(file->flags & LFS_F_ERRED) && !lfs_pairisnull(file->pair)) {
+        // update dir entry
+        lfs_dir_t cwd;
+        err = lfs_dir_fetch(lfs, &cwd, file->pair);
+        if (err) {
+            return err;
+        }
+
+        lfs_entry_t entry = {.off = file->poff};
+        err = lfs_bd_read(lfs, cwd.pair[0], entry.off, &entry.d, sizeof(entry.d));
+        lfs_entry_fromle32(&entry.d);
+        if (err) {
+            return err;
+        }
+
+        LFS_ASSERT(entry.d.type == LFS_TYPE_REG);
+        entry.d.u.file.head = file->head;
+        entry.d.u.file.size = file->size;
+
+        err = lfs_dir_update(lfs, &cwd, &entry, NULL);
+        if (err) {
+            return err;
+        }
+
+        file->flags &= ~LFS_F_DIRTY;
+    }
+
+    return 0;
+}
+
+lfs_ssize_t lfs_file_read(lfs_t *lfs, lfs_file_t *file, void *buffer, lfs_size_t size)
+{
+    uint8_t *data = buffer;
+    lfs_size_t nsize = size;
+
+    if ((file->flags & 3) == LFS_O_WRONLY) {
+        return LFS_ERR_BADF;
+    }
+
+    if (file->flags & LFS_F_WRITING) {
+        // flush out any writes
+        int err = lfs_file_flush(lfs, file);
+        if (err) {
+            return err;
+        }
+    }
+
+    if (file->pos >= file->size) {
+        // eof if past end
+        return 0;
+    }
+
+    size = lfs_min(size, file->size - file->pos);
+    nsize = size;
+
+    while (nsize > 0) {
+        // check if we need a new block
+        if (!(file->flags & LFS_F_READING) || file->off == lfs->cfg->block_size) {
+            int err = lfs_ctz_find(lfs, &file->cache, NULL, file->head, file->size, file->pos, &file->block, &file->off);
+            if (err) {
+                return err;
+            }
+
+            file->flags |= LFS_F_READING;
+        }
+
+        // read as much as we can in current block
+        lfs_size_t diff = lfs_min(nsize, lfs->cfg->block_size - file->off);
+        int err = lfs_cache_read(lfs, &file->cache, NULL, file->block, file->off, data, diff);
+        if (err) {
+            return err;
+        }
+
+        file->pos += diff;
+        file->off += diff;
+        data += diff;
+        nsize -= diff;
+    }
+
+    return size;
+}
+
+lfs_ssize_t lfs_file_write(lfs_t *lfs, lfs_file_t *file, const void *buffer, lfs_size_t size)
+{
+    const uint8_t *data = buffer;
+    lfs_size_t nsize = size;
+
+    if ((file->flags & 3) == LFS_O_RDONLY) {
+        return LFS_ERR_BADF;
+    }
+
+    if (file->flags & LFS_F_READING) {
+        // drop any reads
+        int err = lfs_file_flush(lfs, file);
+        if (err) {
+            return err;
+        }
+    }
+
+    if ((file->flags & LFS_O_APPEND) && file->pos < file->size) {
+        file->pos = file->size;
+    }
+
+    if (!(file->flags & LFS_F_WRITING) && file->pos > file->size) {
+        // fill with zeros
+        lfs_off_t pos = file->pos;
+        file->pos = file->size;
+
+        while (file->pos < pos) {
+            lfs_ssize_t res = lfs_file_write(lfs, file, &(uint8_t){0}, 1);
+            if (res < 0) {
+                return res;
+            }
+        }
+    }
+
+    while (nsize > 0) {
+        // check if we need a new block
+        if (!(file->flags & LFS_F_WRITING) || file->off == lfs->cfg->block_size) {
+            if (!(file->flags & LFS_F_WRITING) && file->pos > 0) {
+                // find out which block we're extending from
+                int err = lfs_ctz_find(lfs, &file->cache, NULL, file->head, file->size, file->pos - 1, &file->block, &file->off);
+                if (err) {
+                    file->flags |= LFS_F_ERRED;
+                    return err;
+                }
+
+                // mark cache as dirty since we may have read data into it
+                lfs_cache_zero(lfs, &file->cache);
+            }
+
+            // extend file with new blocks
+            lfs_alloc_ack(lfs);
+            int err = lfs_ctz_extend(lfs, &lfs->rcache, &file->cache, file->block, file->pos, &file->block, &file->off);
+            if (err) {
+                file->flags |= LFS_F_ERRED;
+                return err;
+            }
+
+            file->flags |= LFS_F_WRITING;
+        }
+
+        // program as much as we can in current block
+        lfs_size_t diff = lfs_min(nsize, lfs->cfg->block_size - file->off);
+        while (true) {
+            int err = lfs_cache_prog(lfs, &file->cache, &lfs->rcache, file->block, file->off, data, diff);
+            if (err) {
+                if (err == LFS_ERR_CORRUPT) {
+                    goto relocate;
+                }
+                file->flags |= LFS_F_ERRED;
+                return err;
+            }
+
+            break;
+        relocate:
+            err = lfs_file_relocate(lfs, file);
+            if (err) {
+                file->flags |= LFS_F_ERRED;
+                return err;
+            }
+        }
+
+        file->pos += diff;
+        file->off += diff;
+        data += diff;
+        nsize -= diff;
+
+        lfs_alloc_ack(lfs);
+    }
+
+    file->flags &= ~LFS_F_ERRED;
+    return size;
+}
+
+lfs_soff_t lfs_file_seek(lfs_t *lfs, lfs_file_t *file, lfs_soff_t off, int whence)
+{
+    // write out everything beforehand, may be noop if rdonly
+    int err = lfs_file_flush(lfs, file);
+    if (err) {
+        return err;
+    }
+
+    // update pos
+    if (whence == LFS_SEEK_SET) {
+        file->pos = off;
+    } else if (whence == LFS_SEEK_CUR) {
+        if (off < 0 && (lfs_off_t)-off > file->pos) {
+            return LFS_ERR_INVAL;
+        }
+
+        file->pos = file->pos + off;
+    } else if (whence == LFS_SEEK_END) {
+        if (off < 0 && (lfs_off_t)-off > file->size) {
+            return LFS_ERR_INVAL;
+        }
+
+        file->pos = file->size + off;
+    }
+
+    return file->pos;
+}
+
+int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size)
+{
+    if ((file->flags & 3) == LFS_O_RDONLY) {
+        return LFS_ERR_BADF;
+    }
+
+    lfs_off_t oldsize = lfs_file_size(lfs, file);
+    if (size < oldsize) {
+        // need to flush since directly changing metadata
+        int err = lfs_file_flush(lfs, file);
+        if (err) {
+            return err;
+        }
+
+        // lookup new head in ctz skip list
+        err = lfs_ctz_find(lfs, &file->cache, NULL, file->head, file->size, size, &file->head, &(lfs_off_t){0});
+        if (err) {
+            return err;
+        }
+
+        file->size = size;
+        file->flags |= LFS_F_DIRTY;
+    } else if (size > oldsize) {
+        lfs_off_t pos = file->pos;
+
+        // flush+seek if not already at end
+        if (file->pos != oldsize) {
+            int err = lfs_file_seek(lfs, file, 0, LFS_SEEK_END);
+            if (err < 0) {
+                return err;
+            }
+        }
+
+        // fill with zeros
+        while (file->pos < size) {
+            lfs_ssize_t res = lfs_file_write(lfs, file, &(uint8_t){0}, 1);
+            if (res < 0) {
+                return res;
+            }
+        }
+
+        // restore pos
+        int err = lfs_file_seek(lfs, file, pos, LFS_SEEK_SET);
+        if (err < 0) {
+            return err;
+        }
+    }
+
+    return 0;
+}
+
+lfs_soff_t lfs_file_tell(lfs_t *lfs, lfs_file_t *file)
+{
+    (void)lfs;
+    return file->pos;
+}
+
+int lfs_file_rewind(lfs_t *lfs, lfs_file_t *file)
+{
+    lfs_soff_t res = lfs_file_seek(lfs, file, 0, LFS_SEEK_SET);
+    if (res < 0) {
+        return res;
+    }
+
+    return 0;
+}
+
+lfs_soff_t lfs_file_size(lfs_t *lfs, lfs_file_t *file)
+{
+    (void)lfs;
+    if (file->flags & LFS_F_WRITING) {
+        return lfs_max(file->pos, file->size);
+    } else {
+        return file->size;
+    }
+}
+
+/// General fs operations ///
+int lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info)
+{
+    lfs_dir_t cwd;
+    lfs_entry_t entry;
+    int err = lfs_dir_find(lfs, &cwd, &entry, &path);
+    if (err) {
+        return err;
+    }
+
+    memset(info, 0, sizeof(*info));
+    info->type = entry.d.type;
+    if (info->type == LFS_TYPE_REG) {
+        info->size = entry.d.u.file.size;
+    }
+
+    if (lfs_paircmp(entry.d.u.dir, lfs->root) == 0) {
+        strcpy(info->name, "/");
+    } else {
+        err = lfs_bd_read(lfs, cwd.pair[0], entry.off + 4 + entry.d.elen + entry.d.alen, info->name, entry.d.nlen);
+        if (err) {
+            return err;
+        }
+    }
+
+    return 0;
+}
+
+int lfs_remove(lfs_t *lfs, const char *path)
+{
+    // deorphan if we haven't yet, needed at most once after poweron
+    if (!lfs->deorphaned) {
+        int err = lfs_deorphan(lfs);
+        if (err) {
+            return err;
+        }
+    }
+
+    lfs_dir_t cwd;
+    lfs_entry_t entry;
+    int err = lfs_dir_find(lfs, &cwd, &entry, &path);
+    if (err) {
+        return err;
+    }
+
+    lfs_dir_t dir;
+    if (entry.d.type == LFS_TYPE_DIR) {
+        // must be empty before removal, checking size
+        // without masking top bit checks for any case where
+        // dir is not empty
+        err = lfs_dir_fetch(lfs, &dir, entry.d.u.dir);
+        if (err) {
+            return err;
+        } /* else if (dir.d.size != sizeof(dir.d)+4) {
+            return LFS_ERR_NOTEMPTY;
+        }  allow to remove non-empty folder,
+           According to below issue, comment these 2 line won't corrupt filesystem
+           https://github.com/ARMmbed/littlefs/issues/43 */
+    }
+
+    // remove the entry
+    err = lfs_dir_remove(lfs, &cwd, &entry);
+    if (err) {
+        return err;
+    }
+
+    // if we were a directory, find pred, replace tail
+    if (entry.d.type == LFS_TYPE_DIR) {
+        int res = lfs_pred(lfs, dir.pair, &cwd);
+        if (res < 0) {
+            return res;
+        }
+
+        LFS_ASSERT(res); // must have pred
+        cwd.d.tail[0] = dir.d.tail[0];
+        cwd.d.tail[1] = dir.d.tail[1];
+
+        err = lfs_dir_commit(lfs, &cwd, NULL, 0);
+        if (err) {
+            return err;
+        }
+    }
+
+    return 0;
+}
+
+int lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath)
+{
+    // deorphan if we haven't yet, needed at most once after poweron
+    if (!lfs->deorphaned) {
+        int err = lfs_deorphan(lfs);
+        if (err) {
+            return err;
+        }
+    }
+
+    // find old entry
+    lfs_dir_t oldcwd;
+    lfs_entry_t oldentry;
+    int err = lfs_dir_find(lfs, &oldcwd, &oldentry, &oldpath);
+    if (err) {
+        return err;
+    }
+
+    // allocate new entry
+    lfs_dir_t newcwd;
+    lfs_entry_t preventry;
+    err = lfs_dir_find(lfs, &newcwd, &preventry, &newpath);
+    if (err && (err != LFS_ERR_NOENT || strchr(newpath, '/') != NULL)) {
+        return err;
+    }
+
+    bool prevexists = (err != LFS_ERR_NOENT);
+    bool samepair = (lfs_paircmp(oldcwd.pair, newcwd.pair) == 0);
+
+    // must have same type
+    if (prevexists && preventry.d.type != oldentry.d.type) {
+        return LFS_ERR_ISDIR;
+    }
+
+    lfs_dir_t dir;
+    if (prevexists && preventry.d.type == LFS_TYPE_DIR) {
+        // must be empty before removal, checking size
+        // without masking top bit checks for any case where
+        // dir is not empty
+        err = lfs_dir_fetch(lfs, &dir, preventry.d.u.dir);
+        if (err) {
+            return err;
+        } else if (dir.d.size != sizeof(dir.d) + 4) {
+            return LFS_ERR_NOTEMPTY;
+        }
+    }
+
+    // mark as moving
+    oldentry.d.type |= 0x80;
+    err = lfs_dir_update(lfs, &oldcwd, &oldentry, NULL);
+    if (err) {
+        return err;
+    }
+
+    // update pair if newcwd == oldcwd
+    if (samepair) {
+        newcwd = oldcwd;
+    }
+
+    // move to new location
+    lfs_entry_t newentry = preventry;
+    newentry.d = oldentry.d;
+    newentry.d.type &= ~0x80;
+    newentry.d.nlen = strlen(newpath);
+
+    if (prevexists) {
+        err = lfs_dir_update(lfs, &newcwd, &newentry, newpath);
+        if (err) {
+            return err;
+        }
+    } else {
+        err = lfs_dir_append(lfs, &newcwd, &newentry, newpath);
+        if (err) {
+            return err;
+        }
+    }
+
+    // update pair if newcwd == oldcwd
+    if (samepair) {
+        oldcwd = newcwd;
+    }
+
+    // remove old entry
+    err = lfs_dir_remove(lfs, &oldcwd, &oldentry);
+    if (err) {
+        return err;
+    }
+
+    // if we were a directory, find pred, replace tail
+    if (prevexists && preventry.d.type == LFS_TYPE_DIR) {
+        int res = lfs_pred(lfs, dir.pair, &newcwd);
+        if (res < 0) {
+            return res;
+        }
+
+        LFS_ASSERT(res); // must have pred
+        newcwd.d.tail[0] = dir.d.tail[0];
+        newcwd.d.tail[1] = dir.d.tail[1];
+
+        err = lfs_dir_commit(lfs, &newcwd, NULL, 0);
+        if (err) {
+            return err;
+        }
+    }
+
+    return 0;
+}
+
+/// Filesystem operations ///
+static void lfs_deinit(lfs_t *lfs)
+{
+    // free allocated memory
+    if (!lfs->cfg->read_buffer) {
+        lfs_free(lfs->rcache.buffer);
+    }
+
+    if (!lfs->cfg->prog_buffer) {
+        lfs_free(lfs->pcache.buffer);
+    }
+
+    if (!lfs->cfg->lookahead_buffer) {
+        lfs_free(lfs->free.buffer);
+    }
+}
+
+static int lfs_init(lfs_t *lfs, const struct lfs_config *cfg)
+{
+    lfs->cfg = cfg;
+
+    // setup read cache
+    if (lfs->cfg->read_buffer) {
+        lfs->rcache.buffer = lfs->cfg->read_buffer;
+    } else {
+        lfs->rcache.buffer = lfs_malloc(lfs->cfg->read_size);
+        if (!lfs->rcache.buffer) {
+            goto cleanup;
+        }
+    }
+
+    // setup program cache
+    if (lfs->cfg->prog_buffer) {
+        lfs->pcache.buffer = lfs->cfg->prog_buffer;
+    } else {
+        lfs->pcache.buffer = lfs_malloc(lfs->cfg->prog_size);
+        if (!lfs->pcache.buffer) {
+            goto cleanup;
+        }
+    }
+
+    // zero to avoid information leaks
+    lfs_cache_zero(lfs, &lfs->pcache);
+    lfs_cache_drop(lfs, &lfs->rcache);
+
+    // setup lookahead, round down to nearest 32-bits
+    LFS_ASSERT(lfs->cfg->lookahead % 32 == 0);
+    LFS_ASSERT(lfs->cfg->lookahead > 0);
+    if (lfs->cfg->lookahead_buffer) {
+        lfs->free.buffer = lfs->cfg->lookahead_buffer;
+    } else {
+        lfs->free.buffer = lfs_malloc(lfs->cfg->lookahead / 8);
+        if (!lfs->free.buffer) {
+            goto cleanup;
+        }
+    }
+
+    // check that program and read sizes are multiples of the block size
+    LFS_ASSERT(lfs->cfg->prog_size % lfs->cfg->read_size == 0);
+    LFS_ASSERT(lfs->cfg->block_size % lfs->cfg->prog_size == 0);
+
+    // check that the block size is large enough to fit ctz pointers
+    LFS_ASSERT(4 * lfs_npw2(0xffffffff / (lfs->cfg->block_size - 2 * 4)) <= lfs->cfg->block_size);
+
+    // setup default state
+    lfs->root[0] = 0xffffffff;
+    lfs->root[1] = 0xffffffff;
+    lfs->files = NULL;
+    lfs->dirs = NULL;
+    lfs->deorphaned = false;
+
+    return 0;
+
+cleanup:
+    lfs_deinit(lfs);
+    return LFS_ERR_NOMEM;
+}
+
+int lfs_format(lfs_t *lfs, const struct lfs_config *cfg)
+{
+    int err = 0;
+    if (true) {
+        err = lfs_init(lfs, cfg);
+        if (err) {
+            return err;
+        }
+
+        // create free lookahead
+        memset(lfs->free.buffer, 0, lfs->cfg->lookahead / 8);
+        lfs->free.off = 0;
+        lfs->free.size = lfs_min(lfs->cfg->lookahead, lfs->cfg->block_count);
+        lfs->free.i = 0;
+        lfs_alloc_ack(lfs);
+
+        // create superblock dir
+        lfs_dir_t superdir;
+        err = lfs_dir_alloc(lfs, &superdir);
+        if (err) {
+            goto cleanup;
+        }
+
+        // write root directory
+        lfs_dir_t root;
+        err = lfs_dir_alloc(lfs, &root);
+        if (err) {
+            goto cleanup;
+        }
+
+        err = lfs_dir_commit(lfs, &root, NULL, 0);
+        if (err) {
+            goto cleanup;
+        }
+
+        lfs->root[0] = root.pair[0];
+        lfs->root[1] = root.pair[1];
+
+        // write superblocks
+        lfs_superblock_t superblock = {
+            .off = sizeof(superdir.d),
+            .d.type = LFS_TYPE_SUPERBLOCK,
+            .d.elen = sizeof(superblock.d) - sizeof(superblock.d.magic) - 4,
+            .d.nlen = sizeof(superblock.d.magic),
+            .d.version = LFS_DISK_VERSION,
+            .d.magic = {"littlefs"},
+            .d.block_size = lfs->cfg->block_size,
+            .d.block_count = lfs->cfg->block_count,
+            .d.root = {lfs->root[0], lfs->root[1]},
+        };
+        superdir.d.tail[0] = root.pair[0];
+        superdir.d.tail[1] = root.pair[1];
+        superdir.d.size = sizeof(superdir.d) + sizeof(superblock.d) + 4;
+
+        // write both pairs to be safe
+        lfs_superblock_tole32(&superblock.d);
+        bool valid = false;
+        for (int i = 0; i < 2; i++) {
+            err = lfs_dir_commit(
+                lfs, &superdir,
+                (struct lfs_region[]){{sizeof(superdir.d), sizeof(superblock.d), &superblock.d, sizeof(superblock.d)}}, 1);
+            if (err && err != LFS_ERR_CORRUPT) {
+                goto cleanup;
+            }
+
+            valid = valid || !err;
+        }
+
+        if (!valid) {
+            err = LFS_ERR_CORRUPT;
+            goto cleanup;
+        }
+
+        // sanity check that fetch works
+        err = lfs_dir_fetch(lfs, &superdir, (const lfs_block_t[2]){0, 1});
+        if (err) {
+            goto cleanup;
+        }
+
+        lfs_alloc_ack(lfs);
+    }
+
+cleanup:
+    lfs_deinit(lfs);
+    return err;
+}
+
+int lfs_mount(lfs_t *lfs, const struct lfs_config *cfg)
+{
+    int err = 0;
+    if (true) {
+        err = lfs_init(lfs, cfg);
+        if (err) {
+            return err;
+        }
+
+        // setup free lookahead
+        lfs->free.off = 0;
+        lfs->free.size = 0;
+        lfs->free.i = 0;
+        lfs_alloc_ack(lfs);
+
+        // load superblock
+        lfs_dir_t dir;
+        lfs_superblock_t superblock;
+        err = lfs_dir_fetch(lfs, &dir, (const lfs_block_t[2]){0, 1});
+        if (err && err != LFS_ERR_CORRUPT) {
+            goto cleanup;
+        }
+
+        if (!err) {
+            err = lfs_bd_read(lfs, dir.pair[0], sizeof(dir.d), &superblock.d, sizeof(superblock.d));
+            lfs_superblock_fromle32(&superblock.d);
+            if (err) {
+                goto cleanup;
+            }
+
+            lfs->root[0] = superblock.d.root[0];
+            lfs->root[1] = superblock.d.root[1];
+        }
+
+        if (err || memcmp(superblock.d.magic, "littlefs", 8) != 0) {
+            LFS_ERROR("Invalid superblock at %d %d", 0, 1);
+            err = LFS_ERR_CORRUPT;
+            goto cleanup;
+        }
+
+        uint16_t major_version = (0xffff & (superblock.d.version >> 16));
+        uint16_t minor_version = (0xffff & (superblock.d.version >> 0));
+        if ((major_version != LFS_DISK_VERSION_MAJOR || minor_version > LFS_DISK_VERSION_MINOR)) {
+            LFS_ERROR("Invalid version %d.%d", major_version, minor_version);
+            err = LFS_ERR_INVAL;
+            goto cleanup;
+        }
+
+        return 0;
+    }
+
+cleanup:
+
+    lfs_deinit(lfs);
+    return err;
+}
+
+int lfs_unmount(lfs_t *lfs)
+{
+    lfs_deinit(lfs);
+    return 0;
+}
+
+/// Littlefs specific operations ///
+int lfs_traverse(lfs_t *lfs, int (*cb)(void *, lfs_block_t), void *data)
+{
+    if (lfs_pairisnull(lfs->root)) {
+        return 0;
+    }
+
+    // iterate over metadata pairs
+    lfs_dir_t dir;
+    lfs_entry_t entry;
+    lfs_block_t cwd[2] = {0, 1};
+
+    while (true) {
+        for (int i = 0; i < 2; i++) {
+            int err = cb(data, cwd[i]);
+            if (err) {
+                return err;
+            }
+        }
+
+        int err = lfs_dir_fetch(lfs, &dir, cwd);
+        if (err) {
+            return err;
+        }
+
+        // iterate over contents
+        while (dir.off + sizeof(entry.d) <= (0x7fffffff & dir.d.size) - 4) {
+            err = lfs_bd_read(lfs, dir.pair[0], dir.off, &entry.d, sizeof(entry.d));
+            lfs_entry_fromle32(&entry.d);
+            if (err) {
+                return err;
+            }
+
+            dir.off += lfs_entry_size(&entry);
+            if ((0x70 & entry.d.type) == (0x70 & LFS_TYPE_REG)) {
+                err = lfs_ctz_traverse(lfs, &lfs->rcache, NULL, entry.d.u.file.head, entry.d.u.file.size, cb, data);
+                if (err) {
+                    return err;
+                }
+            }
+        }
+
+        cwd[0] = dir.d.tail[0];
+        cwd[1] = dir.d.tail[1];
+
+        if (lfs_pairisnull(cwd)) {
+            break;
+        }
+    }
+
+    // iterate over any open files
+    for (lfs_file_t *f = lfs->files; f; f = f->next) {
+        if (f->flags & LFS_F_DIRTY) {
+            int err = lfs_ctz_traverse(lfs, &lfs->rcache, &f->cache, f->head, f->size, cb, data);
+            if (err) {
+                return err;
+            }
+        }
+
+        if (f->flags & LFS_F_WRITING) {
+            int err = lfs_ctz_traverse(lfs, &lfs->rcache, &f->cache, f->block, f->pos, cb, data);
+            if (err) {
+                return err;
+            }
+        }
+    }
+
+    return 0;
+}
+
+static int lfs_pred(lfs_t *lfs, const lfs_block_t dir[2], lfs_dir_t *pdir)
+{
+    if (lfs_pairisnull(lfs->root)) {
+        return 0;
+    }
+
+    // iterate over all directory directory entries
+    int err = lfs_dir_fetch(lfs, pdir, (const lfs_block_t[2]){0, 1});
+    if (err) {
+        return err;
+    }
+
+    while (!lfs_pairisnull(pdir->d.tail)) {
+        if (lfs_paircmp(pdir->d.tail, dir) == 0) {
+            return true;
+        }
+
+        err = lfs_dir_fetch(lfs, pdir, pdir->d.tail);
+        if (err) {
+            return err;
+        }
+    }
+
+    return false;
+}
+
+static int lfs_parent(lfs_t *lfs, const lfs_block_t dir[2], lfs_dir_t *parent, lfs_entry_t *entry)
+{
+    if (lfs_pairisnull(lfs->root)) {
+        return 0;
+    }
+
+    parent->d.tail[0] = 0;
+    parent->d.tail[1] = 1;
+
+    // iterate over all directory directory entries
+    while (!lfs_pairisnull(parent->d.tail)) {
+        int err = lfs_dir_fetch(lfs, parent, parent->d.tail);
+        if (err) {
+            return err;
+        }
+
+        while (true) {
+            err = lfs_dir_next(lfs, parent, entry);
+            if (err && err != LFS_ERR_NOENT) {
+                return err;
+            }
+
+            if (err == LFS_ERR_NOENT) {
+                break;
+            }
+
+            if (((0x70 & entry->d.type) == (0x70 & LFS_TYPE_DIR)) && lfs_paircmp(entry->d.u.dir, dir) == 0) {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+static int lfs_moved(lfs_t *lfs, const void *e)
+{
+    if (lfs_pairisnull(lfs->root)) {
+        return 0;
+    }
+
+    // skip superblock
+    lfs_dir_t cwd;
+    int err = lfs_dir_fetch(lfs, &cwd, (const lfs_block_t[2]){0, 1});
+    if (err) {
+        return err;
+    }
+
+    // iterate over all directory directory entries
+    lfs_entry_t entry;
+    while (!lfs_pairisnull(cwd.d.tail)) {
+        err = lfs_dir_fetch(lfs, &cwd, cwd.d.tail);
+        if (err) {
+            return err;
+        }
+
+        while (true) {
+            err = lfs_dir_next(lfs, &cwd, &entry);
+            if (err && err != LFS_ERR_NOENT) {
+                return err;
+            }
+
+            if (err == LFS_ERR_NOENT) {
+                break;
+            }
+
+            if (!(0x80 & entry.d.type) && memcmp(&entry.d.u, e, sizeof(entry.d.u)) == 0) {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+static int lfs_relocate(lfs_t *lfs, const lfs_block_t oldpair[2], const lfs_block_t newpair[2])
+{
+    // find parent
+    lfs_dir_t parent;
+    lfs_entry_t entry;
+    int res = lfs_parent(lfs, oldpair, &parent, &entry);
+    if (res < 0) {
+        return res;
+    }
+
+    if (res) {
+        // update disk, this creates a desync
+        entry.d.u.dir[0] = newpair[0];
+        entry.d.u.dir[1] = newpair[1];
+
+        int err = lfs_dir_update(lfs, &parent, &entry, NULL);
+        if (err) {
+            return err;
+        }
+
+        // update internal root
+        if (lfs_paircmp(oldpair, lfs->root) == 0) {
+            LFS_DEBUG("Relocating root %" PRIu32 " %" PRIu32, newpair[0], newpair[1]);
+            lfs->root[0] = newpair[0];
+            lfs->root[1] = newpair[1];
+        }
+
+        // clean up bad block, which should now be a desync
+        return lfs_deorphan(lfs);
+    }
+
+    // find pred
+    res = lfs_pred(lfs, oldpair, &parent);
+    if (res < 0) {
+        return res;
+    }
+
+    if (res) {
+        // just replace bad pair, no desync can occur
+        parent.d.tail[0] = newpair[0];
+        parent.d.tail[1] = newpair[1];
+
+        return lfs_dir_commit(lfs, &parent, NULL, 0);
+    }
+
+    // couldn't find dir, must be new
+    return 0;
+}
+
+int lfs_deorphan(lfs_t *lfs)
+{
+    lfs->deorphaned = true;
+
+    if (lfs_pairisnull(lfs->root)) {
+        return 0;
+    }
+
+    lfs_dir_t pdir = {.d.size = 0x80000000};
+    lfs_dir_t cwd = {.d.tail[0] = 0, .d.tail[1] = 1};
+
+    // iterate over all directory directory entries
+    for (lfs_size_t i = 0; i < lfs->cfg->block_count; i++) {
+        if (lfs_pairisnull(cwd.d.tail)) {
+            return 0;
+        }
+
+        int err = lfs_dir_fetch(lfs, &cwd, cwd.d.tail);
+        if (err) {
+            return err;
+        }
+
+        // check head blocks for orphans
+        if (!(0x80000000 & pdir.d.size)) {
+            // check if we have a parent
+            lfs_dir_t parent;
+            lfs_entry_t entry;
+            int res = lfs_parent(lfs, pdir.d.tail, &parent, &entry);
+            if (res < 0) {
+                return res;
+            }
+
+            if (!res) {
+                // we are an orphan
+                LFS_DEBUG("Found orphan %" PRIu32 " %" PRIu32, pdir.d.tail[0], pdir.d.tail[1]);
+
+                pdir.d.tail[0] = cwd.d.tail[0];
+                pdir.d.tail[1] = cwd.d.tail[1];
+
+                err = lfs_dir_commit(lfs, &pdir, NULL, 0);
+                if (err) {
+                    return err;
+                }
+
+                return 0;
+            }
+
+            if (!lfs_pairsync(entry.d.u.dir, pdir.d.tail)) {
+                // we have desynced
+                LFS_DEBUG("Found desync %" PRIu32 " %" PRIu32, entry.d.u.dir[0], entry.d.u.dir[1]);
+
+                pdir.d.tail[0] = entry.d.u.dir[0];
+                pdir.d.tail[1] = entry.d.u.dir[1];
+
+                err = lfs_dir_commit(lfs, &pdir, NULL, 0);
+                if (err) {
+                    return err;
+                }
+
+                return 0;
+            }
+        }
+
+        // check entries for moves
+        lfs_entry_t entry;
+        while (true) {
+            err = lfs_dir_next(lfs, &cwd, &entry);
+            if (err && err != LFS_ERR_NOENT) {
+                return err;
+            }
+
+            if (err == LFS_ERR_NOENT) {
+                break;
+            }
+
+            // found moved entry
+            if (entry.d.type & 0x80) {
+                int moved = lfs_moved(lfs, &entry.d.u);
+                if (moved < 0) {
+                    return moved;
+                }
+
+                if (moved) {
+                    LFS_DEBUG("Found move %" PRIu32 " %" PRIu32, entry.d.u.dir[0], entry.d.u.dir[1]);
+                    err = lfs_dir_remove(lfs, &cwd, &entry);
+                    if (err) {
+                        return err;
+                    }
+                } else {
+                    LFS_DEBUG("Found partial move %" PRIu32 " %" PRIu32, entry.d.u.dir[0], entry.d.u.dir[1]);
+                    entry.d.type &= ~0x80;
+                    err = lfs_dir_update(lfs, &cwd, &entry, NULL);
+                    if (err) {
+                        return err;
+                    }
+                }
+            }
+        }
+
+        memcpy(&pdir, &cwd, sizeof(pdir));
+    }
+
+    // If we reached here, we have more directory pairs than blocks in the
+    // filesystem... So something must be horribly wrong
+    return LFS_ERR_CORRUPT;
+}
diff --git a/src/platform/stm32wl/littlefs/lfs.h b/src/platform/stm32wl/littlefs/lfs.h
new file mode 100644
index 000000000..f243c404b
--- /dev/null
+++ b/src/platform/stm32wl/littlefs/lfs.h
@@ -0,0 +1,476 @@
+/*
+ * The little filesystem
+ *
+ * Copyright (c) 2017, Arm Limited. All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+#ifndef LFS_H
+#define LFS_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/// Version info ///
+
+// Software library version
+// Major (top-nibble), incremented on backwards incompatible changes
+// Minor (bottom-nibble), incremented on feature additions
+#define LFS_VERSION 0x00010006
+#define LFS_VERSION_MAJOR (0xffff & (LFS_VERSION >> 16))
+#define LFS_VERSION_MINOR (0xffff & (LFS_VERSION >> 0))
+
+// Version of On-disk data structures
+// Major (top-nibble), incremented on backwards incompatible changes
+// Minor (bottom-nibble), incremented on feature additions
+#define LFS_DISK_VERSION 0x00010001
+#define LFS_DISK_VERSION_MAJOR (0xffff & (LFS_DISK_VERSION >> 16))
+#define LFS_DISK_VERSION_MINOR (0xffff & (LFS_DISK_VERSION >> 0))
+
+/// Definitions ///
+
+// Type definitions
+typedef uint32_t lfs_size_t;
+typedef uint32_t lfs_off_t;
+
+typedef int32_t lfs_ssize_t;
+typedef int32_t lfs_soff_t;
+
+typedef uint32_t lfs_block_t;
+
+// Max name size in bytes
+#ifndef LFS_NAME_MAX
+#define LFS_NAME_MAX 255
+#endif
+
+// Possible error codes, these are negative to allow
+// valid positive return values
+enum lfs_error {
+    LFS_ERR_OK = 0,         // No error
+    LFS_ERR_IO = -5,        // Error during device operation
+    LFS_ERR_CORRUPT = -52,  // Corrupted
+    LFS_ERR_NOENT = -2,     // No directory entry
+    LFS_ERR_EXIST = -17,    // Entry already exists
+    LFS_ERR_NOTDIR = -20,   // Entry is not a dir
+    LFS_ERR_ISDIR = -21,    // Entry is a dir
+    LFS_ERR_NOTEMPTY = -39, // Dir is not empty
+    LFS_ERR_BADF = -9,      // Bad file number
+    LFS_ERR_INVAL = -22,    // Invalid parameter
+    LFS_ERR_NOSPC = -28,    // No space left on device
+    LFS_ERR_NOMEM = -12,    // No more memory available
+};
+
+// File types
+enum lfs_type {
+    LFS_TYPE_REG = 0x11,
+    LFS_TYPE_DIR = 0x22,
+    LFS_TYPE_SUPERBLOCK = 0x2e,
+};
+
+// File open flags
+enum lfs_open_flags {
+    // open flags
+    LFS_O_RDONLY = 1,      // Open a file as read only
+    LFS_O_WRONLY = 2,      // Open a file as write only
+    LFS_O_RDWR = 3,        // Open a file as read and write
+    LFS_O_CREAT = 0x0100,  // Create a file if it does not exist
+    LFS_O_EXCL = 0x0200,   // Fail if a file already exists
+    LFS_O_TRUNC = 0x0400,  // Truncate the existing file to zero size
+    LFS_O_APPEND = 0x0800, // Move to end of file on every write
+
+    // internally used flags
+    LFS_F_DIRTY = 0x10000,   // File does not match storage
+    LFS_F_WRITING = 0x20000, // File has been written since last flush
+    LFS_F_READING = 0x40000, // File has been read since last flush
+    LFS_F_ERRED = 0x80000,   // An error occured during write
+};
+
+// File seek flags
+enum lfs_whence_flags {
+    LFS_SEEK_SET = 0, // Seek relative to an absolute position
+    LFS_SEEK_CUR = 1, // Seek relative to the current file position
+    LFS_SEEK_END = 2, // Seek relative to the end of the file
+};
+
+// Configuration provided during initialization of the littlefs
+struct lfs_config {
+    // Opaque user provided context that can be used to pass
+    // information to the block device operations
+    void *context;
+
+    // Read a region in a block. Negative error codes are propogated
+    // to the user.
+    int (*read)(const struct lfs_config *c, lfs_block_t block, lfs_off_t off, void *buffer, lfs_size_t size);
+
+    // Program a region in a block. The block must have previously
+    // been erased. Negative error codes are propogated to the user.
+    // May return LFS_ERR_CORRUPT if the block should be considered bad.
+    int (*prog)(const struct lfs_config *c, lfs_block_t block, lfs_off_t off, const void *buffer, lfs_size_t size);
+
+    // Erase a block. A block must be erased before being programmed.
+    // The state of an erased block is undefined. Negative error codes
+    // are propogated to the user.
+    // May return LFS_ERR_CORRUPT if the block should be considered bad.
+    int (*erase)(const struct lfs_config *c, lfs_block_t block);
+
+    // Sync the state of the underlying block device. Negative error codes
+    // are propogated to the user.
+    int (*sync)(const struct lfs_config *c);
+
+    // Minimum size of a block read. This determines the size of read buffers.
+    // This may be larger than the physical read size to improve performance
+    // by caching more of the block device.
+    lfs_size_t read_size;
+
+    // Minimum size of a block program. This determines the size of program
+    // buffers. This may be larger than the physical program size to improve
+    // performance by caching more of the block device.
+    // Must be a multiple of the read size.
+    lfs_size_t prog_size;
+
+    // Size of an erasable block. This does not impact ram consumption and
+    // may be larger than the physical erase size. However, this should be
+    // kept small as each file currently takes up an entire block.
+    // Must be a multiple of the program size.
+    lfs_size_t block_size;
+
+    // Number of erasable blocks on the device.
+    lfs_size_t block_count;
+
+    // Number of blocks to lookahead during block allocation. A larger
+    // lookahead reduces the number of passes required to allocate a block.
+    // The lookahead buffer requires only 1 bit per block so it can be quite
+    // large with little ram impact. Should be a multiple of 32.
+    lfs_size_t lookahead;
+
+    // Optional, statically allocated read buffer. Must be read sized.
+    void *read_buffer;
+
+    // Optional, statically allocated program buffer. Must be program sized.
+    void *prog_buffer;
+
+    // Optional, statically allocated lookahead buffer. Must be 1 bit per
+    // lookahead block.
+    void *lookahead_buffer;
+
+    // Optional, statically allocated buffer for files. Must be program sized.
+    // If enabled, only one file may be opened at a time.
+    void *file_buffer;
+};
+
+// Optional configuration provided during lfs_file_opencfg
+struct lfs_file_config {
+    // Optional, statically allocated buffer for files. Must be program sized.
+    // If NULL, malloc will be used by default.
+    void *buffer;
+};
+
+// File info structure
+struct lfs_info {
+    // Type of the file, either LFS_TYPE_REG or LFS_TYPE_DIR
+    uint8_t type;
+
+    // Size of the file, only valid for REG files
+    lfs_size_t size;
+
+    // Name of the file stored as a null-terminated string
+    char name[LFS_NAME_MAX + 1];
+};
+
+/// littlefs data structures ///
+typedef struct lfs_entry {
+    lfs_off_t off;
+
+    struct lfs_disk_entry {
+        uint8_t type;
+        uint8_t elen;
+        uint8_t alen;
+        uint8_t nlen;
+        union {
+            struct {
+                lfs_block_t head;
+                lfs_size_t size;
+            } file;
+            lfs_block_t dir[2];
+        } u;
+    } d;
+} lfs_entry_t;
+
+typedef struct lfs_cache {
+    lfs_block_t block;
+    lfs_off_t off;
+    uint8_t *buffer;
+} lfs_cache_t;
+
+typedef struct lfs_file {
+    struct lfs_file *next;
+    lfs_block_t pair[2];
+    lfs_off_t poff;
+
+    lfs_block_t head;
+    lfs_size_t size;
+
+    const struct lfs_file_config *cfg;
+    uint32_t flags;
+    lfs_off_t pos;
+    lfs_block_t block;
+    lfs_off_t off;
+    lfs_cache_t cache;
+} lfs_file_t;
+
+typedef struct lfs_dir {
+    struct lfs_dir *next;
+    lfs_block_t pair[2];
+    lfs_off_t off;
+
+    lfs_block_t head[2];
+    lfs_off_t pos;
+
+    struct lfs_disk_dir {
+        uint32_t rev;
+        lfs_size_t size;
+        lfs_block_t tail[2];
+    } d;
+} lfs_dir_t;
+
+typedef struct lfs_superblock {
+    lfs_off_t off;
+
+    struct lfs_disk_superblock {
+        uint8_t type;
+        uint8_t elen;
+        uint8_t alen;
+        uint8_t nlen;
+        lfs_block_t root[2];
+        uint32_t block_size;
+        uint32_t block_count;
+        uint32_t version;
+        char magic[8];
+    } d;
+} lfs_superblock_t;
+
+typedef struct lfs_free {
+    lfs_block_t off;
+    lfs_block_t size;
+    lfs_block_t i;
+    lfs_block_t ack;
+    uint32_t *buffer;
+} lfs_free_t;
+
+// The littlefs type
+typedef struct lfs {
+    const struct lfs_config *cfg;
+
+    lfs_block_t root[2];
+    lfs_file_t *files;
+    lfs_dir_t *dirs;
+
+    lfs_cache_t rcache;
+    lfs_cache_t pcache;
+
+    lfs_free_t free;
+    bool deorphaned;
+} lfs_t;
+
+/// Filesystem functions ///
+
+// Format a block device with the littlefs
+//
+// Requires a littlefs object and config struct. This clobbers the littlefs
+// object, and does not leave the filesystem mounted. The config struct must
+// be zeroed for defaults and backwards compatibility.
+//
+// Returns a negative error code on failure.
+int lfs_format(lfs_t *lfs, const struct lfs_config *config);
+
+// Mounts a littlefs
+//
+// Requires a littlefs object and config struct. Multiple filesystems
+// may be mounted simultaneously with multiple littlefs objects. Both
+// lfs and config must be allocated while mounted. The config struct must
+// be zeroed for defaults and backwards compatibility.
+//
+// Returns a negative error code on failure.
+int lfs_mount(lfs_t *lfs, const struct lfs_config *config);
+
+// Unmounts a littlefs
+//
+// Does nothing besides releasing any allocated resources.
+// Returns a negative error code on failure.
+int lfs_unmount(lfs_t *lfs);
+
+/// General operations ///
+
+// Removes a file or directory
+//
+// If removing a directory, the directory must be empty.
+// Returns a negative error code on failure.
+int lfs_remove(lfs_t *lfs, const char *path);
+
+// Rename or move a file or directory
+//
+// If the destination exists, it must match the source in type.
+// If the destination is a directory, the directory must be empty.
+//
+// Returns a negative error code on failure.
+int lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath);
+
+// Find info about a file or directory
+//
+// Fills out the info structure, based on the specified file or directory.
+// Returns a negative error code on failure.
+int lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info);
+
+/// File operations ///
+
+// Open a file
+//
+// The mode that the file is opened in is determined by the flags, which
+// are values from the enum lfs_open_flags that are bitwise-ored together.
+//
+// Returns a negative error code on failure.
+int lfs_file_open(lfs_t *lfs, lfs_file_t *file, const char *path, int flags);
+
+// Open a file with extra configuration
+//
+// The mode that the file is opened in is determined by the flags, which
+// are values from the enum lfs_open_flags that are bitwise-ored together.
+//
+// The config struct provides additional config options per file as described
+// above. The config struct must be allocated while the file is open, and the
+// config struct must be zeroed for defaults and backwards compatibility.
+//
+// Returns a negative error code on failure.
+int lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, const struct lfs_file_config *config);
+
+// Close a file
+//
+// Any pending writes are written out to storage as though
+// sync had been called and releases any allocated resources.
+//
+// Returns a negative error code on failure.
+int lfs_file_close(lfs_t *lfs, lfs_file_t *file);
+
+// Synchronize a file on storage
+//
+// Any pending writes are written out to storage.
+// Returns a negative error code on failure.
+int lfs_file_sync(lfs_t *lfs, lfs_file_t *file);
+
+// Read data from file
+//
+// Takes a buffer and size indicating where to store the read data.
+// Returns the number of bytes read, or a negative error code on failure.
+lfs_ssize_t lfs_file_read(lfs_t *lfs, lfs_file_t *file, void *buffer, lfs_size_t size);
+
+// Write data to file
+//
+// Takes a buffer and size indicating the data to write. The file will not
+// actually be updated on the storage until either sync or close is called.
+//
+// Returns the number of bytes written, or a negative error code on failure.
+lfs_ssize_t lfs_file_write(lfs_t *lfs, lfs_file_t *file, const void *buffer, lfs_size_t size);
+
+// Change the position of the file
+//
+// The change in position is determined by the offset and whence flag.
+// Returns the old position of the file, or a negative error code on failure.
+lfs_soff_t lfs_file_seek(lfs_t *lfs, lfs_file_t *file, lfs_soff_t off, int whence);
+
+// Truncates the size of the file to the specified size
+//
+// Returns a negative error code on failure.
+int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size);
+
+// Return the position of the file
+//
+// Equivalent to lfs_file_seek(lfs, file, 0, LFS_SEEK_CUR)
+// Returns the position of the file, or a negative error code on failure.
+lfs_soff_t lfs_file_tell(lfs_t *lfs, lfs_file_t *file);
+
+// Change the position of the file to the beginning of the file
+//
+// Equivalent to lfs_file_seek(lfs, file, 0, LFS_SEEK_CUR)
+// Returns a negative error code on failure.
+int lfs_file_rewind(lfs_t *lfs, lfs_file_t *file);
+
+// Return the size of the file
+//
+// Similar to lfs_file_seek(lfs, file, 0, LFS_SEEK_END)
+// Returns the size of the file, or a negative error code on failure.
+lfs_soff_t lfs_file_size(lfs_t *lfs, lfs_file_t *file);
+
+/// Directory operations ///
+
+// Create a directory
+//
+// Returns a negative error code on failure.
+int lfs_mkdir(lfs_t *lfs, const char *path);
+
+// Open a directory
+//
+// Once open a directory can be used with read to iterate over files.
+// Returns a negative error code on failure.
+int lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path);
+
+// Close a directory
+//
+// Releases any allocated resources.
+// Returns a negative error code on failure.
+int lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir);
+
+// Read an entry in the directory
+//
+// Fills out the info structure, based on the specified file or directory.
+// Returns a negative error code on failure.
+int lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info);
+
+// Change the position of the directory
+//
+// The new off must be a value previous returned from tell and specifies
+// an absolute offset in the directory seek.
+//
+// Returns a negative error code on failure.
+int lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off);
+
+// Return the position of the directory
+//
+// The returned offset is only meant to be consumed by seek and may not make
+// sense, but does indicate the current position in the directory iteration.
+//
+// Returns the position of the directory, or a negative error code on failure.
+lfs_soff_t lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir);
+
+// Change the position of the directory to the beginning of the directory
+//
+// Returns a negative error code on failure.
+int lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir);
+
+/// Miscellaneous littlefs specific operations ///
+
+// Traverse through all blocks in use by the filesystem
+//
+// The provided callback will be called with each block address that is
+// currently in use by the filesystem. This can be used to determine which
+// blocks are in use or how much of the storage is available.
+//
+// Returns a negative error code on failure.
+int lfs_traverse(lfs_t *lfs, int (*cb)(void *, lfs_block_t), void *data);
+
+// Prunes any recoverable errors that may have occured in the filesystem
+//
+// Not needed to be called by user unless an operation is interrupted
+// but the filesystem is still mounted. This is already called on first
+// allocation.
+//
+// Returns a negative error code on failure.
+int lfs_deorphan(lfs_t *lfs);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif
diff --git a/src/platform/stm32wl/littlefs/lfs_util.c b/src/platform/stm32wl/littlefs/lfs_util.c
new file mode 100644
index 000000000..0b352c51f
--- /dev/null
+++ b/src/platform/stm32wl/littlefs/lfs_util.c
@@ -0,0 +1,28 @@
+/*
+ * lfs util functions
+ *
+ * Copyright (c) 2017, Arm Limited. All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+#include "lfs_util.h"
+
+// Only compile if user does not provide custom config
+#ifndef LFS_CONFIG
+
+// Software CRC implementation with small lookup table
+void lfs_crc(uint32_t *restrict crc, const void *buffer, size_t size)
+{
+    static const uint32_t rtable[16] = {
+        0x00000000, 0x1db71064, 0x3b6e20c8, 0x26d930ac, 0x76dc4190, 0x6b6b51f4, 0x4db26158, 0x5005713c,
+        0xedb88320, 0xf00f9344, 0xd6d6a3e8, 0xcb61b38c, 0x9b64c2b0, 0x86d3d2d4, 0xa00ae278, 0xbdbdf21c,
+    };
+
+    const uint8_t *data = buffer;
+
+    for (size_t i = 0; i < size; i++) {
+        *crc = (*crc >> 4) ^ rtable[(*crc ^ (data[i] >> 0)) & 0xf];
+        *crc = (*crc >> 4) ^ rtable[(*crc ^ (data[i] >> 4)) & 0xf];
+    }
+}
+
+#endif
diff --git a/src/platform/stm32wl/littlefs/lfs_util.h b/src/platform/stm32wl/littlefs/lfs_util.h
new file mode 100644
index 000000000..5c8469f88
--- /dev/null
+++ b/src/platform/stm32wl/littlefs/lfs_util.h
@@ -0,0 +1,199 @@
+/*
+ * lfs utility functions
+ *
+ * Copyright (c) 2017, Arm Limited. All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+#ifndef LFS_UTIL_H
+#define LFS_UTIL_H
+
+// Users can override lfs_util.h with their own configuration by defining
+// LFS_CONFIG as a header file to include (-DLFS_CONFIG=lfs_config.h).
+//
+// If LFS_CONFIG is used, none of the default utils will be emitted and must be
+// provided by the config file. To start I would suggest copying lfs_util.h and
+// modifying as needed.
+#ifdef LFS_CONFIG
+#define LFS_STRINGIZE(x) LFS_STRINGIZE2(x)
+#define LFS_STRINGIZE2(x) #x
+#include LFS_STRINGIZE(LFS_CONFIG)
+#else
+
+// System includes
+#include <stdbool.h>
+#include <stdint.h>
+#include <string.h>
+
+#ifndef LFS_NO_MALLOC
+#include <stdlib.h>
+#endif
+#ifndef LFS_NO_ASSERT
+#include <assert.h>
+#endif
+
+#if !CFG_DEBUG
+#define LFS_NO_DEBUG
+#define LFS_NO_WARN
+#define LFS_NO_ERROR
+#endif
+
+#if !defined(LFS_NO_DEBUG) || !defined(LFS_NO_WARN) || !defined(LFS_NO_ERROR)
+#include <stdio.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Macros, may be replaced by system specific wrappers. Arguments to these
+// macros must not have side-effects as the macros can be removed for a smaller
+// code footprint
+
+// Logging functions
+#ifndef LFS_NO_DEBUG
+#define LFS_DEBUG(fmt, ...) printf("lfs debug:%d: " fmt "\n", __LINE__, __VA_ARGS__)
+#else
+#define LFS_DEBUG(fmt, ...)
+#endif
+
+#ifndef LFS_NO_WARN
+#define LFS_WARN(fmt, ...) printf("lfs warn:%d: " fmt "\n", __LINE__, __VA_ARGS__)
+#else
+#define LFS_WARN(fmt, ...)
+#endif
+
+#ifndef LFS_NO_ERROR
+#define LFS_ERROR(fmt, ...) printf("lfs error:%d: " fmt "\n", __LINE__, __VA_ARGS__)
+#else
+#define LFS_ERROR(fmt, ...)
+#endif
+
+// Runtime assertions
+#ifndef LFS_NO_ASSERT
+#define LFS_ASSERT(test) assert(test)
+#else
+#define LFS_ASSERT(test)
+#endif
+
+// Builtin functions, these may be replaced by more efficient
+// toolchain-specific implementations. LFS_NO_INTRINSICS falls back to a more
+// expensive basic C implementation for debugging purposes
+
+// Min/max functions for unsigned 32-bit numbers
+static inline uint32_t lfs_max(uint32_t a, uint32_t b)
+{
+    return (a > b) ? a : b;
+}
+
+static inline uint32_t lfs_min(uint32_t a, uint32_t b)
+{
+    return (a < b) ? a : b;
+}
+
+// Find the next smallest power of 2 less than or equal to a
+static inline uint32_t lfs_npw2(uint32_t a)
+{
+#if !defined(LFS_NO_INTRINSICS) && (defined(__GNUC__) || defined(__CC_ARM))
+    return 32 - __builtin_clz(a - 1);
+#else
+    uint32_t r = 0;
+    uint32_t s;
+    a -= 1;
+    s = (a > 0xffff) << 4;
+    a >>= s;
+    r |= s;
+    s = (a > 0xff) << 3;
+    a >>= s;
+    r |= s;
+    s = (a > 0xf) << 2;
+    a >>= s;
+    r |= s;
+    s = (a > 0x3) << 1;
+    a >>= s;
+    r |= s;
+    return (r | (a >> 1)) + 1;
+#endif
+}
+
+// Count the number of trailing binary zeros in a
+// lfs_ctz(0) may be undefined
+static inline uint32_t lfs_ctz(uint32_t a)
+{
+#if !defined(LFS_NO_INTRINSICS) && defined(__GNUC__)
+    return __builtin_ctz(a);
+#else
+    return lfs_npw2((a & -a) + 1) - 1;
+#endif
+}
+
+// Count the number of binary ones in a
+static inline uint32_t lfs_popc(uint32_t a)
+{
+#if !defined(LFS_NO_INTRINSICS) && (defined(__GNUC__) || defined(__CC_ARM))
+    return __builtin_popcount(a);
+#else
+    a = a - ((a >> 1) & 0x55555555);
+    a = (a & 0x33333333) + ((a >> 2) & 0x33333333);
+    return (((a + (a >> 4)) & 0xf0f0f0f) * 0x1010101) >> 24;
+#endif
+}
+
+// Find the sequence comparison of a and b, this is the distance
+// between a and b ignoring overflow
+static inline int lfs_scmp(uint32_t a, uint32_t b)
+{
+    return (int)(unsigned)(a - b);
+}
+
+// Convert from 32-bit little-endian to native order
+static inline uint32_t lfs_fromle32(uint32_t a)
+{
+#if !defined(LFS_NO_INTRINSICS) && ((defined(BYTE_ORDER) && BYTE_ORDER == ORDER_LITTLE_ENDIAN) ||                                \
+                                    (defined(__BYTE_ORDER) && __BYTE_ORDER == __ORDER_LITTLE_ENDIAN) ||                          \
+                                    (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
+    return a;
+#elif !defined(LFS_NO_INTRINSICS) &&                                                                                             \
+    ((defined(BYTE_ORDER) && BYTE_ORDER == ORDER_BIG_ENDIAN) || (defined(__BYTE_ORDER) && __BYTE_ORDER == __ORDER_BIG_ENDIAN) || \
+     (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
+    return __builtin_bswap32(a);
+#else
+    return (((uint8_t *)&a)[0] << 0) | (((uint8_t *)&a)[1] << 8) | (((uint8_t *)&a)[2] << 16) | (((uint8_t *)&a)[3] << 24);
+#endif
+}
+
+// Convert to 32-bit little-endian from native order
+static inline uint32_t lfs_tole32(uint32_t a)
+{
+    return lfs_fromle32(a);
+}
+
+// Calculate CRC-32 with polynomial = 0x04c11db7
+void lfs_crc(uint32_t *crc, const void *buffer, size_t size);
+
+// Allocate memory, only used if buffers are not provided to littlefs
+static inline void *lfs_malloc(size_t size)
+{
+#ifndef LFS_NO_MALLOC
+    return malloc(size);
+#else
+    (void)size;
+    return NULL;
+#endif
+}
+
+// Deallocate memory, only used if buffers are not provided to littlefs
+static inline void lfs_free(void *p)
+{
+#ifndef LFS_NO_MALLOC
+    free(p);
+#else
+    (void)p;
+#endif
+}
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif
+#endif
diff --git a/src/shutdown.h b/src/shutdown.h
index c2ba6f670..f02cb7964 100644
--- a/src/shutdown.h
+++ b/src/shutdown.h
@@ -32,6 +32,8 @@ void powerCommandsCheck()
             delete screen;
         LOG_DEBUG("final reboot!");
         reboot();
+#elif defined(ARCH_STM32WL)
+        HAL_NVIC_SystemReset();
 #else
         rebootAtMsec = -1;
         LOG_WARN("FIXME implement reboot for this platform. Note that some settings require a restart to be applied");
diff --git a/variants/CDEBYTE_E77-MBL/platformio.ini b/variants/CDEBYTE_E77-MBL/platformio.ini
index a8d90f676..3252a56ea 100644
--- a/variants/CDEBYTE_E77-MBL/platformio.ini
+++ b/variants/CDEBYTE_E77-MBL/platformio.ini
@@ -3,6 +3,7 @@ extends = stm32_base
 ; `ebyte_e77_dev` was added in this commit. Remove when a new release is used in the base.
 platform = https://github.com/platformio/platform-ststm32.git#3208828db447f4373cd303b7f7393c8fc0dae623
 board = ebyte_e77_dev
+board_upload.maximum_size = 233472 ; reserve the last 28KB for filesystem
 board_level = extra
 build_flags =
   ${stm32_base.build_flags}
@@ -11,31 +12,19 @@ build_flags =
   -DPIN_SERIAL_RX=PA3
   -DPIN_SERIAL_TX=PA2
   -DHAL_DAC_MODULE_ONLY
-  -DHAL_ADC_MODULE_DISABLED
-  -DHAL_COMP_MODULE_DISABLED
-  -DHAL_CRC_MODULE_DISABLED
-  -DHAL_CRYP_MODULE_DISABLED
-  -DHAL_GTZC_MODULE_DISABLED
-  -DHAL_HSEM_MODULE_DISABLED
-  -DHAL_I2C_MODULE_DISABLED
-  -DHAL_I2S_MODULE_DISABLED
-  -DHAL_IPCC_MODULE_DISABLED
-  -DHAL_IRDA_MODULE_DISABLED
-  -DHAL_IWDG_MODULE_DISABLED
-  -DHAL_LPTIM_MODULE_DISABLED
-  -DHAL_PKA_MODULE_DISABLED
-  -DHAL_RNG_MODULE_DISABLED
-  -DHAL_RTC_MODULE_DISABLED
-  -DHAL_SMARTCARD_MODULE_DISABLED
-  -DHAL_SMBUS_MODULE_DISABLED
-  -DHAL_TIM_MODULE_DISABLED
-  -DHAL_WWDG_MODULE_DISABLED
-  -DHAL_EXTI_MODULE_DISABLED
-  -DHAL_SAI_MODULE_DISABLED
-  -DHAL_ICACHE_MODULE_DISABLED
+  -DHAL_RNG_MODULE_ENABLED
   -DRADIOLIB_EXCLUDE_SX128X=1
   -DRADIOLIB_EXCLUDE_SX127X=1
   -DRADIOLIB_EXCLUDE_LR11X0=1
-; -D PIO_FRAMEWORK_ARDUINO_NANOLIB_FLOAT_PRINTF
+  -DMESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR=1
+  -DMESHTASTIC_EXCLUDE_I2C=1
+  -DMESHTASTIC_EXCLUDE_WIFI=1
+  -DMESHTASTIC_EXCLUDE_BLUETOOTH=1
+  -DMESHTASTIC_EXCLUDE_GPS=1
+  -DMESHTASTIC_EXCLUDE_SCREEN=1
+  -DMESHTASTIC_EXCLUDE_MQTT=1
+  -DMESHTASTIC_EXCLUDE_POWERMON=1
+  ;-DPIO_FRAMEWORK_ARDUINO_NANOLIB_FLOAT_PRINTF
+  ;-DCFG_DEBUG
 
 upload_port = stlink
\ No newline at end of file
diff --git a/variants/rak3172/platformio.ini b/variants/rak3172/platformio.ini
index 58ea32088..456697aef 100644
--- a/variants/rak3172/platformio.ini
+++ b/variants/rak3172/platformio.ini
@@ -1,36 +1,23 @@
 [env:rak3172]
 extends = stm32_base
 board = wiscore_rak3172
+board_upload.maximum_size = 233472 ; reserve the last 28KB for filesystem
 build_flags =
   ${stm32_base.build_flags}
   -Ivariants/rak3172
-  -DSERIAL_UART_INSTANCE=1
-  -DPIN_SERIAL_RX=PB7
-  -DPIN_SERIAL_TX=PB6
   -DHAL_DAC_MODULE_ONLY
-  -DHAL_ADC_MODULE_DISABLED
-  -DHAL_COMP_MODULE_DISABLED
-  -DHAL_CRC_MODULE_DISABLED
-  -DHAL_CRYP_MODULE_DISABLED
-  -DHAL_GTZC_MODULE_DISABLED
-  -DHAL_HSEM_MODULE_DISABLED
-  -DHAL_I2C_MODULE_DISABLED
-  -DHAL_I2S_MODULE_DISABLED
-  -DHAL_IPCC_MODULE_DISABLED
-  -DHAL_IRDA_MODULE_DISABLED
-  -DHAL_IWDG_MODULE_DISABLED
-  -DHAL_LPTIM_MODULE_DISABLED
-  -DHAL_PKA_MODULE_DISABLED
-  -DHAL_RNG_MODULE_DISABLED
-  -DHAL_RTC_MODULE_DISABLED
-  -DHAL_SMARTCARD_MODULE_DISABLED
-  -DHAL_SMBUS_MODULE_DISABLED
-  -DHAL_TIM_MODULE_DISABLED
-  -DHAL_WWDG_MODULE_DISABLED
-  -DHAL_EXTI_MODULE_DISABLED
-  -DHAL_SAI_MODULE_DISABLED
-  -DHAL_ICACHE_MODULE_DISABLED
+  -DHAL_RNG_MODULE_ENABLED
   -DRADIOLIB_EXCLUDE_SX128X=1
   -DRADIOLIB_EXCLUDE_SX127X=1
   -DRADIOLIB_EXCLUDE_LR11X0=1
-upload_port = stlink
\ No newline at end of file
+  -DMESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR=1
+  -DMESHTASTIC_EXCLUDE_I2C=1
+  -DMESHTASTIC_EXCLUDE_WIFI=1
+  -DMESHTASTIC_EXCLUDE_BLUETOOTH=1
+  -DMESHTASTIC_EXCLUDE_GPS=1
+  -DMESHTASTIC_EXCLUDE_SCREEN=1
+  -DMESHTASTIC_EXCLUDE_MQTT=1
+  -DMESHTASTIC_EXCLUDE_POWERMON=1
+  ;-DPIO_FRAMEWORK_ARDUINO_NANOLIB_FLOAT_PRINTF
+  ;-DCFG_DEBUG
+upload_port = stlink
diff --git a/variants/rak3172/variant.h b/variants/rak3172/variant.h
index dd12fe393..45752b481 100644
--- a/variants/rak3172/variant.h
+++ b/variants/rak3172/variant.h
@@ -1,3 +1,8 @@
+/*
+STM32WLE5 Core Module for LoRaWAN® RAK3372
+https://store.rakwireless.com/products/wisblock-core-module-rak3372
+*/
+
 /*
 This variant is a work in progress.
 Do not expect a working Meshtastic device with this target.
@@ -8,4 +13,7 @@ Do not expect a working Meshtastic device with this target.
 
 #define USE_STM32WLx
 
-#endif
\ No newline at end of file
+#define LED_PIN PA0 // Green LED
+#define LED_STATE_ON 1
+
+#endif
diff --git a/variants/wio-e5/platformio.ini b/variants/wio-e5/platformio.ini
index e9d4ca946..e746ae2f0 100644
--- a/variants/wio-e5/platformio.ini
+++ b/variants/wio-e5/platformio.ini
@@ -1,6 +1,7 @@
 [env:wio-e5]
 extends = stm32_base
 board = lora_e5_dev_board
+board_upload.maximum_size = 233472 ; reserve the last 28KB for filesystem
 build_flags =
   ${stm32_base.build_flags}
   -Ivariants/wio-e5
@@ -8,31 +9,19 @@ build_flags =
   -DPIN_SERIAL_RX=PB7
   -DPIN_SERIAL_TX=PB6
   -DHAL_DAC_MODULE_ONLY
-  -DHAL_ADC_MODULE_DISABLED
-  -DHAL_COMP_MODULE_DISABLED
-  -DHAL_CRC_MODULE_DISABLED
-  -DHAL_CRYP_MODULE_DISABLED
-  -DHAL_GTZC_MODULE_DISABLED
-  -DHAL_HSEM_MODULE_DISABLED
-  -DHAL_I2C_MODULE_DISABLED
-  -DHAL_I2S_MODULE_DISABLED
-  -DHAL_IPCC_MODULE_DISABLED
-  -DHAL_IRDA_MODULE_DISABLED
-  -DHAL_IWDG_MODULE_DISABLED
-  -DHAL_LPTIM_MODULE_DISABLED
-  -DHAL_PKA_MODULE_DISABLED
-  -DHAL_RNG_MODULE_DISABLED
-  -DHAL_RTC_MODULE_DISABLED
-  -DHAL_SMARTCARD_MODULE_DISABLED
-  -DHAL_SMBUS_MODULE_DISABLED
-  -DHAL_TIM_MODULE_DISABLED
-  -DHAL_WWDG_MODULE_DISABLED
-  -DHAL_EXTI_MODULE_DISABLED
-  -DHAL_SAI_MODULE_DISABLED
-  -DHAL_ICACHE_MODULE_DISABLED
+  -DHAL_RNG_MODULE_ENABLED
   -DRADIOLIB_EXCLUDE_SX128X=1
   -DRADIOLIB_EXCLUDE_SX127X=1
   -DRADIOLIB_EXCLUDE_LR11X0=1
-; -D PIO_FRAMEWORK_ARDUINO_NANOLIB_FLOAT_PRINTF
+  -DMESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR=1
+  -DMESHTASTIC_EXCLUDE_I2C=1
+  -DMESHTASTIC_EXCLUDE_WIFI=1
+  -DMESHTASTIC_EXCLUDE_BLUETOOTH=1
+  -DMESHTASTIC_EXCLUDE_GPS=1
+  -DMESHTASTIC_EXCLUDE_SCREEN=1
+  -DMESHTASTIC_EXCLUDE_MQTT=1
+  -DMESHTASTIC_EXCLUDE_POWERMON=1
+  ;-DPIO_FRAMEWORK_ARDUINO_NANOLIB_FLOAT_PRINTF
+  ;-DCFG_DEBUG
 
 upload_port = stlink
\ No newline at end of file
diff --git a/variants/wio-e5/variant.h b/variants/wio-e5/variant.h
index 1de424d1d..5421eaeb9 100644
--- a/variants/wio-e5/variant.h
+++ b/variants/wio-e5/variant.h
@@ -17,4 +17,9 @@ Do not expect a working Meshtastic device with this target.
 #define LED_PIN PB5
 #define LED_STATE_ON 1
 
+#if (defined(LED_BUILTIN) && LED_BUILTIN == PNUM_NOT_DEFINED)
+#undef LED_BUILTIN
+#define LED_BUILTIN (LED_PIN)
+#endif
+
 #endif

From 0951fdd49b67c00c3c075b4236b12af7fb04d507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Fri, 21 Mar 2025 16:12:49 +0100
Subject: [PATCH 057/116] Add support for Heltec HRI-3621 industrial sensor hub
 (#6366)

---
 src/ButtonThread.cpp                          |  2 +-
 src/Power.cpp                                 |  4 +-
 .../Telemetry/EnvironmentTelemetry.cpp        |  7 +--
 src/modules/Telemetry/EnvironmentTelemetry.h  |  5 ++
 src/platform/esp32/architecture.h             |  2 +
 variants/heltec_sensor_hub/platformio.ini     | 11 +++++
 variants/heltec_sensor_hub/variant.h          | 46 +++++++++++++++++++
 7 files changed, 71 insertions(+), 6 deletions(-)
 create mode 100644 variants/heltec_sensor_hub/platformio.ini
 create mode 100644 variants/heltec_sensor_hub/variant.h

diff --git a/src/ButtonThread.cpp b/src/ButtonThread.cpp
index ec0bc5fc2..12f81353c 100644
--- a/src/ButtonThread.cpp
+++ b/src/ButtonThread.cpp
@@ -47,7 +47,7 @@ ButtonThread::ButtonThread() : OSThread("Button")
 #ifdef USERPREFS_BUTTON_PIN
     int pin = config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN; // Resolved button pin
 #endif
-#if defined(HELTEC_CAPSULE_SENSOR_V3)
+#if defined(HELTEC_CAPSULE_SENSOR_V3) || defined(HELTEC_SENSOR_HUB)
     this->userButton = OneButton(pin, false, false);
 #elif defined(BUTTON_ACTIVE_LOW)
     this->userButton = OneButton(pin, BUTTON_ACTIVE_LOW, BUTTON_ACTIVE_PULLUP);
diff --git a/src/Power.cpp b/src/Power.cpp
index 5768e9908..8c2ef998d 100644
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -391,7 +391,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
     virtual bool isVbusIn() override
     {
 #ifdef EXT_PWR_DETECT
-#ifdef HELTEC_CAPSULE_SENSOR_V3
+#if defined(HELTEC_CAPSULE_SENSOR_V3) || defined(HELTEC_SENSOR_HUB)
         // if external powered that pin will be pulled down
         if (digitalRead(EXT_PWR_DETECT) == LOW) {
             return true;
@@ -541,7 +541,7 @@ Power::Power() : OSThread("Power")
 bool Power::analogInit()
 {
 #ifdef EXT_PWR_DETECT
-#ifdef HELTEC_CAPSULE_SENSOR_V3
+#if defined(HELTEC_CAPSULE_SENSOR_V3) || defined(HELTEC_SENSOR_HUB)
     pinMode(EXT_PWR_DETECT, INPUT_PULLUP);
 #else
     pinMode(EXT_PWR_DETECT, INPUT);
diff --git a/src/modules/Telemetry/EnvironmentTelemetry.cpp b/src/modules/Telemetry/EnvironmentTelemetry.cpp
index 8835c985d..8c0507e77 100644
--- a/src/modules/Telemetry/EnvironmentTelemetry.cpp
+++ b/src/modules/Telemetry/EnvironmentTelemetry.cpp
@@ -98,7 +98,8 @@ int32_t EnvironmentTelemetryModule::runOnce()
     // moduleConfig.telemetry.environment_screen_enabled = 1;
     // moduleConfig.telemetry.environment_update_interval = 15;
 
-    if (!(moduleConfig.telemetry.environment_measurement_enabled || moduleConfig.telemetry.environment_screen_enabled)) {
+    if (!(moduleConfig.telemetry.environment_measurement_enabled || moduleConfig.telemetry.environment_screen_enabled ||
+          ENVIRONMENTAL_TELEMETRY_MODULE_ENABLE)) {
         // If this module is not enabled, and the user doesn't want the display screen don't waste any OSThread time on it
         return disable();
     }
@@ -107,7 +108,7 @@ int32_t EnvironmentTelemetryModule::runOnce()
         // This is the first time the OSThread library has called this function, so do some setup
         firstTime = 0;
 
-        if (moduleConfig.telemetry.environment_measurement_enabled) {
+        if (moduleConfig.telemetry.environment_measurement_enabled || ENVIRONMENTAL_TELEMETRY_MODULE_ENABLE) {
             LOG_INFO("Environment Telemetry: init");
 #ifdef SENSECAP_INDICATOR
             result = indicatorSensor.runOnce();
@@ -178,7 +179,7 @@ int32_t EnvironmentTelemetryModule::runOnce()
         return result == UINT32_MAX ? disable() : setStartDelay();
     } else {
         // if we somehow got to a second run of this module with measurement disabled, then just wait forever
-        if (!moduleConfig.telemetry.environment_measurement_enabled) {
+        if (!moduleConfig.telemetry.environment_measurement_enabled && !ENVIRONMENTAL_TELEMETRY_MODULE_ENABLE) {
             return disable();
         } else {
 #if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR_EXTERNAL
diff --git a/src/modules/Telemetry/EnvironmentTelemetry.h b/src/modules/Telemetry/EnvironmentTelemetry.h
index 6e0f850ef..d70c063fc 100644
--- a/src/modules/Telemetry/EnvironmentTelemetry.h
+++ b/src/modules/Telemetry/EnvironmentTelemetry.h
@@ -3,6 +3,11 @@
 #if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
 
 #pragma once
+
+#ifndef ENVIRONMENTAL_TELEMETRY_MODULE_ENABLE
+#define ENVIRONMENTAL_TELEMETRY_MODULE_ENABLE 0
+#endif
+
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "NodeDB.h"
 #include "ProtobufModule.h"
diff --git a/src/platform/esp32/architecture.h b/src/platform/esp32/architecture.h
index e4f8b49a0..631df0fe4 100644
--- a/src/platform/esp32/architecture.h
+++ b/src/platform/esp32/architecture.h
@@ -178,6 +178,8 @@
 #define HW_VENDOR meshtastic_HardwareModel_MESH_TAB
 #elif defined(T_ETH_ELITE)
 #define HW_VENDOR meshtastic_HardwareModel_T_ETH_ELITE
+#elif defined(HELTEC_SENSOR_HUB)
+#define HW_VENDOR meshtastic_HardwareModel_HELTEC_SENSOR_HUB
 #endif
 
 // -----------------------------------------------------------------------------
diff --git a/variants/heltec_sensor_hub/platformio.ini b/variants/heltec_sensor_hub/platformio.ini
new file mode 100644
index 000000000..53f84fab4
--- /dev/null
+++ b/variants/heltec_sensor_hub/platformio.ini
@@ -0,0 +1,11 @@
+[env:heltec_sensor_hub]
+extends = esp32s3_base
+board = heltec_wifi_lora_32_V3
+board_check = true
+
+build_flags = 
+  ${esp32s3_base.build_flags} -I variants/heltec_sensor_hub
+  -D HELTEC_SENSOR_HUB
+
+lib_deps = ${esp32s3_base.lib_deps}
+  adafruit/Adafruit NeoPixel @ ^1.12.0
diff --git a/variants/heltec_sensor_hub/variant.h b/variants/heltec_sensor_hub/variant.h
new file mode 100644
index 000000000..771cefee3
--- /dev/null
+++ b/variants/heltec_sensor_hub/variant.h
@@ -0,0 +1,46 @@
+#define EXT_PWR_DETECT 20
+
+#define BUTTON_PIN 17
+
+#define BATTERY_PIN 7 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
+#define ADC_CHANNEL ADC1_GPIO7_CHANNEL
+#define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // lower dB for high resistance voltage divider
+#define ADC_MULTIPLIER (4.9 * 1.045)
+#define ADC_CTRL 34 // active HIGH, powers the voltage divider. Only on 1.1
+#define ADC_CTRL_ENABLED HIGH
+
+#define HAS_NEOPIXEL                         // Enable the use of neopixels
+#define NEOPIXEL_COUNT 1                     // How many neopixels are connected
+#define NEOPIXEL_DATA 18                     // gpio pin used to send data to the neopixels
+#define NEOPIXEL_TYPE (NEO_GRB + NEO_KHZ800) // type of neopixels in use
+
+#define USE_SX1262
+#define LORA_DIO0 RADIOLIB_NC
+#define LORA_RESET 12
+#define LORA_DIO1 14 // SX1262 IRQ
+#define LORA_DIO2 13 // SX1262 BUSY
+
+#define LORA_SCK 9
+#define LORA_MISO 11
+#define LORA_MOSI 10
+#define LORA_CS 8
+
+#define SX126X_CS LORA_CS
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY LORA_DIO2
+#define SX126X_RESET LORA_RESET
+
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8
+
+#define I2C_SDA 1
+#define I2C_SCL 2
+#define HAS_SCREEN 0
+#define SENSOR_POWER_CTRL_PIN 33
+#define SENSOR_POWER_ON 1
+
+#define PERIPHERAL_WARMUP_MS 100
+
+#define ESP32S3_WAKE_TYPE ESP_EXT1_WAKEUP_ANY_HIGH
+
+#define ENVIRONMENTAL_TELEMETRY_MODULE_ENABLE 1
\ No newline at end of file

From 1e4a0134e6ed6d455e54cd21f64232389280781b Mon Sep 17 00:00:00 2001
From: Tom Fifield <tom@tomfifield.net>
Date: Sat, 22 Mar 2025 11:55:11 +1100
Subject: [PATCH 058/116] Remove unnecessary null pointer check (#6370)

Further pointed out by @elfring, this patch removes one more unnecessary null pointer check.

https://github.com/meshtastic/firmware/issues/6170#issuecomment-2744002798
---
 src/mesh/CryptoEngine.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/mesh/CryptoEngine.cpp b/src/mesh/CryptoEngine.cpp
index 6dffbe2b7..d32b73855 100644
--- a/src/mesh/CryptoEngine.cpp
+++ b/src/mesh/CryptoEngine.cpp
@@ -223,10 +223,8 @@ void CryptoEngine::decrypt(uint32_t fromNode, uint64_t packetId, size_t numBytes
 // Generic implementation of AES-CTR encryption.
 void CryptoEngine::encryptAESCtr(CryptoKey _key, uint8_t *_nonce, size_t numBytes, uint8_t *bytes)
 {
-    if (ctr) {
-        delete ctr;
-        ctr = nullptr;
-    }
+    delete ctr;
+    ctr = nullptr;
     if (_key.length == 16)
         ctr = new CTR<AES128>();
     else

From cf7f0f9d0895602df3453a4f5cfea843f4e09744 Mon Sep 17 00:00:00 2001
From: dfsx1 <60702962+dfsx1@users.noreply.github.com>
Date: Sun, 23 Mar 2025 10:49:06 +0000
Subject: [PATCH 059/116] Fix NodeInfo exploit overwriting publicKey in NodeDB
 (#6372)

Co-authored-by: dfsx1 <dfsx1@users.noreply.github.com>
---
 src/mesh/NodeDB.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
index a9130c3a9..666276f83 100644
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -1437,13 +1437,14 @@ bool NodeDB::updateUser(uint32_t nodeId, meshtastic_User &p, uint8_t channelInde
 #if !(MESHTASTIC_EXCLUDE_PKI)
     if (p.public_key.size > 0) {
         printBytes("Incoming Pubkey: ", p.public_key.bytes, 32);
-        if (info->user.public_key.size > 0) { // if we have a key for this user already, don't overwrite with a new one
-            LOG_INFO("Public Key set for node, not updating!");
-            // we copy the key into the incoming packet, to prevent overwrite
-            memcpy(p.public_key.bytes, info->user.public_key.bytes, 32);
-        } else {
-            LOG_INFO("Update Node Pubkey!");
-        }
+    }
+    if (info->user.public_key.size > 0) { // if we have a key for this user already, don't overwrite with a new one
+        LOG_INFO("Public Key set for node, not updating!");
+        // we copy the key into the incoming packet, to prevent overwrite
+        p.public_key.size = 32;
+        memcpy(p.public_key.bytes, info->user.public_key.bytes, 32);
+    } else if (p.public_key.size > 0) {
+        LOG_INFO("Update Node Pubkey!");
     }
 #endif
 

From 1ee800e9011e54abf6a9546947c6b34244e96766 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Sun, 23 Mar 2025 12:33:26 +0100
Subject: [PATCH 060/116] add MUI/inkHUD to bug report template (#6376)

---
 .github/ISSUE_TEMPLATE/Bug Report.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/Bug Report.yml b/.github/ISSUE_TEMPLATE/Bug Report.yml
index f638b9018..bc77e8c1b 100644
--- a/.github/ISSUE_TEMPLATE/Bug Report.yml	
+++ b/.github/ISSUE_TEMPLATE/Bug Report.yml	
@@ -72,6 +72,15 @@ body:
     validations:
       required: true
 
+  - type: checkboxes
+    id: mui
+    attributes:
+      label: Is this bug report about any UI component firmware like InkHUD or Meshtatic UI (MUI)?
+      options:
+        - label: Meshtastic UI aka MUI colorTFT
+        - label: InkHUD ePaper
+        - label: OLED slide UI on any display
+
   - type: input
     id: version
     attributes:

From daa4186d654ff13c354ad55fdd326fa8832a1410 Mon Sep 17 00:00:00 2001
From: Andrew Yong <me@ndoo.sg>
Date: Sun, 23 Mar 2025 23:32:55 +0800
Subject: [PATCH 061/116] [esp32] Define BUTTON_PIN (-1) by default, fixes
 #6213 (#6371)

Signed-off-by: Andrew Yong <me@ndoo.sg>
---
 src/configuration.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/configuration.h b/src/configuration.h
index fd4a5b196..1a4dbbcc3 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -110,6 +110,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Define if screen should be mirrored left to right
 // #define SCREEN_MIRROR
 
+// Define BUTTON_PIN to ensure button setup is always done
+#ifndef BUTTON_PIN
+#define BUTTON_PIN (-1)
+#endif
+
 // I2C Keyboards (M5Stack, RAK14004, T-Deck)
 #define CARDKB_ADDR 0x5F
 #define TDECK_KB_ADDR 0x55

From e722a97987031fc0affd715b55957b6f62b787f7 Mon Sep 17 00:00:00 2001
From: Chloe Bethel <chloe@9net.org>
Date: Mon, 24 Mar 2025 22:26:59 +0000
Subject: [PATCH 062/116] Don't use assert() in MeshService to guard queueing
 packets (#6388)

---
 src/mesh/MeshService.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/mesh/MeshService.cpp b/src/mesh/MeshService.cpp
index f293559ad..297c7b2ed 100644
--- a/src/mesh/MeshService.cpp
+++ b/src/mesh/MeshService.cpp
@@ -309,7 +309,10 @@ void MeshService::sendToPhone(meshtastic_MeshPacket *p)
         }
     }
 
-    assert(toPhoneQueue.enqueue(p, 0));
+    if (toPhoneQueue.enqueue(p, 0) == false) {
+        LOG_CRIT("Failed to queue a packet into toPhoneQueue!");
+        abort();
+    }
     fromNum++;
 }
 
@@ -323,7 +326,10 @@ void MeshService::sendMqttMessageToClientProxy(meshtastic_MqttClientProxyMessage
             releaseMqttClientProxyMessageToPool(d);
     }
 
-    assert(toPhoneMqttProxyQueue.enqueue(m, 0));
+    if (toPhoneMqttProxyQueue.enqueue(m, 0) == false) {
+        LOG_CRIT("Failed to queue a packet into toPhoneMqttProxyQueue!");
+        abort();
+    }
     fromNum++;
 }
 
@@ -337,7 +343,10 @@ void MeshService::sendClientNotification(meshtastic_ClientNotification *n)
             releaseClientNotificationToPool(d);
     }
 
-    assert(toPhoneClientNotificationQueue.enqueue(n, 0));
+    if (toPhoneClientNotificationQueue.enqueue(n, 0) == false) {
+        LOG_CRIT("Failed to queue a notification into toPhoneClientNotificationQueue!");
+        abort();
+    }
     fromNum++;
 }
 

From e9d8a3d7f95fa3a4e27514321a1c942d04239b72 Mon Sep 17 00:00:00 2001
From: Manuel <71137295+mverch67@users.noreply.github.com>
Date: Tue, 25 Mar 2025 01:30:17 +0100
Subject: [PATCH 063/116] MUI: increase stack, cache and drawbuffer (#6389)

* increase stack, cache and drawbuffer

* bump device-ui lib

* T-Deck map: switch to full redraw
---
 platformio.ini                    | 2 +-
 src/graphics/tftSetup.cpp         | 2 +-
 variants/portduino/platformio.ini | 3 ++-
 variants/t-deck/platformio.ini    | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 7f71d2f58..3de5b715f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -94,7 +94,7 @@ lib_deps =
 
 [device-ui_base]
 lib_deps =
-	https://github.com/meshtastic/device-ui.git#74e739ed4532ca10393df9fc89ae5a22f0bab2b1
+	https://github.com/meshtastic/device-ui.git#7a6ffba3c86901b0e3234b6c056aa803b4cd8854
 
 ; Common libs for environmental measurements in telemetry module
 ; (not included in native / portduino)
diff --git a/src/graphics/tftSetup.cpp b/src/graphics/tftSetup.cpp
index c31659c62..cacb02694 100644
--- a/src/graphics/tftSetup.cpp
+++ b/src/graphics/tftSetup.cpp
@@ -119,7 +119,7 @@ void tftSetup(void)
 #ifdef ARCH_ESP32
     tftSleepObserver.observe(&notifyLightSleep);
     endSleepObserver.observe(&notifyLightSleepEnd);
-    xTaskCreatePinnedToCore(tft_task_handler, "tft", 8192, NULL, 1, NULL, 0);
+    xTaskCreatePinnedToCore(tft_task_handler, "tft", 10240, NULL, 1, NULL, 0);
 #endif
 }
 
diff --git a/variants/portduino/platformio.ini b/variants/portduino/platformio.ini
index 9bf3313ce..7a3392eb4 100644
--- a/variants/portduino/platformio.ini
+++ b/variants/portduino/platformio.ini
@@ -27,6 +27,7 @@ build_flags = ${native_base.build_flags} -Os -lX11 -linput -lxkbcommon -ffunctio
   -D USE_X11=1
   -D HAS_TFT=1
   -D HAS_SCREEN=0
+  -D LV_CACHE_DEF_SIZE=6291456
   -D LV_BUILD_TEST=0
   -D LV_USE_LIBINPUT=1
   -D LV_LVGL_H_INCLUDE_SIMPLE
@@ -56,7 +57,7 @@ build_flags = ${native_base.build_flags} -O0 -fsanitize=address -lX11 -linput -l
   -D USE_X11=1
   -D HAS_TFT=1
   -D HAS_SCREEN=0
-;  -D CALIBRATE_TOUCH=0
+  -D LV_CACHE_DEF_SIZE=6291456
   -D LV_BUILD_TEST=0
   -D LV_USE_LOG=1
   -D LV_USE_SYSMON=1
diff --git a/variants/t-deck/platformio.ini b/variants/t-deck/platformio.ini
index 4671a5a9b..14fbee6cf 100644
--- a/variants/t-deck/platformio.ini
+++ b/variants/t-deck/platformio.ini
@@ -42,7 +42,7 @@ build_flags =
   -D HAS_SCREEN=0
   -D HAS_TFT=1
   -D USE_I2S_BUZZER
-  -D RAM_SIZE=4096
+  -D RAM_SIZE=5120
 	-D LV_LVGL_H_INCLUDE_SIMPLE
 	-D LV_CONF_INCLUDE_SIMPLE
 	-D LV_COMP_CONF_INCLUDE_SIMPLE
@@ -66,6 +66,7 @@ build_flags =
   -D VIEW_320x240
 ;	-D USE_DOUBLE_BUFFER
   -D USE_PACKET_API
+  -D MAP_FULL_REDRAW
 
 lib_deps =
   ${env:t-deck.lib_deps}

From 3afe84c4f4ca3e01faff4e503eae887173c989a4 Mon Sep 17 00:00:00 2001
From: Jorropo <jorropo.pgm@gmail.com>
Date: Tue, 25 Mar 2025 01:30:47 +0100
Subject: [PATCH 064/116] linux-native: allow multiple processes to all bind to
 the same multicast 2tuple (#6391)

* cleanup UdpMulticastThread.h preprocessor rules a tiny bit

* bump platform-native to allow for multiple multicast listeners on the same machine

---------

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
---
 arch/portduino/portduino.ini      | 2 +-
 src/mesh/udp/UdpMulticastThread.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini
index 734a4f91e..55234914f 100644
--- a/arch/portduino/portduino.ini
+++ b/arch/portduino/portduino.ini
@@ -1,6 +1,6 @@
 ; The Portduino based 'native' environment. Currently supported on Linux targets with real LoRa hardware (or simulated).
 [portduino_base]
-platform = https://github.com/meshtastic/platform-native.git#df71ed0040e9aad767a002829330965b78fc452a
+platform = https://github.com/meshtastic/platform-native.git#e82ba1a19b6cd1dc55cbde29b33ea8dd0640014f
 framework = arduino
 
 build_src_filter = 
diff --git a/src/mesh/udp/UdpMulticastThread.h b/src/mesh/udp/UdpMulticastThread.h
index 7067cced9..88824dc4d 100644
--- a/src/mesh/udp/UdpMulticastThread.h
+++ b/src/mesh/udp/UdpMulticastThread.h
@@ -23,7 +23,7 @@ class UdpMulticastThread : public concurrency::OSThread
     void start()
     {
         if (udp.listenMulticast(udpIpAddress, UDP_MULTICAST_DEFAUL_PORT, 64)) {
-#if !defined(ARCH_PORTDUINO)
+#ifndef ARCH_PORTDUINO
             // FIXME(PORTDUINO): arduino lacks IPAddress::toString()
             LOG_DEBUG("UDP Listening on IP: %s", WiFi.localIP().toString().c_str());
 #else
@@ -59,7 +59,7 @@ class UdpMulticastThread : public concurrency::OSThread
         if (!mp || !udp) {
             return false;
         }
-#if !defined(ARCH_PORTDUINO)
+#ifndef ARCH_PORTDUINO
         if (WiFi.status() != WL_CONNECTED) {
             return false;
         }

From 0ddb507055d15b25941e672f54c88819d5050cb1 Mon Sep 17 00:00:00 2001
From: Austin <vidplace7@gmail.com>
Date: Mon, 24 Mar 2025 20:38:47 -0400
Subject: [PATCH 065/116] userPrefs: Add WiFi SSID/PW, and UDP multicast
 configs (#6387)

---
 src/mesh/NodeDB.cpp | 16 ++++++++++++++++
 userPrefs.jsonc     |  4 ++++
 2 files changed, 20 insertions(+)

diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
index 666276f83..0269c1dfc 100644
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -628,6 +628,22 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
          meshtastic_Config_PositionConfig_PositionFlags_SPEED | meshtastic_Config_PositionConfig_PositionFlags_HEADING |
          meshtastic_Config_PositionConfig_PositionFlags_DOP | meshtastic_Config_PositionConfig_PositionFlags_SATINVIEW);
 
+#ifdef USERPREFS_NETWORK_ENABLED_PROTOCOLS
+    config.network.enabled_protocols = USERPREFS_NETWORK_ENABLED_PROTOCOLS;
+#endif
+
+#ifdef USERPREFS_NETWORK_WIFI_ENABLED
+    config.network.wifi_enabled = USERPREFS_NETWORK_WIFI_ENABLED;
+#endif
+
+#ifdef USERPREFS_NETWORK_WIFI_SSID
+    strncpy(config.network.wifi_ssid, USERPREFS_NETWORK_WIFI_SSID, sizeof(config.network.wifi_ssid));
+#endif
+
+#ifdef USERPREFS_NETWORK_WIFI_PSK
+    strncpy(config.network.wifi_psk, USERPREFS_NETWORK_WIFI_PSK, sizeof(config.network.wifi_psk));
+#endif
+
 #ifdef DISPLAY_FLIP_SCREEN
     config.display.flip_screen = true;
 #endif
diff --git a/userPrefs.jsonc b/userPrefs.jsonc
index 6a3fdbb55..d522ad272 100644
--- a/userPrefs.jsonc
+++ b/userPrefs.jsonc
@@ -40,5 +40,9 @@
   // "USERPREFS_OEM_IMAGE_WIDTH": "50",
   // "USERPREFS_OEM_IMAGE_HEIGHT": "28",
   // "USERPREFS_OEM_IMAGE_DATA": "{ 0x00, 0x00, 0xF0, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0xC0, 0x07, 0x80, 0x0F, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0x61, 0x00, 0x00, 0x00, 0x0C, 0xFF, 0xFF, 0xC7, 0x00, 0x00, 0x00, 0x0C, 0xFF, 0xFF, 0xC7, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0x67, 0x00, 0x00, 0x00, 0x18, 0x1F, 0xF0, 0x67, 0x00, 0x00, 0x00, 0x30, 0x1F, 0xF8, 0x33, 0x00, 0x00, 0x00, 0x30, 0x00, 0xFC, 0x31, 0x00, 0x00, 0x00, 0x60, 0x00, 0xFE, 0x18, 0x00, 0x00, 0x00, 0x60, 0x00, 0x7E, 0x18, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x3F, 0x0C, 0x00, 0x00, 0x00, 0xC0, 0x80, 0x1F, 0x0C, 0x00, 0x00, 0x00, 0x80, 0x81, 0x1F, 0x06, 0x00, 0x00, 0x00, 0x80, 0xC1, 0x0F, 0x06, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x0F, 0x03, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x0F, 0x03, 0x00, 0x00, 0x00, 0x00, 0xE6, 0x8F, 0x01, 0x00, 0x00, 0x00, 0x00, 0xEE, 0xC7, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x00, 0x00, 0x00}",
+  // "USERPREFS_NETWORK_ENABLED_PROTOCOLS": "1", // Enable UDP mesh
+  // "USERPREFS_NETWORK_WIFI_ENABLED": "true",
+  // "USERPREFS_NETWORK_WIFI_SSID": "wifi_ssid",
+  // "USERPREFS_NETWORK_WIFI_PSK": "wifi_psk",
   "USERPREFS_TZ_STRING": "tzplaceholder                                         "
 }

From e5f8218d34611649d806114a329b1c40e7b67fa9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 25 Mar 2025 07:00:54 -0500
Subject: [PATCH 066/116] Upgrade trunk (#6383)

Co-authored-by: sachaw <11172820+sachaw@users.noreply.github.com>
---
 .trunk/trunk.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
index c451bb66d..b44f46a51 100644
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -12,11 +12,11 @@ lint:
     - trufflehog@3.88.18
     - yamllint@1.36.2
     - bandit@1.8.3
-    - checkov@3.2.388
+    - checkov@3.2.390
     - terrascan@1.19.9
     - trivy@0.60.0
     - taplo@0.9.3
-    - ruff@0.11.0
+    - ruff@0.11.1
     - isort@6.0.1
     - markdownlint@0.44.0
     - oxipng@9.1.4

From 33f2b7144f2a548f7a76389d6aca22bddcdbf8e9 Mon Sep 17 00:00:00 2001
From: Austin <vidplace7@gmail.com>
Date: Tue, 25 Mar 2025 12:39:19 -0400
Subject: [PATCH 067/116] Default to UDP enabled if it's available (#6394)

---
 src/mesh/NodeDB.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
index 0269c1dfc..df0fbcedd 100644
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -628,8 +628,13 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
          meshtastic_Config_PositionConfig_PositionFlags_SPEED | meshtastic_Config_PositionConfig_PositionFlags_HEADING |
          meshtastic_Config_PositionConfig_PositionFlags_DOP | meshtastic_Config_PositionConfig_PositionFlags_SATINVIEW);
 
+// Set default value for 'Mesh via UDP'
+#if HAS_UDP_MULTICAST
 #ifdef USERPREFS_NETWORK_ENABLED_PROTOCOLS
     config.network.enabled_protocols = USERPREFS_NETWORK_ENABLED_PROTOCOLS;
+#else
+    config.network.enabled_protocols = 1;
+#endif
 #endif
 
 #ifdef USERPREFS_NETWORK_WIFI_ENABLED

From eb375d8e6220a57f2e69a75645ad4cd0c2a057ef Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 25 Mar 2025 14:55:37 -0500
Subject: [PATCH 068/116] [create-pull-request] automated change (#6396)

Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
---
 protobufs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/protobufs b/protobufs
index b4e24c3a8..b4044f8f9 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit b4e24c3a868f9e5fd782d2e256b05456d578923b
+Subproject commit b4044f8f9f3681d4d20521dbe13ee42c96eae353

From 53a7afff41f0cbb664d07ba49ee03f7025ccc009 Mon Sep 17 00:00:00 2001
From: nledevil <rschultz82@comcast.net>
Date: Tue, 25 Mar 2025 16:57:06 -0500
Subject: [PATCH 069/116] Adding Variants for Hackerboxes ESP32C3 OLED kit and
 the ESP32 IO Kit (#6319)

---
 variants/hackerboxes_esp32_io/platformio.ini  | 12 +++++++
 variants/hackerboxes_esp32_io/variant.h       | 30 ++++++++++++++++
 .../hackerboxes_esp32c3_oled/platformio.ini   | 14 ++++++++
 variants/hackerboxes_esp32c3_oled/variant.h   | 36 +++++++++++++++++++
 4 files changed, 92 insertions(+)
 create mode 100644 variants/hackerboxes_esp32_io/platformio.ini
 create mode 100644 variants/hackerboxes_esp32_io/variant.h
 create mode 100644 variants/hackerboxes_esp32c3_oled/platformio.ini
 create mode 100644 variants/hackerboxes_esp32c3_oled/variant.h

diff --git a/variants/hackerboxes_esp32_io/platformio.ini b/variants/hackerboxes_esp32_io/platformio.ini
new file mode 100644
index 000000000..f024dac3e
--- /dev/null
+++ b/variants/hackerboxes_esp32_io/platformio.ini
@@ -0,0 +1,12 @@
+[env:hackerboxes-esp32-io]
+extends = esp32_base
+board = esp32dev
+board_level = extra
+build_flags = 
+  ${esp32_base.build_flags}
+  -D PRIVATE_HW
+  -I variants/hackerboxes_esp32_io
+monitor_speed = 115200
+upload_protocol = esptool
+;upload_port = /dev/ttyUSB0
+upload_speed = 921600
\ No newline at end of file
diff --git a/variants/hackerboxes_esp32_io/variant.h b/variants/hackerboxes_esp32_io/variant.h
new file mode 100644
index 000000000..06f0032ee
--- /dev/null
+++ b/variants/hackerboxes_esp32_io/variant.h
@@ -0,0 +1,30 @@
+#define BUTTON_PIN 0
+
+// HACKBOX LoRa IO Kit
+// Uses a ESP-32-WROOM and a RA-01SH (SX1262) LoRa Board
+
+#define LED_PIN 2      // LED
+#define LED_STATE_ON 1 // State when LED is lit
+
+#define HAS_SCREEN 0
+#define HAS_GPS 0
+#undef GPS_RX_PIN
+#undef GPS_TX_PIN
+
+#define USE_SX1262
+#define LORA_SCK 18
+#define LORA_MISO 19
+#define LORA_MOSI 23
+#define LORA_CS 5
+#define LORA_DIO0 RADIOLIB_NC
+#define LORA_RESET 27
+#define LORA_DIO1 33
+#define LORA_DIO2 RADIOLIB_NC
+#define LORA_BUSY 32
+
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_CS LORA_CS
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY LORA_BUSY
+#define SX126X_RESET LORA_RESET
+#define SX126X_MAX_POWER 22 // Max power of the RA-01SH is 22db
\ No newline at end of file
diff --git a/variants/hackerboxes_esp32c3_oled/platformio.ini b/variants/hackerboxes_esp32c3_oled/platformio.ini
new file mode 100644
index 000000000..4fcbf2ade
--- /dev/null
+++ b/variants/hackerboxes_esp32c3_oled/platformio.ini
@@ -0,0 +1,14 @@
+[env:hackerboxes-esp32c3-oled]
+extends = esp32c3_base
+board = esp32-c3-devkitm-1
+board_level = extra
+build_flags = 
+  ${esp32_base.build_flags}
+  -D PRIVATE_HW
+  -D ARDUINO_USB_MODE=1
+  -D ARDUINO_USB_CDC_ON_BOOT=1
+  -I variants/hackerboxes_esp32c3_oled
+monitor_speed = 115200
+upload_protocol = esptool
+;upload_port = /dev/ttyUSB0
+upload_speed = 921600
\ No newline at end of file
diff --git a/variants/hackerboxes_esp32c3_oled/variant.h b/variants/hackerboxes_esp32c3_oled/variant.h
new file mode 100644
index 000000000..7432a9941
--- /dev/null
+++ b/variants/hackerboxes_esp32c3_oled/variant.h
@@ -0,0 +1,36 @@
+#define BUTTON_PIN 9
+
+// Hackerboxes LoRa ESP32-C3 OLED Kit
+// Uses a ESP32-C3 OLED Board and a RA-01SH (SX1262) LoRa Board
+
+#define LED_PIN 8      // LED
+#define LED_STATE_ON 1 // State when LED is lit
+
+#define HAS_SCREEN 0
+#define HAS_GPS 0
+#undef GPS_RX_PIN
+#undef GPS_TX_PIN
+
+// #define USE_SSD1306_72_40
+// #define I2C_SDA 5 // I2C pins for this board
+// #define I2C_SCL 6 //
+// #define TFT_WIDTH 72
+// #define TFT_HEIGHT 40
+
+#define USE_SX1262
+#define LORA_SCK 4
+#define LORA_MISO 7
+#define LORA_MOSI 3
+#define LORA_CS 1
+#define LORA_DIO0 RADIOLIB_NC
+#define LORA_RESET 0
+#define LORA_DIO1 20
+#define LORA_DIO2 RADIOLIB_NC
+#define LORA_BUSY 10
+
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_CS LORA_CS
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY LORA_BUSY
+#define SX126X_RESET LORA_RESET
+#define SX126X_MAX_POWER 22 // Max power of the RA-01SH is 22db
\ No newline at end of file

From d28af68b5a540a08b31fbc71c61fa87d4177fbfa Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Tue, 25 Mar 2025 18:49:22 -0500
Subject: [PATCH 070/116] Update version.properties

---
 version.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.properties b/version.properties
index 4c2cefef3..9d6d2a464 100644
--- a/version.properties
+++ b/version.properties
@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 6
-build = 2
+build = 3

From 13101c1bab2066998779856812bea47e7d0b148a Mon Sep 17 00:00:00 2001
From: Nasimovy <smeetswout@hotmail.com>
Date: Wed, 26 Mar 2025 02:29:18 +0000
Subject: [PATCH 071/116] TCA8418 initial config + basic 3x4 keypad config
 (#6320)

* add TCA8418 to configuration.h

added the TCA8418

* add TCA8418 to ScanI2C.cpp

add TCA8418

* add TCA8418KB to ScanI2C.h

add TCA8418KB

* add TCA8418KB ScanI2CTwoWire.cpp

add TCA8418KB

* Create TCA8418Keyboard.cpp

Create TCA8418Keyboard.cpp

* Create TCA8418Keyboard.h

Create TCA8418Keyboard.h

* add TCA8418 to kbI2cBase.cpp

add TCA8418

* add TCA8418 to kbI2cBase.h

add TCA8418

* add TCA8418KB to main.cpp

add TCA8418KB

* add TCA8418KB to cardKbI2cImpl.cpp

add TCA8418KB

* Update TCA8418 kbI2cBase.cpp

* enable debug TCA8418

* Nokia 5130 config

* Update TCA8418Keyboard.h

old version in initial commit

* Update ScanI2CTwoWire.cpp

* add tap_interval and backlight_on to constructor

* Create TCA8418-layouts.cpp

TCA8418-layout

3x4 should work

Nokia 5130 needs editing.

* put layouts in different file + adjusted code for variable matrix sizes

* rename TCA8418-layouts.cpp to TCA8418Layouts.cpp + add endif

* Update TCA8418Keyboard.cpp name change layouts

* forgot a \

* Create TCA8418Layouts.h

* Update TCA8418Keyboard.cpp

* add include

forgot include

* Update TCA8418Keyboard.cpp

* Update TCA8418Keyboard.h

* Update TCA8418Layouts.h

* revert to keyboard layout in main TCA8418Keyboard.cpp

* fixed the address

* changed ordering of constructor

* reflect changes #6371

* edit config.h

* bug fix fast pressing multiple buttons + clean up scanI2CTwoWire.cpp

* trunked

---------

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
Co-authored-by: Tom Fifield <tom@tomfifield.net>
---
 src/configuration.h           |   3 +-
 src/detect/ScanI2C.cpp        |   6 +-
 src/detect/ScanI2C.h          |   5 +-
 src/detect/ScanI2CTwoWire.cpp |  23 +-
 src/input/TCA8418Keyboard.cpp | 561 ++++++++++++++++++++++++++++++++++
 src/input/TCA8418Keyboard.h   |  83 +++++
 src/input/cardKbI2cImpl.cpp   |  10 +-
 src/input/kbI2cBase.cpp       |  70 +++++
 src/input/kbI2cBase.h         |   4 +-
 src/main.cpp                  |   4 +
 10 files changed, 750 insertions(+), 19 deletions(-)
 create mode 100644 src/input/TCA8418Keyboard.cpp
 create mode 100644 src/input/TCA8418Keyboard.h

diff --git a/src/configuration.h b/src/configuration.h
index 1a4dbbcc3..d9da09108 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -157,6 +157,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MLX90614_ADDR_DEF 0x5A
 #define CGRADSENS_ADDR 0x66
 #define LTR390UV_ADDR 0x53
+#define XPOWERS_AXP192_AXP2101_ADDRESS 0x34 // same adress as TCA8418
 
 // -----------------------------------------------------------------------------
 // ACCELEROMETER
@@ -374,4 +375,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 #include "DebugConfiguration.h"
-#include "RF95Configuration.h"
+#include "RF95Configuration.h"
\ No newline at end of file
diff --git a/src/detect/ScanI2C.cpp b/src/detect/ScanI2C.cpp
index 4caa0f730..58e87b1c5 100644
--- a/src/detect/ScanI2C.cpp
+++ b/src/detect/ScanI2C.cpp
@@ -31,8 +31,8 @@ ScanI2C::FoundDevice ScanI2C::firstRTC() const
 
 ScanI2C::FoundDevice ScanI2C::firstKeyboard() const
 {
-    ScanI2C::DeviceType types[] = {CARDKB, TDECKKB, BBQ10KB, RAK14004, MPR121KB};
-    return firstOfOrNONE(5, types);
+    ScanI2C::DeviceType types[] = {CARDKB, TDECKKB, BBQ10KB, RAK14004, MPR121KB, TCA8418KB};
+    return firstOfOrNONE(6, types);
 }
 
 ScanI2C::FoundDevice ScanI2C::firstAccelerometer() const
@@ -74,4 +74,4 @@ bool ScanI2C::DeviceAddress::operator<(const ScanI2C::DeviceAddress &other) cons
         || (port != NO_I2C && other.port != NO_I2C && (address < other.address));
 }
 
-ScanI2C::FoundDevice::FoundDevice(ScanI2C::DeviceType type, ScanI2C::DeviceAddress address) : type(type), address(address) {}
\ No newline at end of file
+ScanI2C::FoundDevice::FoundDevice(ScanI2C::DeviceType type, ScanI2C::DeviceAddress address) : type(type), address(address) {}
diff --git a/src/detect/ScanI2C.h b/src/detect/ScanI2C.h
index 5b6bbe629..cb61304a9 100644
--- a/src/detect/ScanI2C.h
+++ b/src/detect/ScanI2C.h
@@ -18,7 +18,7 @@ class ScanI2C
         TDECKKB,
         BBQ10KB,
         RAK14004,
-        PMU_AXP192_AXP2101,
+        PMU_AXP192_AXP2101, // has the same address as the TCA8418KB
         BME_680,
         BME_280,
         BMP_280,
@@ -69,6 +69,7 @@ class ScanI2C
         DFROBOT_RAIN,
         DPS310,
         LTR390UV,
+        TCA8418KB,
     } DeviceType;
 
     // typedef uint8_t DeviceAddress;
@@ -132,4 +133,4 @@ class ScanI2C
 
   private:
     bool shouldSuppressScreen = false;
-};
+};
\ No newline at end of file
diff --git a/src/detect/ScanI2CTwoWire.cpp b/src/detect/ScanI2CTwoWire.cpp
index 8b779277d..e8506f07c 100644
--- a/src/detect/ScanI2CTwoWire.cpp
+++ b/src/detect/ScanI2CTwoWire.cpp
@@ -10,11 +10,6 @@
 #include "meshUtils.h" // vformat
 #endif
 
-// AXP192 and AXP2101 have the same device address, we just need to identify it in Power.cpp
-#ifndef XPOWERS_AXP192_AXP2101_ADDRESS
-#define XPOWERS_AXP192_AXP2101_ADDRESS 0x34
-#endif
-
 bool in_array(uint8_t *array, int size, uint8_t lookfor)
 {
     int i;
@@ -211,6 +206,18 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                 }
                 break;
 
+            case XPOWERS_AXP192_AXP2101_ADDRESS:
+                // Do we have the TCA8418 instead?
+                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x02), 1);
+                if ((registerValue & 0b11100000) == 0) {
+                    logFoundDevice("TCA8418", (uint8_t)addr.address);
+                    type = TCA8418KB;
+                } else {
+                    logFoundDevice("AXP192/AXP2101", (uint8_t)addr.address);
+                    type = PMU_AXP192_AXP2101;
+                }
+                break;
+
                 SCAN_SIMPLE_CASE(TDECK_KB_ADDR, TDECKKB, "T-Deck keyboard", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(BBQ10_KB_ADDR, BBQ10KB, "BB Q10", (uint8_t)addr.address);
 
@@ -218,9 +225,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
 #ifdef HAS_NCP5623
                 SCAN_SIMPLE_CASE(NCP5623_ADDR, NCP5623, "NCP5623", (uint8_t)addr.address);
 #endif
-#ifdef HAS_PMU
-                SCAN_SIMPLE_CASE(XPOWERS_AXP192_AXP2101_ADDRESS, PMU_AXP192_AXP2101, "AXP192/AXP2101", (uint8_t)addr.address)
-#endif
+
             case BME_ADDR:
             case BME_ADDR_ALTERNATE:
                 registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0xD0), 1); // GET_ID
@@ -536,4 +541,4 @@ void ScanI2CTwoWire::logFoundDevice(const char *device, uint8_t address)
 {
     LOG_INFO("%s found at address 0x%x", device, address);
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/input/TCA8418Keyboard.cpp b/src/input/TCA8418Keyboard.cpp
new file mode 100644
index 000000000..21cd7b2d5
--- /dev/null
+++ b/src/input/TCA8418Keyboard.cpp
@@ -0,0 +1,561 @@
+// Based on the MPR121 Keyboard and Adafruit TCA8418 library
+
+#include "TCA8418Keyboard.h"
+#include "configuration.h"
+
+#include <Arduino.h>
+
+// REGISTERS
+// #define _TCA8418_REG_RESERVED 0x00
+#define _TCA8418_REG_CFG 0x01             // Configuration register
+#define _TCA8418_REG_INT_STAT 0x02        // Interrupt status
+#define _TCA8418_REG_KEY_LCK_EC 0x03      // Key lock and event counter
+#define _TCA8418_REG_KEY_EVENT_A 0x04     // Key event register A
+#define _TCA8418_REG_KEY_EVENT_B 0x05     // Key event register B
+#define _TCA8418_REG_KEY_EVENT_C 0x06     // Key event register C
+#define _TCA8418_REG_KEY_EVENT_D 0x07     // Key event register D
+#define _TCA8418_REG_KEY_EVENT_E 0x08     // Key event register E
+#define _TCA8418_REG_KEY_EVENT_F 0x09     // Key event register F
+#define _TCA8418_REG_KEY_EVENT_G 0x0A     // Key event register G
+#define _TCA8418_REG_KEY_EVENT_H 0x0B     // Key event register H
+#define _TCA8418_REG_KEY_EVENT_I 0x0C     // Key event register I
+#define _TCA8418_REG_KEY_EVENT_J 0x0D     // Key event register J
+#define _TCA8418_REG_KP_LCK_TIMER 0x0E    // Keypad lock1 to lock2 timer
+#define _TCA8418_REG_UNLOCK_1 0x0F        // Unlock register 1
+#define _TCA8418_REG_UNLOCK_2 0x10        // Unlock register 2
+#define _TCA8418_REG_GPIO_INT_STAT_1 0x11 // GPIO interrupt status 1
+#define _TCA8418_REG_GPIO_INT_STAT_2 0x12 // GPIO interrupt status 2
+#define _TCA8418_REG_GPIO_INT_STAT_3 0x13 // GPIO interrupt status 3
+#define _TCA8418_REG_GPIO_DAT_STAT_1 0x14 // GPIO data status 1
+#define _TCA8418_REG_GPIO_DAT_STAT_2 0x15 // GPIO data status 2
+#define _TCA8418_REG_GPIO_DAT_STAT_3 0x16 // GPIO data status 3
+#define _TCA8418_REG_GPIO_DAT_OUT_1 0x17  // GPIO data out 1
+#define _TCA8418_REG_GPIO_DAT_OUT_2 0x18  // GPIO data out 2
+#define _TCA8418_REG_GPIO_DAT_OUT_3 0x19  // GPIO data out 3
+#define _TCA8418_REG_GPIO_INT_EN_1 0x1A   // GPIO interrupt enable 1
+#define _TCA8418_REG_GPIO_INT_EN_2 0x1B   // GPIO interrupt enable 2
+#define _TCA8418_REG_GPIO_INT_EN_3 0x1C   // GPIO interrupt enable 3
+#define _TCA8418_REG_KP_GPIO_1 0x1D       // Keypad/GPIO select 1
+#define _TCA8418_REG_KP_GPIO_2 0x1E       // Keypad/GPIO select 2
+#define _TCA8418_REG_KP_GPIO_3 0x1F       // Keypad/GPIO select 3
+#define _TCA8418_REG_GPI_EM_1 0x20        // GPI event mode 1
+#define _TCA8418_REG_GPI_EM_2 0x21        // GPI event mode 2
+#define _TCA8418_REG_GPI_EM_3 0x22        // GPI event mode 3
+#define _TCA8418_REG_GPIO_DIR_1 0x23      // GPIO data direction 1
+#define _TCA8418_REG_GPIO_DIR_2 0x24      // GPIO data direction 2
+#define _TCA8418_REG_GPIO_DIR_3 0x25      // GPIO data direction 3
+#define _TCA8418_REG_GPIO_INT_LVL_1 0x26  // GPIO edge/level detect 1
+#define _TCA8418_REG_GPIO_INT_LVL_2 0x27  // GPIO edge/level detect 2
+#define _TCA8418_REG_GPIO_INT_LVL_3 0x28  // GPIO edge/level detect 3
+#define _TCA8418_REG_DEBOUNCE_DIS_1 0x29  // Debounce disable 1
+#define _TCA8418_REG_DEBOUNCE_DIS_2 0x2A  // Debounce disable 2
+#define _TCA8418_REG_DEBOUNCE_DIS_3 0x2B  // Debounce disable 3
+#define _TCA8418_REG_GPIO_PULL_1 0x2C     // GPIO pull-up disable 1
+#define _TCA8418_REG_GPIO_PULL_2 0x2D     // GPIO pull-up disable 2
+#define _TCA8418_REG_GPIO_PULL_3 0x2E     // GPIO pull-up disable 3
+// #define _TCA8418_REG_RESERVED 0x2F
+
+// FIELDS CONFIG REGISTER  1
+#define _TCA8418_REG_CFG_AI 0x80           // Auto-increment for read/write
+#define _TCA8418_REG_CFG_GPI_E_CGF 0x40    // Event mode config
+#define _TCA8418_REG_CFG_OVR_FLOW_M 0x20   // Overflow mode enable
+#define _TCA8418_REG_CFG_INT_CFG 0x10      // Interrupt config
+#define _TCA8418_REG_CFG_OVR_FLOW_IEN 0x08 // Overflow interrupt enable
+#define _TCA8418_REG_CFG_K_LCK_IEN 0x04    // Keypad lock interrupt enable
+#define _TCA8418_REG_CFG_GPI_IEN 0x02      // GPI interrupt enable
+#define _TCA8418_REG_CFG_KE_IEN 0x01       // Key events interrupt enable
+
+// FIELDS INT_STAT REGISTER  2
+#define _TCA8418_REG_STAT_CAD_INT 0x10      // Ctrl-alt-del seq status
+#define _TCA8418_REG_STAT_OVR_FLOW_INT 0x08 // Overflow interrupt status
+#define _TCA8418_REG_STAT_K_LCK_INT 0x04    // Key lock interrupt status
+#define _TCA8418_REG_STAT_GPI_INT 0x02      // GPI interrupt status
+#define _TCA8418_REG_STAT_K_INT 0x01        // Key events interrupt status
+
+// FIELDS  KEY_LCK_EC REGISTER 3
+#define _TCA8418_REG_LCK_EC_K_LCK_EN 0x40 // Key lock enable
+#define _TCA8418_REG_LCK_EC_LCK_2 0x20    // Keypad lock status 2
+#define _TCA8418_REG_LCK_EC_LCK_1 0x10    // Keypad lock status 1
+#define _TCA8418_REG_LCK_EC_KLEC_3 0x08   // Key event count bit 3
+#define _TCA8418_REG_LCK_EC_KLEC_2 0x04   // Key event count bit 2
+#define _TCA8418_REG_LCK_EC_KLEC_1 0x02   // Key event count bit 1
+#define _TCA8418_REG_LCK_EC_KLEC_0 0x01   // Key event count bit 0
+
+// Pin IDs for matrix rows/columns
+enum {
+    _TCA8418_ROW0, // Pin ID for row 0
+    _TCA8418_ROW1, // Pin ID for row 1
+    _TCA8418_ROW2, // Pin ID for row 2
+    _TCA8418_ROW3, // Pin ID for row 3
+    _TCA8418_ROW4, // Pin ID for row 4
+    _TCA8418_ROW5, // Pin ID for row 5
+    _TCA8418_ROW6, // Pin ID for row 6
+    _TCA8418_ROW7, // Pin ID for row 7
+    _TCA8418_COL0, // Pin ID for column 0
+    _TCA8418_COL1, // Pin ID for column 1
+    _TCA8418_COL2, // Pin ID for column 2
+    _TCA8418_COL3, // Pin ID for column 3
+    _TCA8418_COL4, // Pin ID for column 4
+    _TCA8418_COL5, // Pin ID for column 5
+    _TCA8418_COL6, // Pin ID for column 6
+    _TCA8418_COL7, // Pin ID for column 7
+    _TCA8418_COL8, // Pin ID for column 8
+    _TCA8418_COL9  // Pin ID for column 9
+};
+
+#define _TCA8418_COLS 3
+#define _TCA8418_ROWS 4
+#define _TCA8418_NUM_KEYS 12
+
+uint8_t TCA8418TapMod[_TCA8418_NUM_KEYS] = {13, 7, 7, 7, 7, 7,
+                                            9,  7, 9, 2, 2, 2}; // Num chars per key, Modulus for rotating through characters
+
+unsigned char TCA8418TapMap[_TCA8418_NUM_KEYS][13] = {
+    {'1', '.', ',', '?', '!', ':', ';', '-', '_', '\\', '/', '(', ')'}, // 1
+    {'2', 'a', 'b', 'c', 'A', 'B', 'C'},                                // 2
+    {'3', 'd', 'e', 'f', 'D', 'E', 'F'},                                // 3
+    {'4', 'g', 'h', 'i', 'G', 'H', 'I'},                                // 4
+    {'5', 'j', 'k', 'l', 'J', 'K', 'L'},                                // 5
+    {'6', 'm', 'n', 'o', 'M', 'N', 'O'},                                // 6
+    {'7', 'p', 'q', 'r', 's', 'P', 'Q', 'R', 'S'},                      // 7
+    {'8', 't', 'u', 'v', 'T', 'U', 'V'},                                // 8
+    {'9', 'w', 'x', 'y', 'z', 'W', 'X', 'Y', 'Z'},                      // 9
+    {'*', '+'},                                                         // *
+    {'0', ' '},                                                         // 0
+    {'#', '@'},                                                         // #
+};
+
+unsigned char TCA8418LongPressMap[_TCA8418_NUM_KEYS] = {
+    _TCA8418_ESC,   // 1
+    _TCA8418_UP,    // 2
+    _TCA8418_NONE,  // 3
+    _TCA8418_LEFT,  // 4
+    _TCA8418_NONE,  // 5
+    _TCA8418_RIGHT, // 6
+    _TCA8418_NONE,  // 7
+    _TCA8418_DOWN,  // 8
+    _TCA8418_NONE,  // 9
+    _TCA8418_BSP,   // *
+    _TCA8418_NONE,  // 0
+    _TCA8418_NONE,  // #
+};
+
+#define _TCA8418_LONG_PRESS_THRESHOLD 2000
+#define _TCA8418_MULTI_TAP_THRESHOLD 750
+
+TCA8418Keyboard::TCA8418Keyboard() : m_wire(nullptr), m_addr(0), readCallback(nullptr), writeCallback(nullptr)
+{
+    state = Init;
+    last_key = -1;
+    next_key = -1;
+    should_backspace = false;
+    last_tap = 0L;
+    char_idx = 0;
+    tap_interval = 0;
+    backlight_on = true;
+    queue = "";
+}
+
+void TCA8418Keyboard::begin(uint8_t addr, TwoWire *wire)
+{
+    m_addr = addr;
+    m_wire = wire;
+
+    m_wire->begin();
+
+    reset();
+}
+
+void TCA8418Keyboard::begin(i2c_com_fptr_t r, i2c_com_fptr_t w, uint8_t addr)
+{
+    m_addr = addr;
+    m_wire = nullptr;
+    writeCallback = w;
+    readCallback = r;
+    reset();
+}
+
+void TCA8418Keyboard::reset()
+{
+    LOG_DEBUG("TCA8418 Reset");
+    //  GPIO
+    //  set default all GIO pins to INPUT
+    writeRegister(_TCA8418_REG_GPIO_DIR_1, 0x00);
+    writeRegister(_TCA8418_REG_GPIO_DIR_2, 0x00);
+    // Set COL9 as GPIO output
+    writeRegister(_TCA8418_REG_GPIO_DIR_3, 0x02);
+    // Switch off keyboard backlight (COL9 = LOW)
+    writeRegister(_TCA8418_REG_GPIO_DAT_OUT_3, 0x00);
+
+    //  add all pins to key events
+    writeRegister(_TCA8418_REG_GPI_EM_1, 0xFF);
+    writeRegister(_TCA8418_REG_GPI_EM_2, 0xFF);
+    writeRegister(_TCA8418_REG_GPI_EM_3, 0xFF);
+
+    //  set all pins to FALLING interrupts
+    writeRegister(_TCA8418_REG_GPIO_INT_LVL_1, 0x00);
+    writeRegister(_TCA8418_REG_GPIO_INT_LVL_2, 0x00);
+    writeRegister(_TCA8418_REG_GPIO_INT_LVL_3, 0x00);
+
+    //  add all pins to interrupts
+    writeRegister(_TCA8418_REG_GPIO_INT_EN_1, 0xFF);
+    writeRegister(_TCA8418_REG_GPIO_INT_EN_2, 0xFF);
+    writeRegister(_TCA8418_REG_GPIO_INT_EN_3, 0xFF);
+
+    // Set keyboard matrix size
+    matrix(_TCA8418_ROWS, _TCA8418_COLS);
+    enableDebounce();
+    flush();
+    state = Idle;
+}
+
+bool TCA8418Keyboard::matrix(uint8_t rows, uint8_t columns)
+{
+    if ((rows > 8) || (columns > 10))
+        return false;
+
+    //  Skip zero size matrix
+    if ((rows != 0) && (columns != 0)) {
+        // Setup the keypad matrix.
+        uint8_t mask = 0x00;
+        for (int r = 0; r < rows; r++) {
+            mask <<= 1;
+            mask |= 1;
+        }
+        writeRegister(_TCA8418_REG_KP_GPIO_1, mask);
+
+        mask = 0x00;
+        for (int c = 0; c < columns && c < 8; c++) {
+            mask <<= 1;
+            mask |= 1;
+        }
+        writeRegister(_TCA8418_REG_KP_GPIO_2, mask);
+
+        if (columns > 8) {
+            if (columns == 9)
+                mask = 0x01;
+            else
+                mask = 0x03;
+            writeRegister(_TCA8418_REG_KP_GPIO_3, mask);
+        }
+    }
+
+    return true;
+}
+
+uint8_t TCA8418Keyboard::keyCount() const
+{
+    uint8_t eventCount = readRegister(_TCA8418_REG_KEY_LCK_EC);
+    eventCount &= 0x0F; //  lower 4 bits only
+    return eventCount;
+}
+
+bool TCA8418Keyboard::hasEvent()
+{
+    return queue.length() > 0;
+}
+
+void TCA8418Keyboard::queueEvent(char next)
+{
+    if (next == _TCA8418_NONE) {
+        return;
+    }
+    queue.concat(next);
+}
+
+char TCA8418Keyboard::dequeueEvent()
+{
+    if (queue.length() < 1) {
+        return _TCA8418_NONE;
+    }
+    char next = queue.charAt(0);
+    queue.remove(0, 1);
+    return next;
+}
+
+void TCA8418Keyboard::trigger()
+{
+    if (keyCount() == 0) {
+        return;
+    }
+    if (state != Init) {
+        // Read the key register
+        uint8_t k = readRegister(_TCA8418_REG_KEY_EVENT_A);
+        uint8_t key = k & 0x7F;
+        if (k & 0x80) {
+            if (state == Idle)
+                pressed(key);
+            return;
+        } else {
+            if (state == Held) {
+                released();
+            }
+            state = Idle;
+            return;
+        }
+    } else {
+        reset();
+    }
+}
+
+void TCA8418Keyboard::pressed(uint8_t key)
+{
+    if (state == Init || state == Busy) {
+        return;
+    }
+    uint8_t next_key = 0;
+    int row = (key - 1) / 10;
+    int col = (key - 1) % 10;
+
+    if (row >= _TCA8418_ROWS || col >= _TCA8418_COLS) {
+        return; // Invalid key
+    }
+
+    // Compute key index based on dynamic row/column
+    next_key = row * _TCA8418_COLS + col;
+
+    // LOG_DEBUG("TCA8418: Key %u -> Next Key %u", key, next_key);
+
+    state = Held;
+    uint32_t now = millis();
+    tap_interval = now - last_tap;
+    if (tap_interval < 0) {
+        // Long running, millis has overflowed.
+        last_tap = 0;
+        state = Busy;
+        return;
+    }
+
+    // Check if the key is the same as the last one or if the time interval has passed
+    if (next_key != last_key || tap_interval > _TCA8418_MULTI_TAP_THRESHOLD) {
+        char_idx = 0;             // Reset char index if new key or long press
+        should_backspace = false; // dont backspace on new key
+    } else {
+        char_idx += 1;           // Cycle through characters if same key pressed
+        should_backspace = true; // allow backspace on same key
+    }
+
+    // Store the current key as the last key
+    last_key = next_key;
+    last_tap = now;
+}
+
+void TCA8418Keyboard::released()
+{
+    if (state != Held) {
+        return;
+    }
+
+    if (last_key < 0 || last_key > _TCA8418_NUM_KEYS) { // reset to idle if last_key out of bounds
+        last_key = -1;
+        state = Idle;
+        return;
+    }
+    uint32_t now = millis();
+    int32_t held_interval = now - last_tap;
+    last_tap = now;
+    if (tap_interval < _TCA8418_MULTI_TAP_THRESHOLD && should_backspace) {
+        queueEvent(_TCA8418_BSP);
+    }
+    if (held_interval > _TCA8418_LONG_PRESS_THRESHOLD) {
+        queueEvent(TCA8418LongPressMap[last_key]);
+        // LOG_DEBUG("Long Press Key: %i Map: %i", last_key, TCA8418LongPressMap[last_key]);
+    } else {
+        queueEvent(TCA8418TapMap[last_key][(char_idx % TCA8418TapMod[last_key])]);
+        // LOG_DEBUG("Key Press: %i Index:%i if %i Map: %c", last_key, char_idx, TCA8418TapMod[last_key],
+        //           TCA8418TapMap[last_key][(char_idx % TCA8418TapMod[last_key])]);
+    }
+}
+
+uint8_t TCA8418Keyboard::flush()
+{
+    // Flush key events
+    uint8_t count = 0;
+    while (readRegister(_TCA8418_REG_KEY_EVENT_A) != 0)
+        count++;
+    // Flush gpio events
+    readRegister(_TCA8418_REG_GPIO_INT_STAT_1);
+    readRegister(_TCA8418_REG_GPIO_INT_STAT_2);
+    readRegister(_TCA8418_REG_GPIO_INT_STAT_3);
+    // Clear INT_STAT register
+    writeRegister(_TCA8418_REG_INT_STAT, 3);
+    return count;
+}
+
+uint8_t TCA8418Keyboard::digitalRead(uint8_t pinnum) const
+{
+    if (pinnum > _TCA8418_COL9)
+        return 0xFF;
+
+    uint8_t reg = _TCA8418_REG_GPIO_DAT_STAT_1 + pinnum / 8;
+    uint8_t mask = (1 << (pinnum % 8));
+
+    // Level  0 = low  other = high
+    uint8_t value = readRegister(reg);
+    if (value & mask)
+        return HIGH;
+    return LOW;
+}
+
+bool TCA8418Keyboard::digitalWrite(uint8_t pinnum, uint8_t level)
+{
+    if (pinnum > _TCA8418_COL9)
+        return false;
+
+    uint8_t reg = _TCA8418_REG_GPIO_DAT_OUT_1 + pinnum / 8;
+    uint8_t mask = (1 << (pinnum % 8));
+
+    // Level  0 = low  other = high
+    uint8_t value = readRegister(reg);
+    if (level == LOW)
+        value &= ~mask;
+    else
+        value |= mask;
+    writeRegister(reg, value);
+    return true;
+}
+
+bool TCA8418Keyboard::pinMode(uint8_t pinnum, uint8_t mode)
+{
+    if (pinnum > _TCA8418_COL9)
+        return false;
+
+    uint8_t idx = pinnum / 8;
+    uint8_t reg = _TCA8418_REG_GPIO_DIR_1 + idx;
+    uint8_t mask = (1 << (pinnum % 8));
+
+    // Mode  0 = input   1 = output
+    uint8_t value = readRegister(reg);
+    if (mode == OUTPUT)
+        value |= mask;
+    else
+        value &= ~mask;
+    writeRegister(reg, value);
+
+    // Pullup  0 = enabled   1 = disabled
+    reg = _TCA8418_REG_GPIO_PULL_1 + idx;
+    value = readRegister(reg);
+    if (mode == INPUT_PULLUP)
+        value &= ~mask;
+    else
+        value |= mask;
+    writeRegister(reg, value);
+
+    return true;
+}
+
+bool TCA8418Keyboard::pinIRQMode(uint8_t pinnum, uint8_t mode)
+{
+    if (pinnum > _TCA8418_COL9)
+        return false;
+    if ((mode != RISING) && (mode != FALLING))
+        return false;
+
+    //  Mode  0 = falling   1 = rising
+    uint8_t idx = pinnum / 8;
+    uint8_t reg = _TCA8418_REG_GPIO_INT_LVL_1 + idx;
+    uint8_t mask = (1 << (pinnum % 8));
+
+    uint8_t value = readRegister(reg);
+    if (mode == RISING)
+        value |= mask;
+    else
+        value &= ~mask;
+    writeRegister(reg, value);
+
+    // Enable interrupt
+    reg = _TCA8418_REG_GPIO_INT_EN_1 + idx;
+    value = readRegister(reg);
+    value |= mask;
+    writeRegister(reg, value);
+
+    return true;
+}
+
+void TCA8418Keyboard::enableInterrupts()
+{
+    uint8_t value = readRegister(_TCA8418_REG_CFG);
+    value |= (_TCA8418_REG_CFG_GPI_IEN | _TCA8418_REG_CFG_KE_IEN);
+    writeRegister(_TCA8418_REG_CFG, value);
+};
+
+void TCA8418Keyboard::disableInterrupts()
+{
+    uint8_t value = readRegister(_TCA8418_REG_CFG);
+    value &= ~(_TCA8418_REG_CFG_GPI_IEN | _TCA8418_REG_CFG_KE_IEN);
+    writeRegister(_TCA8418_REG_CFG, value);
+};
+
+void TCA8418Keyboard::enableMatrixOverflow()
+{
+    uint8_t value = readRegister(_TCA8418_REG_CFG);
+    value |= _TCA8418_REG_CFG_OVR_FLOW_M;
+    writeRegister(_TCA8418_REG_CFG, value);
+};
+
+void TCA8418Keyboard::disableMatrixOverflow()
+{
+    uint8_t value = readRegister(_TCA8418_REG_CFG);
+    value &= ~_TCA8418_REG_CFG_OVR_FLOW_M;
+    writeRegister(_TCA8418_REG_CFG, value);
+};
+
+void TCA8418Keyboard::enableDebounce()
+{
+    writeRegister(_TCA8418_REG_DEBOUNCE_DIS_1, 0x00);
+    writeRegister(_TCA8418_REG_DEBOUNCE_DIS_2, 0x00);
+    writeRegister(_TCA8418_REG_DEBOUNCE_DIS_3, 0x00);
+}
+
+void TCA8418Keyboard::disableDebounce()
+{
+    writeRegister(_TCA8418_REG_DEBOUNCE_DIS_1, 0xFF);
+    writeRegister(_TCA8418_REG_DEBOUNCE_DIS_2, 0xFF);
+    writeRegister(_TCA8418_REG_DEBOUNCE_DIS_3, 0xFF);
+}
+
+void TCA8418Keyboard::setBacklight(bool on)
+{
+    if (on) {
+        digitalWrite(_TCA8418_COL9, HIGH);
+    } else {
+        digitalWrite(_TCA8418_COL9, LOW);
+    }
+}
+
+uint8_t TCA8418Keyboard::readRegister(uint8_t reg) const
+{
+    if (m_wire) {
+        m_wire->beginTransmission(m_addr);
+        m_wire->write(reg);
+        m_wire->endTransmission();
+
+        m_wire->requestFrom(m_addr, (uint8_t)1);
+        if (m_wire->available() < 1)
+            return 0;
+
+        return m_wire->read();
+    }
+    if (readCallback) {
+        uint8_t data;
+        readCallback(m_addr, reg, &data, 1);
+        return data;
+    }
+    return 0;
+}
+
+void TCA8418Keyboard::writeRegister(uint8_t reg, uint8_t value)
+{
+    uint8_t data[2];
+    data[0] = reg;
+    data[1] = value;
+
+    if (m_wire) {
+        m_wire->beginTransmission(m_addr);
+        m_wire->write(data, sizeof(uint8_t) * 2);
+        m_wire->endTransmission();
+    }
+    if (writeCallback) {
+        writeCallback(m_addr, data[0], &(data[1]), 1);
+    }
+}
\ No newline at end of file
diff --git a/src/input/TCA8418Keyboard.h b/src/input/TCA8418Keyboard.h
new file mode 100644
index 000000000..c7f3c1f28
--- /dev/null
+++ b/src/input/TCA8418Keyboard.h
@@ -0,0 +1,83 @@
+// Based on the MPR121 Keyboard and Adafruit TCA8418 library
+#include "configuration.h"
+#include <Wire.h>
+
+#define _TCA8418_NONE 0x00
+#define _TCA8418_REBOOT 0x90
+#define _TCA8418_LEFT 0xb4
+#define _TCA8418_UP 0xb5
+#define _TCA8418_DOWN 0xb6
+#define _TCA8418_RIGHT 0xb7
+#define _TCA8418_ESC 0x1b
+#define _TCA8418_BSP 0x08
+#define _TCA8418_SELECT 0x0d
+
+class TCA8418Keyboard
+{
+  public:
+    typedef uint8_t (*i2c_com_fptr_t)(uint8_t dev_addr, uint8_t reg_addr, uint8_t *data, uint8_t len);
+
+    enum KeyState { Init = 0, Idle, Held, Busy };
+
+    KeyState state;
+    int8_t last_key;
+    int8_t next_key;
+    bool should_backspace;
+    uint32_t last_tap;
+    uint8_t char_idx;
+    int32_t tap_interval;
+    bool backlight_on;
+
+    String queue;
+
+    TCA8418Keyboard();
+
+    void begin(uint8_t addr = XPOWERS_AXP192_AXP2101_ADDRESS, TwoWire *wire = &Wire);
+    void begin(i2c_com_fptr_t r, i2c_com_fptr_t w, uint8_t addr = XPOWERS_AXP192_AXP2101_ADDRESS);
+
+    void reset(void);
+    // Configure the size of the keypad.
+    // All other rows and columns are set as inputs.
+    bool matrix(uint8_t rows, uint8_t columns);
+
+    // Flush all events in the FIFO buffer + GPIO events.
+    uint8_t flush(void);
+
+    // Key events available in the internal FIFO buffer.
+    uint8_t keyCount(void) const;
+
+    void trigger(void);
+    void pressed(uint8_t key);
+    void released(void);
+    bool hasEvent(void);
+    char dequeueEvent(void);
+    void queueEvent(char);
+
+    uint8_t digitalRead(uint8_t pinnum) const;
+    bool digitalWrite(uint8_t pinnum, uint8_t level);
+    bool pinMode(uint8_t pinnum, uint8_t mode);
+    bool pinIRQMode(uint8_t pinnum, uint8_t mode); // MODE  FALLING or RISING
+
+    // enable / disable interrupts for matrix and GPI pins
+    void enableInterrupts();
+    void disableInterrupts();
+
+    // ignore key events when FIFO buffer is full or not.
+    void enableMatrixOverflow();
+    void disableMatrixOverflow();
+
+    // debounce keys.
+    void enableDebounce();
+    void disableDebounce();
+
+    void setBacklight(bool on);
+
+    uint8_t readRegister(uint8_t reg) const;
+    void writeRegister(uint8_t reg, uint8_t value);
+
+  private:
+    TwoWire *m_wire;
+    uint8_t m_addr;
+    i2c_com_fptr_t readCallback;
+    i2c_com_fptr_t writeCallback;
+};
diff --git a/src/input/cardKbI2cImpl.cpp b/src/input/cardKbI2cImpl.cpp
index eb9b07d6e..0d661811b 100644
--- a/src/input/cardKbI2cImpl.cpp
+++ b/src/input/cardKbI2cImpl.cpp
@@ -12,8 +12,8 @@ void CardKbI2cImpl::init()
 #if !MESHTASTIC_EXCLUDE_I2C && !defined(ARCH_PORTDUINO) && !defined(I2C_NO_RESCAN)
     if (cardkb_found.address == 0x00) {
         LOG_DEBUG("Rescan for I2C keyboard");
-        uint8_t i2caddr_scan[] = {CARDKB_ADDR, TDECK_KB_ADDR, BBQ10_KB_ADDR, MPR121_KB_ADDR};
-        uint8_t i2caddr_asize = 4;
+        uint8_t i2caddr_scan[] = {CARDKB_ADDR, TDECK_KB_ADDR, BBQ10_KB_ADDR, MPR121_KB_ADDR, XPOWERS_AXP192_AXP2101_ADDRESS};
+        uint8_t i2caddr_asize = 5;
         auto i2cScanner = std::unique_ptr<ScanI2CTwoWire>(new ScanI2CTwoWire());
 
 #if WIRE_INTERFACES_COUNT == 2
@@ -43,6 +43,10 @@ void CardKbI2cImpl::init()
                 // assign an arbitrary value to distinguish from other models
                 kb_model = 0x37;
                 break;
+            case ScanI2C::DeviceType::TCA8418KB:
+                // assign an arbitrary value to distinguish from other models
+                kb_model = 0x84;
+                break;
             default:
                 // use this as default since it's also just zero
                 LOG_WARN("kb_info.type is unknown(0x%02x), setting kb_model=0x00", kb_info.type);
@@ -63,4 +67,4 @@ void CardKbI2cImpl::init()
     }
 #endif
     inputBroker->registerSource(this);
-}
\ No newline at end of file
+}
diff --git a/src/input/kbI2cBase.cpp b/src/input/kbI2cBase.cpp
index 9b1a27745..daccc6622 100644
--- a/src/input/kbI2cBase.cpp
+++ b/src/input/kbI2cBase.cpp
@@ -43,6 +43,9 @@ int32_t KbI2cBase::runOnce()
             if (cardkb_found.address == MPR121_KB_ADDR) {
                 MPRkeyboard.begin(MPR121_KB_ADDR, &Wire1);
             }
+            if (cardkb_found.address == XPOWERS_AXP192_AXP2101_ADDRESS) {
+                TCAKeyboard.begin(XPOWERS_AXP192_AXP2101_ADDRESS, &Wire1);
+            }
             break;
 #endif
         case ScanI2C::WIRE:
@@ -55,6 +58,9 @@ int32_t KbI2cBase::runOnce()
             if (cardkb_found.address == MPR121_KB_ADDR) {
                 MPRkeyboard.begin(MPR121_KB_ADDR, &Wire);
             }
+            if (cardkb_found.address == XPOWERS_AXP192_AXP2101_ADDRESS) {
+                TCAKeyboard.begin(XPOWERS_AXP192_AXP2101_ADDRESS, &Wire);
+            }
             break;
         case ScanI2C::NO_I2C:
         default:
@@ -163,6 +169,70 @@ int32_t KbI2cBase::runOnce()
         }
         break;
     }
+
+    case 0x84: { // Adafruit TCA8418
+        TCAKeyboard.trigger();
+        InputEvent e;
+        while (TCAKeyboard.hasEvent()) {
+            char nextEvent = TCAKeyboard.dequeueEvent();
+            e.inputEvent = ANYKEY;
+            e.kbchar = 0x00;
+            e.source = this->_originName;
+            switch (nextEvent) {
+            case _TCA8418_NONE:
+                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+                e.kbchar = 0x00;
+                break;
+            case _TCA8418_REBOOT:
+                e.inputEvent = ANYKEY;
+                e.kbchar = INPUT_BROKER_MSG_REBOOT;
+                break;
+            case _TCA8418_LEFT:
+                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT;
+                e.kbchar = 0x00;
+                break;
+            case _TCA8418_UP:
+                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP;
+                e.kbchar = 0x00;
+                break;
+            case _TCA8418_DOWN:
+                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN;
+                e.kbchar = 0x00;
+                break;
+            case _TCA8418_RIGHT:
+                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT;
+                e.kbchar = 0x00;
+                break;
+            case _TCA8418_BSP:
+                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_BACK;
+                e.kbchar = 0x08;
+                break;
+            case _TCA8418_SELECT:
+                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT;
+                e.kbchar = 0x0d;
+                break;
+            case _TCA8418_ESC:
+                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_CANCEL;
+                e.kbchar = 0x1b;
+                break;
+            default:
+                if (nextEvent > 127) {
+                    e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+                    e.kbchar = 0x00;
+                    break;
+                }
+                e.inputEvent = ANYKEY;
+                e.kbchar = nextEvent;
+                break;
+            }
+            if (e.inputEvent != meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE) {
+                LOG_DEBUG("TCA8418 Notifying: %i Char: %c", e.inputEvent, e.kbchar);
+                this->notifyObservers(&e);
+            }
+        }
+        break;
+    }
+
     case 0x37: { // MPR121
         MPRkeyboard.trigger();
         InputEvent e;
diff --git a/src/input/kbI2cBase.h b/src/input/kbI2cBase.h
index dc2414fc0..d5831aafa 100644
--- a/src/input/kbI2cBase.h
+++ b/src/input/kbI2cBase.h
@@ -3,6 +3,7 @@
 #include "BBQ10Keyboard.h"
 #include "InputBroker.h"
 #include "MPR121Keyboard.h"
+#include "TCA8418Keyboard.h"
 #include "Wire.h"
 #include "concurrency/OSThread.h"
 
@@ -21,5 +22,6 @@ class KbI2cBase : public Observable<const InputEvent *>, public concurrency::OST
 
     BBQ10Keyboard Q10keyboard;
     MPR121Keyboard MPRkeyboard;
+    TCA8418Keyboard TCAKeyboard;
     bool is_sym = false;
-};
\ No newline at end of file
+};
diff --git a/src/main.cpp b/src/main.cpp
index e9e0c9d4b..104982783 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -568,6 +568,10 @@ void setup()
             // assign an arbitrary value to distinguish from other models
             kb_model = 0x37;
             break;
+        case ScanI2C::DeviceType::TCA8418KB:
+            // assign an arbitrary value to distinguish from other models
+            kb_model = 0x84;
+            break;
         default:
             // use this as default since it's also just zero
             LOG_WARN("kb_info.type is unknown(0x%02x), setting kb_model=0x00", kb_info.type);

From 6429eca5e47aa1d438012a9886632a5cdbbec898 Mon Sep 17 00:00:00 2001
From: Jorropo <jorropo.pgm@gmail.com>
Date: Wed, 26 Mar 2025 08:10:56 +0100
Subject: [PATCH 072/116] udp-multicast: do not listen for incoming udp
 multicast packets if disabled (#6397)

Currently the config flag only control if packets are sent, not received.

As we discussed in VC this is not what was intended.
---
 src/main.cpp                   | 4 +++-
 src/mesh/wifi/WiFiAPClient.cpp | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 104982783..f65c3fcd1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -829,7 +829,9 @@ void setup()
 #ifdef ARCH_PORTDUINO
     // FIXME: portduino does not ever call onNetworkConnected so call it here because I don't know what happen if I call
     // onNetworkConnected there
-    udpThread->start();
+    if (config.network.enabled_protocols & meshtastic_Config_NetworkConfig_ProtocolFlags_UDP_BROADCAST) {
+        udpThread->start();
+    }
 #endif
 #endif
     service = new MeshService();
diff --git a/src/mesh/wifi/WiFiAPClient.cpp b/src/mesh/wifi/WiFiAPClient.cpp
index 92388d52a..4d0b74f7c 100644
--- a/src/mesh/wifi/WiFiAPClient.cpp
+++ b/src/mesh/wifi/WiFiAPClient.cpp
@@ -133,7 +133,7 @@ static void onNetworkConnected()
     }
 
 #if HAS_UDP_MULTICAST
-    if (udpThread) {
+    if (udpThread && config.network.enabled_protocols & meshtastic_Config_NetworkConfig_ProtocolFlags_UDP_BROADCAST) {
         udpThread->start();
     }
 #endif

From 83d8e3cb098cc536d5fb221bcdb1780b48fb277e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 26 Mar 2025 06:07:22 -0500
Subject: [PATCH 073/116] Upgrade trunk (#6398)

Co-authored-by: sachaw <11172820+sachaw@users.noreply.github.com>
---
 .trunk/trunk.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
index b44f46a51..71d37bc2e 100644
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -10,13 +10,13 @@ lint:
   enabled:
     - prettier@3.5.3
     - trufflehog@3.88.18
-    - yamllint@1.36.2
+    - yamllint@1.37.0
     - bandit@1.8.3
-    - checkov@3.2.390
+    - checkov@3.2.392
     - terrascan@1.19.9
     - trivy@0.60.0
     - taplo@0.9.3
-    - ruff@0.11.1
+    - ruff@0.11.2
     - isort@6.0.1
     - markdownlint@0.44.0
     - oxipng@9.1.4
@@ -28,7 +28,7 @@ lint:
     - shellcheck@0.10.0
     - black@25.1.0
     - git-diff-check
-    - gitleaks@8.24.0
+    - gitleaks@8.24.2
     - clang-format@16.0.3
   ignore:
     - linters: [ALL]

From ba81a8ad878ca6e01e0e52df361d9e1c5e6e78b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Wed, 26 Mar 2025 15:02:53 +0100
Subject: [PATCH 074/116] Fix default pin assignment

---
 src/configuration.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/configuration.h b/src/configuration.h
index d9da09108..56c3ac2a8 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -110,11 +110,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Define if screen should be mirrored left to right
 // #define SCREEN_MIRROR
 
-// Define BUTTON_PIN to ensure button setup is always done
-#ifndef BUTTON_PIN
-#define BUTTON_PIN (-1)
-#endif
-
 // I2C Keyboards (M5Stack, RAK14004, T-Deck)
 #define CARDKB_ADDR 0x5F
 #define TDECK_KB_ADDR 0x55
@@ -203,6 +198,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Step #1: offer chance for variant-specific defines */
 #include "variant.h"
 
+// Define BUTTON_PIN to ensure button setup is always done
+#ifndef BUTTON_PIN
+#define BUTTON_PIN (-1)
+#endif
+
 #if defined(VEXT_ENABLE) && !defined(VEXT_ON_VALUE)
 // Older variant.h files might not be defining this value, so stay with the old default
 #define VEXT_ON_VALUE LOW

From 640e731ad2a903c0e3a1651e6483da68f694346e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Wed, 26 Mar 2025 15:18:21 +0100
Subject: [PATCH 075/116] Remove button fix for further investigation

---
 src/configuration.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/configuration.h b/src/configuration.h
index 56c3ac2a8..d5aacdbd2 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -198,11 +198,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Step #1: offer chance for variant-specific defines */
 #include "variant.h"
 
-// Define BUTTON_PIN to ensure button setup is always done
-#ifndef BUTTON_PIN
-#define BUTTON_PIN (-1)
-#endif
-
 #if defined(VEXT_ENABLE) && !defined(VEXT_ON_VALUE)
 // Older variant.h files might not be defining this value, so stay with the old default
 #define VEXT_ON_VALUE LOW
@@ -375,4 +370,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 #include "DebugConfiguration.h"
-#include "RF95Configuration.h"
\ No newline at end of file
+#include "RF95Configuration.h"

From 6c17694b64a391b06bded312f063d0e480380a81 Mon Sep 17 00:00:00 2001
From: Mark Trevor Birss <markbirss@gmail.com>
Date: Thu, 27 Mar 2025 11:06:41 +0200
Subject: [PATCH 076/116] CrowPanel e-Ink Updates for 4.2 and 2.9 inch (#6401)

* Update platformio.ini

* Update EInkDisplay2.cpp

* Update EInkDisplay2.h
---
 src/graphics/EInkDisplay2.cpp                      | 5 +++--
 src/graphics/EInkDisplay2.h                        | 3 ++-
 variants/crowpanel-esp32s3-5-epaper/platformio.ini | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/graphics/EInkDisplay2.cpp b/src/graphics/EInkDisplay2.cpp
index a640e3560..1bf1bc300 100644
--- a/src/graphics/EInkDisplay2.cpp
+++ b/src/graphics/EInkDisplay2.cpp
@@ -166,7 +166,8 @@ bool EInkDisplay::connect()
     }
 
 #elif defined(HELTEC_WIRELESS_PAPER_V1_0) || defined(HELTEC_WIRELESS_PAPER) || defined(HELTEC_VISION_MASTER_E213) ||             \
-    defined(HELTEC_VISION_MASTER_E290) || defined(TLORA_T3S3_EPAPER) || defined(CROWPANEL_ESP32S3_5_EPAPER)
+    defined(HELTEC_VISION_MASTER_E290) || defined(TLORA_T3S3_EPAPER) || defined(CROWPANEL_ESP32S3_5_EPAPER) ||                   \
+    defined(CROWPANEL_ESP32S3_4_EPAPER) || defined(CROWPANEL_ESP32S3_2_EPAPER)
     {
         // Start HSPI
         hspi = new SPIClass(HSPI);
@@ -182,7 +183,7 @@ bool EInkDisplay::connect()
         // Init GxEPD2
         adafruitDisplay->init();
         adafruitDisplay->setRotation(3);
-#if defined(CROWPANEL_ESP32S3_5_EPAPER)
+#if defined(CROWPANEL_ESP32S3_5_EPAPER) || defined(CROWPANEL_ESP32S3_4_EPAPER)
         adafruitDisplay->setRotation(0);
 #endif
     }
diff --git a/src/graphics/EInkDisplay2.h b/src/graphics/EInkDisplay2.h
index efbf45f0f..9c1c8d18e 100644
--- a/src/graphics/EInkDisplay2.h
+++ b/src/graphics/EInkDisplay2.h
@@ -68,7 +68,8 @@ class EInkDisplay : public OLEDDisplay
 
     // If display uses HSPI
 #if defined(HELTEC_WIRELESS_PAPER) || defined(HELTEC_WIRELESS_PAPER_V1_0) || defined(HELTEC_VISION_MASTER_E213) ||               \
-    defined(HELTEC_VISION_MASTER_E290) || defined(TLORA_T3S3_EPAPER) || defined(CROWPANEL_ESP32S3_5_EPAPER)
+    defined(HELTEC_VISION_MASTER_E290) || defined(TLORA_T3S3_EPAPER) || defined(CROWPANEL_ESP32S3_5_EPAPER) ||                   \
+    defined(CROWPANEL_ESP32S3_4_EPAPER) || defined(CROWPANEL_ESP32S3_2_EPAPER)
     SPIClass *hspi = NULL;
 #endif
 
diff --git a/variants/crowpanel-esp32s3-5-epaper/platformio.ini b/variants/crowpanel-esp32s3-5-epaper/platformio.ini
index 36816d616..c9786690b 100644
--- a/variants/crowpanel-esp32s3-5-epaper/platformio.ini
+++ b/variants/crowpanel-esp32s3-5-epaper/platformio.ini
@@ -39,7 +39,7 @@ board = esp32-s3-devkitc-1
 board_level = extra
 upload_protocol = esptool
 build_flags = 
-  ${esp32_base.build_flags} -D CROWPANEL_ESP32S3_5_EPAPER -I variants/crowpanel-esp32s3-5-epaper
+  ${esp32_base.build_flags} -D CROWPANEL_ESP32S3_4_EPAPER -I variants/crowpanel-esp32s3-5-epaper
   -D PRIVATE_HW
   -DBOARD_HAS_PSRAM
   -DGPS_POWER_TOGGLE
@@ -67,7 +67,7 @@ board = esp32-s3-devkitc-1
 board_level = extra
 upload_protocol = esptool
 build_flags = 
-  ${esp32_base.build_flags} -D CROWPANEL_ESP32S3_5_EPAPER -I variants/crowpanel-esp32s3-5-epaper
+  ${esp32_base.build_flags} -D CROWPANEL_ESP32S3_2_EPAPER -I variants/crowpanel-esp32s3-5-epaper
   -D PRIVATE_HW
   -DBOARD_HAS_PSRAM
   -DGPS_POWER_TOGGLE

From 52527b24a72bb4552ce0000e1919cc71a30ae1db Mon Sep 17 00:00:00 2001
From: Mark Trevor Birss <markbirss@gmail.com>
Date: Thu, 27 Mar 2025 12:02:27 +0200
Subject: [PATCH 077/116] Update lora-Adafruit-RFM9x (#6402)

* Update lora-Adafruit-RFM9x

* Update variant.h

* Update variant.h
---
 bin/config.d/lora-Adafruit-RFM9x | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/bin/config.d/lora-Adafruit-RFM9x b/bin/config.d/lora-Adafruit-RFM9x
index 2d64f1f91..20295dc72 100644
--- a/bin/config.d/lora-Adafruit-RFM9x
+++ b/bin/config.d/lora-Adafruit-RFM9x
@@ -1,5 +1,6 @@
-#  Module: RF95  # Adafruit RFM9x
-#  Reset: 25
-#  CS: 7
-#  IRQ: 22
-#  Busy: 23
\ No newline at end of file
+Lora:
+  Module: RF95  # Adafruit RFM9x
+  Reset: 25
+  CS: 7
+  IRQ: 22
+#  Busy: 23

From 769f0623be6a7d7503c56bc1b6e468114dacdff0 Mon Sep 17 00:00:00 2001
From: Austin <vidplace7@gmail.com>
Date: Thu, 27 Mar 2025 08:46:16 -0400
Subject: [PATCH 078/116] Fix: T-Watch-S3 has 8MB Flash (#6407)

---
 bin/device-install.bat             | 4 ++--
 bin/device-install.sh              | 2 +-
 variants/t-watch-s3/platformio.ini | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/device-install.bat b/bin/device-install.bat
index 3ffca0b63..594d973f5 100755
--- a/bin/device-install.bat
+++ b/bin/device-install.bat
@@ -17,8 +17,8 @@ SET "LOGCOUNTER=0"
 SET "S3=s3 v3 t-deck wireless-paper wireless-tracker station-g2 unphone"
 SET "C3=esp32c3"
 @REM FIXME: Determine flash size from PlatformIO variant, this is unmaintainable.
-SET "BIGDB_8MB=picomputer-s3 unphone seeed-sensecap-indicator crowpanel-esp32s3 heltec_capsule_sensor_v3 heltec-v3 heltec-vision-master-e213 heltec-vision-master-e290 heltec-vision-master-t190 heltec-wireless-paper heltec-wireless-tracker heltec-wsl-v3 icarus seeed-xiao-s3 tbeam-s3-core tracksenger"
-SET "BIGDB_16MB=t-deck mesh-tab t-energy-s3 dreamcatcher ESP32-S3-Pico m5stack-cores3 station-g2 t-eth-elite t-watch-s3"
+SET "BIGDB_8MB=picomputer-s3 unphone seeed-sensecap-indicator crowpanel-esp32s3 heltec_capsule_sensor_v3 heltec-v3 heltec-vision-master-e213 heltec-vision-master-e290 heltec-vision-master-t190 heltec-wireless-paper heltec-wireless-tracker heltec-wsl-v3 icarus seeed-xiao-s3 tbeam-s3-core t-watch-s3 tracksenger"
+SET "BIGDB_16MB=t-deck mesh-tab t-energy-s3 dreamcatcher ESP32-S3-Pico m5stack-cores3 station-g2 t-eth-elite"
 
 GOTO getopts
 :help
diff --git a/bin/device-install.sh b/bin/device-install.sh
index b5322b9d1..bacf48f69 100755
--- a/bin/device-install.sh
+++ b/bin/device-install.sh
@@ -22,6 +22,7 @@ BIGDB_8MB=(
 	"icarus"
 	"seeed-xiao-s3"
 	"tbeam-s3-core"
+	"t-watch-s3"
 	"tracksenger"
 )
 BIGDB_16MB=(
@@ -33,7 +34,6 @@ BIGDB_16MB=(
 	"m5stack-cores3"
 	"station-g2"
 	"t-eth-elite"
-	"t-watch-s3"
 )
 S3_VARIANTS=(
 	"s3"
diff --git a/variants/t-watch-s3/platformio.ini b/variants/t-watch-s3/platformio.ini
index f98237943..d650b1f11 100644
--- a/variants/t-watch-s3/platformio.ini
+++ b/variants/t-watch-s3/platformio.ini
@@ -3,7 +3,7 @@
 extends = esp32s3_base
 board = t-watch-s3
 board_check = true
-board_build.partitions = default_16MB.csv
+board_build.partitions = default_8MB.csv
 upload_protocol = esptool
 
 build_flags = ${esp32_base.build_flags} 

From 4590ef2e7b16cb7e745691d1b358f7f92fbfe570 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Thu, 27 Mar 2025 08:31:57 -0500
Subject: [PATCH 079/116] Revert "TCA8418 initial config + basic 3x4 keypad
 config (#6320)" (#6410)

This reverts commit 13101c1bab2066998779856812bea47e7d0b148a.
---
 src/configuration.h           |   1 -
 src/detect/ScanI2C.cpp        |   6 +-
 src/detect/ScanI2C.h          |   5 +-
 src/detect/ScanI2CTwoWire.cpp |  23 +-
 src/input/TCA8418Keyboard.cpp | 561 ----------------------------------
 src/input/TCA8418Keyboard.h   |  83 -----
 src/input/cardKbI2cImpl.cpp   |  10 +-
 src/input/kbI2cBase.cpp       |  70 -----
 src/input/kbI2cBase.h         |   4 +-
 src/main.cpp                  |   4 -
 10 files changed, 18 insertions(+), 749 deletions(-)
 delete mode 100644 src/input/TCA8418Keyboard.cpp
 delete mode 100644 src/input/TCA8418Keyboard.h

diff --git a/src/configuration.h b/src/configuration.h
index d5aacdbd2..fd4a5b196 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -152,7 +152,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MLX90614_ADDR_DEF 0x5A
 #define CGRADSENS_ADDR 0x66
 #define LTR390UV_ADDR 0x53
-#define XPOWERS_AXP192_AXP2101_ADDRESS 0x34 // same adress as TCA8418
 
 // -----------------------------------------------------------------------------
 // ACCELEROMETER
diff --git a/src/detect/ScanI2C.cpp b/src/detect/ScanI2C.cpp
index 58e87b1c5..4caa0f730 100644
--- a/src/detect/ScanI2C.cpp
+++ b/src/detect/ScanI2C.cpp
@@ -31,8 +31,8 @@ ScanI2C::FoundDevice ScanI2C::firstRTC() const
 
 ScanI2C::FoundDevice ScanI2C::firstKeyboard() const
 {
-    ScanI2C::DeviceType types[] = {CARDKB, TDECKKB, BBQ10KB, RAK14004, MPR121KB, TCA8418KB};
-    return firstOfOrNONE(6, types);
+    ScanI2C::DeviceType types[] = {CARDKB, TDECKKB, BBQ10KB, RAK14004, MPR121KB};
+    return firstOfOrNONE(5, types);
 }
 
 ScanI2C::FoundDevice ScanI2C::firstAccelerometer() const
@@ -74,4 +74,4 @@ bool ScanI2C::DeviceAddress::operator<(const ScanI2C::DeviceAddress &other) cons
         || (port != NO_I2C && other.port != NO_I2C && (address < other.address));
 }
 
-ScanI2C::FoundDevice::FoundDevice(ScanI2C::DeviceType type, ScanI2C::DeviceAddress address) : type(type), address(address) {}
+ScanI2C::FoundDevice::FoundDevice(ScanI2C::DeviceType type, ScanI2C::DeviceAddress address) : type(type), address(address) {}
\ No newline at end of file
diff --git a/src/detect/ScanI2C.h b/src/detect/ScanI2C.h
index cb61304a9..5b6bbe629 100644
--- a/src/detect/ScanI2C.h
+++ b/src/detect/ScanI2C.h
@@ -18,7 +18,7 @@ class ScanI2C
         TDECKKB,
         BBQ10KB,
         RAK14004,
-        PMU_AXP192_AXP2101, // has the same address as the TCA8418KB
+        PMU_AXP192_AXP2101,
         BME_680,
         BME_280,
         BMP_280,
@@ -69,7 +69,6 @@ class ScanI2C
         DFROBOT_RAIN,
         DPS310,
         LTR390UV,
-        TCA8418KB,
     } DeviceType;
 
     // typedef uint8_t DeviceAddress;
@@ -133,4 +132,4 @@ class ScanI2C
 
   private:
     bool shouldSuppressScreen = false;
-};
\ No newline at end of file
+};
diff --git a/src/detect/ScanI2CTwoWire.cpp b/src/detect/ScanI2CTwoWire.cpp
index e8506f07c..8b779277d 100644
--- a/src/detect/ScanI2CTwoWire.cpp
+++ b/src/detect/ScanI2CTwoWire.cpp
@@ -10,6 +10,11 @@
 #include "meshUtils.h" // vformat
 #endif
 
+// AXP192 and AXP2101 have the same device address, we just need to identify it in Power.cpp
+#ifndef XPOWERS_AXP192_AXP2101_ADDRESS
+#define XPOWERS_AXP192_AXP2101_ADDRESS 0x34
+#endif
+
 bool in_array(uint8_t *array, int size, uint8_t lookfor)
 {
     int i;
@@ -206,18 +211,6 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                 }
                 break;
 
-            case XPOWERS_AXP192_AXP2101_ADDRESS:
-                // Do we have the TCA8418 instead?
-                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x02), 1);
-                if ((registerValue & 0b11100000) == 0) {
-                    logFoundDevice("TCA8418", (uint8_t)addr.address);
-                    type = TCA8418KB;
-                } else {
-                    logFoundDevice("AXP192/AXP2101", (uint8_t)addr.address);
-                    type = PMU_AXP192_AXP2101;
-                }
-                break;
-
                 SCAN_SIMPLE_CASE(TDECK_KB_ADDR, TDECKKB, "T-Deck keyboard", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(BBQ10_KB_ADDR, BBQ10KB, "BB Q10", (uint8_t)addr.address);
 
@@ -225,7 +218,9 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
 #ifdef HAS_NCP5623
                 SCAN_SIMPLE_CASE(NCP5623_ADDR, NCP5623, "NCP5623", (uint8_t)addr.address);
 #endif
-
+#ifdef HAS_PMU
+                SCAN_SIMPLE_CASE(XPOWERS_AXP192_AXP2101_ADDRESS, PMU_AXP192_AXP2101, "AXP192/AXP2101", (uint8_t)addr.address)
+#endif
             case BME_ADDR:
             case BME_ADDR_ALTERNATE:
                 registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0xD0), 1); // GET_ID
@@ -541,4 +536,4 @@ void ScanI2CTwoWire::logFoundDevice(const char *device, uint8_t address)
 {
     LOG_INFO("%s found at address 0x%x", device, address);
 }
-#endif
+#endif
\ No newline at end of file
diff --git a/src/input/TCA8418Keyboard.cpp b/src/input/TCA8418Keyboard.cpp
deleted file mode 100644
index 21cd7b2d5..000000000
--- a/src/input/TCA8418Keyboard.cpp
+++ /dev/null
@@ -1,561 +0,0 @@
-// Based on the MPR121 Keyboard and Adafruit TCA8418 library
-
-#include "TCA8418Keyboard.h"
-#include "configuration.h"
-
-#include <Arduino.h>
-
-// REGISTERS
-// #define _TCA8418_REG_RESERVED 0x00
-#define _TCA8418_REG_CFG 0x01             // Configuration register
-#define _TCA8418_REG_INT_STAT 0x02        // Interrupt status
-#define _TCA8418_REG_KEY_LCK_EC 0x03      // Key lock and event counter
-#define _TCA8418_REG_KEY_EVENT_A 0x04     // Key event register A
-#define _TCA8418_REG_KEY_EVENT_B 0x05     // Key event register B
-#define _TCA8418_REG_KEY_EVENT_C 0x06     // Key event register C
-#define _TCA8418_REG_KEY_EVENT_D 0x07     // Key event register D
-#define _TCA8418_REG_KEY_EVENT_E 0x08     // Key event register E
-#define _TCA8418_REG_KEY_EVENT_F 0x09     // Key event register F
-#define _TCA8418_REG_KEY_EVENT_G 0x0A     // Key event register G
-#define _TCA8418_REG_KEY_EVENT_H 0x0B     // Key event register H
-#define _TCA8418_REG_KEY_EVENT_I 0x0C     // Key event register I
-#define _TCA8418_REG_KEY_EVENT_J 0x0D     // Key event register J
-#define _TCA8418_REG_KP_LCK_TIMER 0x0E    // Keypad lock1 to lock2 timer
-#define _TCA8418_REG_UNLOCK_1 0x0F        // Unlock register 1
-#define _TCA8418_REG_UNLOCK_2 0x10        // Unlock register 2
-#define _TCA8418_REG_GPIO_INT_STAT_1 0x11 // GPIO interrupt status 1
-#define _TCA8418_REG_GPIO_INT_STAT_2 0x12 // GPIO interrupt status 2
-#define _TCA8418_REG_GPIO_INT_STAT_3 0x13 // GPIO interrupt status 3
-#define _TCA8418_REG_GPIO_DAT_STAT_1 0x14 // GPIO data status 1
-#define _TCA8418_REG_GPIO_DAT_STAT_2 0x15 // GPIO data status 2
-#define _TCA8418_REG_GPIO_DAT_STAT_3 0x16 // GPIO data status 3
-#define _TCA8418_REG_GPIO_DAT_OUT_1 0x17  // GPIO data out 1
-#define _TCA8418_REG_GPIO_DAT_OUT_2 0x18  // GPIO data out 2
-#define _TCA8418_REG_GPIO_DAT_OUT_3 0x19  // GPIO data out 3
-#define _TCA8418_REG_GPIO_INT_EN_1 0x1A   // GPIO interrupt enable 1
-#define _TCA8418_REG_GPIO_INT_EN_2 0x1B   // GPIO interrupt enable 2
-#define _TCA8418_REG_GPIO_INT_EN_3 0x1C   // GPIO interrupt enable 3
-#define _TCA8418_REG_KP_GPIO_1 0x1D       // Keypad/GPIO select 1
-#define _TCA8418_REG_KP_GPIO_2 0x1E       // Keypad/GPIO select 2
-#define _TCA8418_REG_KP_GPIO_3 0x1F       // Keypad/GPIO select 3
-#define _TCA8418_REG_GPI_EM_1 0x20        // GPI event mode 1
-#define _TCA8418_REG_GPI_EM_2 0x21        // GPI event mode 2
-#define _TCA8418_REG_GPI_EM_3 0x22        // GPI event mode 3
-#define _TCA8418_REG_GPIO_DIR_1 0x23      // GPIO data direction 1
-#define _TCA8418_REG_GPIO_DIR_2 0x24      // GPIO data direction 2
-#define _TCA8418_REG_GPIO_DIR_3 0x25      // GPIO data direction 3
-#define _TCA8418_REG_GPIO_INT_LVL_1 0x26  // GPIO edge/level detect 1
-#define _TCA8418_REG_GPIO_INT_LVL_2 0x27  // GPIO edge/level detect 2
-#define _TCA8418_REG_GPIO_INT_LVL_3 0x28  // GPIO edge/level detect 3
-#define _TCA8418_REG_DEBOUNCE_DIS_1 0x29  // Debounce disable 1
-#define _TCA8418_REG_DEBOUNCE_DIS_2 0x2A  // Debounce disable 2
-#define _TCA8418_REG_DEBOUNCE_DIS_3 0x2B  // Debounce disable 3
-#define _TCA8418_REG_GPIO_PULL_1 0x2C     // GPIO pull-up disable 1
-#define _TCA8418_REG_GPIO_PULL_2 0x2D     // GPIO pull-up disable 2
-#define _TCA8418_REG_GPIO_PULL_3 0x2E     // GPIO pull-up disable 3
-// #define _TCA8418_REG_RESERVED 0x2F
-
-// FIELDS CONFIG REGISTER  1
-#define _TCA8418_REG_CFG_AI 0x80           // Auto-increment for read/write
-#define _TCA8418_REG_CFG_GPI_E_CGF 0x40    // Event mode config
-#define _TCA8418_REG_CFG_OVR_FLOW_M 0x20   // Overflow mode enable
-#define _TCA8418_REG_CFG_INT_CFG 0x10      // Interrupt config
-#define _TCA8418_REG_CFG_OVR_FLOW_IEN 0x08 // Overflow interrupt enable
-#define _TCA8418_REG_CFG_K_LCK_IEN 0x04    // Keypad lock interrupt enable
-#define _TCA8418_REG_CFG_GPI_IEN 0x02      // GPI interrupt enable
-#define _TCA8418_REG_CFG_KE_IEN 0x01       // Key events interrupt enable
-
-// FIELDS INT_STAT REGISTER  2
-#define _TCA8418_REG_STAT_CAD_INT 0x10      // Ctrl-alt-del seq status
-#define _TCA8418_REG_STAT_OVR_FLOW_INT 0x08 // Overflow interrupt status
-#define _TCA8418_REG_STAT_K_LCK_INT 0x04    // Key lock interrupt status
-#define _TCA8418_REG_STAT_GPI_INT 0x02      // GPI interrupt status
-#define _TCA8418_REG_STAT_K_INT 0x01        // Key events interrupt status
-
-// FIELDS  KEY_LCK_EC REGISTER 3
-#define _TCA8418_REG_LCK_EC_K_LCK_EN 0x40 // Key lock enable
-#define _TCA8418_REG_LCK_EC_LCK_2 0x20    // Keypad lock status 2
-#define _TCA8418_REG_LCK_EC_LCK_1 0x10    // Keypad lock status 1
-#define _TCA8418_REG_LCK_EC_KLEC_3 0x08   // Key event count bit 3
-#define _TCA8418_REG_LCK_EC_KLEC_2 0x04   // Key event count bit 2
-#define _TCA8418_REG_LCK_EC_KLEC_1 0x02   // Key event count bit 1
-#define _TCA8418_REG_LCK_EC_KLEC_0 0x01   // Key event count bit 0
-
-// Pin IDs for matrix rows/columns
-enum {
-    _TCA8418_ROW0, // Pin ID for row 0
-    _TCA8418_ROW1, // Pin ID for row 1
-    _TCA8418_ROW2, // Pin ID for row 2
-    _TCA8418_ROW3, // Pin ID for row 3
-    _TCA8418_ROW4, // Pin ID for row 4
-    _TCA8418_ROW5, // Pin ID for row 5
-    _TCA8418_ROW6, // Pin ID for row 6
-    _TCA8418_ROW7, // Pin ID for row 7
-    _TCA8418_COL0, // Pin ID for column 0
-    _TCA8418_COL1, // Pin ID for column 1
-    _TCA8418_COL2, // Pin ID for column 2
-    _TCA8418_COL3, // Pin ID for column 3
-    _TCA8418_COL4, // Pin ID for column 4
-    _TCA8418_COL5, // Pin ID for column 5
-    _TCA8418_COL6, // Pin ID for column 6
-    _TCA8418_COL7, // Pin ID for column 7
-    _TCA8418_COL8, // Pin ID for column 8
-    _TCA8418_COL9  // Pin ID for column 9
-};
-
-#define _TCA8418_COLS 3
-#define _TCA8418_ROWS 4
-#define _TCA8418_NUM_KEYS 12
-
-uint8_t TCA8418TapMod[_TCA8418_NUM_KEYS] = {13, 7, 7, 7, 7, 7,
-                                            9,  7, 9, 2, 2, 2}; // Num chars per key, Modulus for rotating through characters
-
-unsigned char TCA8418TapMap[_TCA8418_NUM_KEYS][13] = {
-    {'1', '.', ',', '?', '!', ':', ';', '-', '_', '\\', '/', '(', ')'}, // 1
-    {'2', 'a', 'b', 'c', 'A', 'B', 'C'},                                // 2
-    {'3', 'd', 'e', 'f', 'D', 'E', 'F'},                                // 3
-    {'4', 'g', 'h', 'i', 'G', 'H', 'I'},                                // 4
-    {'5', 'j', 'k', 'l', 'J', 'K', 'L'},                                // 5
-    {'6', 'm', 'n', 'o', 'M', 'N', 'O'},                                // 6
-    {'7', 'p', 'q', 'r', 's', 'P', 'Q', 'R', 'S'},                      // 7
-    {'8', 't', 'u', 'v', 'T', 'U', 'V'},                                // 8
-    {'9', 'w', 'x', 'y', 'z', 'W', 'X', 'Y', 'Z'},                      // 9
-    {'*', '+'},                                                         // *
-    {'0', ' '},                                                         // 0
-    {'#', '@'},                                                         // #
-};
-
-unsigned char TCA8418LongPressMap[_TCA8418_NUM_KEYS] = {
-    _TCA8418_ESC,   // 1
-    _TCA8418_UP,    // 2
-    _TCA8418_NONE,  // 3
-    _TCA8418_LEFT,  // 4
-    _TCA8418_NONE,  // 5
-    _TCA8418_RIGHT, // 6
-    _TCA8418_NONE,  // 7
-    _TCA8418_DOWN,  // 8
-    _TCA8418_NONE,  // 9
-    _TCA8418_BSP,   // *
-    _TCA8418_NONE,  // 0
-    _TCA8418_NONE,  // #
-};
-
-#define _TCA8418_LONG_PRESS_THRESHOLD 2000
-#define _TCA8418_MULTI_TAP_THRESHOLD 750
-
-TCA8418Keyboard::TCA8418Keyboard() : m_wire(nullptr), m_addr(0), readCallback(nullptr), writeCallback(nullptr)
-{
-    state = Init;
-    last_key = -1;
-    next_key = -1;
-    should_backspace = false;
-    last_tap = 0L;
-    char_idx = 0;
-    tap_interval = 0;
-    backlight_on = true;
-    queue = "";
-}
-
-void TCA8418Keyboard::begin(uint8_t addr, TwoWire *wire)
-{
-    m_addr = addr;
-    m_wire = wire;
-
-    m_wire->begin();
-
-    reset();
-}
-
-void TCA8418Keyboard::begin(i2c_com_fptr_t r, i2c_com_fptr_t w, uint8_t addr)
-{
-    m_addr = addr;
-    m_wire = nullptr;
-    writeCallback = w;
-    readCallback = r;
-    reset();
-}
-
-void TCA8418Keyboard::reset()
-{
-    LOG_DEBUG("TCA8418 Reset");
-    //  GPIO
-    //  set default all GIO pins to INPUT
-    writeRegister(_TCA8418_REG_GPIO_DIR_1, 0x00);
-    writeRegister(_TCA8418_REG_GPIO_DIR_2, 0x00);
-    // Set COL9 as GPIO output
-    writeRegister(_TCA8418_REG_GPIO_DIR_3, 0x02);
-    // Switch off keyboard backlight (COL9 = LOW)
-    writeRegister(_TCA8418_REG_GPIO_DAT_OUT_3, 0x00);
-
-    //  add all pins to key events
-    writeRegister(_TCA8418_REG_GPI_EM_1, 0xFF);
-    writeRegister(_TCA8418_REG_GPI_EM_2, 0xFF);
-    writeRegister(_TCA8418_REG_GPI_EM_3, 0xFF);
-
-    //  set all pins to FALLING interrupts
-    writeRegister(_TCA8418_REG_GPIO_INT_LVL_1, 0x00);
-    writeRegister(_TCA8418_REG_GPIO_INT_LVL_2, 0x00);
-    writeRegister(_TCA8418_REG_GPIO_INT_LVL_3, 0x00);
-
-    //  add all pins to interrupts
-    writeRegister(_TCA8418_REG_GPIO_INT_EN_1, 0xFF);
-    writeRegister(_TCA8418_REG_GPIO_INT_EN_2, 0xFF);
-    writeRegister(_TCA8418_REG_GPIO_INT_EN_3, 0xFF);
-
-    // Set keyboard matrix size
-    matrix(_TCA8418_ROWS, _TCA8418_COLS);
-    enableDebounce();
-    flush();
-    state = Idle;
-}
-
-bool TCA8418Keyboard::matrix(uint8_t rows, uint8_t columns)
-{
-    if ((rows > 8) || (columns > 10))
-        return false;
-
-    //  Skip zero size matrix
-    if ((rows != 0) && (columns != 0)) {
-        // Setup the keypad matrix.
-        uint8_t mask = 0x00;
-        for (int r = 0; r < rows; r++) {
-            mask <<= 1;
-            mask |= 1;
-        }
-        writeRegister(_TCA8418_REG_KP_GPIO_1, mask);
-
-        mask = 0x00;
-        for (int c = 0; c < columns && c < 8; c++) {
-            mask <<= 1;
-            mask |= 1;
-        }
-        writeRegister(_TCA8418_REG_KP_GPIO_2, mask);
-
-        if (columns > 8) {
-            if (columns == 9)
-                mask = 0x01;
-            else
-                mask = 0x03;
-            writeRegister(_TCA8418_REG_KP_GPIO_3, mask);
-        }
-    }
-
-    return true;
-}
-
-uint8_t TCA8418Keyboard::keyCount() const
-{
-    uint8_t eventCount = readRegister(_TCA8418_REG_KEY_LCK_EC);
-    eventCount &= 0x0F; //  lower 4 bits only
-    return eventCount;
-}
-
-bool TCA8418Keyboard::hasEvent()
-{
-    return queue.length() > 0;
-}
-
-void TCA8418Keyboard::queueEvent(char next)
-{
-    if (next == _TCA8418_NONE) {
-        return;
-    }
-    queue.concat(next);
-}
-
-char TCA8418Keyboard::dequeueEvent()
-{
-    if (queue.length() < 1) {
-        return _TCA8418_NONE;
-    }
-    char next = queue.charAt(0);
-    queue.remove(0, 1);
-    return next;
-}
-
-void TCA8418Keyboard::trigger()
-{
-    if (keyCount() == 0) {
-        return;
-    }
-    if (state != Init) {
-        // Read the key register
-        uint8_t k = readRegister(_TCA8418_REG_KEY_EVENT_A);
-        uint8_t key = k & 0x7F;
-        if (k & 0x80) {
-            if (state == Idle)
-                pressed(key);
-            return;
-        } else {
-            if (state == Held) {
-                released();
-            }
-            state = Idle;
-            return;
-        }
-    } else {
-        reset();
-    }
-}
-
-void TCA8418Keyboard::pressed(uint8_t key)
-{
-    if (state == Init || state == Busy) {
-        return;
-    }
-    uint8_t next_key = 0;
-    int row = (key - 1) / 10;
-    int col = (key - 1) % 10;
-
-    if (row >= _TCA8418_ROWS || col >= _TCA8418_COLS) {
-        return; // Invalid key
-    }
-
-    // Compute key index based on dynamic row/column
-    next_key = row * _TCA8418_COLS + col;
-
-    // LOG_DEBUG("TCA8418: Key %u -> Next Key %u", key, next_key);
-
-    state = Held;
-    uint32_t now = millis();
-    tap_interval = now - last_tap;
-    if (tap_interval < 0) {
-        // Long running, millis has overflowed.
-        last_tap = 0;
-        state = Busy;
-        return;
-    }
-
-    // Check if the key is the same as the last one or if the time interval has passed
-    if (next_key != last_key || tap_interval > _TCA8418_MULTI_TAP_THRESHOLD) {
-        char_idx = 0;             // Reset char index if new key or long press
-        should_backspace = false; // dont backspace on new key
-    } else {
-        char_idx += 1;           // Cycle through characters if same key pressed
-        should_backspace = true; // allow backspace on same key
-    }
-
-    // Store the current key as the last key
-    last_key = next_key;
-    last_tap = now;
-}
-
-void TCA8418Keyboard::released()
-{
-    if (state != Held) {
-        return;
-    }
-
-    if (last_key < 0 || last_key > _TCA8418_NUM_KEYS) { // reset to idle if last_key out of bounds
-        last_key = -1;
-        state = Idle;
-        return;
-    }
-    uint32_t now = millis();
-    int32_t held_interval = now - last_tap;
-    last_tap = now;
-    if (tap_interval < _TCA8418_MULTI_TAP_THRESHOLD && should_backspace) {
-        queueEvent(_TCA8418_BSP);
-    }
-    if (held_interval > _TCA8418_LONG_PRESS_THRESHOLD) {
-        queueEvent(TCA8418LongPressMap[last_key]);
-        // LOG_DEBUG("Long Press Key: %i Map: %i", last_key, TCA8418LongPressMap[last_key]);
-    } else {
-        queueEvent(TCA8418TapMap[last_key][(char_idx % TCA8418TapMod[last_key])]);
-        // LOG_DEBUG("Key Press: %i Index:%i if %i Map: %c", last_key, char_idx, TCA8418TapMod[last_key],
-        //           TCA8418TapMap[last_key][(char_idx % TCA8418TapMod[last_key])]);
-    }
-}
-
-uint8_t TCA8418Keyboard::flush()
-{
-    // Flush key events
-    uint8_t count = 0;
-    while (readRegister(_TCA8418_REG_KEY_EVENT_A) != 0)
-        count++;
-    // Flush gpio events
-    readRegister(_TCA8418_REG_GPIO_INT_STAT_1);
-    readRegister(_TCA8418_REG_GPIO_INT_STAT_2);
-    readRegister(_TCA8418_REG_GPIO_INT_STAT_3);
-    // Clear INT_STAT register
-    writeRegister(_TCA8418_REG_INT_STAT, 3);
-    return count;
-}
-
-uint8_t TCA8418Keyboard::digitalRead(uint8_t pinnum) const
-{
-    if (pinnum > _TCA8418_COL9)
-        return 0xFF;
-
-    uint8_t reg = _TCA8418_REG_GPIO_DAT_STAT_1 + pinnum / 8;
-    uint8_t mask = (1 << (pinnum % 8));
-
-    // Level  0 = low  other = high
-    uint8_t value = readRegister(reg);
-    if (value & mask)
-        return HIGH;
-    return LOW;
-}
-
-bool TCA8418Keyboard::digitalWrite(uint8_t pinnum, uint8_t level)
-{
-    if (pinnum > _TCA8418_COL9)
-        return false;
-
-    uint8_t reg = _TCA8418_REG_GPIO_DAT_OUT_1 + pinnum / 8;
-    uint8_t mask = (1 << (pinnum % 8));
-
-    // Level  0 = low  other = high
-    uint8_t value = readRegister(reg);
-    if (level == LOW)
-        value &= ~mask;
-    else
-        value |= mask;
-    writeRegister(reg, value);
-    return true;
-}
-
-bool TCA8418Keyboard::pinMode(uint8_t pinnum, uint8_t mode)
-{
-    if (pinnum > _TCA8418_COL9)
-        return false;
-
-    uint8_t idx = pinnum / 8;
-    uint8_t reg = _TCA8418_REG_GPIO_DIR_1 + idx;
-    uint8_t mask = (1 << (pinnum % 8));
-
-    // Mode  0 = input   1 = output
-    uint8_t value = readRegister(reg);
-    if (mode == OUTPUT)
-        value |= mask;
-    else
-        value &= ~mask;
-    writeRegister(reg, value);
-
-    // Pullup  0 = enabled   1 = disabled
-    reg = _TCA8418_REG_GPIO_PULL_1 + idx;
-    value = readRegister(reg);
-    if (mode == INPUT_PULLUP)
-        value &= ~mask;
-    else
-        value |= mask;
-    writeRegister(reg, value);
-
-    return true;
-}
-
-bool TCA8418Keyboard::pinIRQMode(uint8_t pinnum, uint8_t mode)
-{
-    if (pinnum > _TCA8418_COL9)
-        return false;
-    if ((mode != RISING) && (mode != FALLING))
-        return false;
-
-    //  Mode  0 = falling   1 = rising
-    uint8_t idx = pinnum / 8;
-    uint8_t reg = _TCA8418_REG_GPIO_INT_LVL_1 + idx;
-    uint8_t mask = (1 << (pinnum % 8));
-
-    uint8_t value = readRegister(reg);
-    if (mode == RISING)
-        value |= mask;
-    else
-        value &= ~mask;
-    writeRegister(reg, value);
-
-    // Enable interrupt
-    reg = _TCA8418_REG_GPIO_INT_EN_1 + idx;
-    value = readRegister(reg);
-    value |= mask;
-    writeRegister(reg, value);
-
-    return true;
-}
-
-void TCA8418Keyboard::enableInterrupts()
-{
-    uint8_t value = readRegister(_TCA8418_REG_CFG);
-    value |= (_TCA8418_REG_CFG_GPI_IEN | _TCA8418_REG_CFG_KE_IEN);
-    writeRegister(_TCA8418_REG_CFG, value);
-};
-
-void TCA8418Keyboard::disableInterrupts()
-{
-    uint8_t value = readRegister(_TCA8418_REG_CFG);
-    value &= ~(_TCA8418_REG_CFG_GPI_IEN | _TCA8418_REG_CFG_KE_IEN);
-    writeRegister(_TCA8418_REG_CFG, value);
-};
-
-void TCA8418Keyboard::enableMatrixOverflow()
-{
-    uint8_t value = readRegister(_TCA8418_REG_CFG);
-    value |= _TCA8418_REG_CFG_OVR_FLOW_M;
-    writeRegister(_TCA8418_REG_CFG, value);
-};
-
-void TCA8418Keyboard::disableMatrixOverflow()
-{
-    uint8_t value = readRegister(_TCA8418_REG_CFG);
-    value &= ~_TCA8418_REG_CFG_OVR_FLOW_M;
-    writeRegister(_TCA8418_REG_CFG, value);
-};
-
-void TCA8418Keyboard::enableDebounce()
-{
-    writeRegister(_TCA8418_REG_DEBOUNCE_DIS_1, 0x00);
-    writeRegister(_TCA8418_REG_DEBOUNCE_DIS_2, 0x00);
-    writeRegister(_TCA8418_REG_DEBOUNCE_DIS_3, 0x00);
-}
-
-void TCA8418Keyboard::disableDebounce()
-{
-    writeRegister(_TCA8418_REG_DEBOUNCE_DIS_1, 0xFF);
-    writeRegister(_TCA8418_REG_DEBOUNCE_DIS_2, 0xFF);
-    writeRegister(_TCA8418_REG_DEBOUNCE_DIS_3, 0xFF);
-}
-
-void TCA8418Keyboard::setBacklight(bool on)
-{
-    if (on) {
-        digitalWrite(_TCA8418_COL9, HIGH);
-    } else {
-        digitalWrite(_TCA8418_COL9, LOW);
-    }
-}
-
-uint8_t TCA8418Keyboard::readRegister(uint8_t reg) const
-{
-    if (m_wire) {
-        m_wire->beginTransmission(m_addr);
-        m_wire->write(reg);
-        m_wire->endTransmission();
-
-        m_wire->requestFrom(m_addr, (uint8_t)1);
-        if (m_wire->available() < 1)
-            return 0;
-
-        return m_wire->read();
-    }
-    if (readCallback) {
-        uint8_t data;
-        readCallback(m_addr, reg, &data, 1);
-        return data;
-    }
-    return 0;
-}
-
-void TCA8418Keyboard::writeRegister(uint8_t reg, uint8_t value)
-{
-    uint8_t data[2];
-    data[0] = reg;
-    data[1] = value;
-
-    if (m_wire) {
-        m_wire->beginTransmission(m_addr);
-        m_wire->write(data, sizeof(uint8_t) * 2);
-        m_wire->endTransmission();
-    }
-    if (writeCallback) {
-        writeCallback(m_addr, data[0], &(data[1]), 1);
-    }
-}
\ No newline at end of file
diff --git a/src/input/TCA8418Keyboard.h b/src/input/TCA8418Keyboard.h
deleted file mode 100644
index c7f3c1f28..000000000
--- a/src/input/TCA8418Keyboard.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// Based on the MPR121 Keyboard and Adafruit TCA8418 library
-#include "configuration.h"
-#include <Wire.h>
-
-#define _TCA8418_NONE 0x00
-#define _TCA8418_REBOOT 0x90
-#define _TCA8418_LEFT 0xb4
-#define _TCA8418_UP 0xb5
-#define _TCA8418_DOWN 0xb6
-#define _TCA8418_RIGHT 0xb7
-#define _TCA8418_ESC 0x1b
-#define _TCA8418_BSP 0x08
-#define _TCA8418_SELECT 0x0d
-
-class TCA8418Keyboard
-{
-  public:
-    typedef uint8_t (*i2c_com_fptr_t)(uint8_t dev_addr, uint8_t reg_addr, uint8_t *data, uint8_t len);
-
-    enum KeyState { Init = 0, Idle, Held, Busy };
-
-    KeyState state;
-    int8_t last_key;
-    int8_t next_key;
-    bool should_backspace;
-    uint32_t last_tap;
-    uint8_t char_idx;
-    int32_t tap_interval;
-    bool backlight_on;
-
-    String queue;
-
-    TCA8418Keyboard();
-
-    void begin(uint8_t addr = XPOWERS_AXP192_AXP2101_ADDRESS, TwoWire *wire = &Wire);
-    void begin(i2c_com_fptr_t r, i2c_com_fptr_t w, uint8_t addr = XPOWERS_AXP192_AXP2101_ADDRESS);
-
-    void reset(void);
-    // Configure the size of the keypad.
-    // All other rows and columns are set as inputs.
-    bool matrix(uint8_t rows, uint8_t columns);
-
-    // Flush all events in the FIFO buffer + GPIO events.
-    uint8_t flush(void);
-
-    // Key events available in the internal FIFO buffer.
-    uint8_t keyCount(void) const;
-
-    void trigger(void);
-    void pressed(uint8_t key);
-    void released(void);
-    bool hasEvent(void);
-    char dequeueEvent(void);
-    void queueEvent(char);
-
-    uint8_t digitalRead(uint8_t pinnum) const;
-    bool digitalWrite(uint8_t pinnum, uint8_t level);
-    bool pinMode(uint8_t pinnum, uint8_t mode);
-    bool pinIRQMode(uint8_t pinnum, uint8_t mode); // MODE  FALLING or RISING
-
-    // enable / disable interrupts for matrix and GPI pins
-    void enableInterrupts();
-    void disableInterrupts();
-
-    // ignore key events when FIFO buffer is full or not.
-    void enableMatrixOverflow();
-    void disableMatrixOverflow();
-
-    // debounce keys.
-    void enableDebounce();
-    void disableDebounce();
-
-    void setBacklight(bool on);
-
-    uint8_t readRegister(uint8_t reg) const;
-    void writeRegister(uint8_t reg, uint8_t value);
-
-  private:
-    TwoWire *m_wire;
-    uint8_t m_addr;
-    i2c_com_fptr_t readCallback;
-    i2c_com_fptr_t writeCallback;
-};
diff --git a/src/input/cardKbI2cImpl.cpp b/src/input/cardKbI2cImpl.cpp
index 0d661811b..eb9b07d6e 100644
--- a/src/input/cardKbI2cImpl.cpp
+++ b/src/input/cardKbI2cImpl.cpp
@@ -12,8 +12,8 @@ void CardKbI2cImpl::init()
 #if !MESHTASTIC_EXCLUDE_I2C && !defined(ARCH_PORTDUINO) && !defined(I2C_NO_RESCAN)
     if (cardkb_found.address == 0x00) {
         LOG_DEBUG("Rescan for I2C keyboard");
-        uint8_t i2caddr_scan[] = {CARDKB_ADDR, TDECK_KB_ADDR, BBQ10_KB_ADDR, MPR121_KB_ADDR, XPOWERS_AXP192_AXP2101_ADDRESS};
-        uint8_t i2caddr_asize = 5;
+        uint8_t i2caddr_scan[] = {CARDKB_ADDR, TDECK_KB_ADDR, BBQ10_KB_ADDR, MPR121_KB_ADDR};
+        uint8_t i2caddr_asize = 4;
         auto i2cScanner = std::unique_ptr<ScanI2CTwoWire>(new ScanI2CTwoWire());
 
 #if WIRE_INTERFACES_COUNT == 2
@@ -43,10 +43,6 @@ void CardKbI2cImpl::init()
                 // assign an arbitrary value to distinguish from other models
                 kb_model = 0x37;
                 break;
-            case ScanI2C::DeviceType::TCA8418KB:
-                // assign an arbitrary value to distinguish from other models
-                kb_model = 0x84;
-                break;
             default:
                 // use this as default since it's also just zero
                 LOG_WARN("kb_info.type is unknown(0x%02x), setting kb_model=0x00", kb_info.type);
@@ -67,4 +63,4 @@ void CardKbI2cImpl::init()
     }
 #endif
     inputBroker->registerSource(this);
-}
+}
\ No newline at end of file
diff --git a/src/input/kbI2cBase.cpp b/src/input/kbI2cBase.cpp
index daccc6622..9b1a27745 100644
--- a/src/input/kbI2cBase.cpp
+++ b/src/input/kbI2cBase.cpp
@@ -43,9 +43,6 @@ int32_t KbI2cBase::runOnce()
             if (cardkb_found.address == MPR121_KB_ADDR) {
                 MPRkeyboard.begin(MPR121_KB_ADDR, &Wire1);
             }
-            if (cardkb_found.address == XPOWERS_AXP192_AXP2101_ADDRESS) {
-                TCAKeyboard.begin(XPOWERS_AXP192_AXP2101_ADDRESS, &Wire1);
-            }
             break;
 #endif
         case ScanI2C::WIRE:
@@ -58,9 +55,6 @@ int32_t KbI2cBase::runOnce()
             if (cardkb_found.address == MPR121_KB_ADDR) {
                 MPRkeyboard.begin(MPR121_KB_ADDR, &Wire);
             }
-            if (cardkb_found.address == XPOWERS_AXP192_AXP2101_ADDRESS) {
-                TCAKeyboard.begin(XPOWERS_AXP192_AXP2101_ADDRESS, &Wire);
-            }
             break;
         case ScanI2C::NO_I2C:
         default:
@@ -169,70 +163,6 @@ int32_t KbI2cBase::runOnce()
         }
         break;
     }
-
-    case 0x84: { // Adafruit TCA8418
-        TCAKeyboard.trigger();
-        InputEvent e;
-        while (TCAKeyboard.hasEvent()) {
-            char nextEvent = TCAKeyboard.dequeueEvent();
-            e.inputEvent = ANYKEY;
-            e.kbchar = 0x00;
-            e.source = this->_originName;
-            switch (nextEvent) {
-            case _TCA8418_NONE:
-                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
-                e.kbchar = 0x00;
-                break;
-            case _TCA8418_REBOOT:
-                e.inputEvent = ANYKEY;
-                e.kbchar = INPUT_BROKER_MSG_REBOOT;
-                break;
-            case _TCA8418_LEFT:
-                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT;
-                e.kbchar = 0x00;
-                break;
-            case _TCA8418_UP:
-                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP;
-                e.kbchar = 0x00;
-                break;
-            case _TCA8418_DOWN:
-                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN;
-                e.kbchar = 0x00;
-                break;
-            case _TCA8418_RIGHT:
-                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT;
-                e.kbchar = 0x00;
-                break;
-            case _TCA8418_BSP:
-                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_BACK;
-                e.kbchar = 0x08;
-                break;
-            case _TCA8418_SELECT:
-                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT;
-                e.kbchar = 0x0d;
-                break;
-            case _TCA8418_ESC:
-                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_CANCEL;
-                e.kbchar = 0x1b;
-                break;
-            default:
-                if (nextEvent > 127) {
-                    e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
-                    e.kbchar = 0x00;
-                    break;
-                }
-                e.inputEvent = ANYKEY;
-                e.kbchar = nextEvent;
-                break;
-            }
-            if (e.inputEvent != meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE) {
-                LOG_DEBUG("TCA8418 Notifying: %i Char: %c", e.inputEvent, e.kbchar);
-                this->notifyObservers(&e);
-            }
-        }
-        break;
-    }
-
     case 0x37: { // MPR121
         MPRkeyboard.trigger();
         InputEvent e;
diff --git a/src/input/kbI2cBase.h b/src/input/kbI2cBase.h
index d5831aafa..dc2414fc0 100644
--- a/src/input/kbI2cBase.h
+++ b/src/input/kbI2cBase.h
@@ -3,7 +3,6 @@
 #include "BBQ10Keyboard.h"
 #include "InputBroker.h"
 #include "MPR121Keyboard.h"
-#include "TCA8418Keyboard.h"
 #include "Wire.h"
 #include "concurrency/OSThread.h"
 
@@ -22,6 +21,5 @@ class KbI2cBase : public Observable<const InputEvent *>, public concurrency::OST
 
     BBQ10Keyboard Q10keyboard;
     MPR121Keyboard MPRkeyboard;
-    TCA8418Keyboard TCAKeyboard;
     bool is_sym = false;
-};
+};
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index f65c3fcd1..b4e8cd521 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -568,10 +568,6 @@ void setup()
             // assign an arbitrary value to distinguish from other models
             kb_model = 0x37;
             break;
-        case ScanI2C::DeviceType::TCA8418KB:
-            // assign an arbitrary value to distinguish from other models
-            kb_model = 0x84;
-            break;
         default:
             // use this as default since it's also just zero
             LOG_WARN("kb_info.type is unknown(0x%02x), setting kb_model=0x00", kb_info.type);

From 1e41c994b3ec9395c1c9fb2aae25947ec6306060 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Thu, 27 Mar 2025 10:06:11 -0500
Subject: [PATCH 080/116] Add attestations and PR template

---
 .github/pull_request_template.md | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 6ccb4a105..a15b34aae 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,7 +1,6 @@
+## 🙏 Thank you for sending in a pull request, here's some tips to get started!
+
 ### ❌ (Please delete all these tips and replace them with your text) ❌
-
-## Thank you for sending in a pull request, here's some tips to get started!
-
 - Before starting on some new big chunk of code, it it is optional but highly recommended to open an issue first
   to say "Hey, I think this idea X should be implemented and I'm starting work on it. My general plan is Y, any feedback
   is appreciated." This will allow other devs to potentially save you time by not accidentially duplicating work etc...
@@ -12,4 +11,17 @@
 - If your PR fixes a bug, mention "fixes #bugnum" somewhere in your pull request description.
 - If your other co-developers have comments on your PR please tweak as needed.
 - Please also enable "Allow edits by maintainers".
+- Please do not submit untested code.
+- If you do not have the affected hardware to test your code changes adequately against regressions, please indicate this, so that contributors and commnunity members can help test your changes.
 - If your PR gets accepted you can request a "Contributor" role in the Meshtastic Discord
+
+
+## 🤝 Attestations
+- [ ] I have tested that my proposed changes behave as described.
+- [ ] I have tested that my proposed changes do not cause any obvious regressions on the following devices:
+  - [ ] Heltec (Lora32) V3
+  - [ ] LilyGo T-Deck 
+  - [ ] LilyGo T-Beam
+  - [ ] RAK WisBlock 4631
+  - [ ] Seeed Studio T-1000E tracker card
+  - [ ] Other (please specify below)

From 4e1030ef9c0c1ab573105962687fba1378c98650 Mon Sep 17 00:00:00 2001
From: Austin <vidplace7@gmail.com>
Date: Fri, 28 Mar 2025 07:31:24 -0400
Subject: [PATCH 081/116] Fix USERPREFS_EVENT_MODE compile error (#6408)

---
 src/mesh/Channels.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesh/Channels.cpp b/src/mesh/Channels.cpp
index f1d4926db..4d061f80f 100644
--- a/src/mesh/Channels.cpp
+++ b/src/mesh/Channels.cpp
@@ -347,7 +347,7 @@ bool Channels::anyMqttEnabled()
 {
 #if USERPREFS_EVENT_MODE
     // Don't publish messages on the public MQTT broker if we are in event mode
-    if (mqtt && mqtt.isUsingDefaultServer()) {
+    if (mqtt && mqtt->isUsingDefaultServer()) {
         return false;
     }
 #endif

From d7504921fb15d0048aeb81dd1ccf64af525e4ad1 Mon Sep 17 00:00:00 2001
From: Marco Veneziano <macvenez@gmail.com>
Date: Fri, 28 Mar 2025 12:45:04 +0100
Subject: [PATCH 082/116] Add missing board definition for MESHLINK (#6404)

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
---
 src/platform/nrf52/architecture.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/platform/nrf52/architecture.h b/src/platform/nrf52/architecture.h
index bf7fce29a..71db98da6 100644
--- a/src/platform/nrf52/architecture.h
+++ b/src/platform/nrf52/architecture.h
@@ -75,6 +75,8 @@
 #define HW_VENDOR meshtastic_HardwareModel_PRIVATE_HW
 #elif defined(HELTEC_T114)
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_MESH_NODE_T114
+#elif defined(MESHLINK)
+#define HW_VENDOR meshtastic_HardwareModel_MESHLINK
 #elif defined(SEEED_XIAO_NRF52840_KIT)
 #define HW_VENDOR meshtastic_HardwareModel_XIAO_NRF52_KIT
 #else

From a2387c79ee05f599f4d998687e86e8b1e5518495 Mon Sep 17 00:00:00 2001
From: Manuel <71137295+mverch67@users.noreply.github.com>
Date: Fri, 28 Mar 2025 16:18:47 +0100
Subject: [PATCH 083/116] fix: SenseCAP Indicator sporadic touch crash (#6432)

* fix indicator touch crash

* replace wrong .ini

* delete wrong .ini
---
 platformio.ini                                   | 2 +-
 variants/seeed-sensecap-indicator/platformio.ini | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 3de5b715f..542374637 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -94,7 +94,7 @@ lib_deps =
 
 [device-ui_base]
 lib_deps =
-	https://github.com/meshtastic/device-ui.git#7a6ffba3c86901b0e3234b6c056aa803b4cd8854
+	https://github.com/meshtastic/device-ui.git#b1e862e8b2a604a8d911e9d7a27f6e80f1176c21
 
 ; Common libs for environmental measurements in telemetry module
 ; (not included in native / portduino)
diff --git a/variants/seeed-sensecap-indicator/platformio.ini b/variants/seeed-sensecap-indicator/platformio.ini
index da11953b7..ca1639e4d 100644
--- a/variants/seeed-sensecap-indicator/platformio.ini
+++ b/variants/seeed-sensecap-indicator/platformio.ini
@@ -24,7 +24,7 @@ build_flags = ${esp32_base.build_flags}
   -DUSE_ARDUINO_HAL_GPIO
 
 lib_deps = ${esp32s3_base.lib_deps}
-  https://github.com/mverch67/LovyanGFX#develop
+  https://github.com/mverch67/LovyanGFX#4c76238c1344162a234ae917b27651af146d6fb2
   earlephilhower/ESP8266Audio@^1.9.9
   earlephilhower/ESP8266SAM@^1.0.1
 
@@ -49,7 +49,7 @@ build_flags =
   -D HAS_SCREEN=0
   -D HAS_TFT=1
   -D DISPLAY_SET_RESOLUTION
-  -D USE_I2S_BUZZER
+  -D USE_PIN_BUZZER
   -D RAM_SIZE=4096
 	-D LV_LVGL_H_INCLUDE_SIMPLE
 	-D LV_CONF_INCLUDE_SIMPLE
@@ -65,10 +65,9 @@ build_flags =
   -D LGFX_DRIVER=LGFX_INDICATOR
   -D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_INDICATOR.h\"
   -D VIEW_320x240
-;	-D USE_DOUBLE_BUFFER
   -D USE_PACKET_API
 
 lib_deps =
   ${env:seeed-sensecap-indicator.lib_deps}
   ${device-ui_base.lib_deps}
-  https://github.com/bitbank2/bb_captouch.git#8f2f06462ff597847921739376a299db93612417 ; alternative touch library supporting FT6x36
+  https://github.com/mverch67/bb_captouch.git#8626412fe650d808a267791c0eae6e5860c85a5d ; alternative touch library supporting FT6x36

From 4a12b4eb32e3a4c16e9cb819ddf460c61a38704e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Fri, 28 Mar 2025 21:22:17 +0100
Subject: [PATCH 084/116] add Thinknode-M1 (#6435)

* ThinkNode M1
* Update Epaper Driver
* Your day isn't complete unless trunk has complained about your formatting at least once.
---
 boards/ThinkNode-M1.json                     |  53 +++++
 src/Power.cpp                                |   9 +
 src/graphics/EInkDisplay2.cpp                |  10 +-
 src/graphics/Screen.cpp                      |   5 +
 src/main.cpp                                 |  29 ++-
 src/modules/SerialModule.cpp                 |   9 +-
 src/platform/nrf52/architecture.h            |   2 +
 src/platform/nrf52/main-nrf52.cpp            |  48 ++++-
 src/power.h                                  |   5 +
 src/sleep.cpp                                |   1 +
 variants/ELECROW-ThinkNode-M1/platformio.ini |  29 +++
 variants/ELECROW-ThinkNode-M1/variant.cpp    |  44 ++++
 variants/ELECROW-ThinkNode-M1/variant.h      | 205 +++++++++++++++++++
 13 files changed, 435 insertions(+), 14 deletions(-)
 create mode 100644 boards/ThinkNode-M1.json
 create mode 100644 variants/ELECROW-ThinkNode-M1/platformio.ini
 create mode 100644 variants/ELECROW-ThinkNode-M1/variant.cpp
 create mode 100644 variants/ELECROW-ThinkNode-M1/variant.h

diff --git a/boards/ThinkNode-M1.json b/boards/ThinkNode-M1.json
new file mode 100644
index 000000000..e55da3ec7
--- /dev/null
+++ b/boards/ThinkNode-M1.json
@@ -0,0 +1,53 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "nrf52840_s140_v6.ld"
+    },
+    "core": "nRF5",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DARDUINO_NRF52840_TTGO_EINK -DNRF52840_XXAA",
+    "f_cpu": "64000000L",
+    "hwids": [
+      ["0x239A", "0x4405"],
+      ["0x239A", "0x0029"],
+      ["0x239A", "0x002A"]
+    ],
+    "usb_product": "elecrow_eink",
+    "mcu": "nrf52840",
+    "variant": "ELECROW-ThinkNode-M1",
+    "variants_dir": "variants",
+    "bsp": {
+      "name": "adafruit"
+    },
+    "softdevice": {
+      "sd_flags": "-DS140",
+      "sd_name": "s140",
+      "sd_version": "6.1.1",
+      "sd_fwid": "0x00B6"
+    },
+    "bootloader": {
+      "settings_addr": "0xFF000"
+    }
+  },
+  "connectivity": ["bluetooth"],
+  "debug": {
+    "jlink_device": "nRF52840_xxAA",
+    "onboard_tools": ["jlink"],
+    "svd_path": "nrf52840.svd",
+    "openocd_target": "nrf52840-mdk-rs"
+  },
+  "frameworks": ["arduino"],
+  "name": "elecrow eink",
+  "upload": {
+    "maximum_ram_size": 248832,
+    "maximum_size": 815104,
+    "speed": 115200,
+    "protocol": "nrfutil",
+    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
+    "use_1200bps_touch": true,
+    "require_upload_port": true,
+    "wait_for_upload_port": true
+  },
+  "url": "FIXME",
+  "vendor": "ELECROW"
+}
diff --git a/src/Power.cpp b/src/Power.cpp
index 8c2ef998d..20447ad63 100644
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -713,6 +713,9 @@ void Power::readPowerStatus()
     const PowerStatus powerStatus2 = PowerStatus(hasBattery, usbPowered, isCharging, batteryVoltageMv, batteryChargePercent);
     LOG_DEBUG("Battery: usbPower=%d, isCharging=%d, batMv=%d, batPct=%d", powerStatus2.getHasUSB(), powerStatus2.getIsCharging(),
               powerStatus2.getBatteryVoltageMv(), powerStatus2.getBatteryChargePercent());
+#if defined(ELECROW_ThinkNode_M1)
+    power_num = powerStatus2.getBatteryVoltageMv();
+#endif
     newStatus.notifyObservers(&powerStatus2);
 #ifdef DEBUG_HEAP
     if (lastheap != memGet.getFreeHeap()) {
@@ -759,6 +762,9 @@ void Power::readPowerStatus()
     if (batteryLevel && powerStatus2.getHasBattery() && !powerStatus2.getHasUSB()) {
         if (batteryLevel->getBattVoltage() < OCV[NUM_OCV_POINTS - 1]) {
             low_voltage_counter++;
+#if defined(ELECROW_ThinkNode_M1)
+            low_voltage_counter_led3 = low_voltage_counter;
+#endif
             LOG_DEBUG("Low voltage counter: %d/10", low_voltage_counter);
             if (low_voltage_counter > 10) {
 #ifdef ARCH_NRF52
@@ -771,6 +777,9 @@ void Power::readPowerStatus()
             }
         } else {
             low_voltage_counter = 0;
+#if defined(ELECROW_ThinkNode_M1)
+            low_voltage_counter_led3 = low_voltage_counter;
+#endif
         }
     }
 }
diff --git a/src/graphics/EInkDisplay2.cpp b/src/graphics/EInkDisplay2.cpp
index 1bf1bc300..96c6b44c1 100644
--- a/src/graphics/EInkDisplay2.cpp
+++ b/src/graphics/EInkDisplay2.cpp
@@ -128,16 +128,24 @@ bool EInkDisplay::connect()
 #ifdef PIN_EINK_EN
     // backlight power, HIGH is backlight on, LOW is off
     pinMode(PIN_EINK_EN, OUTPUT);
+#ifdef ELECROW_ThinkNode_M1
     digitalWrite(PIN_EINK_EN, LOW);
+#else
+    digitalWrite(PIN_EINK_EN, HIGH);
+#endif
 #endif
 
-#if defined(TTGO_T_ECHO)
+#if defined(TTGO_T_ECHO) || defined(ELECROW_ThinkNode_M1)
     {
         auto lowLevel = new EINK_DISPLAY_MODEL(PIN_EINK_CS, PIN_EINK_DC, PIN_EINK_RES, PIN_EINK_BUSY, SPI1);
 
         adafruitDisplay = new GxEPD2_BW<EINK_DISPLAY_MODEL, EINK_DISPLAY_MODEL::HEIGHT>(*lowLevel);
         adafruitDisplay->init();
+#ifdef ELECROW_ThinkNode_M1
+        adafruitDisplay->setRotation(4);
+#else
         adafruitDisplay->setRotation(3);
+#endif
         adafruitDisplay->setPartialWindow(0, 0, displayWidth, displayHeight);
     }
 #elif defined(MESHLINK)
diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index 0c18f3287..635cd5164 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -1641,6 +1641,11 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver)
             setScreensaverFrames(einkScreensaver);
 #endif
             LOG_INFO("Turn off screen");
+#ifdef ELECROW_ThinkNode_M1
+            if (digitalRead(PIN_EINK_EN) == HIGH) {
+                digitalWrite(PIN_EINK_EN, LOW);
+            }
+#endif
             dispdev->displayOff();
 #ifdef USE_ST7789
             SPI1.end();
diff --git a/src/main.cpp b/src/main.cpp
index b4e8cd521..2e0470fa1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -262,6 +262,27 @@ void printInfo()
 #ifndef PIO_UNIT_TESTING
 void setup()
 {
+// power on peripherals
+#if defined(PIN_POWER_EN)
+    pinMode(PIN_POWER_EN, OUTPUT);
+    digitalWrite(PIN_POWER_EN, HIGH);
+#endif
+
+#ifdef LED_POWER
+    pinMode(LED_POWER, OUTPUT);
+    digitalWrite(LED_POWER, HIGH);
+#endif
+
+#ifdef POWER_LED
+    pinMode(POWER_LED, OUTPUT);
+    digitalWrite(POWER_LED, HIGH);
+#endif
+
+#ifdef USER_LED
+    pinMode(USER_LED, OUTPUT);
+    digitalWrite(USER_LED, LOW);
+#endif
+
 #if defined(T_DECK)
     // GPIO10 manages all peripheral power supplies
     // Turn on peripheral power immediately after MUC starts.
@@ -325,13 +346,6 @@ void setup()
 
     initDeepSleep();
 
-    // power on peripherals
-#if defined(PIN_POWER_EN)
-    pinMode(PIN_POWER_EN, OUTPUT);
-    digitalWrite(PIN_POWER_EN, HIGH);
-    // digitalWrite(PIN_POWER_EN1, INPUT);
-#endif
-
 #if defined(LORA_TCXO_GPIO)
     pinMode(LORA_TCXO_GPIO, OUTPUT);
     digitalWrite(LORA_TCXO_GPIO, HIGH);
@@ -1303,5 +1317,4 @@ void loop()
         mainDelay.delay(delayMsec);
     }
 }
-
 #endif
diff --git a/src/modules/SerialModule.cpp b/src/modules/SerialModule.cpp
index 34ece2312..f3f23b080 100644
--- a/src/modules/SerialModule.cpp
+++ b/src/modules/SerialModule.cpp
@@ -60,7 +60,7 @@
 SerialModule *serialModule;
 SerialModuleRadio *serialModuleRadio;
 
-#if defined(TTGO_T_ECHO) || defined(CANARYONE) || defined(MESHLINK)
+#if defined(TTGO_T_ECHO) || defined(CANARYONE) || defined(MESHLINK) || defined(ELECROW_ThinkNode_M1)
 SerialModule::SerialModule() : StreamAPI(&Serial), concurrency::OSThread("Serial") {}
 static Print *serialPrint = &Serial;
 #elif defined(CONFIG_IDF_TARGET_ESP32C6)
@@ -158,7 +158,7 @@ int32_t SerialModule::runOnce()
                 Serial.begin(baud);
                 Serial.setTimeout(moduleConfig.serial.timeout > 0 ? moduleConfig.serial.timeout : TIMEOUT);
             }
-#elif !defined(TTGO_T_ECHO) && !defined(CANARYONE) && !defined(MESHLINK)
+#elif !defined(TTGO_T_ECHO) && !defined(CANARYONE) && !defined(MESHLINK) && !defined(ELECROW_ThinkNode_M1)
             if (moduleConfig.serial.rxd && moduleConfig.serial.txd) {
 #ifdef ARCH_RP2040
                 Serial2.setFIFOSize(RX_BUFFER);
@@ -214,7 +214,7 @@ int32_t SerialModule::runOnce()
                 }
             }
 
-#if !defined(TTGO_T_ECHO) && !defined(CANARYONE) && !defined(MESHLINK)
+#if !defined(TTGO_T_ECHO) && !defined(CANARYONE) && !defined(MESHLINK) && !defined(ELECROW_ThinkNode_M1)
             else if ((moduleConfig.serial.mode == meshtastic_ModuleConfig_SerialConfig_Serial_Mode_WS85)) {
                 processWXSerial();
 
@@ -416,7 +416,8 @@ uint32_t SerialModule::getBaudRate()
  */
 void SerialModule::processWXSerial()
 {
-#if !defined(TTGO_T_ECHO) && !defined(CANARYONE) && !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(MESHLINK)
+#if !defined(TTGO_T_ECHO) && !defined(CANARYONE) && !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(MESHLINK) &&                 \
+    !defined(ELECROW_ThinkNode_M1)
     static unsigned int lastAveraged = 0;
     static unsigned int averageIntervalMillis = 300000; // 5 minutes hard coded.
     static double dir_sum_sin = 0;
diff --git a/src/platform/nrf52/architecture.h b/src/platform/nrf52/architecture.h
index 71db98da6..1a06f173a 100644
--- a/src/platform/nrf52/architecture.h
+++ b/src/platform/nrf52/architecture.h
@@ -53,6 +53,8 @@
 #define HW_VENDOR meshtastic_HardwareModel_RAK4631
 #elif defined(TTGO_T_ECHO)
 #define HW_VENDOR meshtastic_HardwareModel_T_ECHO
+#elif defined(ELECROW_ThinkNode_M1)
+#define HW_VENDOR meshtastic_HardwareModel_NRF52_UNKNOWN // HW_VENDOR meshtastic_HardwareModel_ThinkNode_M1
 #elif defined(NANO_G2_ULTRA)
 #define HW_VENDOR meshtastic_HardwareModel_NANO_G2_ULTRA
 #elif defined(CANARYONE)
diff --git a/src/platform/nrf52/main-nrf52.cpp b/src/platform/nrf52/main-nrf52.cpp
index 8483d21c6..53971e95a 100644
--- a/src/platform/nrf52/main-nrf52.cpp
+++ b/src/platform/nrf52/main-nrf52.cpp
@@ -235,6 +235,14 @@ void nrf52InitSemiHosting()
 
 void nrf52Setup()
 {
+#ifdef USB_CHECK
+    pinMode(USB_CHECK, INPUT);
+#endif
+
+#ifdef ADC_V
+    pinMode(ADC_V, INPUT);
+#endif
+
     uint32_t why = NRF_POWER->RESETREAS;
     // per
     // https://infocenter.nordicsemi.com/index.jsp?topic=%2Fcom.nordic.infocenter.nrf52832.ps.v1.1%2Fpower.html
@@ -275,9 +283,11 @@ void cpuDeepSleep(uint32_t msecToWake)
     Wire.end();
 #endif
     SPI.end();
+#if SPI_INTERFACES_COUNT > 1
+    SPI1.end();
+#endif
     // This may cause crashes as debug messages continue to flow.
     Serial.end();
-
 #ifdef PIN_SERIAL_RX1
     Serial1.end();
 #endif
@@ -315,6 +325,31 @@ void cpuDeepSleep(uint32_t msecToWake)
     detachInterrupt(PIN_GPS_PPS);
     detachInterrupt(PIN_BUTTON1);
 #endif
+
+#ifdef ELECROW_ThinkNode_M1
+    for (int pin = 0; pin < 48; pin++) {
+        if (pin == 17 || pin == 19 || pin == 20 || pin == 22 || pin == 23 || pin == 24 || pin == 25 || pin == 9 || pin == 10 ||
+            pin == PIN_BUTTON1 || pin == PIN_BUTTON2) {
+            continue;
+        }
+        pinMode(pin, OUTPUT);
+    }
+    for (int pin = 0; pin < 48; pin++) {
+        if (pin == 17 || pin == 19 || pin == 20 || pin == 22 || pin == 23 || pin == 24 || pin == 25 || pin == 9 || pin == 10 ||
+            pin == PIN_BUTTON1 || pin == PIN_BUTTON2) {
+            continue;
+        }
+        digitalWrite(pin, LOW);
+    }
+    for (int pin = 0; pin < 48; pin++) {
+        if (pin == 17 || pin == 19 || pin == 20 || pin == 22 || pin == 23 || pin == 24 || pin == 25 || pin == 9 || pin == 10 ||
+            pin == PIN_BUTTON1 || pin == PIN_BUTTON2) {
+            continue;
+        }
+        NRF_GPIO->DIRCLR = (1 << pin);
+    }
+#endif
+
     // Sleepy trackers or sensors can low power "sleep"
     // Don't enter this if we're sleeping portMAX_DELAY, since that's a shutdown event
     if (msecToWake != portMAX_DELAY &&
@@ -333,6 +368,17 @@ void cpuDeepSleep(uint32_t msecToWake)
         // FIXME, use system off mode with ram retention for key state?
         // FIXME, use non-init RAM per
         // https://devzone.nordicsemi.com/f/nordic-q-a/48919/ram-retention-settings-with-softdevice-enabled
+
+#ifdef ELECROW_ThinkNode_M1
+        nrf_gpio_cfg_input(PIN_BUTTON1, NRF_GPIO_PIN_PULLUP); // Configure the pin to be woken up as an input
+        nrf_gpio_pin_sense_t sense = NRF_GPIO_PIN_SENSE_LOW;
+        nrf_gpio_cfg_sense_set(PIN_BUTTON1, sense);
+
+        nrf_gpio_cfg_input(PIN_BUTTON2, NRF_GPIO_PIN_PULLUP);
+        nrf_gpio_pin_sense_t sense1 = NRF_GPIO_PIN_SENSE_LOW;
+        nrf_gpio_cfg_sense_set(PIN_BUTTON2, sense1);
+#endif
+
         auto ok = sd_power_system_off();
         if (ok != NRF_SUCCESS) {
             LOG_ERROR("FIXME: Ignoring soft device (EasyDMA pending?) and forcing system-off!");
diff --git a/src/power.h b/src/power.h
index e9c0deb7c..78caa8a7d 100644
--- a/src/power.h
+++ b/src/power.h
@@ -84,6 +84,11 @@ class Power : private concurrency::OSThread
     void setStatusHandler(meshtastic::PowerStatus *handler) { statusHandler = handler; }
     const uint16_t OCV[11] = {OCV_ARRAY};
 
+#if defined(ELECROW_ThinkNode_M1)
+    uint8_t low_voltage_counter_led3;
+    int power_num = 0;
+#endif
+
   protected:
     meshtastic::PowerStatus *statusHandler;
 
diff --git a/src/sleep.cpp b/src/sleep.cpp
index 202b8c354..02fa8d871 100644
--- a/src/sleep.cpp
+++ b/src/sleep.cpp
@@ -228,6 +228,7 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false, bool skipSaveN
     }
 
 #ifdef PIN_POWER_EN
+    digitalWrite(PIN_POWER_EN, LOW);
     pinMode(PIN_POWER_EN, INPUT); // power off peripherals
     // pinMode(PIN_POWER_EN1, INPUT_PULLDOWN);
 #endif
diff --git a/variants/ELECROW-ThinkNode-M1/platformio.ini b/variants/ELECROW-ThinkNode-M1/platformio.ini
new file mode 100644
index 000000000..f37f6d310
--- /dev/null
+++ b/variants/ELECROW-ThinkNode-M1/platformio.ini
@@ -0,0 +1,29 @@
+; First prototype eink/nrf52840/sx1262 device
+[env:thinknode_m1]
+extends = nrf52840_base
+board = ThinkNode-M1
+board_check = true
+debug_tool = jlink
+
+# add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
+build_flags = ${nrf52840_base.build_flags} -Ivariants/ELECROW-ThinkNode-M1
+  -DELECROW_ThinkNode_M1
+  -DGPS_POWER_TOGGLE
+  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
+  -DEINK_DISPLAY_MODEL=GxEPD2_154_D67
+  -DEINK_WIDTH=200
+  -DEINK_HEIGHT=200
+  -DUSE_EINK_DYNAMICDISPLAY            ; Enable Dynamic EInk
+  -DEINK_LIMIT_FASTREFRESH=10          ; How many consecutive fast-refreshes are permitted    //20
+  -DEINK_LIMIT_RATE_BACKGROUND_SEC=10  ; Minimum interval between BACKGROUND updates          //30
+  -DEINK_LIMIT_RATE_RESPONSIVE_SEC=1   ; Minimum interval between RESPONSIVE updates
+;   -DEINK_LIMIT_GHOSTING_PX=2000        ; (Optional) How much image ghosting is tolerated
+  -DEINK_BACKGROUND_USES_FAST          ; (Optional) Use FAST refresh for both BACKGROUND and RESPONSIVE, until a limit is reached.
+
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/ELECROW-ThinkNode-M1>
+lib_deps = 
+  ${nrf52840_base.lib_deps}
+  https://github.com/meshtastic/GxEPD2/archive/33db3fa8ee6fc47d160bdb44f8f127c9a9203a10.zip
+  lewisxhe/PCF8563_Library@^1.0.1
+  khoih-prog/nRF52_PWM@^1.0.1
+;upload_protocol = fs
\ No newline at end of file
diff --git a/variants/ELECROW-ThinkNode-M1/variant.cpp b/variants/ELECROW-ThinkNode-M1/variant.cpp
new file mode 100644
index 000000000..cae079b74
--- /dev/null
+++ b/variants/ELECROW-ThinkNode-M1/variant.cpp
@@ -0,0 +1,44 @@
+/*
+  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+  Copyright (c) 2016 Sandeep Mistry All right reserved.
+  Copyright (c) 2018, Adafruit Industries (adafruit.com)
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "variant.h"
+#include "nrf.h"
+#include "wiring_constants.h"
+#include "wiring_digital.h"
+
+const uint32_t g_ADigitalPinMap[] = {
+    // P0 - pins 0 and 1 are hardwired for xtal and should never be enabled
+    0xff, 0xff, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+
+    // P1
+    32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47};
+
+void initVariant()
+{
+    // LED1 & LED2
+    pinMode(PIN_LED1, OUTPUT);
+    ledOff(PIN_LED1);
+
+    pinMode(PIN_LED2, OUTPUT);
+    ledOff(PIN_LED2);
+
+    pinMode(PIN_LED3, OUTPUT);
+    ledOff(PIN_LED3);
+}
diff --git a/variants/ELECROW-ThinkNode-M1/variant.h b/variants/ELECROW-ThinkNode-M1/variant.h
new file mode 100644
index 000000000..3bfa360f6
--- /dev/null
+++ b/variants/ELECROW-ThinkNode-M1/variant.h
@@ -0,0 +1,205 @@
+/*
+ Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+ Copyright (c) 2016 Sandeep Mistry All right reserved.
+ Copyright (c) 2018, Adafruit Industries (adafruit.com)
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the GNU Lesser General Public License for more details.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef _VARIANT_ELECROW_EINK_V1_0_
+#define _VARIANT_ELECROW_EINK_V1_0_
+
+/** Master clock frequency */
+#define VARIANT_MCK (64000000ul)
+
+#define USE_LFXO // Board uses 32khz crystal for LF
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+
+#include "WVariant.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+// Number of pins defined in PinDescription array
+// 在PinDescription数组中定义的引脚数
+#define PINS_COUNT (48)
+#define NUM_DIGITAL_PINS (48)
+#define NUM_ANALOG_INPUTS (1)
+#define NUM_ANALOG_OUTPUTS (0)
+
+#define PIN_LED1 -1
+#define PIN_LED2 -1
+#define PIN_LED3 -1
+
+// LED
+#define POWER_LED (32 + 6) // red
+#define LED_POWER (32 + 4)
+#define USER_LED (0 + 13) // green
+// USB_CHECK
+#define USB_CHECK (32 + 3)
+#define ADC_V (0 + 8)
+
+#define LED_RED PIN_LED3
+#define LED_BLUE PIN_LED1
+#define LED_GREEN PIN_LED2
+#define LED_BUILTIN LED_BLUE
+#define LED_CONN PIN_GREEN
+#define LED_STATE_ON 0 // State when LED is lit  // LED灯亮时的状态
+#define M1_buzzer (0 + 6)
+/*
+ * Buttons
+ */
+#define PIN_BUTTON2 (32 + 10)
+#define PIN_BUTTON1 (32 + 7)
+
+// #define PIN_BUTTON1 (0 + 11)
+// #define PIN_BUTTON1 (32 + 7)
+
+// #define BUTTON_CLICK_MS 400
+// #define BUTTON_TOUCH_MS 200
+
+/*
+ * Analog pins
+ */
+#define PIN_A0 (4) // Battery ADC
+
+#define BATTERY_PIN PIN_A0
+
+static const uint8_t A0 = PIN_A0;
+
+#define ADC_RESOLUTION 14
+
+#define PIN_NFC1 (9)
+#define PIN_NFC2 (10)
+
+/*Wire Interfaces*/
+#define WIRE_INTERFACES_COUNT 1
+
+#define PIN_WIRE_SDA (26)
+#define PIN_WIRE_SCL (27)
+
+/* touch sensor, active high */
+
+#define TP_SER_IO (0 + 11)
+
+#define PIN_RTC_INT (0 + 16) // Interrupt from the PCF8563 RTC
+
+/*
+External serial flash WP25R1635FZUIL0
+*/
+
+// QSPI Pins
+#define PIN_QSPI_SCK (32 + 14)
+#define PIN_QSPI_CS (32 + 15)
+#define PIN_QSPI_IO0 (32 + 12) // MOSI if using two bit interface
+#define PIN_QSPI_IO1 (32 + 13) // MISO if using two bit interface
+#define PIN_QSPI_IO2 (0 + 7)   // WP if using two bit interface (i.e. not used)
+#define PIN_QSPI_IO3 (0 + 5)   // HOLD if using two bit interface (i.e. not used)
+
+// On-board QSPI Flash
+#define EXTERNAL_FLASH_DEVICES MX25R1635F
+#define EXTERNAL_FLASH_USE_QSPI
+
+/*
+ * Lora radio
+ */
+#define SX126X_POWER_EN (0 + 21)
+#define USE_SX1262
+#define SX126X_CS (0 + 24) // FIXME - we really should define LORA_CS instead
+#define SX126X_DIO1 (0 + 20)
+// Note DIO2 is attached internally to the module to an analog switch for TX/RX switching
+// #define SX1262_DIO3 (0 + 21) // This is used as an *output* from the sx1262 and connected internally to power the tcxo, do not
+// drive from the main
+#define SX126X_BUSY (0 + 17)
+#define SX126X_RESET (0 + 25)
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_DIO3_TCXO_VOLTAGE 3.3
+
+#define PIN_EINK_EN (32 + 11) // Note: this is really just backlight power
+#define PIN_EINK_CS (0 + 30)
+#define PIN_EINK_BUSY (0 + 3)
+#define PIN_EINK_DC (0 + 28)
+#define PIN_EINK_RES (0 + 2)
+#define PIN_EINK_SCLK (0 + 31)
+#define PIN_EINK_MOSI (0 + 29) // also called SDI
+
+// Controls power for all peripherals (eink + GPS + LoRa + Sensor)
+#define PIN_POWER_EN (0 + 12)
+
+#define USE_EINK
+
+#define PIN_SPI1_MISO (32 + 7)
+#define PIN_SPI1_MOSI PIN_EINK_MOSI
+#define PIN_SPI1_SCK PIN_EINK_SCLK
+
+/*
+ * GPS pins
+ */
+// #define HAS_GPS 1
+#define GPS_L76K
+#define GPS_BAUDRATE 9600
+#define PIN_GPS_REINIT (32 + 5)  // An output to reset L76K GPS. As per datasheet, low for > 100ms will reset the L76K
+#define PIN_GPS_STANDBY (32 + 2) // An output to wake GPS, low means allow sleep, high means force wake
+// Seems to be missing on this new board
+// #define PIN_GPS_PPS (32 + 4)  // Pulse per second input from the GPS
+#define GPS_TX_PIN (32 + 9) // This is for bits going TOWARDS the CPU
+#define GPS_RX_PIN (32 + 8) // This is for bits going TOWARDS the GPS
+
+#define GPS_THREAD_INTERVAL 50
+
+#define PIN_GPS_PPS (32 + 1) // GPS开关判断
+
+#define PIN_SERIAL1_RX GPS_TX_PIN
+#define PIN_SERIAL1_TX GPS_RX_PIN
+
+// PCF8563 RTC Module
+#define PCF8563_RTC 0x51
+
+/*
+ * SPI Interfaces
+ */
+#define SPI_INTERFACES_COUNT 2
+
+// For LORA, spi 0
+#define PIN_SPI_MISO (0 + 23)
+#define PIN_SPI_MOSI (0 + 22)
+#define PIN_SPI_SCK (0 + 19)
+
+#define PIN_PWR_EN (0 + 6)
+
+// To debug via the segger JLINK console rather than the CDC-ACM serial device
+// #define USE_SEGGER
+
+// Battery
+// The battery sense is hooked to pin A0 (4)
+// it is defined in the anlaolgue pin section of this file
+// and has 12 bit resolution
+#define BATTERY_SENSE_RESOLUTION_BITS 12
+#define BATTERY_SENSE_RESOLUTION 4096.0
+#undef AREF_VOLTAGE
+#define AREF_VOLTAGE 3.0
+#define VBAT_AR_INTERNAL AR_INTERNAL_3_0
+#define ADC_MULTIPLIER (2.02F)
+
+// #define HAS_RTC 0
+// #define HAS_SCREEN 0
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
\ No newline at end of file

From 02237f5ac643c7319a2d431cfcf5545e9bc6ac94 Mon Sep 17 00:00:00 2001
From: Austin <vidplace7@gmail.com>
Date: Fri, 28 Mar 2025 16:59:42 -0400
Subject: [PATCH 085/116] Portduino: Return CH341 Product Strng (#6436)

---
 src/platform/portduino/PortduinoGlue.cpp | 5 ++++-
 src/platform/portduino/USBHal.h          | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/platform/portduino/PortduinoGlue.cpp b/src/platform/portduino/PortduinoGlue.cpp
index 9da65c92c..7b13971b4 100644
--- a/src/platform/portduino/PortduinoGlue.cpp
+++ b/src/platform/portduino/PortduinoGlue.cpp
@@ -210,7 +210,10 @@ void portduinoSetup()
         }
         char serial[9] = {0};
         ch341Hal->getSerialString(serial, 8);
-        std::cout << "Serial " << serial << std::endl;
+        std::cout << "CH341 Serial " << serial << std::endl;
+        char product_string[96] = {0};
+        ch341Hal->getProductString(product_string, 95);
+        std::cout << "CH341 Product " << product_string << std::endl;
         if (strlen(serial) == 8 && settingsStrings[mac_address].length() < 12) {
             uint8_t hash[32] = {0};
             memcpy(hash, serial, 8);
diff --git a/src/platform/portduino/USBHal.h b/src/platform/portduino/USBHal.h
index 0d6b361f4..ce2a5cfd3 100644
--- a/src/platform/portduino/USBHal.h
+++ b/src/platform/portduino/USBHal.h
@@ -61,6 +61,12 @@ class Ch341Hal : public RadioLibHal
         strncpy(_serial, pinedio.serial_number, len);
     }
 
+    void getProductString(char *_product_string, size_t len)
+    {
+        len = len > 95 ? 95 : len;
+        strncpy(_product_string, pinedio.product_string, len);
+    }
+
     void init() override {}
     void term() override {}
 

From 89cde1a8e61344f1f0ff80a12bd338f587c529a0 Mon Sep 17 00:00:00 2001
From: Jorropo <jorropo.pgm@gmail.com>
Date: Fri, 28 Mar 2025 22:10:33 +0100
Subject: [PATCH 086/116] udp-multicast: bump platform-native to UDP with error
 handling support (#6433)

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
---
 arch/portduino/portduino.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini
index 55234914f..3b5ec1a9b 100644
--- a/arch/portduino/portduino.ini
+++ b/arch/portduino/portduino.ini
@@ -1,6 +1,6 @@
 ; The Portduino based 'native' environment. Currently supported on Linux targets with real LoRa hardware (or simulated).
 [portduino_base]
-platform = https://github.com/meshtastic/platform-native.git#e82ba1a19b6cd1dc55cbde29b33ea8dd0640014f
+platform = https://github.com/meshtastic/platform-native.git#c5bd469ab9b5a6966321e09557b27d906961da63
 framework = arduino
 
 build_src_filter = 

From 6c7c0770f921b43a189aa96a87e403dfbc62ae53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Sat, 29 Mar 2025 01:55:00 +0100
Subject: [PATCH 087/116] add ThinkNode M2 Support (#6354)

* [WIP] Base firmware pending support for 2nd button

* Update button behaviour. Still WIP

* [WIP] Base firmware pending support for 2nd button

* Update button behaviour. Still WIP

* change env to lowercase

Co-authored-by: rcarteraz <robert.l.carter2@gmail.com>

* yea - well - what else is new?

* fix secondary button behavior and update trunk

---------

Co-authored-by: rcarteraz <robert.l.carter2@gmail.com>
---
 .trunk/trunk.yaml                            |  2 +-
 protobufs                                    |  2 +-
 src/ButtonThread.cpp                         | 64 ++++++++++++++++++--
 src/ButtonThread.h                           | 10 ++-
 src/Power.cpp                                |  6 +-
 src/buzz/buzz.cpp                            | 13 +++-
 src/buzz/buzz.h                              |  1 +
 src/main.cpp                                 |  7 ++-
 src/platform/esp32/architecture.h            |  2 +
 src/platform/esp32/main-esp32.cpp            |  5 ++
 src/power.h                                  |  2 +-
 variants/ELECROW-ThinkNode-M2/pins_arduino.h | 28 +++++++++
 variants/ELECROW-ThinkNode-M2/platformio.ini |  7 +++
 variants/ELECROW-ThinkNode-M2/variant.h      | 64 ++++++++++++++++++++
 14 files changed, 201 insertions(+), 12 deletions(-)
 create mode 100644 variants/ELECROW-ThinkNode-M2/pins_arduino.h
 create mode 100644 variants/ELECROW-ThinkNode-M2/platformio.ini
 create mode 100644 variants/ELECROW-ThinkNode-M2/variant.h

diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
index 71d37bc2e..8f938ce9e 100644
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -12,7 +12,7 @@ lint:
     - trufflehog@3.88.18
     - yamllint@1.37.0
     - bandit@1.8.3
-    - checkov@3.2.392
+    - checkov@3.2.394
     - terrascan@1.19.9
     - trivy@0.60.0
     - taplo@0.9.3
diff --git a/protobufs b/protobufs
index b4044f8f9..14ec20586 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit b4044f8f9f3681d4d20521dbe13ee42c96eae353
+Subproject commit 14ec205865592fcfa798065bb001a549fc77b438
diff --git a/src/ButtonThread.cpp b/src/ButtonThread.cpp
index 12f81353c..2363f804c 100644
--- a/src/ButtonThread.cpp
+++ b/src/ButtonThread.cpp
@@ -73,23 +73,28 @@ ButtonThread::ButtonThread() : OSThread("Button")
     userButton.setDebounceMs(1);
     userButton.attachDoubleClick(userButtonDoublePressed);
     userButton.attachMultiClick(userButtonMultiPressed, this); // Reference to instance: get click count from non-static OneButton
-#ifndef T_DECK // T-Deck immediately wakes up after shutdown, so disable this function
+#if !defined(T_DECK) &&                                                                                                          \
+    !defined(                                                                                                                    \
+        ELECROW_ThinkNode_M2) // T-Deck immediately wakes up after shutdown, Thinknode M2 has this on the smaller ALT button
     userButton.attachLongPressStart(userButtonPressedLongStart);
     userButton.attachLongPressStop(userButtonPressedLongStop);
 #endif
 #endif
 
 #ifdef BUTTON_PIN_ALT
-    userButtonAlt = OneButton(BUTTON_PIN_ALT, true, true);
+#if defined(ELECROW_ThinkNode_M2)
+    this->userButtonAlt = OneButton(BUTTON_PIN_ALT, false, false);
+#else
+    this->userButtonAlt = OneButton(BUTTON_PIN_ALT, true, true);
+#endif
 #ifdef INPUT_PULLUP_SENSE
     // Some platforms (nrf52) have a SENSE variant which allows wake from sleep - override what OneButton did
     pinMode(BUTTON_PIN_ALT, INPUT_PULLUP_SENSE);
 #endif
-    userButtonAlt.attachClick(userButtonPressed);
+    userButtonAlt.attachClick(userButtonPressedScreen);
     userButtonAlt.setClickMs(BUTTON_CLICK_MS);
     userButtonAlt.setPressMs(BUTTON_LONGPRESS_MS);
     userButtonAlt.setDebounceMs(1);
-    userButtonAlt.attachDoubleClick(userButtonDoublePressed);
     userButtonAlt.attachLongPressStart(userButtonPressedLongStart);
     userButtonAlt.attachLongPressStop(userButtonPressedLongStop);
 #endif
@@ -117,6 +122,40 @@ int32_t ButtonThread::runOnce()
     canSleep = true; // Assume we should not keep the board awake
 
 #if defined(BUTTON_PIN) || defined(USERPREFS_BUTTON_PIN)
+    // #if defined(ELECROW_ThinkNode_M1) || defined(ELECROW_ThinkNode_M2)
+    //     buzzer_updata();
+    //     if (buttonPressed) {
+    //         buttonPressed = false;            // 清除标志
+    //         LOG_INFO("PIN_BUTTON2 pressed!"); // 串口打印信息
+    //         // off_currentTime = millis();
+    //         while (digitalRead(PIN_BUTTON2) == HIGH) {
+    //             if (cont < 40) {
+    //                 //     unsigned long currentTime = millis(); // 获取当前时间
+    //                 //     if (currentTime - off_currentTime >= 1000) {
+    //                 cont++;
+    //                 //         off_currentTime = currentTime;
+    //                 //     }
+    //                 delay(100);
+    //             } else {
+
+    //                 currentState = OFF;
+    //                 isBuzzing = false;
+    //                 cont = 0;
+    //                 BEEP_STATE = false;
+    //                 analogWrite(M2_buzzer, 0);
+    //                 pinMode(M2_buzzer, INPUT);
+    //                 screen->setOn(false);
+    //                 cont = 0;
+    //                 LOG_INFO("GGGGGGGGGGGGGGGGGGGGGGGGG");
+    //                 pinMode(1, OUTPUT);
+    //                 digitalWrite(1, LOW);
+    //                 pinMode(6, OUTPUT);
+    //                 digitalWrite(6, LOW);
+    //             }
+    //         }
+    //     }
+
+    // #endif
     userButton.tick();
     canSleep &= userButton.isIdle();
 #elif defined(ARCH_PORTDUINO)
@@ -166,6 +205,14 @@ int32_t ButtonThread::runOnce()
             break;
         }
 
+        case BUTTON_EVENT_PRESSED_SCREEN: {
+            // turn screen on or off
+            screen_flag = !screen_flag;
+            if (screen)
+                screen->setOn(screen_flag);
+            break;
+        }
+
         case BUTTON_EVENT_DOUBLE_PRESSED: {
             LOG_BUTTON("Double press!");
             service->refreshLocalMeshNode();
@@ -192,7 +239,16 @@ int32_t ButtonThread::runOnce()
                         screen->forceDisplay(true); // Force a new UI frame, then force an EInk update
                 }
                 break;
+#elif defined(ELECROW_ThinkNode_M2)
+            case 3:
+                LOG_INFO("3 clicks: toggle buzzer");
+                buzzer_flag = !buzzer_flag;
+                if (buzzer_flag) {
+                    playBeep();
+                }
+                break;
 #endif
+
 #if defined(USE_EINK) && defined(PIN_EINK_EN) // i.e. T-Echo
             // 4 clicks: toggle backlight
             case 4:
diff --git a/src/ButtonThread.h b/src/ButtonThread.h
index 54b833d03..a8f1f77c3 100644
--- a/src/ButtonThread.h
+++ b/src/ButtonThread.h
@@ -24,6 +24,7 @@ class ButtonThread : public concurrency::OSThread
     enum ButtonEventType {
         BUTTON_EVENT_NONE,
         BUTTON_EVENT_PRESSED,
+        BUTTON_EVENT_PRESSED_SCREEN,
         BUTTON_EVENT_DOUBLE_PRESSED,
         BUTTON_EVENT_MULTI_PRESSED,
         BUTTON_EVENT_LONG_PRESSED,
@@ -42,7 +43,6 @@ class ButtonThread : public concurrency::OSThread
     int beforeLightSleep(void *unused);
     int afterLightSleep(esp_sleep_wakeup_cause_t cause);
 #endif
-
   private:
 #if defined(BUTTON_PIN) || defined(ARCH_PORTDUINO) || defined(USERPREFS_BUTTON_PIN)
     static OneButton userButton; // Static - accessed from an interrupt
@@ -64,6 +64,8 @@ class ButtonThread : public concurrency::OSThread
 
     // set during IRQ
     static volatile ButtonEventType btnEvent;
+    bool buzzer_flag = false;
+    bool screen_flag = true;
 
     // Store click count during callback, for later use
     volatile int multipressClickCount = 0;
@@ -72,6 +74,12 @@ class ButtonThread : public concurrency::OSThread
 
     // IRQ callbacks
     static void userButtonPressed() { btnEvent = BUTTON_EVENT_PRESSED; }
+    static void userButtonPressedScreen()
+    {
+        if (millis() > c_holdOffTime) {
+            btnEvent = BUTTON_EVENT_PRESSED_SCREEN;
+        }
+    }
     static void userButtonDoublePressed() { btnEvent = BUTTON_EVENT_DOUBLE_PRESSED; }
     static void userButtonMultiPressed(void *callerThread); // Retrieve click count from non-static Onebutton while still valid
     static void userButtonPressedLongStart();
diff --git a/src/Power.cpp b/src/Power.cpp
index 20447ad63..ec3550869 100644
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -713,7 +713,7 @@ void Power::readPowerStatus()
     const PowerStatus powerStatus2 = PowerStatus(hasBattery, usbPowered, isCharging, batteryVoltageMv, batteryChargePercent);
     LOG_DEBUG("Battery: usbPower=%d, isCharging=%d, batMv=%d, batPct=%d", powerStatus2.getHasUSB(), powerStatus2.getIsCharging(),
               powerStatus2.getBatteryVoltageMv(), powerStatus2.getBatteryChargePercent());
-#if defined(ELECROW_ThinkNode_M1)
+#if defined(ELECROW_ThinkNode_M1) || defined(POWER_CFG)
     power_num = powerStatus2.getBatteryVoltageMv();
 #endif
     newStatus.notifyObservers(&powerStatus2);
@@ -759,6 +759,7 @@ void Power::readPowerStatus()
     // If we have a battery at all and it is less than 0%, force deep sleep if we have more than 10 low readings in
     // a row. NOTE: min LiIon/LiPo voltage is 2.0 to 2.5V, current OCV min is set to 3100 that is large enough.
     //
+
     if (batteryLevel && powerStatus2.getHasBattery() && !powerStatus2.getHasUSB()) {
         if (batteryLevel->getBattVoltage() < OCV[NUM_OCV_POINTS - 1]) {
             low_voltage_counter++;
@@ -781,6 +782,9 @@ void Power::readPowerStatus()
             low_voltage_counter_led3 = low_voltage_counter;
 #endif
         }
+#ifdef POWER_CFG
+        low_voltage_counter_led3 = low_voltage_counter;
+#endif
     }
 }
 
diff --git a/src/buzz/buzz.cpp b/src/buzz/buzz.cpp
index 8db9602bc..6ba2f4140 100644
--- a/src/buzz/buzz.cpp
+++ b/src/buzz/buzz.cpp
@@ -30,8 +30,11 @@ struct ToneDuration {
 #define NOTE_B3 247
 #define NOTE_CS4 277
 
-const int DURATION_1_8 = 125; // 1/8 note
-const int DURATION_1_4 = 250; // 1/4 note
+const int DURATION_1_8 = 125;  // 1/8 note
+const int DURATION_1_4 = 250;  // 1/4 note
+const int DURATION_1_2 = 500;  // 1/2 note
+const int DURATION_3_4 = 750;  // 1/4 note
+const int DURATION_1_1 = 1000; // 1/1 note
 
 void playTones(const ToneDuration *tone_durations, int size)
 {
@@ -55,6 +58,12 @@ void playBeep()
     playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }
 
+void playLongBeep()
+{
+    ToneDuration melody[] = {{NOTE_B3, DURATION_1_1}};
+    playTones(melody, sizeof(melody) / sizeof(ToneDuration));
+}
+
 void playGPSEnableBeep()
 {
     ToneDuration melody[] = {{NOTE_C3, DURATION_1_8}, {NOTE_FS3, DURATION_1_4}, {NOTE_CS4, DURATION_1_4}};
diff --git a/src/buzz/buzz.h b/src/buzz/buzz.h
index c52c3020c..adeaca73d 100644
--- a/src/buzz/buzz.h
+++ b/src/buzz/buzz.h
@@ -1,6 +1,7 @@
 #pragma once
 
 void playBeep();
+void playLongBeep();
 void playStartMelody();
 void playShutdownMelody();
 void playGPSEnableBeep();
diff --git a/src/main.cpp b/src/main.cpp
index 2e0470fa1..59cd6d8e9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -262,7 +262,12 @@ void printInfo()
 #ifndef PIO_UNIT_TESTING
 void setup()
 {
-// power on peripherals
+
+#ifdef POWER_CHRG
+    pinMode(POWER_CHRG, OUTPUT);
+    digitalWrite(POWER_CHRG, HIGH);
+#endif
+
 #if defined(PIN_POWER_EN)
     pinMode(PIN_POWER_EN, OUTPUT);
     digitalWrite(PIN_POWER_EN, HIGH);
diff --git a/src/platform/esp32/architecture.h b/src/platform/esp32/architecture.h
index 631df0fe4..0af6d4d04 100644
--- a/src/platform/esp32/architecture.h
+++ b/src/platform/esp32/architecture.h
@@ -144,6 +144,8 @@
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_HT62
 #elif defined(EBYTE_ESP32_S3)
 #define HW_VENDOR meshtastic_HardwareModel_EBYTE_ESP32_S3
+#elif defined(ELECROW_ThinkNode_M2)
+#define HW_VENDOR meshtastic_HardwareModel_THINKNODE_M2
 #elif defined(ESP32_S3_PICO)
 #define HW_VENDOR meshtastic_HardwareModel_ESP32_S3_PICO
 #elif defined(SENSELORA_S3)
diff --git a/src/platform/esp32/main-esp32.cpp b/src/platform/esp32/main-esp32.cpp
index d0fe31f21..ab1e5c922 100644
--- a/src/platform/esp32/main-esp32.cpp
+++ b/src/platform/esp32/main-esp32.cpp
@@ -109,6 +109,11 @@ void esp32Setup()
     randomSeed(seed);
     */
 
+#ifdef POWER_FULL
+    pinMode(POWER_FULL, INPUT);
+    pinMode(7, INPUT);
+#endif
+
     LOG_DEBUG("Total heap: %d", ESP.getHeapSize());
     LOG_DEBUG("Free heap: %d", ESP.getFreeHeap());
     LOG_DEBUG("Total PSRAM: %d", ESP.getPsramSize());
diff --git a/src/power.h b/src/power.h
index 78caa8a7d..97944fef7 100644
--- a/src/power.h
+++ b/src/power.h
@@ -84,7 +84,7 @@ class Power : private concurrency::OSThread
     void setStatusHandler(meshtastic::PowerStatus *handler) { statusHandler = handler; }
     const uint16_t OCV[11] = {OCV_ARRAY};
 
-#if defined(ELECROW_ThinkNode_M1)
+#if defined(ELECROW_ThinkNode_M1) || defined(POWER_CFG)
     uint8_t low_voltage_counter_led3;
     int power_num = 0;
 #endif
diff --git a/variants/ELECROW-ThinkNode-M2/pins_arduino.h b/variants/ELECROW-ThinkNode-M2/pins_arduino.h
new file mode 100644
index 000000000..46415d30f
--- /dev/null
+++ b/variants/ELECROW-ThinkNode-M2/pins_arduino.h
@@ -0,0 +1,28 @@
+// Need this file for ESP32-S3
+// No need to modify this file, changes to pins imported from variant.h
+// Most is similar to https://github.com/espressif/arduino-esp32/blob/master/variants/esp32s3/pins_arduino.h
+
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+#include <variant.h>
+
+#define USB_VID 0x303a
+#define USB_PID 0x1001
+
+// Serial
+static const uint8_t TX = UART_TX;
+static const uint8_t RX = UART_RX;
+
+// Default SPI will be mapped to Radio
+static const uint8_t SS = LORA_CS;
+static const uint8_t SCK = LORA_SCK;
+static const uint8_t MOSI = LORA_MOSI;
+static const uint8_t MISO = LORA_MISO;
+
+// The default Wire will be mapped to PMU and RTC
+static const uint8_t SCL = I2C_SCL;
+static const uint8_t SDA = I2C_SDA;
+
+#endif /* Pins_Arduino_h */
diff --git a/variants/ELECROW-ThinkNode-M2/platformio.ini b/variants/ELECROW-ThinkNode-M2/platformio.ini
new file mode 100644
index 000000000..c08c94a71
--- /dev/null
+++ b/variants/ELECROW-ThinkNode-M2/platformio.ini
@@ -0,0 +1,7 @@
+[env:thinknode_m2]
+extends = esp32s3_base
+board = ESP32-S3-WROOM-1-N4
+build_flags =
+  ${esp32s3_base.build_flags}
+  -D ELECROW_ThinkNode_M2
+  -I variants/ELECROW-ThinkNode-M2
diff --git a/variants/ELECROW-ThinkNode-M2/variant.h b/variants/ELECROW-ThinkNode-M2/variant.h
new file mode 100644
index 000000000..801d5606f
--- /dev/null
+++ b/variants/ELECROW-ThinkNode-M2/variant.h
@@ -0,0 +1,64 @@
+// Status
+#define LED_PIN_POWER 1
+#define BIAS_T_ENABLE LED_PIN_POWER
+#define BIAS_T_VALUE HIGH
+
+#define PIN_BUTTON1 47 // 功能键
+#define PIN_BUTTON2 4  // 电源键
+
+#define POWER_CFG
+#define POWER_CHRG 6
+#define POWER_FULL 42
+
+#define PIN_BUZZER 5
+
+#define I2C_SCL 15
+#define I2C_SDA 16
+
+#define UART_TX 43
+#define UART_RX 44
+
+#define VEXT_ENABLE 46 // for OLED
+#define VEXT_ON_VALUE HIGH
+
+#define SX126X_CS 10
+#define LORA_SCK 12
+#define LORA_MOSI 11
+#define LORA_MISO 13
+#define SX126X_RESET 21
+#define SX126X_BUSY 14
+#define SX126X_DIO1 3
+#define SX126X_DIO2_AS_RF_SWITCH
+// #define SX126X_DIO3 9
+#define SX126X_DIO3_TCXO_VOLTAGE 3.3
+
+#define SX126X_MAX_POWER 22 // SX126xInterface.cpp defaults to 22 if not defined, but here we define it for good practice
+#define USE_SX1262
+#define LORA_CS SX126X_CS // FIXME: for some reason both are used in /src
+#define LORA_DIO1 SX126X_DIO1
+#define SX126X_POWER_EN 48
+
+// Battery
+// #define BATTERY_PIN 2
+#define BATTERY_PIN 17
+// #define ADC_CHANNEL ADC1_GPIO2_CHANNEL
+#define ADC_CHANNEL ADC2_GPIO17_CHANNEL
+#define BATTERY_SENSE_RESOLUTION_BITS 12
+#define BATTERY_SENSE_RESOLUTION 4096.0
+#undef AREF_VOLTAGE
+#define AREF_VOLTAGE 3.0
+#define VBAT_AR_INTERNAL AR_INTERNAL_3_0
+#define ADC_MULTIPLIER (1.548F)
+#define BAT_MEASURE_ADC_UNIT 2
+
+#define HAS_SCREEN 1
+#define USE_SH1106 1
+
+// PCF8563 RTC Module
+// #define PCF8563_RTC 0x51
+// #define PIN_RTC_INT 48 // Interrupt from the PCF8563 RTC
+#define HAS_RTC 0
+#define HAS_GPS 0
+
+#define BUTTON_PIN PIN_BUTTON1
+#define BUTTON_PIN_ALT PIN_BUTTON2

From c602bfecbd1a6f4c64857fcde6f457322c246ebc Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Fri, 28 Mar 2025 20:13:19 -0500
Subject: [PATCH 088/116] Update version.properties

---
 version.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.properties b/version.properties
index 9d6d2a464..56a8e4f3a 100644
--- a/version.properties
+++ b/version.properties
@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 6
-build = 3
+build = 4

From 4a3991a8c6e1e9b16bc80241abbacb71df747728 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 28 Mar 2025 20:14:15 -0500
Subject: [PATCH 089/116] [create-pull-request] automated change (#6438)

Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
---
 protobufs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/protobufs b/protobufs
index 14ec20586..f00e96f12 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit 14ec205865592fcfa798065bb001a549fc77b438
+Subproject commit f00e96f12da48abfa9a992f8b5546fd75a370250

From 0491c890d72981c360ddbfebbf314060f031c43b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Sat, 29 Mar 2025 08:26:30 +0100
Subject: [PATCH 090/116] recognize M1

---
 src/platform/nrf52/architecture.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/platform/nrf52/architecture.h b/src/platform/nrf52/architecture.h
index 1a06f173a..95ed8c617 100644
--- a/src/platform/nrf52/architecture.h
+++ b/src/platform/nrf52/architecture.h
@@ -54,7 +54,7 @@
 #elif defined(TTGO_T_ECHO)
 #define HW_VENDOR meshtastic_HardwareModel_T_ECHO
 #elif defined(ELECROW_ThinkNode_M1)
-#define HW_VENDOR meshtastic_HardwareModel_NRF52_UNKNOWN // HW_VENDOR meshtastic_HardwareModel_ThinkNode_M1
+#define HW_VENDOR meshtastic_HardwareModel_ThinkNode_M1
 #elif defined(NANO_G2_ULTRA)
 #define HW_VENDOR meshtastic_HardwareModel_NANO_G2_ULTRA
 #elif defined(CANARYONE)
@@ -133,4 +133,4 @@
 #if !defined(PIN_SERIAL_RX) && !defined(NRF52840_XXAA)
 // No serial ports on this board - ONLY use segger in memory console
 #define USE_SEGGER
-#endif
\ No newline at end of file
+#endif

From ea9485657e845fdbcd116d4c584c560f6f955a81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Sat, 29 Mar 2025 12:19:05 +0100
Subject: [PATCH 091/116] Speed up builds by referencing github zips for
 shallow checkouts (#6441)

* Speed up builds by referencing github zips for shallow checkouts

* sadly the zips don't include submodules OR submodule metadata
---
 arch/esp32/esp32.ini                           |  6 +++---
 arch/esp32/esp32c6.ini                         |  4 ++--
 arch/nrf52/nrf52.ini                           |  2 +-
 arch/nrf52/nrf52840.ini                        |  2 +-
 arch/portduino/portduino.ini                   |  4 ++--
 arch/rp2xx0/rp2040.ini                         |  4 ++--
 arch/rp2xx0/rp2350.ini                         |  4 ++--
 arch/stm32/stm32.ini                           |  4 ++--
 platformio.ini                                 | 18 +++++++++---------
 variants/CDEBYTE_E77-MBL/platformio.ini        |  2 --
 .../MakePython_nRF52840_eink/platformio.ini    |  2 +-
 .../MakePython_nRF52840_oled/platformio.ini    |  2 +-
 .../crowpanel-esp32s3-5-epaper/platformio.ini  |  6 +++---
 variants/heltec_mesh_node_t114/platformio.ini  |  2 +-
 .../heltec_vision_master_e213/platformio.ini   |  2 +-
 .../heltec_vision_master_e290/platformio.ini   |  2 +-
 .../heltec_vision_master_t190/platformio.ini   |  2 +-
 variants/heltec_wireless_paper/platformio.ini  |  2 +-
 .../heltec_wireless_paper_v1/platformio.ini    |  2 +-
 variants/meshlink/platformio.ini               |  2 +-
 variants/meshlink_eink/platformio.ini          |  2 +-
 variants/monteops_hw1/platformio.ini           |  2 +-
 variants/radiomaster_900_bandit/platformio.ini |  2 +-
 variants/rak11310/platformio.ini               |  2 +-
 variants/rak2560/platformio.ini                |  2 +-
 variants/rak4631/platformio.ini                |  6 +++---
 variants/rak4631_eth_gw/platformio.ini         |  6 +++---
 variants/rak_wismeshtap/platformio.ini         |  2 +-
 .../seeed-sensecap-indicator/platformio.ini    |  6 +++---
 variants/t-echo/platformio.ini                 |  2 +-
 variants/t-eth-elite/platformio.ini            |  2 +-
 variants/tlora_t3s3_epaper/platformio.ini      |  2 +-
 variants/tracker-t1000-e/platformio.ini        |  2 +-
 33 files changed, 55 insertions(+), 57 deletions(-)

diff --git a/arch/esp32/esp32.ini b/arch/esp32/esp32.ini
index 256781ba1..df3778002 100644
--- a/arch/esp32/esp32.ini
+++ b/arch/esp32/esp32.ini
@@ -45,11 +45,11 @@ lib_deps =
   ${networking_base.lib_deps}
   ${environmental_base.lib_deps}
   ${radiolib_base.lib_deps}
-  https://github.com/meshtastic/esp32_https_server.git#23665b3adc080a311dcbb586ed5941b5f94d6ea2
+  https://github.com/meshtastic/esp32_https_server/archive/23665b3adc080a311dcbb586ed5941b5f94d6ea2.zip
   h2zero/NimBLE-Arduino@^1.4.3
-  https://github.com/dbinfrago/libpax.git#3cdc0371c375676a97967547f4065607d4c53fd1
+  https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip
   lewisxhe/XPowersLib@^0.2.7
-  https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
+  https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
   rweather/Crypto@^0.4.0
 
 lib_ignore = 
diff --git a/arch/esp32/esp32c6.ini b/arch/esp32/esp32c6.ini
index d0425812f..dba3bac08 100644
--- a/arch/esp32/esp32c6.ini
+++ b/arch/esp32/esp32c6.ini
@@ -1,6 +1,6 @@
 [esp32c6_base]
 extends = esp32_base
-platform = https://github.com/Jason2866/platform-espressif32.git#22faa566df8c789000f8136cd8d0aca49617af55
+platform = https://github.com/Jason2866/platform-espressif32/archive/22faa566df8c789000f8136cd8d0aca49617af55.zip
 build_flags =
   ${arduino_base.build_flags}
   -Wall
@@ -25,7 +25,7 @@ lib_deps =
   ${environmental_base.lib_deps}
   ${radiolib_base.lib_deps}
   lewisxhe/XPowersLib@^0.2.7
-  https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
+  https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
   rweather/Crypto@^0.4.0
 
 build_src_filter = 
diff --git a/arch/nrf52/nrf52.ini b/arch/nrf52/nrf52.ini
index d4e88af1f..310967e49 100644
--- a/arch/nrf52/nrf52.ini
+++ b/arch/nrf52/nrf52.ini
@@ -4,7 +4,7 @@ platform = platformio/nordicnrf52@^10.7.0
 extends = arduino_base
 platform_packages =
   ; our custom Git version until they merge our PR
-  platformio/framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino.git#e13f5820002a4fb2a5e6754b42ace185277e5adf
+  platformio/framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino#e13f5820002a4fb2a5e6754b42ace185277e5adf
   platformio/toolchain-gccarmnoneeabi@~1.90301.0
 
 build_type = debug
diff --git a/arch/nrf52/nrf52840.ini b/arch/nrf52/nrf52840.ini
index a13a600f3..0dab5d9ba 100644
--- a/arch/nrf52/nrf52840.ini
+++ b/arch/nrf52/nrf52840.ini
@@ -6,7 +6,7 @@ build_flags = ${nrf52_base.build_flags}
 lib_deps =
   ${nrf52_base.lib_deps}
   ${environmental_base.lib_deps}
-  https://github.com/Kongduino/Adafruit_nRFCrypto.git#e31a8825ea3300b163a0a3c1ddd5de34e10e1371
+  https://github.com/Kongduino/Adafruit_nRFCrypto/archive/e31a8825ea3300b163a0a3c1ddd5de34e10e1371.zip
 
 ; Common NRF52 debugging settings follow.  See the Meshtastic developer docs for how to connect SWD debugging probes to your board.
 
diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini
index 3b5ec1a9b..e0488aeff 100644
--- a/arch/portduino/portduino.ini
+++ b/arch/portduino/portduino.ini
@@ -1,6 +1,6 @@
 ; The Portduino based 'native' environment. Currently supported on Linux targets with real LoRa hardware (or simulated).
 [portduino_base]
-platform = https://github.com/meshtastic/platform-native.git#c5bd469ab9b5a6966321e09557b27d906961da63
+platform = https://github.com/meshtastic/platform-native/archive/c5bd469ab9b5a6966321e09557b27d906961da63.zip
 framework = arduino
 
 build_src_filter = 
@@ -26,7 +26,7 @@ lib_deps =
   ${radiolib_base.lib_deps}
   rweather/Crypto@^0.4.0
   lovyan03/LovyanGFX@^1.2.0
-  https://github.com/pine64/libch341-spi-userspace#a9b17e3452f7fb747000d9b4ad4409155b39f6ef
+  https://github.com/pine64/libch341-spi-userspace/archive/a9b17e3452f7fb747000d9b4ad4409155b39f6ef.zip
 
 build_flags =
   ${arduino_base.build_flags}
diff --git a/arch/rp2xx0/rp2040.ini b/arch/rp2xx0/rp2040.ini
index 1542dbee7..33fcfb211 100644
--- a/arch/rp2xx0/rp2040.ini
+++ b/arch/rp2xx0/rp2040.ini
@@ -1,8 +1,8 @@
 ; Common settings for rp2040 Processor based targets
 [rp2040_base]
-platform = https://github.com/maxgerhardt/platform-raspberrypi.git#76ecf3c7e9dd4503af0331154c4ca1cddc4b03e5 ; For arduino-pico >= 4.4.3
+platform = https://github.com/maxgerhardt/platform-raspberrypi#76ecf3c7e9dd4503af0331154c4ca1cddc4b03e5 ; For arduino-pico >= 4.4.3
 extends = arduino_base
-platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#4.4.3
+platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico#4.4.3
 
 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
diff --git a/arch/rp2xx0/rp2350.ini b/arch/rp2xx0/rp2350.ini
index 6f1e4400e..841035c80 100644
--- a/arch/rp2xx0/rp2350.ini
+++ b/arch/rp2xx0/rp2350.ini
@@ -1,8 +1,8 @@
 ; Common settings for rp2040 Processor based targets
 [rp2350_base]
-platform = https://github.com/maxgerhardt/platform-raspberrypi.git#76ecf3c7e9dd4503af0331154c4ca1cddc4b03e5 ; For arduino-pico >= 4.4.3
+platform = https://github.com/maxgerhardt/platform-raspberrypi#76ecf3c7e9dd4503af0331154c4ca1cddc4b03e5 ; For arduino-pico >= 4.4.3
 extends = arduino_base
-platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#4.4.3
+platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico#4.4.3
 
 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
diff --git a/arch/stm32/stm32.ini b/arch/stm32/stm32.ini
index d5e615f5f..c1b58bb82 100644
--- a/arch/stm32/stm32.ini
+++ b/arch/stm32/stm32.ini
@@ -1,7 +1,7 @@
 [stm32_base]
 extends = arduino_base
 platform = ststm32
-platform_packages = platformio/framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32.git#2.9.0
+platform_packages = platformio/framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/2.10.1.zip
 extra_scripts =
   ${env.extra_scripts}
   post:extra_scripts/extra_stm32.py
@@ -35,7 +35,7 @@ debug_tool = stlink
 lib_deps =
   ${env.lib_deps}
   ${radiolib_base.lib_deps}
-  https://github.com/caveman99/Crypto.git#eae9c768054118a9399690f8af202853d1ae8516
+  https://github.com/caveman99/Crypto/archive/eae9c768054118a9399690f8af202853d1ae8516.zip
 
 lib_ignore =
   mathertel/OneButton@2.6.1
diff --git a/platformio.ini b/platformio.ini
index 542374637..3db4af88d 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -56,11 +56,11 @@ build_flags = -Wno-missing-field-initializers
 monitor_speed = 115200
 monitor_filters = direct
 lib_deps =
-	https://github.com/meshtastic/esp8266-oled-ssd1306.git#e16cee124fe26490cb14880c679321ad8ac89c95
+	https://github.com/meshtastic/esp8266-oled-ssd1306/archive/e16cee124fe26490cb14880c679321ad8ac89c95.zip
 	mathertel/OneButton@2.6.1
-	https://github.com/meshtastic/arduino-fsm.git#7db3702bf0cfe97b783d6c72595e3f38e0b19159
-	https://github.com/meshtastic/TinyGPSPlus.git#71a82db35f3b973440044c476d4bcdc673b104f4
-	https://github.com/meshtastic/ArduinoThread.git#7c3ee9e1951551b949763b1f5280f8db1fa4068d
+	https://github.com/meshtastic/arduino-fsm/archive/7db3702bf0cfe97b783d6c72595e3f38e0b19159.zip
+	https://github.com/meshtastic/TinyGPSPlus/archive/71a82db35f3b973440044c476d4bcdc673b104f4.zip
+	https://github.com/meshtastic/ArduinoThread/archive/7c3ee9e1951551b949763b1f5280f8db1fa4068d.zip
 	nanopb/Nanopb@0.4.91
 	erriez/ErriezCRC32@1.0.1
 
@@ -94,7 +94,7 @@ lib_deps =
 
 [device-ui_base]
 lib_deps =
-	https://github.com/meshtastic/device-ui.git#b1e862e8b2a604a8d911e9d7a27f6e80f1176c21
+	https://github.com/meshtastic/device-ui/archive/b1e862e8b2a604a8d911e9d7a27f6e80f1176c21.zip
 
 ; Common libs for environmental measurements in telemetry module
 ; (not included in native / portduino)
@@ -127,13 +127,13 @@ lib_deps =
 	ClosedCube OPT3001@1.1.2
 	emotibit/EmotiBit MLX90632@1.0.8
 	adafruit/Adafruit MLX90614 Library@2.1.5
-	https://github.com/boschsensortec/Bosch-BSEC2-Library#v1.7.2502
+	https://github.com/boschsensortec/Bosch-BSEC2-Library/archive/v1.7.2502.zip
 	boschsensortec/BME68x Sensor Library@1.1.40407
-	https://github.com/KodinLanewave/INA3221@1.0.1
+	https://github.com/KodinLanewave/INA3221/archive/1.0.1.zip
 	mprograms/QMC5883LCompass@1.2.3
 	dfrobot/DFRobot_RTU@1.0.3
-	https://github.com/meshtastic/DFRobot_LarkWeatherStation#4de3a9cadef0f6a5220a8a906cf9775b02b0040d
-	https://github.com/DFRobot/DFRobot_RainfallSensor#38fea5e02b40a5430be6dab39a99a6f6347d667e
+	https://github.com/meshtastic/DFRobot_LarkWeatherStation/archive/4de3a9cadef0f6a5220a8a906cf9775b02b0040d.zip
+	https://github.com/DFRobot/DFRobot_RainfallSensor/archive/38fea5e02b40a5430be6dab39a99a6f6347d667e.zip
 	robtillaart/INA226@0.6.0
 
 	; Health Sensor Libraries
diff --git a/variants/CDEBYTE_E77-MBL/platformio.ini b/variants/CDEBYTE_E77-MBL/platformio.ini
index 3252a56ea..8a8002086 100644
--- a/variants/CDEBYTE_E77-MBL/platformio.ini
+++ b/variants/CDEBYTE_E77-MBL/platformio.ini
@@ -1,7 +1,5 @@
 [env:CDEBYTE_E77-MBL]
 extends = stm32_base
-; `ebyte_e77_dev` was added in this commit. Remove when a new release is used in the base.
-platform = https://github.com/platformio/platform-ststm32.git#3208828db447f4373cd303b7f7393c8fc0dae623
 board = ebyte_e77_dev
 board_upload.maximum_size = 233472 ; reserve the last 28KB for filesystem
 board_level = extra
diff --git a/variants/MakePython_nRF52840_eink/platformio.ini b/variants/MakePython_nRF52840_eink/platformio.ini
index b7ce97dcb..9e2d5bbf7 100644
--- a/variants/MakePython_nRF52840_eink/platformio.ini
+++ b/variants/MakePython_nRF52840_eink/platformio.ini
@@ -11,7 +11,7 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/MakePython_nRF52840_eink -
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/MakePython_nRF52840_eink>
 lib_deps = 
   ${nrf52840_base.lib_deps}
-  https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
+  https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
   zinggjm/GxEPD2@^1.6.2
 debug_tool = jlink
 ;upload_port = /dev/ttyACM4
\ No newline at end of file
diff --git a/variants/MakePython_nRF52840_oled/platformio.ini b/variants/MakePython_nRF52840_oled/platformio.ini
index 0146385e0..25dd36c08 100644
--- a/variants/MakePython_nRF52840_oled/platformio.ini
+++ b/variants/MakePython_nRF52840_oled/platformio.ini
@@ -7,5 +7,5 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/MakePython_nRF52840_oled -
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/MakePython_nRF52840_oled>
 lib_deps = 
   ${nrf52840_base.lib_deps}
-  https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
+  https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
 debug_tool = jlink
diff --git a/variants/crowpanel-esp32s3-5-epaper/platformio.ini b/variants/crowpanel-esp32s3-5-epaper/platformio.ini
index c9786690b..f1257a979 100644
--- a/variants/crowpanel-esp32s3-5-epaper/platformio.ini
+++ b/variants/crowpanel-esp32s3-5-epaper/platformio.ini
@@ -24,7 +24,7 @@ build_flags =
   ;-DEINK_LIMIT_RATE_RESPONSIVE_SEC=1 
 lib_deps =
   ${esp32s3_base.lib_deps}
-  https://github.com/meshtastic/GxEPD2
+  https://github.com/meshtastic/GxEPD2/archive/33db3fa8ee6fc47d160bdb44f8f127c9a9203a10.zip
 
 [env:crowpanel-esp32s3-4-epaper]
 extends = esp32s3_base
@@ -52,7 +52,7 @@ build_flags =
   ;-DEINK_LIMIT_RATE_RESPONSIVE_SEC=1 
 lib_deps =
   ${esp32s3_base.lib_deps}
-  https://github.com/meshtastic/GxEPD2
+  https://github.com/meshtastic/GxEPD2/archive/33db3fa8ee6fc47d160bdb44f8f127c9a9203a10.zip
 
 [env:crowpanel-esp32s3-2-epaper]
 extends = esp32s3_base
@@ -80,4 +80,4 @@ build_flags =
   ;-DEINK_LIMIT_RATE_RESPONSIVE_SEC=1 
 lib_deps =
   ${esp32s3_base.lib_deps}
-  https://github.com/meshtastic/GxEPD2
+  https://github.com/meshtastic/GxEPD2/archive/33db3fa8ee6fc47d160bdb44f8f127c9a9203a10.zip
diff --git a/variants/heltec_mesh_node_t114/platformio.ini b/variants/heltec_mesh_node_t114/platformio.ini
index 1b06c7f5e..4f83d8516 100644
--- a/variants/heltec_mesh_node_t114/platformio.ini
+++ b/variants/heltec_mesh_node_t114/platformio.ini
@@ -14,4 +14,4 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/heltec_mesh_node
 lib_deps = 
   ${nrf52840_base.lib_deps}
   lewisxhe/PCF8563_Library@^1.0.1
-  https://github.com/meshtastic/st7789#bd33ea58ddfe4a5e4a66d53300ccbd38d66ac21f
\ No newline at end of file
+  https://github.com/meshtastic/st7789/archive/bd33ea58ddfe4a5e4a66d53300ccbd38d66ac21f.zip
\ No newline at end of file
diff --git a/variants/heltec_vision_master_e213/platformio.ini b/variants/heltec_vision_master_e213/platformio.ini
index 4bed30324..037d10168 100644
--- a/variants/heltec_vision_master_e213/platformio.ini
+++ b/variants/heltec_vision_master_e213/platformio.ini
@@ -16,7 +16,7 @@ build_flags =
   -DEINK_HASQUIRK_GHOSTING             ; Display model is identified as "prone to ghosting"
 lib_deps =
   ${esp32s3_base.lib_deps}
-  https://github.com/meshtastic/GxEPD2#b202ebfec6a4821e098cf7a625ba0f6f2400292d
+  https://github.com/meshtastic/GxEPD2/archive/b202ebfec6a4821e098cf7a625ba0f6f2400292d.zip
   lewisxhe/PCF8563_Library@^1.0.1
 upload_speed = 115200
 
diff --git a/variants/heltec_vision_master_e290/platformio.ini b/variants/heltec_vision_master_e290/platformio.ini
index d28c2015b..6952e9f9e 100644
--- a/variants/heltec_vision_master_e290/platformio.ini
+++ b/variants/heltec_vision_master_e290/platformio.ini
@@ -20,7 +20,7 @@ build_flags =
 
 lib_deps =
   ${esp32s3_base.lib_deps}
-  https://github.com/meshtastic/GxEPD2#448c8538129fde3d02a7cb5e6fc81971ad92547f
+  https://github.com/meshtastic/GxEPD2/archive/448c8538129fde3d02a7cb5e6fc81971ad92547f.zip
   lewisxhe/PCF8563_Library@^1.0.1
 upload_speed = 115200
 
diff --git a/variants/heltec_vision_master_t190/platformio.ini b/variants/heltec_vision_master_t190/platformio.ini
index 53b56f57d..7f55a1be7 100644
--- a/variants/heltec_vision_master_t190/platformio.ini
+++ b/variants/heltec_vision_master_t190/platformio.ini
@@ -9,5 +9,5 @@ build_flags =
 lib_deps =
   ${esp32s3_base.lib_deps}
   lewisxhe/PCF8563_Library@^1.0.1
-  https://github.com/meshtastic/st7789#bd33ea58ddfe4a5e4a66d53300ccbd38d66ac21f
+  https://github.com/meshtastic/st7789/archive/bd33ea58ddfe4a5e4a66d53300ccbd38d66ac21f.zip
 upload_speed = 921600
\ No newline at end of file
diff --git a/variants/heltec_wireless_paper/platformio.ini b/variants/heltec_wireless_paper/platformio.ini
index bd25a932a..51430ebff 100644
--- a/variants/heltec_wireless_paper/platformio.ini
+++ b/variants/heltec_wireless_paper/platformio.ini
@@ -17,7 +17,7 @@ build_flags =
   -D EINK_HASQUIRK_GHOSTING             ; Display model is identified as "prone to ghosting"
 lib_deps =
   ${esp32s3_base.lib_deps}
-  https://github.com/meshtastic/GxEPD2#b202ebfec6a4821e098cf7a625ba0f6f2400292d
+  https://github.com/meshtastic/GxEPD2/archive/b202ebfec6a4821e098cf7a625ba0f6f2400292d.zip
   lewisxhe/PCF8563_Library@^1.0.1
 upload_speed = 115200
 
diff --git a/variants/heltec_wireless_paper_v1/platformio.ini b/variants/heltec_wireless_paper_v1/platformio.ini
index ec5fe2408..44b0606af 100644
--- a/variants/heltec_wireless_paper_v1/platformio.ini
+++ b/variants/heltec_wireless_paper_v1/platformio.ini
@@ -15,6 +15,6 @@ build_flags =
   -D EINK_LIMIT_GHOSTING_PX=2000        ; (Optional) How much image ghosting is tolerated
 lib_deps =
   ${esp32s3_base.lib_deps}
-  https://github.com/meshtastic/GxEPD2#55f618961db45a23eff0233546430f1e5a80f63a
+  https://github.com/meshtastic/GxEPD2/archive/55f618961db45a23eff0233546430f1e5a80f63a.zip
   lewisxhe/PCF8563_Library@^1.0.1
 upload_speed = 115200
\ No newline at end of file
diff --git a/variants/meshlink/platformio.ini b/variants/meshlink/platformio.ini
index 180dddd49..ec3506b0e 100644
--- a/variants/meshlink/platformio.ini
+++ b/variants/meshlink/platformio.ini
@@ -23,7 +23,7 @@ build_flags = ${nrf52840_base.build_flags} -I variants/meshlink -D MESHLINK
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/meshlink>
 lib_deps = 
   ${nrf52840_base.lib_deps}
-  https://github.com/meshtastic/GxEPD2#55f618961db45a23eff0233546430f1e5a80f63a
+  https://github.com/meshtastic/GxEPD2/archive/55f618961db45a23eff0233546430f1e5a80f63a.zip
 debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 ; Note: as of 6/2013 the serial/bootloader based programming takes approximately 30 seconds
diff --git a/variants/meshlink_eink/platformio.ini b/variants/meshlink_eink/platformio.ini
index db3647e73..f8ee96fc3 100644
--- a/variants/meshlink_eink/platformio.ini
+++ b/variants/meshlink_eink/platformio.ini
@@ -23,7 +23,7 @@ build_flags = ${nrf52840_base.build_flags} -I variants/meshlink_eink -D MESHLINK
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/meshlink_eink>
 lib_deps = 
   ${nrf52840_base.lib_deps}
-  https://github.com/meshtastic/GxEPD2#55f618961db45a23eff0233546430f1e5a80f63a
+  https://github.com/meshtastic/GxEPD2/archive/55f618961db45a23eff0233546430f1e5a80f63a.zip
 debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 ; Note: as of 6/2013 the serial/bootloader based programming takes approximately 30 seconds
diff --git a/variants/monteops_hw1/platformio.ini b/variants/monteops_hw1/platformio.ini
index eaa246526..1464ca7e7 100644
--- a/variants/monteops_hw1/platformio.ini
+++ b/variants/monteops_hw1/platformio.ini
@@ -9,7 +9,7 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/monteops_hw1> +<
 lib_deps = 
   ${nrf52840_base.lib_deps}
   ${networking_base.lib_deps}
-  https://github.com/RAKWireless/RAK13800-W5100S.git#1.0.2
+  https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip
 debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 ;upload_protocol = jlink
diff --git a/variants/radiomaster_900_bandit/platformio.ini b/variants/radiomaster_900_bandit/platformio.ini
index 010791d8a..f87025937 100644
--- a/variants/radiomaster_900_bandit/platformio.ini
+++ b/variants/radiomaster_900_bandit/platformio.ini
@@ -13,4 +13,4 @@ board_build.f_cpu = 240000000L
 upload_protocol = esptool
 lib_deps =
   ${esp32_base.lib_deps}
-  https://github.com/gjelsoe/STK8xxx-Accelerometer.git#v0.1.1
+  https://github.com/gjelsoe/STK8xxx-Accelerometer/archive/v0.1.1.zip
diff --git a/variants/rak11310/platformio.ini b/variants/rak11310/platformio.ini
index 6e718a651..c87304e61 100644
--- a/variants/rak11310/platformio.ini
+++ b/variants/rak11310/platformio.ini
@@ -15,6 +15,6 @@ lib_deps =
   ${rp2040_base.lib_deps}
   ${networking_base.lib_deps}
   melopero/Melopero RV3028@^1.1.0
-  https://github.com/RAKWireless/RAK13800-W5100S.git#1.0.2
+  https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip
 debug_build_flags = ${rp2040_base.build_flags}, -g
 debug_tool = cmsis-dap ; for e.g. Picotool
\ No newline at end of file
diff --git a/variants/rak2560/platformio.ini b/variants/rak2560/platformio.ini
index 956f573c5..faed231f1 100644
--- a/variants/rak2560/platformio.ini
+++ b/variants/rak2560/platformio.ini
@@ -15,7 +15,7 @@ lib_deps =
   ${nrf52840_base.lib_deps}
   ${networking_base.lib_deps}
   melopero/Melopero RV3028@^1.1.0
-  https://github.com/beegee-tokyo/RAK-OneWireSerial.git#0.0.2
+  https://github.com/beegee-tokyo/RAK-OneWireSerial/archive/0.0.2.zip
 debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 ;upload_protocol = jlink
diff --git a/variants/rak4631/platformio.ini b/variants/rak4631/platformio.ini
index ced93df66..1c6bdabcf 100644
--- a/variants/rak4631/platformio.ini
+++ b/variants/rak4631/platformio.ini
@@ -17,9 +17,9 @@ lib_deps =
   ${nrf52840_base.lib_deps}
   ${networking_base.lib_deps}
   melopero/Melopero RV3028@^1.1.0
-  https://github.com/RAKWireless/RAK13800-W5100S.git#1.0.2
+  https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip
   rakwireless/RAKwireless NCP5623 RGB LED library@^1.0.2
-  https://github.com/RAKWireless/RAK12034-BMX160.git#dcead07ffa267d3c906e9ca4a1330ab989e957e2
+  https://github.com/RAKWireless/RAK12034-BMX160/archive/dcead07ffa267d3c906e9ca4a1330ab989e957e2.zip
 
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 ; Note: as of 6/2013 the serial/bootloader based programming takes approximately 30 seconds
@@ -41,7 +41,7 @@ build_flags =
 
 lib_deps =
   ${env:rak4631.lib_deps}
-  https://github.com/geeksville/Armduino-Semihosting.git#35b538fdf208c3530c1434cd099a08e486672ee4
+  https://github.com/geeksville/Armduino-Semihosting/archive/35b538fdf208c3530c1434cd099a08e486672ee4.zip
 
 ; NOTE: the pyocd support for semihosting is buggy.  So I switched to using the builtin platformio support for the stlink adapter which worked much better.
 ; However the built in openocd version in platformio has buggy support for TCP to semihosting. 
diff --git a/variants/rak4631_eth_gw/platformio.ini b/variants/rak4631_eth_gw/platformio.ini
index a624d0381..e3da21c55 100644
--- a/variants/rak4631_eth_gw/platformio.ini
+++ b/variants/rak4631_eth_gw/platformio.ini
@@ -27,9 +27,9 @@ lib_deps =
   ${nrf52840_base.lib_deps}
   ${networking_base.lib_deps}
   melopero/Melopero RV3028@^1.1.0
-  https://github.com/RAKWireless/RAK13800-W5100S.git#1.0.2
+  https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip
   rakwireless/RAKwireless NCP5623 RGB LED library@^1.0.2
-  https://github.com/meshtastic/RAK12034-BMX160.git#4821355fb10390ba8557dc43ca29a023bcfbb9d9
+  https://github.com/meshtastic/RAK12034-BMX160/archive/4821355fb10390ba8557dc43ca29a023bcfbb9d9.zip
   bblanchon/ArduinoJson @ 6.21.4
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 ; Note: as of 6/2013 the serial/bootloader based programming takes approximately 30 seconds
@@ -51,7 +51,7 @@ build_flags =
 
 lib_deps =
   ${env:rak4631_eth_gw.lib_deps}
-  https://github.com/geeksville/Armduino-Semihosting.git#35b538fdf208c3530c1434cd099a08e486672ee4
+  https://github.com/geeksville/Armduino-Semihosting/archive/35b538fdf208c3530c1434cd099a08e486672ee4.zip
 
 ; NOTE: the pyocd support for semihosting is buggy.  So I switched to using the builtin platformio support for the stlink adapter which worked much better.
 ; However the built in openocd version in platformio has buggy support for TCP to semihosting. 
diff --git a/variants/rak_wismeshtap/platformio.ini b/variants/rak_wismeshtap/platformio.ini
index bcf46b90d..78472783e 100644
--- a/variants/rak_wismeshtap/platformio.ini
+++ b/variants/rak_wismeshtap/platformio.ini
@@ -18,7 +18,7 @@ lib_deps =
   ${nrf52840_base.lib_deps}
   ${networking_base.lib_deps}
   melopero/Melopero RV3028@^1.1.0
-  https://github.com/RAKWireless/RAK13800-W5100S.git#1.0.2
+  https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip
   rakwireless/RAKwireless NCP5623 RGB LED library@^1.0.2
   bodmer/TFT_eSPI
   beegee-tokyo/RAKwireless RAK12034@^1.0.0
diff --git a/variants/seeed-sensecap-indicator/platformio.ini b/variants/seeed-sensecap-indicator/platformio.ini
index ca1639e4d..fb51d77c3 100644
--- a/variants/seeed-sensecap-indicator/platformio.ini
+++ b/variants/seeed-sensecap-indicator/platformio.ini
@@ -2,7 +2,7 @@
 [env:seeed-sensecap-indicator]
 extends = esp32s3_base
 platform_packages =
-    platformio/framework-arduinoespressif32 @ https://github.com/mverch67/arduino-esp32.git#aef7fef6de3329ed6f75512d46d63bba12b09bb5 ; add_tca9535 (based on 2.0.16)
+    platformio/framework-arduinoespressif32 @ https://github.com/mverch67/arduino-esp32/archive/aef7fef6de3329ed6f75512d46d63bba12b09bb5.zip ; add_tca9535 (based on 2.0.16)
 
 board = seeed-sensecap-indicator
 board_check = true
@@ -24,7 +24,7 @@ build_flags = ${esp32_base.build_flags}
   -DUSE_ARDUINO_HAL_GPIO
 
 lib_deps = ${esp32s3_base.lib_deps}
-  https://github.com/mverch67/LovyanGFX#4c76238c1344162a234ae917b27651af146d6fb2
+  https://github.com/mverch67/LovyanGFX/archive/4c76238c1344162a234ae917b27651af146d6fb2.zip
   earlephilhower/ESP8266Audio@^1.9.9
   earlephilhower/ESP8266SAM@^1.0.1
 
@@ -70,4 +70,4 @@ build_flags =
 lib_deps =
   ${env:seeed-sensecap-indicator.lib_deps}
   ${device-ui_base.lib_deps}
-  https://github.com/mverch67/bb_captouch.git#8626412fe650d808a267791c0eae6e5860c85a5d ; alternative touch library supporting FT6x36
+  https://github.com/mverch67/bb_captouch/archive/8626412fe650d808a267791c0eae6e5860c85a5d.zip ; alternative touch library supporting FT6x36
diff --git a/variants/t-echo/platformio.ini b/variants/t-echo/platformio.ini
index e01befb45..59fd52ccd 100644
--- a/variants/t-echo/platformio.ini
+++ b/variants/t-echo/platformio.ini
@@ -20,7 +20,7 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/t-echo
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/t-echo>
 lib_deps = 
   ${nrf52840_base.lib_deps}
-  https://github.com/meshtastic/GxEPD2#55f618961db45a23eff0233546430f1e5a80f63a
+  https://github.com/meshtastic/GxEPD2/archive/55f618961db45a23eff0233546430f1e5a80f63a.zip
   lewisxhe/PCF8563_Library@^1.0.1
 ;upload_protocol = fs
 
diff --git a/variants/t-eth-elite/platformio.ini b/variants/t-eth-elite/platformio.ini
index ec6c82a5d..d6f415f3d 100644
--- a/variants/t-eth-elite/platformio.ini
+++ b/variants/t-eth-elite/platformio.ini
@@ -14,4 +14,4 @@ lib_ignore =
 
 lib_deps = 
   ${esp32s3_base.lib_deps}
-  https://github.com/meshtastic/ETHClass2#v1.0.0
+  https://github.com/meshtastic/ETHClass2/archive/v1.0.0.zip
diff --git a/variants/tlora_t3s3_epaper/platformio.ini b/variants/tlora_t3s3_epaper/platformio.ini
index 3f3b3fe50..87351e586 100644
--- a/variants/tlora_t3s3_epaper/platformio.ini
+++ b/variants/tlora_t3s3_epaper/platformio.ini
@@ -15,4 +15,4 @@ build_flags =
 
 lib_deps =
   ${esp32s3_base.lib_deps}
-  https://github.com/meshtastic/GxEPD2#b202ebfec6a4821e098cf7a625ba0f6f2400292d
+  https://github.com/meshtastic/GxEPD2/archive/b202ebfec6a4821e098cf7a625ba0f6f2400292d.zip
diff --git a/variants/tracker-t1000-e/platformio.ini b/variants/tracker-t1000-e/platformio.ini
index 0bce9fbb5..8c3c97e6c 100644
--- a/variants/tracker-t1000-e/platformio.ini
+++ b/variants/tracker-t1000-e/platformio.ini
@@ -9,7 +9,7 @@ board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/tracker-t1000-e>
 lib_deps = 
   ${nrf52840_base.lib_deps}
-  https://github.com/meshtastic/QMA6100P_Arduino_Library.git#14c900b8b2e4feaac5007a7e41e0c1b7f0841136
+  https://github.com/meshtastic/QMA6100P_Arduino_Library/archive/14c900b8b2e4feaac5007a7e41e0c1b7f0841136.zip
 debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 upload_protocol = nrfutil
\ No newline at end of file

From a902776e578bc2574c95eff8c13402e8cb5f5fbd Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Sat, 29 Mar 2025 07:18:03 -0500
Subject: [PATCH 092/116] Try-fix ESP32 wifi disconnects (#6363)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
---
 src/mesh/wifi/WiFiAPClient.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesh/wifi/WiFiAPClient.cpp b/src/mesh/wifi/WiFiAPClient.cpp
index 4d0b74f7c..e050c2057 100644
--- a/src/mesh/wifi/WiFiAPClient.cpp
+++ b/src/mesh/wifi/WiFiAPClient.cpp
@@ -163,7 +163,7 @@ static int32_t reconnectWiFi()
         delay(5000);
 
         if (!WiFi.isConnected()) {
-#ifdef CONFIG_IDF_TARGET_ESP32C3
+#ifdef ARCH_ESP32
             WiFi.mode(WIFI_MODE_NULL);
             WiFi.useStaticBuffers(true);
             WiFi.mode(WIFI_STA);

From 7df327664eba3548ec8d8b2d7cbfe99d3c2352c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Sat, 29 Mar 2025 14:13:01 +0100
Subject: [PATCH 093/116] add missing C8H10N4O2

---
 src/platform/nrf52/architecture.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/platform/nrf52/architecture.h b/src/platform/nrf52/architecture.h
index 95ed8c617..4e8823063 100644
--- a/src/platform/nrf52/architecture.h
+++ b/src/platform/nrf52/architecture.h
@@ -54,7 +54,7 @@
 #elif defined(TTGO_T_ECHO)
 #define HW_VENDOR meshtastic_HardwareModel_T_ECHO
 #elif defined(ELECROW_ThinkNode_M1)
-#define HW_VENDOR meshtastic_HardwareModel_ThinkNode_M1
+#define HW_VENDOR meshtastic_HardwareModel_THINKNODE_M1
 #elif defined(NANO_G2_ULTRA)
 #define HW_VENDOR meshtastic_HardwareModel_NANO_G2_ULTRA
 #elif defined(CANARYONE)

From 3148e7277d41cb1b102bb6376a4d0eb65f4a1a6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Sat, 29 Mar 2025 14:14:24 +0100
Subject: [PATCH 094/116] Fix a couple of warnings (#6445)

* Fix a couple of warnings

* fix build error

---------

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
---
 src/Power.cpp                                | 13 ++++++++-----
 src/gps/GPS.cpp                              | 11 ++++++-----
 src/mesh/NodeDB.cpp                          |  4 ++--
 src/mesh/Router.cpp                          |  4 ++--
 src/platform/stm32wl/STM32_LittleFS.h        |  2 +-
 src/platform/stm32wl/STM32_LittleFS_File.cpp |  7 +++----
 src/platform/stm32wl/STM32_LittleFS_File.h   |  2 +-
 src/platform/stm32wl/littlefs/lfs.c          |  6 +++---
 8 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/Power.cpp b/src/Power.cpp
index ec3550869..0dec0fc21 100644
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -533,6 +533,9 @@ Power::Power() : OSThread("Power")
 {
     statusHandler = {};
     low_voltage_counter = 0;
+#if defined(ELECROW_ThinkNode_M1) || defined(POWER_CFG)
+    low_voltage_counter_led3 = 0;
+#endif
 #ifdef DEBUG_HEAP
     lastheap = memGet.getFreeHeap();
 #endif
@@ -668,12 +671,12 @@ void Power::readPowerStatus()
     int8_t batteryChargePercent = -1;
     OptionalBool usbPowered = OptUnknown;
     OptionalBool hasBattery = OptUnknown; // These must be static because NRF_APM code doesn't run every time
-    OptionalBool isCharging = OptUnknown;
+    OptionalBool isChargingNow = OptUnknown;
 
     if (batteryLevel) {
         hasBattery = batteryLevel->isBatteryConnect() ? OptTrue : OptFalse;
         usbPowered = batteryLevel->isVbusIn() ? OptTrue : OptFalse;
-        isCharging = batteryLevel->isCharging() ? OptTrue : OptFalse;
+        isChargingNow = batteryLevel->isCharging() ? OptTrue : OptFalse;
         if (hasBattery) {
             batteryVoltageMv = batteryLevel->getBattVoltage();
             // If the AXP192 returns a valid battery percentage, use it
@@ -702,15 +705,15 @@ void Power::readPowerStatus()
 
     // If changed to DISCONNECTED
     if (nrf_usb_state == NRFX_POWER_USB_STATE_DISCONNECTED)
-        isCharging = usbPowered = OptFalse;
+        isChargingNow = usbPowered = OptFalse;
     // If changed to CONNECTED / READY
     else
-        isCharging = usbPowered = OptTrue;
+        isChargingNow = usbPowered = OptTrue;
 
 #endif
 
     // Notify any status instances that are observing us
-    const PowerStatus powerStatus2 = PowerStatus(hasBattery, usbPowered, isCharging, batteryVoltageMv, batteryChargePercent);
+    const PowerStatus powerStatus2 = PowerStatus(hasBattery, usbPowered, isChargingNow, batteryVoltageMv, batteryChargePercent);
     LOG_DEBUG("Battery: usbPower=%d, isCharging=%d, batMv=%d, batPct=%d", powerStatus2.getHasUSB(), powerStatus2.getIsCharging(),
               powerStatus2.getBatteryVoltageMv(), powerStatus2.getBatteryChargePercent());
 #if defined(ELECROW_ThinkNode_M1) || defined(POWER_CFG)
diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp
index c33cb2975..41a2ff980 100644
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -981,15 +981,16 @@ void GPS::down()
         setPowerState(GPS_IDLE);
 
     else {
-        // Check whether the GPS hardware is capable of GPS_SOFTSLEEP
-        // If not, fallback to GPS_HARDSLEEP instead
+// Check whether the GPS hardware is capable of GPS_SOFTSLEEP
+// If not, fallback to GPS_HARDSLEEP instead
+#ifdef PIN_GPS_STANDBY // L76B, L76K and clones have a standby pin
+        bool softsleepSupported = true;
+#else
         bool softsleepSupported = false;
+#endif
         // U-blox is supported via PMREQ
         if (IS_ONE_OF(gnssModel, GNSS_MODEL_UBLOX6, GNSS_MODEL_UBLOX7, GNSS_MODEL_UBLOX8, GNSS_MODEL_UBLOX9, GNSS_MODEL_UBLOX10))
             softsleepSupported = true;
-#ifdef PIN_GPS_STANDBY // L76B, L76K and clones have a standby pin
-        softsleepSupported = true;
-#endif
 
         if (softsleepSupported) {
             // How long does gps_update_interval need to be, for GPS_HARDSLEEP to become more efficient than
diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
index df0fbcedd..3f79d18e6 100644
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -1061,8 +1061,8 @@ void NodeDB::loadFromDisk()
     // if (state != LoadFileResult::LOAD_SUCCESS) {
     //    installDefaultDeviceState(); // Our in RAM copy might now be corrupt
     //} else {
-    if (devicestate.version < DEVICESTATE_MIN_VER) {
-        LOG_WARN("Devicestate %d is old, discard", devicestate.version);
+    if ((state != LoadFileResult::LOAD_SUCCESS) || (devicestate.version < DEVICESTATE_MIN_VER)) {
+        LOG_WARN("Devicestate %d is old or invalid, discard", devicestate.version);
         installDefaultDeviceState();
     } else {
         LOG_INFO("Loaded saved devicestate version %d", devicestate.version);
diff --git a/src/mesh/Router.cpp b/src/mesh/Router.cpp
index 992f38ff4..b8b7ee610 100644
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -188,7 +188,7 @@ ErrorCode Router::sendLocal(meshtastic_MeshPacket *p, RxSource src)
 
         // don't override if a channel was requested and no need to set it when PKI is enforced
         if (!p->channel && !p->pki_encrypted && !isBroadcast(p->to)) {
-            meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(p->to);
+            meshtastic_NodeInfoLite const *node = nodeDB->getMeshNode(p->to);
             if (node) {
                 p->channel = node->channel;
                 LOG_DEBUG("localSend to channel %d", p->channel);
@@ -688,7 +688,7 @@ void Router::perhapsHandleReceived(meshtastic_MeshPacket *p)
         return;
     }
 
-    meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(p->from);
+    meshtastic_NodeInfoLite const *node = nodeDB->getMeshNode(p->from);
     if (node != NULL && node->is_ignored) {
         LOG_DEBUG("Ignore msg, 0x%x is ignored", p->from);
         packetPool.release(p);
diff --git a/src/platform/stm32wl/STM32_LittleFS.h b/src/platform/stm32wl/STM32_LittleFS.h
index 2ab531ee5..9460ffa81 100644
--- a/src/platform/stm32wl/STM32_LittleFS.h
+++ b/src/platform/stm32wl/STM32_LittleFS.h
@@ -37,7 +37,7 @@ class STM32_LittleFS
 {
   public:
     STM32_LittleFS(void);
-    STM32_LittleFS(struct lfs_config *cfg);
+    explicit STM32_LittleFS(struct lfs_config *cfg);
     virtual ~STM32_LittleFS();
 
     bool begin(struct lfs_config *cfg = NULL);
diff --git a/src/platform/stm32wl/STM32_LittleFS_File.cpp b/src/platform/stm32wl/STM32_LittleFS_File.cpp
index 5e2d4c86c..349187a02 100644
--- a/src/platform/stm32wl/STM32_LittleFS_File.cpp
+++ b/src/platform/stm32wl/STM32_LittleFS_File.cpp
@@ -217,9 +217,9 @@ int File::available(void)
     _fs->_lockFS();
 
     if (!this->_is_dir) {
-        uint32_t size = lfs_file_size(_fs->_getFS(), _file);
+        uint32_t file_size = lfs_file_size(_fs->_getFS(), _file);
         uint32_t pos = lfs_file_tell(_fs->_getFS(), _file);
-        ret = size - pos;
+        ret = file_size - pos;
     }
 
     _fs->_unlockFS();
@@ -279,10 +279,9 @@ bool File::truncate(uint32_t pos)
 bool File::truncate(void)
 {
     int32_t ret = LFS_ERR_ISDIR;
-    uint32_t pos;
     _fs->_lockFS();
     if (!this->_is_dir) {
-        pos = lfs_file_tell(_fs->_getFS(), _file);
+        uint32_t pos = lfs_file_tell(_fs->_getFS(), _file);
         ret = lfs_file_truncate(_fs->_getFS(), _file, pos);
     }
     _fs->_unlockFS();
diff --git a/src/platform/stm32wl/STM32_LittleFS_File.h b/src/platform/stm32wl/STM32_LittleFS_File.h
index 0a021dc54..2b48b02e0 100644
--- a/src/platform/stm32wl/STM32_LittleFS_File.h
+++ b/src/platform/stm32wl/STM32_LittleFS_File.h
@@ -42,7 +42,7 @@ enum {
 class File : public Stream
 {
   public:
-    File(STM32_LittleFS &fs);
+    explicit File(STM32_LittleFS &fs);
     File(char const *filename, uint8_t mode, STM32_LittleFS &fs);
 
   public:
diff --git a/src/platform/stm32wl/littlefs/lfs.c b/src/platform/stm32wl/littlefs/lfs.c
index 522614486..99c8b155e 100644
--- a/src/platform/stm32wl/littlefs/lfs.c
+++ b/src/platform/stm32wl/littlefs/lfs.c
@@ -863,7 +863,7 @@ static int lfs_dir_find(lfs_t *lfs, lfs_dir_t *dir, lfs_entry_t *entry, const ch
         // check that entry has not been moved
         if (entry->d.type & 0x80) {
             int moved = lfs_moved(lfs, &entry->d.u);
-            if (moved < 0 || moved) {
+            if (moved) {
                 return (moved < 0) ? moved : LFS_ERR_NOENT;
             }
 
@@ -1057,7 +1057,7 @@ int lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off)
     return 0;
 }
 
-lfs_soff_t lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir)
+lfs_soff_t lfs_dir_tell(lfs_t *lfs, lfs_dir_t const *dir)
 {
     (void)lfs;
     return dir->pos;
@@ -1755,7 +1755,7 @@ int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size)
     return 0;
 }
 
-lfs_soff_t lfs_file_tell(lfs_t *lfs, lfs_file_t *file)
+lfs_soff_t lfs_file_tell(lfs_t *lfs, lfs_file_t const *file)
 {
     (void)lfs;
     return file->pos;

From d663d4464744e10e89e01eff7c62db1d94315414 Mon Sep 17 00:00:00 2001
From: Jason P <applewiz@mac.com>
Date: Sat, 29 Mar 2025 08:21:57 -0500
Subject: [PATCH 095/116] Fix Bold and Inverted Displays to actually show
 Uptime (#6413)

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
---
 src/graphics/Screen.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index 635cd5164..e27495f54 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -2669,14 +2669,19 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
     // minutes %= 60;
     // hours %= 24;
 
+    // Show uptime as days, hours, minutes OR seconds
+    std::string uptime = screen->drawTimeDelta(days, hours, minutes, seconds);
+
+    // Line 1 (Still)
+    display->drawString(x + SCREEN_WIDTH - display->getStringWidth(uptime.c_str()), y, uptime.c_str());
+    if (config.display.heading_bold)
+        display->drawString(x - 1 + SCREEN_WIDTH - display->getStringWidth(uptime.c_str()), y, uptime.c_str());
+
     display->setColor(WHITE);
 
     // Setup string to assemble analogClock string
     std::string analogClock = "";
 
-    // Show uptime as days, hours, minutes OR seconds
-    std::string uptime = screen->drawTimeDelta(days, hours, minutes, seconds);
-
     uint32_t rtc_sec = getValidTime(RTCQuality::RTCQualityDevice, true); // Display local timezone
     if (rtc_sec > 0) {
         long hms = rtc_sec % SEC_PER_DAY;
@@ -2709,9 +2714,6 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
         analogClock += timebuf;
     }
 
-    // Line 1
-    display->drawString(x + SCREEN_WIDTH - display->getStringWidth(uptime.c_str()), y, uptime.c_str());
-
     // Line 2
     display->drawString(x, y + FONT_HEIGHT_SMALL * 1, analogClock.c_str());
 
@@ -2733,7 +2735,7 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
         drawGPSpowerstat(display, x, y + FONT_HEIGHT_SMALL * 2, gpsStatus);
     }
 #endif
-    /* Display a heartbeat pixel that blinks every time the frame is redrawn */
+/* Display a heartbeat pixel that blinks every time the frame is redrawn */
 #ifdef SHOW_REDRAWS
     if (heartbeat)
         display->setPixel(0, 0);

From cbcdc3ed00a3573784a43dae9d4909e4e11fb8fb Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Sat, 29 Mar 2025 14:30:59 -0500
Subject: [PATCH 096/116] fix STM32 build (#6455)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
---
 src/platform/stm32wl/littlefs/lfs.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/platform/stm32wl/littlefs/lfs.h b/src/platform/stm32wl/littlefs/lfs.h
index f243c404b..398f3b0f3 100644
--- a/src/platform/stm32wl/littlefs/lfs.h
+++ b/src/platform/stm32wl/littlefs/lfs.h
@@ -389,7 +389,7 @@ int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size);
 //
 // Equivalent to lfs_file_seek(lfs, file, 0, LFS_SEEK_CUR)
 // Returns the position of the file, or a negative error code on failure.
-lfs_soff_t lfs_file_tell(lfs_t *lfs, lfs_file_t *file);
+lfs_soff_t lfs_file_tell(lfs_t *lfs, const lfs_file_t *file);
 
 // Change the position of the file to the beginning of the file
 //
@@ -442,7 +442,7 @@ int lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off);
 // sense, but does indicate the current position in the directory iteration.
 //
 // Returns the position of the directory, or a negative error code on failure.
-lfs_soff_t lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir);
+lfs_soff_t lfs_dir_tell(lfs_t *lfs, lfs_dir_t const *dir);
 
 // Change the position of the directory to the beginning of the directory
 //

From 8a4a0cc932d39226f975e697bd9b4d4e86368183 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Sat, 29 Mar 2025 14:32:56 -0500
Subject: [PATCH 097/116] Remove unused lfs_dir_tell function

---
 src/platform/stm32wl/littlefs/lfs.c | 6 ------
 src/platform/stm32wl/littlefs/lfs.h | 8 --------
 2 files changed, 14 deletions(-)

diff --git a/src/platform/stm32wl/littlefs/lfs.c b/src/platform/stm32wl/littlefs/lfs.c
index 99c8b155e..5dc4c7669 100644
--- a/src/platform/stm32wl/littlefs/lfs.c
+++ b/src/platform/stm32wl/littlefs/lfs.c
@@ -1057,12 +1057,6 @@ int lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off)
     return 0;
 }
 
-lfs_soff_t lfs_dir_tell(lfs_t *lfs, lfs_dir_t const *dir)
-{
-    (void)lfs;
-    return dir->pos;
-}
-
 int lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir)
 {
     // reload the head dir
diff --git a/src/platform/stm32wl/littlefs/lfs.h b/src/platform/stm32wl/littlefs/lfs.h
index 398f3b0f3..c6ed1d622 100644
--- a/src/platform/stm32wl/littlefs/lfs.h
+++ b/src/platform/stm32wl/littlefs/lfs.h
@@ -436,14 +436,6 @@ int lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info);
 // Returns a negative error code on failure.
 int lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off);
 
-// Return the position of the directory
-//
-// The returned offset is only meant to be consumed by seek and may not make
-// sense, but does indicate the current position in the directory iteration.
-//
-// Returns the position of the directory, or a negative error code on failure.
-lfs_soff_t lfs_dir_tell(lfs_t *lfs, lfs_dir_t const *dir);
-
 // Change the position of the directory to the beginning of the directory
 //
 // Returns a negative error code on failure.

From b89355ffa60b3893417004b07e7b96f04b17022c Mon Sep 17 00:00:00 2001
From: Manuel <71137295+mverch67@users.noreply.github.com>
Date: Sat, 29 Mar 2025 21:44:13 +0100
Subject: [PATCH 098/116] MUI: node list <-> map navigation (#6456)

device-ui lib update:
- node list <-> map navigation
- customizable boot logo / screen
---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 3db4af88d..52532410d 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -94,7 +94,7 @@ lib_deps =
 
 [device-ui_base]
 lib_deps =
-	https://github.com/meshtastic/device-ui/archive/b1e862e8b2a604a8d911e9d7a27f6e80f1176c21.zip
+	https://github.com/meshtastic/device-ui/archive/99171e87a70452395b56cce713a951c1c2964370.zip
 
 ; Common libs for environmental measurements in telemetry module
 ; (not included in native / portduino)

From 38c8c20a2bf108dcef242074c1835ae522cf2c4c Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Sun, 30 Mar 2025 08:12:56 -0500
Subject: [PATCH 099/116] Update version.properties

---
 version.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.properties b/version.properties
index 56a8e4f3a..0b46aeec6 100644
--- a/version.properties
+++ b/version.properties
@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 6
-build = 4
+build = 5

From a93d779ec0a0eb44262015f6b2e6bbfee82621af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Sun, 30 Mar 2025 15:13:18 +0200
Subject: [PATCH 100/116] Update library deps and nrf Toolchain (#6450)

---
 arch/nrf52/nrf52.ini |  2 +-
 platformio.ini       | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/nrf52/nrf52.ini b/arch/nrf52/nrf52.ini
index 310967e49..ca12be6b1 100644
--- a/arch/nrf52/nrf52.ini
+++ b/arch/nrf52/nrf52.ini
@@ -1,6 +1,6 @@
 [nrf52_base]
 ; Instead of the standard nordicnrf52 platform, we use our fork which has our added variant files
-platform = platformio/nordicnrf52@^10.7.0
+platform = platformio/nordicnrf52@^10.8.0
 extends = arduino_base
 platform_packages =
   ; our custom Git version until they merge our PR
diff --git a/platformio.ini b/platformio.ini
index 52532410d..010aea90f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -100,12 +100,12 @@ lib_deps =
 ; (not included in native / portduino)
 [environmental_base]
 lib_deps =
-	adafruit/Adafruit BusIO@1.16.2
-	adafruit/Adafruit Unified Sensor@1.1.14
+	adafruit/Adafruit BusIO@1.17.0
+	adafruit/Adafruit Unified Sensor@1.1.15
 	adafruit/Adafruit BMP280 Library@2.6.8
 	adafruit/Adafruit BMP085 Library@1.2.4
 	adafruit/Adafruit BME280 Library@2.2.4
-	adafruit/Adafruit BMP3XX Library@2.1.5
+	adafruit/Adafruit BMP3XX Library@2.1.6
 	adafruit/Adafruit DPS310@1.1.5
 	adafruit/Adafruit MCP9808 Library@2.0.2
 	adafruit/Adafruit INA260 Library@1.5.2
@@ -114,16 +114,16 @@ lib_deps =
 	adafruit/Adafruit SHTC3 Library@1.0.1
 	adafruit/Adafruit LPS2X@2.0.6
 	adafruit/Adafruit SHT31 Library@2.2.2
-	adafruit/Adafruit PM25 AQI Sensor@1.1.1
+	adafruit/Adafruit PM25 AQI Sensor@1.2.0
 	adafruit/Adafruit MPU6050@2.2.6
 	adafruit/Adafruit LIS3DH@1.3.0
 	adafruit/Adafruit AHTX0@2.0.5
-	adafruit/Adafruit LSM6DS@4.7.3
+	adafruit/Adafruit LSM6DS@4.7.4
 	adafruit/Adafruit VEML7700 Library@2.1.6
 	adafruit/Adafruit SHT4x Library@1.0.5
 	adafruit/Adafruit TSL2591 Library@1.4.5
 	sparkfun/SparkFun Qwiic Scale NAU7802 Arduino Library@1.0.6
-	sparkfun/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library@1.2.13
+	sparkfun/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library@1.3.0
 	ClosedCube OPT3001@1.1.2
 	emotibit/EmotiBit MLX90632@1.0.8
 	adafruit/Adafruit MLX90614 Library@2.1.5
@@ -134,7 +134,7 @@ lib_deps =
 	dfrobot/DFRobot_RTU@1.0.3
 	https://github.com/meshtastic/DFRobot_LarkWeatherStation/archive/4de3a9cadef0f6a5220a8a906cf9775b02b0040d.zip
 	https://github.com/DFRobot/DFRobot_RainfallSensor/archive/38fea5e02b40a5430be6dab39a99a6f6347d667e.zip
-	robtillaart/INA226@0.6.0
+	robtillaart/INA226@0.6.4
 
 	; Health Sensor Libraries
 	sparkfun/SparkFun MAX3010x Pulse and Proximity Sensor Library@1.1.2

From 32d91ed85944523d358b190c81f5599e70fb2760 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 30 Mar 2025 14:35:51 -0500
Subject: [PATCH 101/116] [create-pull-request] automated change (#6464)

Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
---
 protobufs                               | 2 +-
 src/mesh/generated/meshtastic/mesh.pb.h | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/protobufs b/protobufs
index f00e96f12..5e032099b 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit f00e96f12da48abfa9a992f8b5546fd75a370250
+Subproject commit 5e032099be353f1bebdda021bf66e2c90943f4dd
diff --git a/src/mesh/generated/meshtastic/mesh.pb.h b/src/mesh/generated/meshtastic/mesh.pb.h
index daee04f90..2f47d5503 100644
--- a/src/mesh/generated/meshtastic/mesh.pb.h
+++ b/src/mesh/generated/meshtastic/mesh.pb.h
@@ -326,7 +326,9 @@ typedef enum _meshtastic_ExcludedModules {
     /* Detection Sensor module */
     meshtastic_ExcludedModules_DETECTIONSENSOR_CONFIG = 2048,
     /* Paxcounter module */
-    meshtastic_ExcludedModules_PAXCOUNTER_CONFIG = 4096
+    meshtastic_ExcludedModules_PAXCOUNTER_CONFIG = 4096,
+    /* Bluetooth module */
+    meshtastic_ExcludedModules_BLUETOOTH_CONFIG = 8192
 } meshtastic_ExcludedModules;
 
 /* How the location was acquired: manual, onboard GPS, external (EUD) GPS */
@@ -1122,8 +1124,8 @@ extern "C" {
 #define _meshtastic_CriticalErrorCode_ARRAYSIZE ((meshtastic_CriticalErrorCode)(meshtastic_CriticalErrorCode_FLASH_CORRUPTION_UNRECOVERABLE+1))
 
 #define _meshtastic_ExcludedModules_MIN meshtastic_ExcludedModules_EXCLUDED_NONE
-#define _meshtastic_ExcludedModules_MAX meshtastic_ExcludedModules_PAXCOUNTER_CONFIG
-#define _meshtastic_ExcludedModules_ARRAYSIZE ((meshtastic_ExcludedModules)(meshtastic_ExcludedModules_PAXCOUNTER_CONFIG+1))
+#define _meshtastic_ExcludedModules_MAX meshtastic_ExcludedModules_BLUETOOTH_CONFIG
+#define _meshtastic_ExcludedModules_ARRAYSIZE ((meshtastic_ExcludedModules)(meshtastic_ExcludedModules_BLUETOOTH_CONFIG+1))
 
 #define _meshtastic_Position_LocSource_MIN meshtastic_Position_LocSource_LOC_UNSET
 #define _meshtastic_Position_LocSource_MAX meshtastic_Position_LocSource_LOC_EXTERNAL

From 95523a9659efe2a4e711d7e42f84e1b99f8a4b54 Mon Sep 17 00:00:00 2001
From: Andrew Yong <me@ndoo.sg>
Date: Mon, 31 Mar 2025 08:21:47 +0800
Subject: [PATCH 102/116] Fix: Update xiao_ble E22-900M30S regulatory gain to 7
 dB (#6466)

Allow 3 dBm increase in power from previous value of 10 dB gain, based on actual measurements from https://github.com/S5NC/EBYTE_ESP32-S3/blob/main/E22-900M30S%20power%20output%20testing.txt

Signed-off-by: Andrew Yong <me@ndoo.sg>
---
 variants/xiao_ble/variant.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/variants/xiao_ble/variant.h b/variants/xiao_ble/variant.h
index a86ddfde2..d00f8be89 100644
--- a/variants/xiao_ble/variant.h
+++ b/variants/xiao_ble/variant.h
@@ -143,9 +143,10 @@ static const uint8_t SCK = PIN_SPI_SCK;
 #define SX126X_DIO2_AS_RF_SWITCH
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8
 #ifdef EBYTE_E22_900M30S
-// 10dB PA gain and 30dB rated output; based on PA output table from Ebyte Robin <sales06@ebyte.com>
-#define REGULATORY_GAIN_LORA 10
-#define SX126X_MAX_POWER 20
+// 10dB PA gain and 30dB rated output; based on measurements from
+// https://github.com/S5NC/EBYTE_ESP32-S3/blob/main/E22-900M30S%20power%20output%20testing.txt
+#define REGULATORY_GAIN_LORA 7
+#define SX126X_MAX_POWER 22
 #endif
 #ifdef EBYTE_E22_900M33S
 // 25dB PA gain and 33dB rated output; based on TX Power Curve from E22-900M33S_UserManual_EN_v1.0.pdf

From e79d4492e8c56458b75d47d8cb3388a76b85bc39 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 30 Mar 2025 20:33:22 -0500
Subject: [PATCH 103/116] [create-pull-request] automated change (#6468)

Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
---
 protobufs                               |  2 +-
 src/mesh/generated/meshtastic/mesh.pb.h | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/protobufs b/protobufs
index 5e032099b..484d002a5 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit 5e032099be353f1bebdda021bf66e2c90943f4dd
+Subproject commit 484d002a52bc20fa9f91ebf1b216d585c5f93a1b
diff --git a/src/mesh/generated/meshtastic/mesh.pb.h b/src/mesh/generated/meshtastic/mesh.pb.h
index 2f47d5503..defaaad28 100644
--- a/src/mesh/generated/meshtastic/mesh.pb.h
+++ b/src/mesh/generated/meshtastic/mesh.pb.h
@@ -327,8 +327,10 @@ typedef enum _meshtastic_ExcludedModules {
     meshtastic_ExcludedModules_DETECTIONSENSOR_CONFIG = 2048,
     /* Paxcounter module */
     meshtastic_ExcludedModules_PAXCOUNTER_CONFIG = 4096,
-    /* Bluetooth module */
-    meshtastic_ExcludedModules_BLUETOOTH_CONFIG = 8192
+    /* Bluetooth config (not technically a module, but used to indicate bluetooth capabilities) */
+    meshtastic_ExcludedModules_BLUETOOTH_CONFIG = 8192,
+    /* Network config (not technically a module, but used to indicate network capabilities) */
+    meshtastic_ExcludedModules_NETWORK_CONFIG = 16384
 } meshtastic_ExcludedModules;
 
 /* How the location was acquired: manual, onboard GPS, external (EUD) GPS */
@@ -1124,8 +1126,8 @@ extern "C" {
 #define _meshtastic_CriticalErrorCode_ARRAYSIZE ((meshtastic_CriticalErrorCode)(meshtastic_CriticalErrorCode_FLASH_CORRUPTION_UNRECOVERABLE+1))
 
 #define _meshtastic_ExcludedModules_MIN meshtastic_ExcludedModules_EXCLUDED_NONE
-#define _meshtastic_ExcludedModules_MAX meshtastic_ExcludedModules_BLUETOOTH_CONFIG
-#define _meshtastic_ExcludedModules_ARRAYSIZE ((meshtastic_ExcludedModules)(meshtastic_ExcludedModules_BLUETOOTH_CONFIG+1))
+#define _meshtastic_ExcludedModules_MAX meshtastic_ExcludedModules_NETWORK_CONFIG
+#define _meshtastic_ExcludedModules_ARRAYSIZE ((meshtastic_ExcludedModules)(meshtastic_ExcludedModules_NETWORK_CONFIG+1))
 
 #define _meshtastic_Position_LocSource_MIN meshtastic_Position_LocSource_LOC_UNSET
 #define _meshtastic_Position_LocSource_MAX meshtastic_Position_LocSource_LOC_EXTERNAL

From b52c355f2f560078ff27d2516a8b0ae639c3e1b0 Mon Sep 17 00:00:00 2001
From: Mark Trevor Birss <markbirss@gmail.com>
Date: Mon, 31 Mar 2025 03:37:08 +0200
Subject: [PATCH 104/116] Update ScreenFonts.h (#6412)

---
 src/graphics/ScreenFonts.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/graphics/ScreenFonts.h b/src/graphics/ScreenFonts.h
index 910d1b0b9..079a3e282 100644
--- a/src/graphics/ScreenFonts.h
+++ b/src/graphics/ScreenFonts.h
@@ -16,6 +16,10 @@
 #include "graphics/fonts/OLEDDisplayFontsCS.h"
 #endif
 
+#ifdef CROWPANEL_ESP32S3_5_EPAPER
+#include "graphics/fonts/EinkDisplayFonts.h"
+#endif
+
 #ifdef OLED_PL
 #define FONT_SMALL_LOCAL ArialMT_Plain_10_PL
 #else
@@ -74,13 +78,12 @@
 #endif
 
 #if defined(CROWPANEL_ESP32S3_5_EPAPER)
-#include "graphics/fonts/EinkDisplayFonts.h"
 #undef FONT_SMALL
 #undef FONT_MEDIUM
 #undef FONT_LARGE
-#define FONT_SMALL FONT_LARGE_LOCAL  // Height: 30
-#define FONT_MEDIUM FONT_LARGE_LOCAL // Height: 30
-#define FONT_LARGE FONT_LARGE_LOCAL  // Height: 30
+#define FONT_SMALL Monospaced_plain_30
+#define FONT_MEDIUM Monospaced_plain_30
+#define FONT_LARGE Monospaced_plain_30
 #endif
 
 #define _fontHeight(font) ((font)[1] + 1) // height is position 1

From e08177ba986d915894d7f95a6a2b498b6c8fee2e Mon Sep 17 00:00:00 2001
From: Tavis <github@tavis.la>
Date: Sun, 30 Mar 2025 15:38:24 -1000
Subject: [PATCH 105/116] update to handle ws80 as well (#6440)

Small change to make the string parsing of Name = value less brittle.  Adds a function to parse a line without knowing how many spaces are after the = sign.  This allows it to also work with the ws80 serial output.
---
 src/modules/SerialModule.cpp | 127 ++++++++++++++++++++---------------
 1 file changed, 72 insertions(+), 55 deletions(-)

diff --git a/src/modules/SerialModule.cpp b/src/modules/SerialModule.cpp
index f3f23b080..e088b4612 100644
--- a/src/modules/SerialModule.cpp
+++ b/src/modules/SerialModule.cpp
@@ -408,6 +408,49 @@ uint32_t SerialModule::getBaudRate()
     return BAUD;
 }
 
+// Add this structure to help with parsing WindGust =       24.4 serial lines.
+struct ParsedLine {
+    String name;
+    String value;
+};
+
+/**
+ * Parse a line of format "Name = Value" into name/value pair
+ * @param line Input line to parse
+ * @return ParsedLine containing name and value, or empty strings if parse failed
+ */
+ParsedLine parseLine(const char *line)
+{
+    ParsedLine result = {"", ""};
+
+    // Find equals sign
+    const char *equals = strchr(line, '=');
+    if (!equals) {
+        return result;
+    }
+
+    // Extract name by copying substring
+    char nameBuf[64]; // Temporary buffer
+    size_t nameLen = equals - line;
+    if (nameLen >= sizeof(nameBuf)) {
+        nameLen = sizeof(nameBuf) - 1;
+    }
+    strncpy(nameBuf, line, nameLen);
+    nameBuf[nameLen] = '\0';
+
+    // Create trimmed name string
+    String name = String(nameBuf);
+    name.trim();
+
+    // Extract value after equals sign
+    String value = String(equals + 1);
+    value.trim();
+
+    result.name = name;
+    result.value = value;
+    return result;
+}
+
 /**
  * Process the received weather station serial data, extract wind, voltage, and temperature information,
  * calculate averages and send telemetry data over the mesh network.
@@ -453,6 +496,7 @@ void SerialModule::processWXSerial()
         // WindSpeed    = 0.5
         // WindGust     = 0.6
         // GXTS04Temp   = 24.4
+        // Temperature = 23.4 // WS80
 
         // RainIntSum     = 0
         // Rain           = 0.0
@@ -471,75 +515,48 @@ void SerialModule::processWXSerial()
                     memset(line, '\0', sizeof(line));
                     if (lineEnd - lineStart < sizeof(line) - 1) {
                         memcpy(line, &serialBytes[lineStart], lineEnd - lineStart);
-                        if (strstr(line, "Wind") != NULL) // we have a wind line
-                        {
-                            gotwind = true;
-                            // Find the positions of "=" signs in the line
-                            char *windDirPos = strstr(line, "WindDir      = ");
-                            char *windSpeedPos = strstr(line, "WindSpeed    = ");
-                            char *windGustPos = strstr(line, "WindGust     = ");
 
-                            if (windDirPos != NULL) {
-                                // Extract data after "=" for WindDir
-                                strlcpy(windDir, windDirPos + 15, sizeof(windDir)); // Add 15 to skip "WindDir = "
+                        ParsedLine parsed = parseLine(line);
+                        if (parsed.name.length() > 0) {
+                            if (parsed.name == "WindDir") {
+                                strlcpy(windDir, parsed.value.c_str(), sizeof(windDir));
                                 double radians = GeoCoord::toRadians(strtof(windDir, nullptr));
                                 dir_sum_sin += sin(radians);
                                 dir_sum_cos += cos(radians);
                                 dirCount++;
-                            } else if (windSpeedPos != NULL) {
-                                // Extract data after "=" for WindSpeed
-                                strlcpy(windVel, windSpeedPos + 15, sizeof(windVel)); // Add 15 to skip "WindSpeed = "
+                                gotwind = true;
+                            } else if (parsed.name == "WindSpeed") {
+                                strlcpy(windVel, parsed.value.c_str(), sizeof(windVel));
                                 float newv = strtof(windVel, nullptr);
                                 velSum += newv;
                                 velCount++;
-                                if (newv < lull || lull == -1)
+                                if (newv < lull || lull == -1) {
                                     lull = newv;
-
-                            } else if (windGustPos != NULL) {
-                                strlcpy(windGust, windGustPos + 15, sizeof(windGust)); // Add 15 to skip "WindSpeed = "
+                                }
+                                gotwind = true;
+                            } else if (parsed.name == "WindGust") {
+                                strlcpy(windGust, parsed.value.c_str(), sizeof(windGust));
                                 float newg = strtof(windGust, nullptr);
-                                if (newg > gust)
+                                if (newg > gust) {
                                     gust = newg;
-                            }
-
-                            // these are also voltage data we care about possibly
-                        } else if (strstr(line, "BatVoltage") != NULL) { // we have a battVoltage line
-                            char *batVoltagePos = strstr(line, "BatVoltage     = ");
-                            if (batVoltagePos != NULL) {
-                                strlcpy(batVoltage, batVoltagePos + 17, sizeof(batVoltage)); // 18 for ws 80, 17 for ws85
+                                }
+                                gotwind = true;
+                            } else if (parsed.name == "BatVoltage") {
+                                strlcpy(batVoltage, parsed.value.c_str(), sizeof(batVoltage));
                                 batVoltageF = strtof(batVoltage, nullptr);
                                 break; // last possible data we want so break
-                            }
-                        } else if (strstr(line, "CapVoltage") != NULL) { // we have a cappVoltage line
-                            char *capVoltagePos = strstr(line, "CapVoltage     = ");
-                            if (capVoltagePos != NULL) {
-                                strlcpy(capVoltage, capVoltagePos + 17, sizeof(capVoltage)); // 18 for ws 80, 17 for ws85
+                            } else if (parsed.name == "CapVoltage") {
+                                strlcpy(capVoltage, parsed.value.c_str(), sizeof(capVoltage));
                                 capVoltageF = strtof(capVoltage, nullptr);
-                            }
-                            // GXTS04Temp   = 24.4
-                        } else if (strstr(line, "GXTS04Temp") != NULL) { // we have a temperature line
-                            char *tempPos = strstr(line, "GXTS04Temp   = ");
-                            if (tempPos != NULL) {
-                                strlcpy(temperature, tempPos + 15, sizeof(temperature)); // 15 spaces for ws85
+                            } else if (parsed.name == "GXTS04Temp" || parsed.name == "Temperature") {
+                                strlcpy(temperature, parsed.value.c_str(), sizeof(temperature));
                                 temperatureF = strtof(temperature, nullptr);
-                            }
-
-                        } else if (strstr(line, "RainIntSum") != NULL) { // we have a rainsum line
-                            // LOG_INFO(line);
-                            char *pos = strstr(line, "RainIntSum     = ");
-                            if (pos != NULL) {
-                                strlcpy(rainStr, pos + 17, sizeof(rainStr)); // 17 spaces for ws85
+                            } else if (parsed.name == "RainIntSum") {
+                                strlcpy(rainStr, parsed.value.c_str(), sizeof(rainStr));
                                 rainSum = int(strtof(rainStr, nullptr));
-                            }
-
-                        } else if (strstr(line, "Rain") != NULL) {  // we have a rain line
-                            if (strstr(line, "WaveRain") == NULL) { // skip WaveRain lines though.
-                                // LOG_INFO(line);
-                                char *pos = strstr(line, "Rain           = ");
-                                if (pos != NULL) {
-                                    strlcpy(rainStr, pos + 17, sizeof(rainStr)); // 17 spaces for ws85
-                                    rain = strtof(rainStr, nullptr);
-                                }
+                            } else if (parsed.name == "Rain") {
+                                strlcpy(rainStr, parsed.value.c_str(), sizeof(rainStr));
+                                rain = strtof(rainStr, nullptr);
                             }
                         }
 
@@ -557,7 +574,7 @@ void SerialModule::processWXSerial()
     }
     if (gotwind) {
 
-        LOG_INFO("WS85 : %i %.1fg%.1f %.1fv %.1fv %.1fC rain: %.1f, %i sum", atoi(windDir), strtof(windVel, nullptr),
+        LOG_INFO("WS8X : %i %.1fg%.1f %.1fv %.1fv %.1fC rain: %.1f, %i sum", atoi(windDir), strtof(windVel, nullptr),
                  strtof(windGust, nullptr), batVoltageF, capVoltageF, temperatureF, rain, rainSum);
     }
     if (gotwind && !Throttle::isWithinTimespanMs(lastAveraged, averageIntervalMillis)) {
@@ -607,7 +624,7 @@ void SerialModule::processWXSerial()
         m.variant.environment_metrics.wind_lull = lull;
         m.variant.environment_metrics.has_wind_lull = true;
 
-        LOG_INFO("WS85 Transmit speed=%fm/s, direction=%d , lull=%f, gust=%f, voltage=%f temperature=%f",
+        LOG_INFO("WS8X Transmit speed=%fm/s, direction=%d , lull=%f, gust=%f, voltage=%f temperature=%f",
                  m.variant.environment_metrics.wind_speed, m.variant.environment_metrics.wind_direction,
                  m.variant.environment_metrics.wind_lull, m.variant.environment_metrics.wind_gust,
                  m.variant.environment_metrics.voltage, m.variant.environment_metrics.temperature);

From 850d21dcb9b7ab82016a464d6c05e5950da6fb9f Mon Sep 17 00:00:00 2001
From: "Jason B. Cox" <contact@jasonbcox.com>
Date: Sun, 30 Mar 2025 18:39:01 -0700
Subject: [PATCH 106/116] Add a static_assert to verify assumption about
 NodeInfoLite size (#6428)

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
---
 src/mesh/mesh-pb-constants.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/mesh/mesh-pb-constants.h b/src/mesh/mesh-pb-constants.h
index 1c86653dc..f748d295e 100644
--- a/src/mesh/mesh-pb-constants.h
+++ b/src/mesh/mesh-pb-constants.h
@@ -18,6 +18,10 @@
 #define MAX_RX_TOPHONE 32
 #endif
 
+/// Verify baseline assumption of node size. If it increases, we need to reevaluate
+/// the impact of its memory footprint, notably on MAX_NUM_NODES.
+static_assert(sizeof(meshtastic_NodeInfoLite) <= 192, "NodeInfoLite size increased. Reconsider impact on MAX_NUM_NODES.");
+
 /// max number of nodes allowed in the nodeDB
 #ifndef MAX_NUM_NODES
 #if defined(ARCH_STM32WL)

From f18f60cd0b38cb333a6ca2ebcf28669391b50b85 Mon Sep 17 00:00:00 2001
From: Austin <vidplace7@gmail.com>
Date: Sun, 30 Mar 2025 21:47:15 -0400
Subject: [PATCH 107/116] meshtasticd: CH341 / HAT+ Auto Configuration (#6446)

---
 bin/config-dist.yaml                          |  6 ++
 ...dafruit-RFM9x => lora-Adafruit-RFM9x.yaml} |  0
 src/platform/portduino/PortduinoGlue.cpp      | 71 +++++++++++++++++--
 src/platform/portduino/PortduinoGlue.h        | 11 +++
 4 files changed, 84 insertions(+), 4 deletions(-)
 rename bin/config.d/{lora-Adafruit-RFM9x => lora-Adafruit-RFM9x.yaml} (100%)

diff --git a/bin/config-dist.yaml b/bin/config-dist.yaml
index da4c192c7..722f80fae 100644
--- a/bin/config-dist.yaml
+++ b/bin/config-dist.yaml
@@ -6,6 +6,12 @@
 ### Including the "Module:" line!
 ---
 Lora:
+  # Default to auto-detecting the module type
+  # This will be overridden by configs from config.d
+  Module: auto
+
+#  # Uncomment to enable Simulation mode, or use --sim
+#  Module: sim
 
 #  Module: sx1262  # Waveshare SX1302 LISTEN ONLY AT THIS TIME!
 #  CS: 7
diff --git a/bin/config.d/lora-Adafruit-RFM9x b/bin/config.d/lora-Adafruit-RFM9x.yaml
similarity index 100%
rename from bin/config.d/lora-Adafruit-RFM9x
rename to bin/config.d/lora-Adafruit-RFM9x.yaml
diff --git a/src/platform/portduino/PortduinoGlue.cpp b/src/platform/portduino/PortduinoGlue.cpp
index 7b13971b4..a4050e702 100644
--- a/src/platform/portduino/PortduinoGlue.cpp
+++ b/src/platform/portduino/PortduinoGlue.cpp
@@ -33,6 +33,7 @@ std::ofstream traceFile;
 Ch341Hal *ch341Hal = nullptr;
 char *configPath = nullptr;
 char *optionMac = nullptr;
+bool forceSimulated = false;
 
 // FIXME - move setBluetoothEnable into a HALPlatform class
 void setBluetoothEnable(bool enable)
@@ -61,6 +62,9 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state)
     case 'c':
         configPath = arg;
         break;
+    case 's':
+        forceSimulated = true;
+        break;
     case 'h':
         optionMac = arg;
         break;
@@ -78,6 +82,7 @@ void portduinoCustomInit()
     static struct argp_option options[] = {{"port", 'p', "PORT", 0, "The TCP port to use."},
                                            {"config", 'c', "CONFIG_PATH", 0, "Full path of the .yaml config file to use."},
                                            {"hwid", 'h', "HWID", 0, "The mac address to assign to this virtual machine"},
+                                           {"sim", 's', 0, 0, "Run in Simulated radio mode"},
                                            {0}};
     static void *childArguments;
     static char doc[] = "Meshtastic native build.";
@@ -157,7 +162,9 @@ void portduinoSetup()
 
     YAML::Node yamlConfig;
 
-    if (configPath != nullptr) {
+    if (forceSimulated == true) {
+        settingsMap[use_simradio] = true;
+    } else if (configPath != nullptr) {
         if (loadConfig(configPath)) {
             std::cout << "Using " << configPath << " as config file" << std::endl;
         } else {
@@ -179,7 +186,12 @@ void portduinoSetup()
             exit(EXIT_FAILURE);
         }
     } else {
-        std::cout << "No 'config.yaml' found, running simulated." << std::endl;
+        std::cout << "No 'config.yaml' found..." << std::endl;
+        settingsMap[use_simradio] = true;
+    }
+
+    if (settingsMap[use_simradio] == true) {
+        std::cout << "Running in simulated mode." << std::endl;
         settingsMap[maxnodes] = 200;               // Default to 200 nodes
         settingsMap[logoutputlevel] = level_debug; // Default to debug
         // Set the random seed equal to TCPPort to have a different seed per instance
@@ -197,6 +209,56 @@ void portduinoSetup()
             }
         }
     }
+
+    // If LoRa `Module: auto` (default in config.yaml),
+    // attempt to auto config based on Product Strings
+    if (settingsMap[use_autoconf] == true) {
+        char autoconf_product[96] = {0};
+        // Try CH341
+        try {
+            std::cout << "autoconf: Looking for CH341 device..." << std::endl;
+            ch341Hal =
+                new Ch341Hal(0, settingsStrings[lora_usb_serial_num], settingsMap[lora_usb_vid], settingsMap[lora_usb_pid]);
+            ch341Hal->getProductString(autoconf_product, 95);
+            delete ch341Hal;
+            std::cout << "autoconf: Found CH341 device " << autoconf_product << std::endl;
+        } catch (...) {
+            std::cout << "autoconf: Could not locate CH341 device" << std::endl;
+        }
+        // Try Pi HAT+
+        std::cout << "autoconf: Looking for Pi HAT+..." << std::endl;
+        if (access("/proc/device-tree/hat/product", R_OK) == 0) {
+            std::ifstream hatProductFile("/proc/device-tree/hat/product");
+            if (hatProductFile.is_open()) {
+                hatProductFile.read(autoconf_product, 95);
+                hatProductFile.close();
+            }
+            std::cout << "autoconf: Found Pi HAT+ " << autoconf_product << " at /proc/device-tree/hat/product" << std::endl;
+        } else {
+            std::cout << "autoconf: Could not locate Pi HAT+ at /proc/device-tree/hat/product" << std::endl;
+        }
+        // Load the config file based on the product string
+        if (strlen(autoconf_product) > 0) {
+            // From configProducts map in PortduinoGlue.h
+            std::string product_config = "";
+            try {
+                product_config = configProducts.at(autoconf_product);
+            } catch (std::out_of_range &e) {
+                std::cerr << "autoconf: Unable to find config for " << autoconf_product << std::endl;
+                exit(EXIT_FAILURE);
+            }
+            if (loadConfig(("/etc/meshtasticd/available.d/" + product_config).c_str())) {
+                std::cout << "autoconf: Using " << product_config << " as config file for " << autoconf_product << std::endl;
+            } else {
+                std::cerr << "autoconf: Unable to use " << product_config << " as config file for " << autoconf_product
+                          << std::endl;
+                exit(EXIT_FAILURE);
+            }
+        } else {
+            std::cerr << "autoconf: Could not locate any devices" << std::endl;
+        }
+    }
+
     // if we're using a usermode driver, we need to initialize it here, to get a serial number back for mac address
     uint8_t dmac[6] = {0};
     if (settingsStrings[spidev] == "ch341") {
@@ -358,8 +420,9 @@ bool loadConfig(const char *configPath)
             const struct {
                 configNames cfgName;
                 std::string strName;
-            } loraModules[] = {{use_rf95, "RF95"},     {use_sx1262, "sx1262"}, {use_sx1268, "sx1268"}, {use_sx1280, "sx1280"},
-                               {use_lr1110, "lr1110"}, {use_lr1120, "lr1120"}, {use_lr1121, "lr1121"}, {use_llcc68, "LLCC68"}};
+            } loraModules[] = {{use_simradio, "sim"},  {use_autoconf, "auto"}, {use_rf95, "RF95"},     {use_sx1262, "sx1262"},
+                               {use_sx1268, "sx1268"}, {use_sx1280, "sx1280"}, {use_lr1110, "lr1110"}, {use_lr1120, "lr1120"},
+                               {use_lr1121, "lr1121"}, {use_llcc68, "LLCC68"}};
             for (auto &loraModule : loraModules) {
                 settingsMap[loraModule.cfgName] = false;
             }
diff --git a/src/platform/portduino/PortduinoGlue.h b/src/platform/portduino/PortduinoGlue.h
index a52ca88f8..a7aea1c3e 100644
--- a/src/platform/portduino/PortduinoGlue.h
+++ b/src/platform/portduino/PortduinoGlue.h
@@ -1,9 +1,18 @@
 #pragma once
 #include <fstream>
 #include <map>
+#include <unordered_map>
 
 #include "platform/portduino/USBHal.h"
 
+// Product strings for auto-configuration
+// {"PRODUCT_STRING", "CONFIG.YAML"}
+// YAML paths are relative to `meshtastic/available.d`
+inline const std::unordered_map<std::string, std::string> configProducts = {{"MESHTOAD", "lora-usb-meshtoad-e22.yaml"},
+                                                                            {"MESHSTICK", "lora-meshstick-1262.yaml"},
+                                                                            {"MESHADV-PI", "lora-MeshAdv-900M30S.yaml"},
+                                                                            {"POWERPI", "lora-MeshAdv-900M30S.yaml"}};
+
 enum configNames {
     default_gpiochip,
     cs_pin,
@@ -34,6 +43,8 @@ enum configNames {
     rf95_max_power,
     dio2_as_rf_switch,
     dio3_tcxo_voltage,
+    use_simradio,
+    use_autoconf,
     use_rf95,
     use_sx1262,
     use_sx1268,

From f626f02005bfafd0553ebebe8d1db251fae7c8e5 Mon Sep 17 00:00:00 2001
From: Plant Daddy <5402293+PlantDaddy@users.noreply.github.com>
Date: Mon, 31 Mar 2025 02:14:48 -0500
Subject: [PATCH 108/116] Add 'bluetooth' option to the LilyGo T-Watch-S3
 definition.

---
 boards/t-watch-s3.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boards/t-watch-s3.json b/boards/t-watch-s3.json
index e6e363305..5d4afd322 100644
--- a/boards/t-watch-s3.json
+++ b/boards/t-watch-s3.json
@@ -23,7 +23,7 @@
     "mcu": "esp32s3",
     "variant": "t-watch-s3"
   },
-  "connectivity": ["wifi"],
+  "connectivity": ["wifi", "bluetooth"],
   "debug": {
     "openocd_target": "esp32s3.cfg"
   },

From da26ff5b95d6723cd415d0b328d0eaac32e7e87d Mon Sep 17 00:00:00 2001
From: todd-herbert <herbert.todd@gmail.com>
Date: Mon, 31 Mar 2025 20:15:54 +1300
Subject: [PATCH 109/116] feat: more toggles for InkHUD menu (#6469)

GPS on/off
Wifi off -> Bluetooth on
12 / 24 hour clock
---
 src/graphics/niche/InkHUD/Applet.cpp          |  7 ++-
 .../InkHUD/Applets/System/Menu/MenuAction.h   |  6 +-
 .../InkHUD/Applets/System/Menu/MenuApplet.cpp | 63 +++++++++++--------
 3 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/src/graphics/niche/InkHUD/Applet.cpp b/src/graphics/niche/InkHUD/Applet.cpp
index 9fda9a87e..459f30213 100644
--- a/src/graphics/niche/InkHUD/Applet.cpp
+++ b/src/graphics/niche/InkHUD/Applet.cpp
@@ -582,9 +582,12 @@ std::string InkHUD::Applet::getTimeString(uint32_t epochSeconds)
         uint32_t hour = hms / SEC_PER_HOUR;
         uint32_t min = (hms % SEC_PER_HOUR) / SEC_PER_MIN;
 
-        // Format the clock string
+        // Format the clock string, either 12 hour or 24 hour
         char clockStr[11];
-        sprintf(clockStr, "%u:%02u %s", (hour % 12 == 0 ? 12 : hour % 12), min, hour > 11 ? "PM" : "AM");
+        if (config.display.use_12h_clock)
+            sprintf(clockStr, "%u:%02u %s", (hour % 12 == 0 ? 12 : hour % 12), min, hour > 11 ? "PM" : "AM");
+        else
+            sprintf(clockStr, "%02u:%02u", hour, min);
 
         return clockStr;
     }
diff --git a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuAction.h b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuAction.h
index 6950bb110..4f8205647 100644
--- a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuAction.h
+++ b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuAction.h
@@ -22,15 +22,17 @@ enum MenuAction {
     SEND_POSITION,
     SHUTDOWN,
     NEXT_TILE,
+    TOGGLE_BACKLIGHT,
+    TOGGLE_GPS,
+    ENABLE_BLUETOOTH,
     TOGGLE_APPLET,
-    ACTIVATE_APPLETS, // Todo: remove? Possible redundant, handled by TOGGLE_APPLET?
     TOGGLE_AUTOSHOW_APPLET,
     SET_RECENTS,
     ROTATE,
     LAYOUT,
     TOGGLE_BATTERY_ICON,
     TOGGLE_NOTIFICATIONS,
-    TOGGLE_BACKLIGHT,
+    TOGGLE_12H_CLOCK,
 };
 
 } // namespace NicheGraphics::InkHUD
diff --git a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
index 7397f7e9f..4c411bb85 100644
--- a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
@@ -5,8 +5,13 @@
 #include "RTC.h"
 
 #include "airtime.h"
+#include "main.h"
 #include "power.h"
 
+#if !MESHTASTIC_EXCLUDE_GPS
+#include "GPS.h"
+#endif
+
 using namespace NicheGraphics;
 
 static constexpr uint8_t MENU_TIMEOUT_SEC = 60; // How many seconds before menu auto-closes
@@ -161,12 +166,6 @@ void InkHUD::MenuApplet::execute(MenuItem item)
     case TOGGLE_APPLET:
         settings->userApplets.active[cursor] = !settings->userApplets.active[cursor];
         inkhud->updateAppletSelection();
-        // requestUpdate(Drivers::EInk::UpdateTypes::FULL); // Select FULL, seeing how this action doesn't auto exit
-        break;
-
-    case ACTIVATE_APPLETS:
-        // Todo: remove this action? Already handled by TOGGLE_APPLET?
-        inkhud->updateAppletSelection();
         break;
 
     case TOGGLE_AUTOSHOW_APPLET:
@@ -205,6 +204,25 @@ void InkHUD::MenuApplet::execute(MenuItem item)
             backlight->latch();
         break;
 
+    case TOGGLE_12H_CLOCK:
+        config.display.use_12h_clock = !config.display.use_12h_clock;
+        nodeDB->saveToDisk(SEGMENT_CONFIG);
+        break;
+
+    case TOGGLE_GPS:
+        gps->toggleGpsMode();
+        nodeDB->saveToDisk(SEGMENT_CONFIG);
+        break;
+
+    case ENABLE_BLUETOOTH:
+        // This helps users recover from a bad wifi config
+        LOG_INFO("Enabling Bluetooth");
+        config.network.wifi_enabled = false;
+        config.bluetooth.enabled = true;
+        nodeDB->saveToDisk();
+        rebootAtMsec = millis() + 2000;
+        break;
+
     default:
         LOG_WARN("Action not implemented");
     }
@@ -242,13 +260,21 @@ void InkHUD::MenuApplet::showPage(MenuPage page)
 
     case OPTIONS:
         // Optional: backlight
-        if (settings->optionalMenuItems.backlight) {
-            assert(backlight);
+        if (settings->optionalMenuItems.backlight)
             items.push_back(MenuItem(backlight->isLatched() ? "Backlight Off" : "Keep Backlight On", // Label
                                      MenuAction::TOGGLE_BACKLIGHT,                                   // Action
                                      MenuPage::EXIT                                                  // Exit once complete
                                      ));
-        }
+
+        // Optional: GPS
+        if (config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_DISABLED)
+            items.push_back(MenuItem("Enable GPS", MenuAction::TOGGLE_GPS, MenuPage::EXIT));
+        if (config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_ENABLED)
+            items.push_back(MenuItem("Disable GPS", MenuAction::TOGGLE_GPS, MenuPage::EXIT));
+
+        // Optional: Enable Bluetooth, in case of lost wifi connection
+        if (!config.bluetooth.enabled || config.network.wifi_enabled)
+            items.push_back(MenuItem("Enable Bluetooth", MenuAction::ENABLE_BLUETOOTH, MenuPage::EXIT));
 
         items.push_back(MenuItem("Applets", MenuPage::APPLETS));
         items.push_back(MenuItem("Auto-show", MenuPage::AUTOSHOW));
@@ -260,26 +286,14 @@ void InkHUD::MenuApplet::showPage(MenuPage page)
                                  &settings->optionalFeatures.notifications));
         items.push_back(MenuItem("Battery Icon", MenuAction::TOGGLE_BATTERY_ICON, MenuPage::OPTIONS,
                                  &settings->optionalFeatures.batteryIcon));
-
-        // TODO - GPS and Wifi switches
-        /*
-        // Optional: has GPS
-        if (config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_DISABLED)
-            items.push_back(MenuItem("Enable GPS", MenuPage::EXIT)); // TODO
-        if (config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_ENABLED)
-            items.push_back(MenuItem("Disable GPS", MenuPage::EXIT)); // TODO
-
-        // Optional: using wifi
-        if (!config.bluetooth.enabled)
-            items.push_back(MenuItem("Enable Bluetooth", MenuPage::EXIT)); // TODO: escape hatch if wifi configured wrong
-        */
-
+        items.push_back(
+            MenuItem("12-Hour Clock", MenuAction::TOGGLE_12H_CLOCK, MenuPage::OPTIONS, &config.display.use_12h_clock));
         items.push_back(MenuItem("Exit", MenuPage::EXIT));
         break;
 
     case APPLETS:
         populateAppletPage();
-        items.push_back(MenuItem("Exit", MenuAction::ACTIVATE_APPLETS));
+        items.push_back(MenuItem("Exit", MenuPage::EXIT));
         break;
 
     case AUTOSHOW:
@@ -293,7 +307,6 @@ void InkHUD::MenuApplet::showPage(MenuPage page)
 
     case EXIT:
         sendToBackground(); // Menu applet dismissed, allow normal behavior to resume
-        // requestUpdate(Drivers::EInk::UpdateTypes::FULL);
         break;
 
     default:

From bd2d2981c963bcd86fedf727ae15ebb028e68ff3 Mon Sep 17 00:00:00 2001
From: todd-herbert <herbert.todd@gmail.com>
Date: Mon, 31 Mar 2025 20:17:24 +1300
Subject: [PATCH 110/116] Add InkHUD driver for WeAct Studio 4.2" display
 module (#6384)

* chore: todo.txt

* chore: InkHUD documentation
Word salad for maintainers

* refactor: don't init system applets using onActivate
System applets cannot be deactivated, so we will avoid using onActivate / onDeactivate methods entirely.

* chore: update the example applets

* fix: SSD16XX reset pulse
Allow time for controller IC to wake. Aligns with manufacturer's suggestions.
T-Echo button timing adjusted to prevent bouncing as a result(?) of slightly faster refreshes.

* fix: allow timeout if display update fails
Result is not graceful, but avoids total display lockup requiring power cycle.
Typical cause of failure is poor wiring / power supply.

* fix: improve display health on shutdown
Two extra full refreshes, masquerading as a "shutting down" screen. One is drawn white-on-black, to really shake the pixels up.

* feat: driver for display HINK_E042A87
As of Feb. 2025, these panels are used for "WeActStudio 4.2in B&W" display modules.

* fix: inkhud rotation should default to 0

* Revert "chore: todo.txt"

This reverts commit bea7df44a7cbf2f92e8c67c965e53d26a7885b11.

* fix: more generous timeout for display updates
Previously this was tied to the expected duration of the update, but this didn't account for any delay if our polling thread got held up by an unrelated firmware task.

* fix: don't use the full shutdown screen during reboot

* fix: cooldown period during the display shutdown display sequence
Observed to prevent border pixels from being locked in place with some residual charge?
---
 src/graphics/niche/Drivers/EInk/EInk.cpp      |  22 +-
 src/graphics/niche/Drivers/EInk/EInk.h        |   5 +-
 .../niche/Drivers/EInk/HINK_E042A87.cpp       |  58 ++
 .../niche/Drivers/EInk/HINK_E042A87.h         |  43 ++
 src/graphics/niche/Drivers/EInk/README.md     |  49 +-
 src/graphics/niche/Drivers/EInk/SSD16XX.cpp   |  34 +-
 src/graphics/niche/Drivers/EInk/SSD16XX.h     |   2 +-
 src/graphics/niche/InkHUD/Applet.cpp          |  16 +-
 src/graphics/niche/InkHUD/Applet.h            |   3 +-
 .../BasicExample/BasicExampleApplet.cpp       |   2 +-
 .../NewMsgExample/NewMsgExampleApplet.cpp     |   5 +-
 .../InkHUD/Applets/System/Logo/LogoApplet.cpp |  44 +-
 .../InkHUD/Applets/System/Logo/LogoApplet.h   |   2 +
 .../InkHUD/Applets/System/Menu/MenuApplet.cpp |   2 -
 .../InkHUD/Applets/System/Menu/MenuApplet.h   |   1 -
 .../InkHUD/Applets/System/Tips/TipsApplet.cpp |   2 -
 .../InkHUD/Applets/System/Tips/TipsApplet.h   |   1 -
 src/graphics/niche/InkHUD/Events.cpp          |  16 +-
 src/graphics/niche/InkHUD/Persistence.h       |   2 +-
 src/graphics/niche/InkHUD/README.md           |  12 -
 src/graphics/niche/InkHUD/SystemApplet.h      |   2 +
 src/graphics/niche/InkHUD/docs/README.md      | 640 ++++++++++++++++++
 src/graphics/niche/InkHUD/docs/appletfont.png | Bin 0 -> 7797 bytes
 src/graphics/niche/InkHUD/docs/disclaimer.jpg | Bin 0 -> 17942 bytes
 src/graphics/niche/InkHUD/docs/rendering.gif  | Bin 0 -> 78402 bytes
 .../niche/InkHUD/docs/tile_translation.png    | Bin 0 -> 5832 bytes
 .../heltec_vision_master_e213/nicheGraphics.h |  19 +-
 .../heltec_vision_master_e290/nicheGraphics.h |  26 +-
 .../heltec_wireless_paper/nicheGraphics.h     |  21 +-
 variants/t-echo/nicheGraphics.h               |   4 +-
 30 files changed, 945 insertions(+), 88 deletions(-)
 create mode 100644 src/graphics/niche/Drivers/EInk/HINK_E042A87.cpp
 create mode 100644 src/graphics/niche/Drivers/EInk/HINK_E042A87.h
 delete mode 100644 src/graphics/niche/InkHUD/README.md
 create mode 100644 src/graphics/niche/InkHUD/docs/README.md
 create mode 100644 src/graphics/niche/InkHUD/docs/appletfont.png
 create mode 100644 src/graphics/niche/InkHUD/docs/disclaimer.jpg
 create mode 100644 src/graphics/niche/InkHUD/docs/rendering.gif
 create mode 100644 src/graphics/niche/InkHUD/docs/tile_translation.png

diff --git a/src/graphics/niche/Drivers/EInk/EInk.cpp b/src/graphics/niche/Drivers/EInk/EInk.cpp
index 043788b13..cd2e9dc98 100644
--- a/src/graphics/niche/Drivers/EInk/EInk.cpp
+++ b/src/graphics/niche/Drivers/EInk/EInk.cpp
@@ -6,7 +6,7 @@ using namespace NicheGraphics::Drivers;
 
 // Separate from EInk::begin method, as derived class constructors can probably supply these parameters as constants
 EInk::EInk(uint16_t width, uint16_t height, UpdateTypes supported)
-    : concurrency::OSThread("E-Ink Driver"), width(width), height(height), supportedUpdateTypes(supported)
+    : concurrency::OSThread("EInkDriver"), width(width), height(height), supportedUpdateTypes(supported)
 {
     OSThread::disable();
 }
@@ -31,8 +31,8 @@ bool EInk::supports(UpdateTypes type)
 void EInk::beginPolling(uint32_t interval, uint32_t expectedDuration)
 {
     updateRunning = true;
-    updateBegunAt = millis();
     pollingInterval = interval;
+    pollingBegunAt = millis();
 
     // To minimize load, we can choose to delay polling for a few seconds, if we know roughly how long the update will take
     // By default, expectedDuration is 0, and we'll start polling immediately
@@ -45,10 +45,26 @@ void EInk::beginPolling(uint32_t interval, uint32_t expectedDuration)
 // This is what allows us to update the display asynchronously
 int32_t EInk::runOnce()
 {
+    // Check for polling timeout
+    // Manually set at 10 seconds, in case some big task holds up the firmware's cooperative multitasking
+    if (millis() - pollingBegunAt > 10000)
+        failed = true;
+
+    // Handle failure
+    // - polling timeout
+    // - other error (derived classes)
+    if (failed) {
+        LOG_WARN("Display update failed. Check wiring & power supply.");
+        updateRunning = false;
+        failed = false;
+        return disable();
+    }
+
+    // If update not yet done
     if (!isUpdateDone())
         return pollingInterval; // Poll again in a few ms
 
-    // If update done:
+    // If update done
     finalizeUpdate();      // Any post-update code: power down panel hardware, hibernate, etc
     updateRunning = false; // Change what we report via EInk::busy()
     return disable();      // Stop polling
diff --git a/src/graphics/niche/Drivers/EInk/EInk.h b/src/graphics/niche/Drivers/EInk/EInk.h
index facb8ce72..3c51d4f1d 100644
--- a/src/graphics/niche/Drivers/EInk/EInk.h
+++ b/src/graphics/niche/Drivers/EInk/EInk.h
@@ -24,7 +24,7 @@ class EInk : private concurrency::OSThread
     enum UpdateTypes : uint8_t {
         UNSPECIFIED = 0,
         FULL = 1 << 0,
-        FAST = 1 << 1,
+        FAST = 1 << 1, // "Partial Refresh"
     };
 
     EInk(uint16_t width, uint16_t height, UpdateTypes supported);
@@ -41,14 +41,15 @@ class EInk : private concurrency::OSThread
     void beginPolling(uint32_t interval, uint32_t expectedDuration); // Begin checking repeatedly if update finished
     virtual bool isUpdateDone() = 0;                                 // Check once if update finished
     virtual void finalizeUpdate() {}                                 // Run any post-update code
+    bool failed = false;                                             // If an error occurred during update
 
   private:
     int32_t runOnce() override; // Repeated checking if update finished
 
     const UpdateTypes supportedUpdateTypes; // Capabilities of a derived display class
     bool updateRunning = false;             // see EInk::busy()
-    uint32_t updateBegunAt = 0;             // For initial pause before polling for update completion
     uint32_t pollingInterval = 0;           // How often to check if update complete (ms)
+    uint32_t pollingBegunAt = 0;            // To timeout during polling
 };
 
 } // namespace NicheGraphics::Drivers
diff --git a/src/graphics/niche/Drivers/EInk/HINK_E042A87.cpp b/src/graphics/niche/Drivers/EInk/HINK_E042A87.cpp
new file mode 100644
index 000000000..1b72bc4a9
--- /dev/null
+++ b/src/graphics/niche/Drivers/EInk/HINK_E042A87.cpp
@@ -0,0 +1,58 @@
+#include "./HINK_E042A87.h"
+
+#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
+
+using namespace NicheGraphics::Drivers;
+
+// Load settings about how the pixels are moved from old state to new state during a refresh
+// - manually specified,
+// - or with stored values from displays OTP memory
+void HINK_E042A87::configWaveform()
+{
+    sendCommand(0x3C); // Border waveform:
+    sendData(0x01);    // Follow LUT for VSH1
+
+    sendCommand(0x18); // Temperature sensor:
+    sendData(0x80);    // Use internal temperature sensor to select an appropriate refresh waveform
+}
+
+// Describes the sequence of events performed by the displays controller IC during a refresh
+// Includes "power up", "load settings from memory", "update the pixels", etc
+void HINK_E042A87::configUpdateSequence()
+{
+    switch (updateType) {
+    case FAST:
+        sendCommand(0x21); // Use both "old" and "new" image memory (differential)
+        sendData(0x00);
+        sendData(0x00);
+
+        sendCommand(0x22); // Set "update sequence"
+        sendData(0xFF);    // Differential, load waveform from OTP
+        break;
+
+    case FULL:
+    default:
+        sendCommand(0x21); // Bypass "old" image memory (non-differential)
+        sendData(0x40);
+        sendData(0x00);
+
+        sendCommand(0x22); // Set "update sequence":
+        sendData(0xF7);    // Non-differential, load waveform from OTP
+        break;
+    }
+}
+
+// Once the refresh operation has been started,
+// begin periodically polling the display to check for completion, using the normal Meshtastic threading code
+// Only used when refresh is "async"
+void HINK_E042A87::detachFromUpdate()
+{
+    switch (updateType) {
+    case FAST:
+        return beginPolling(50, 1000); // At least 1 second, then check every 50ms
+    case FULL:
+    default:
+        return beginPolling(100, 3500); // At least 3.5 seconds, then check every 100ms
+    }
+}
+#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS
\ No newline at end of file
diff --git a/src/graphics/niche/Drivers/EInk/HINK_E042A87.h b/src/graphics/niche/Drivers/EInk/HINK_E042A87.h
new file mode 100644
index 000000000..ac03b65ef
--- /dev/null
+++ b/src/graphics/niche/Drivers/EInk/HINK_E042A87.h
@@ -0,0 +1,43 @@
+/*
+
+E-Ink display driver
+    - HINK-E042A87
+    - Manufacturer: Holitech
+    - Size: 4.2 inch
+    - Resolution: 400px x 300px
+    - Flex connector marking: HINK-E042A07-FPC-A1
+    - Silver sticker with QR code, marked: HE042A87
+
+    Note: as of Feb. 2025, these panels are used for "WeActStudio 4.2in B&W" display modules
+
+*/
+
+#pragma once
+
+#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
+
+#include "configuration.h"
+
+#include "./SSD16XX.h"
+
+namespace NicheGraphics::Drivers
+{
+class HINK_E042A87 : public SSD16XX
+{
+    // Display properties
+  private:
+    static constexpr uint32_t width = 400;
+    static constexpr uint32_t height = 300;
+    static constexpr UpdateTypes supported = (UpdateTypes)(FULL | FAST);
+
+  public:
+    HINK_E042A87() : SSD16XX(width, height, supported) {}
+
+  protected:
+    void configWaveform() override;
+    void configUpdateSequence() override;
+    void detachFromUpdate() override;
+};
+
+} // namespace NicheGraphics::Drivers
+#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS
\ No newline at end of file
diff --git a/src/graphics/niche/Drivers/EInk/README.md b/src/graphics/niche/Drivers/EInk/README.md
index 04a23a31f..eca91c6a8 100644
--- a/src/graphics/niche/Drivers/EInk/README.md
+++ b/src/graphics/niche/Drivers/EInk/README.md
@@ -28,6 +28,17 @@ void setupNicheGraphics()
 }
 ```
 
+- [Methods](#methods)
+  - [`update(uint8_t *imageData, UpdateTypes type)`](#updateuint8_t-imagedata-updatetypes-type)
+  - [`await()`](#await)
+  - [`supports(UpdateTypes type)`](#supportsupdatetypes-type)
+  - [`busy()`](#busy)
+  - [`width()`](#width)
+  - [`height()`](#height)
+- [Supporting New Displays](#supporting-new-displays)
+  - [Controller IC](#controller-ic)
+  - [Finding Information](#finding-information)
+
 ## Methods
 
 ### `update(uint8_t *imageData, UpdateTypes type)`
@@ -37,7 +48,7 @@ Update the image on the display
 - _`imageData`_ to draw to the display.
 - _`type`_ which type of update to perform.
   - `FULL`
-  - `FAST`
+  - `FAST` (partial refresh)
   - (Other custom types may be possible)
 
 The imageData is a 1-bit image. X-Pixels are 8-per byte, with the MSB being the leftmost pixel. This was not an InkHUD design decision; it is the raw format accepted by the E-Ink display controllers ICs.
@@ -83,3 +94,39 @@ Width of the display, in pixels. Note: most displays are portrait. Your UI will
 ### `height()`
 
 Height of the display, in pixels. Note: most displays are portrait. Your UI will need to implement rotation in software.
+
+## Supporting New Displays
+
+_This topic is not covered in depth, but these notes may be helpful._
+
+The `InkHUD::Drivers::EInk` class contains only the mechanism for implementing an E-Ink driver on-top of Meshtastic's `OSThread`. A driver for a specific display needs to extend this class.
+
+### Controller IC
+
+If your display uses a controller IC from Solomon Systech, you can probably extend the existing `Drivers::SSD16XX` class, making only minor modifications.
+
+At this stage, displays using controller ICS from other manufacturers (UltraChip, Fitipower, etc) need to manually implemented. See `Drivers::LCMEN2R13EFC1` for an example.
+
+Generic base classes for manufacturers other than Solomon Systech might be added here in future.
+
+### Finding Information
+
+#### Flex-Connector Labels
+
+The orange flex-connector attached to E-Ink displays is often printed with an identifying label. This is not a _totally_ unique identifier, but does give a very strong clue as to the true model of the display, which can be used to search out further information.
+
+#### Datasheets
+
+The manufacturer of a DIY display module may publish a datasheet. These are often incomplete, but might reveal the true model of the display, or the controller IC.
+
+If you can determine the true model name of the display, you can likely find a more complete datasheet on the display manufacturer's website. This will often provide a "typical operating sequence"; a general overview of the code used to drive the display
+
+#### Example Code
+
+The manufacturer of a DIY module may publish example code. You may have more luck finding example code published by the display manufacturer themselves, if you can determine the true model of the panel. These examples are a very valuable reference.
+
+#### Other E-Ink drivers
+
+Libraries like ZinggJM's GxEPD2 can be valuable sources of information, although your panel may not be _specifically_ supported, and only _compatible_ with a driver there, so some caution is advised.
+
+The display selection file in GxEPD2's Hello World example is also a useful resource for matching "flex connector labels" with display models, but the flex connector label is _not_ a unique identifier, so this is only another clue.
diff --git a/src/graphics/niche/Drivers/EInk/SSD16XX.cpp b/src/graphics/niche/Drivers/EInk/SSD16XX.cpp
index 07d02a2ae..5a5397dbd 100644
--- a/src/graphics/niche/Drivers/EInk/SSD16XX.cpp
+++ b/src/graphics/niche/Drivers/EInk/SSD16XX.cpp
@@ -37,11 +37,26 @@ void SSD16XX::begin(SPIClass *spi, uint8_t pin_dc, uint8_t pin_cs, uint8_t pin_b
     reset();
 }
 
-void SSD16XX::wait()
+// Poll the displays busy pin until an operation is complete
+// Timeout and set fail flag if something went wrong and the display got stuck
+void SSD16XX::wait(uint32_t timeout)
 {
+    // Don't bother waiting if part of the update sequence failed
+    // In that situation, we're now just failing-through the process, until we can try again with next update.
+    if (failed)
+        return;
+
+    uint32_t startMs = millis();
+
     // Busy when HIGH
-    while (digitalRead(pin_busy) == HIGH)
+    while (digitalRead(pin_busy) == HIGH) {
+        // Check for timeout
+        if (millis() - startMs > timeout) {
+            failed = true;
+            break;
+        }
         yield();
+    }
 }
 
 void SSD16XX::reset()
@@ -50,8 +65,9 @@ void SSD16XX::reset()
     if (pin_rst != 0xFF) {
         pinMode(pin_rst, OUTPUT);
         digitalWrite(pin_rst, LOW);
-        delay(50);
-        pinMode(pin_rst, INPUT_PULLUP);
+        delay(10);
+        digitalWrite(pin_rst, HIGH);
+        delay(10);
         wait();
     }
 
@@ -61,6 +77,11 @@ void SSD16XX::reset()
 
 void SSD16XX::sendCommand(const uint8_t command)
 {
+    // Abort if part of the update sequence failed
+    // This will unlock again once we have failed-through the entire process
+    if (failed)
+        return;
+
     spi->beginTransaction(spiSettings);
     digitalWrite(pin_dc, LOW); // DC pin low indicates command
     digitalWrite(pin_cs, LOW);
@@ -77,6 +98,11 @@ void SSD16XX::sendData(uint8_t data)
 
 void SSD16XX::sendData(const uint8_t *data, uint32_t size)
 {
+    // Abort if part of the update sequence failed
+    // This will unlock again once we have failed-through the entire process
+    if (failed)
+        return;
+
     spi->beginTransaction(spiSettings);
     digitalWrite(pin_dc, HIGH); // DC pin HIGH indicates data, instead of command
     digitalWrite(pin_cs, LOW);
diff --git a/src/graphics/niche/Drivers/EInk/SSD16XX.h b/src/graphics/niche/Drivers/EInk/SSD16XX.h
index 88fe4dc25..799a378c0 100644
--- a/src/graphics/niche/Drivers/EInk/SSD16XX.h
+++ b/src/graphics/niche/Drivers/EInk/SSD16XX.h
@@ -27,7 +27,7 @@ class SSD16XX : public EInk
     virtual void update(uint8_t *imageData, UpdateTypes type) override;
 
   protected:
-    virtual void wait();
+    virtual void wait(uint32_t timeout = 1000);
     virtual void reset();
     virtual void sendCommand(const uint8_t command);
     virtual void sendData(const uint8_t data);
diff --git a/src/graphics/niche/InkHUD/Applet.cpp b/src/graphics/niche/InkHUD/Applet.cpp
index 459f30213..6c6245ec3 100644
--- a/src/graphics/niche/InkHUD/Applet.cpp
+++ b/src/graphics/niche/InkHUD/Applet.cpp
@@ -802,7 +802,7 @@ uint16_t InkHUD::Applet::getLogoHeight(uint16_t limitWidth, uint16_t limitHeight
    //       //       \\
 
 */
-void InkHUD::Applet::drawLogo(int16_t centerX, int16_t centerY, uint16_t width, uint16_t height)
+void InkHUD::Applet::drawLogo(int16_t centerX, int16_t centerY, uint16_t width, uint16_t height, Color color)
 {
     struct Point {
         int x;
@@ -908,24 +908,24 @@ void InkHUD::Applet::drawLogo(int16_t centerX, int16_t centerY, uint16_t width,
     Point aq2{a2.x - fromPath.x, a2.y - fromPath.y};
     Point aq3{a2.x + fromPath.x, a2.y + fromPath.y};
     Point aq4{a1.x + fromPath.x, a1.y + fromPath.y};
-    fillTriangle(aq1.x, aq1.y, aq2.x, aq2.y, aq3.x, aq3.y, BLACK);
-    fillTriangle(aq1.x, aq1.y, aq3.x, aq3.y, aq4.x, aq4.y, BLACK);
+    fillTriangle(aq1.x, aq1.y, aq2.x, aq2.y, aq3.x, aq3.y, color);
+    fillTriangle(aq1.x, aq1.y, aq3.x, aq3.y, aq4.x, aq4.y, color);
 
     // Make the path thick: path b becomes quad b
     Point bq1{b1.x - fromPath.x, b1.y - fromPath.y};
     Point bq2{b2.x - fromPath.x, b2.y - fromPath.y};
     Point bq3{b2.x + fromPath.x, b2.y + fromPath.y};
     Point bq4{b1.x + fromPath.x, b1.y + fromPath.y};
-    fillTriangle(bq1.x, bq1.y, bq2.x, bq2.y, bq3.x, bq3.y, BLACK);
-    fillTriangle(bq1.x, bq1.y, bq3.x, bq3.y, bq4.x, bq4.y, BLACK);
+    fillTriangle(bq1.x, bq1.y, bq2.x, bq2.y, bq3.x, bq3.y, color);
+    fillTriangle(bq1.x, bq1.y, bq3.x, bq3.y, bq4.x, bq4.y, color);
 
     // Make the path thick: path c becomes quad c
     Point cq1{c1.x - fromPath.x, c1.y + fromPath.y};
     Point cq2{c2.x - fromPath.x, c2.y + fromPath.y};
     Point cq3{c2.x + fromPath.x, c2.y - fromPath.y};
     Point cq4{c1.x + fromPath.x, c1.y - fromPath.y};
-    fillTriangle(cq1.x, cq1.y, cq2.x, cq2.y, cq3.x, cq3.y, BLACK);
-    fillTriangle(cq1.x, cq1.y, cq3.x, cq3.y, cq4.x, cq4.y, BLACK);
+    fillTriangle(cq1.x, cq1.y, cq2.x, cq2.y, cq3.x, cq3.y, color);
+    fillTriangle(cq1.x, cq1.y, cq3.x, cq3.y, cq4.x, cq4.y, color);
 
     // Radius the intersection of quad b and quad c
     /*
@@ -944,7 +944,7 @@ void InkHUD::Applet::drawLogo(int16_t centerX, int16_t centerY, uint16_t width,
         // The radius for the cap *should* be the same as logoTh, but it's not, due to accumulated rounding
         // We get better results just re-deriving it
         int16_t capRad = sqrt(pow(fromPath.x, 2) + pow(fromPath.y, 2));
-        fillCircle(b2.x, b2.y, capRad, BLACK);
+        fillCircle(b2.x, b2.y, capRad, color);
     }
 }
 
diff --git a/src/graphics/niche/InkHUD/Applet.h b/src/graphics/niche/InkHUD/Applet.h
index 028b24f9c..8f4466647 100644
--- a/src/graphics/niche/InkHUD/Applet.h
+++ b/src/graphics/niche/InkHUD/Applet.h
@@ -130,7 +130,8 @@ class Applet : public GFX
     static constexpr float LOGO_ASPECT_RATIO = 1.9;                    // Width:Height for drawing the Meshtastic logo
     uint16_t getLogoWidth(uint16_t limitWidth, uint16_t limitHeight);  // Size Meshtastic logo to fit within region
     uint16_t getLogoHeight(uint16_t limitWidth, uint16_t limitHeight); // Size Meshtastic logo to fit within region
-    void drawLogo(int16_t centerX, int16_t centerY, uint16_t width, uint16_t height); // Draw the meshtastic logo
+    void drawLogo(int16_t centerX, int16_t centerY, uint16_t width, uint16_t height,
+                  Color color = BLACK); // Draw the Meshtastic logo
 
     std::string hexifyNodeNum(NodeNum num);                  // Style as !0123abdc
     SignalStrength getSignalStrength(float snr, float rssi); // Interpret SNR and RSSI, as an easy to understand value
diff --git a/src/graphics/niche/InkHUD/Applets/Examples/BasicExample/BasicExampleApplet.cpp b/src/graphics/niche/InkHUD/Applets/Examples/BasicExample/BasicExampleApplet.cpp
index 17458ab96..b12ea4809 100644
--- a/src/graphics/niche/InkHUD/Applets/Examples/BasicExample/BasicExampleApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/Examples/BasicExample/BasicExampleApplet.cpp
@@ -8,7 +8,7 @@ using namespace NicheGraphics;
 // Our basic example doesn't do anything useful. It just passively prints some text.
 void InkHUD::BasicExampleApplet::onRender()
 {
-    print("Hello, World!");
+    printAt(0, 0, "Hello, World!");
 }
 
 #endif
\ No newline at end of file
diff --git a/src/graphics/niche/InkHUD/Applets/Examples/NewMsgExample/NewMsgExampleApplet.cpp b/src/graphics/niche/InkHUD/Applets/Examples/NewMsgExample/NewMsgExampleApplet.cpp
index e31f534ac..6b02f4c92 100644
--- a/src/graphics/niche/InkHUD/Applets/Examples/NewMsgExample/NewMsgExampleApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/Examples/NewMsgExample/NewMsgExampleApplet.cpp
@@ -4,11 +4,12 @@
 
 using namespace NicheGraphics;
 
-// We configured MeshModule API to call this method when we receive a new text message
+// We configured the Module API to call this method when we receive a new text message
 ProcessMessage InkHUD::NewMsgExampleApplet::handleReceived(const meshtastic_MeshPacket &mp)
 {
 
     // Abort if applet fully deactivated
+    // Don't waste time: we wouldn't be rendered anyway
     if (!isActive())
         return ProcessMessage::CONTINUE;
 
@@ -25,7 +26,7 @@ ProcessMessage InkHUD::NewMsgExampleApplet::handleReceived(const meshtastic_Mesh
         requestUpdate();
     }
 
-    // Tell MeshModule API to continue informing other firmware components about this message
+    // Tell Module API to continue informing other firmware components about this message
     // We're not the only component which is interested in new text messages
     return ProcessMessage::CONTINUE;
 }
diff --git a/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.cpp b/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.cpp
index 24c2d88a4..520b3ef65 100644
--- a/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.cpp
@@ -34,7 +34,15 @@ void InkHUD::LogoApplet::onRender()
     int16_t logoCX = X(0.5);
     int16_t logoCY = Y(0.5 - 0.05);
 
-    drawLogo(logoCX, logoCY, logoW, logoH);
+    // Invert colors if black-on-white
+    // Used during shutdown, to resport display health
+    // Todo: handle this in InkHUD::Renderer instead
+    if (inverted) {
+        fillScreen(BLACK);
+        setTextColor(WHITE);
+    }
+
+    drawLogo(logoCX, logoCY, logoW, logoH, inverted ? WHITE : BLACK);
 
     if (!textLeft.empty()) {
         setFont(fontSmall);
@@ -74,13 +82,45 @@ void InkHUD::LogoApplet::onBackground()
 // Begin displaying the screen which is shown at shutdown
 void InkHUD::LogoApplet::onShutdown()
 {
+    bringToForeground();
+
+    textLeft = "";
+    textRight = "";
+    textTitle = "Shutting Down...";
+    fontTitle = fontSmall;
+
+    // Draw a shutting down screen, twice.
+    // Once white on black, once black on white.
+    // Intention is to restore display health.
+
+    inverted = true;
+    inkhud->forceUpdate(Drivers::EInk::FULL, false);
+    delay(1000); // Cooldown. Back to back updates aren't great for health.
+    inverted = false;
+    inkhud->forceUpdate(Drivers::EInk::FULL, false);
+    delay(1000); // Cooldown
+
+    // Prepare for the powered-off screen now
+    // We can change these values because the initial "shutting down" screen has already rendered at this point
     textLeft = "";
     textRight = "";
     textTitle = owner.short_name;
     fontTitle = fontLarge;
 
+    // This is then drawn by InkHUD::Events::onShutdown, with a blocking FULL update, after InkHUD's flash write is complete
+}
+
+void InkHUD::LogoApplet::onReboot()
+{
     bringToForeground();
-    // This is then drawn by InkHUD::Events::onShutdown, with a blocking FULL update
+
+    textLeft = "";
+    textRight = "";
+    textTitle = "Rebooting...";
+    fontTitle = fontSmall;
+
+    inkhud->forceUpdate(Drivers::EInk::FULL, false);
+    // Perform the update right now, waiting here until complete
 }
 
 int32_t InkHUD::LogoApplet::runOnce()
diff --git a/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.h b/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.h
index b55d4a2d9..3f604baed 100644
--- a/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.h
+++ b/src/graphics/niche/InkHUD/Applets/System/Logo/LogoApplet.h
@@ -25,6 +25,7 @@ class LogoApplet : public SystemApplet, public concurrency::OSThread
     void onForeground() override;
     void onBackground() override;
     void onShutdown() override;
+    void onReboot() override;
 
   protected:
     int32_t runOnce() override;
@@ -33,6 +34,7 @@ class LogoApplet : public SystemApplet, public concurrency::OSThread
     std::string textRight;
     std::string textTitle;
     AppletFont fontTitle;
+    bool inverted = false; // Invert colors. Used during shutdown, to restore display health.
 };
 
 } // namespace NicheGraphics::InkHUD
diff --git a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
index 4c411bb85..f59579230 100644
--- a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
@@ -32,8 +32,6 @@ InkHUD::MenuApplet::MenuApplet() : concurrency::OSThread("MenuApplet")
     }
 }
 
-void InkHUD::MenuApplet::onActivate() {}
-
 void InkHUD::MenuApplet::onForeground()
 {
     // We do need this before we render, but we can optimize by just calculating it once now
diff --git a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.h b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.h
index fe72d826b..d9297c8ed 100644
--- a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.h
+++ b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.h
@@ -21,7 +21,6 @@ class MenuApplet : public SystemApplet, public concurrency::OSThread
 {
   public:
     MenuApplet();
-    void onActivate() override;
     void onForeground() override;
     void onBackground() override;
     void onButtonShortPress() override;
diff --git a/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.cpp b/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.cpp
index 1abf3ccfa..82a196cb1 100644
--- a/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.cpp
@@ -207,8 +207,6 @@ void InkHUD::TipsApplet::onBackground()
     inkhud->forceUpdate(EInk::UpdateTypes::FULL);
 }
 
-void InkHUD::TipsApplet::onActivate() {}
-
 // While our SystemApplet::handleInput flag is true
 void InkHUD::TipsApplet::onButtonShortPress()
 {
diff --git a/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.h b/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.h
index e7bb7bedc..db88585e9 100644
--- a/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.h
+++ b/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.h
@@ -33,7 +33,6 @@ class TipsApplet : public SystemApplet
     TipsApplet();
 
     void onRender() override;
-    void onActivate() override;
     void onForeground() override;
     void onBackground() override;
     void onButtonShortPress() override;
diff --git a/src/graphics/niche/InkHUD/Events.cpp b/src/graphics/niche/InkHUD/Events.cpp
index 10072b302..ddd01b7e1 100644
--- a/src/graphics/niche/InkHUD/Events.cpp
+++ b/src/graphics/niche/InkHUD/Events.cpp
@@ -70,6 +70,9 @@ void InkHUD::Events::onButtonLong()
 // Returns 0 to signal that we agree to sleep now
 int InkHUD::Events::beforeDeepSleep(void *unused)
 {
+    // If a previous display update is in progress, wait for it to complete.
+    inkhud->awaitUpdate();
+
     // Notify all applets that we're shutting down
     for (Applet *ua : inkhud->userApplets) {
         ua->onDeactivate();
@@ -87,9 +90,12 @@ int InkHUD::Events::beforeDeepSleep(void *unused)
     inkhud->persistence->saveSettings();
     inkhud->persistence->saveLatestMessage();
 
-    // LogoApplet::onShutdown will have requested an update, to draw the shutdown screen
-    // Draw that now, and wait here until the update is complete
+    // LogoApplet::onShutdown attempted to heal the display by drawing a "shutting down" screen twice,
+    // then prepared a final powered-off screen for us, which shows device shortname.
+    // We're updating to show that one now.
+
     inkhud->forceUpdate(Drivers::EInk::UpdateTypes::FULL, false);
+    delay(1000); // Cooldown, before potentially yanking display power
 
     return 0; // We agree: deep sleep now
 }
@@ -106,16 +112,16 @@ int InkHUD::Events::beforeReboot(void *unused)
         a->onDeactivate();
         a->onShutdown();
     }
-    for (Applet *sa : inkhud->systemApplets) {
+    for (SystemApplet *sa : inkhud->systemApplets) {
         // Note: no onDeactivate. System applets are always active.
-        sa->onShutdown();
+        sa->onReboot();
     }
 
     inkhud->persistence->saveSettings();
     inkhud->persistence->saveLatestMessage();
 
     // Note: no forceUpdate call here
-    // Because OSThread will not be given another chance to run before reboot, this means that no display update will occur
+    // We don't have any final screen to draw, although LogoApplet::onReboot did already display a "rebooting" screen
 
     return 0; // No special status to report. Ignored anyway by this Observable
 }
diff --git a/src/graphics/niche/InkHUD/Persistence.h b/src/graphics/niche/InkHUD/Persistence.h
index 28841d4d9..40f1dd521 100644
--- a/src/graphics/niche/InkHUD/Persistence.h
+++ b/src/graphics/niche/InkHUD/Persistence.h
@@ -99,7 +99,7 @@ class Persistence
         // Rotation of the display
         // Multiples of 90 degrees clockwise
         // Most commonly: rotation is 0 when flex connector is oriented below display
-        uint8_t rotation = 1;
+        uint8_t rotation = 0;
 
         // How long do we consider another node to be "active"?
         // Used when applets want to filter for "active nodes" only
diff --git a/src/graphics/niche/InkHUD/README.md b/src/graphics/niche/InkHUD/README.md
deleted file mode 100644
index 8d788ffa8..000000000
--- a/src/graphics/niche/InkHUD/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# InkHUD
-
-A heads-up-display for E-Ink devices, intended to supplement a connected phone / client. Implemented as a "NicheGraphics" UI.
-
-Supported devices (as of 1st Feb. 2025):
-
-- Heltec Vision Master E213
-- Heltec Vision Master E290
-- Heltec Wireless Paper V1.1
-- LILYGO T-Echo
-
-More to follow
diff --git a/src/graphics/niche/InkHUD/SystemApplet.h b/src/graphics/niche/InkHUD/SystemApplet.h
index 0f8ceedc7..7ee47eeb9 100644
--- a/src/graphics/niche/InkHUD/SystemApplet.h
+++ b/src/graphics/niche/InkHUD/SystemApplet.h
@@ -26,6 +26,8 @@ class SystemApplet : public Applet
     bool lockRendering = false; // - prevent other applets from being rendered during an update
     bool lockRequests = false;  // - prevent other applets from triggering display updates
 
+    virtual void onReboot() { onShutdown(); } // - handle reboot specially
+
     // Other system applets may take precedence over our own system applet though
     // The order an applet is passed to WindowManager::addSystemApplet determines this hierarchy (added earlier = higher rank)
 
diff --git a/src/graphics/niche/InkHUD/docs/README.md b/src/graphics/niche/InkHUD/docs/README.md
new file mode 100644
index 000000000..07fe6c942
--- /dev/null
+++ b/src/graphics/niche/InkHUD/docs/README.md
@@ -0,0 +1,640 @@
+# InkHUD
+
+This document is intended as a reference for maintainers. A haphazard collection of notes which _might_ be helpful.
+
+<img src="disclaimer.jpg" width="250" alt="self deprecating meme" />
+
+---
+
+- [Purpose](#purpose)
+- [Design Principles](#design-principles)
+  - [Self-Contained](#self-contained)
+  - [Static](#static)
+  - [Non-interactive](#non-interactive)
+  - [Customizable](#customizable)
+  - [Event-Driven Rendering](#event-driven-rendering)
+  - [No `#ifdef` spaghetti](#no-ifdef-spaghetti)
+- [The Implementation](#the-implementation)
+- [The Rendering Process](#the-rendering-process)
+- [Concepts](#concepts)
+  - [NicheGraphics Framework](#nichegraphics-framework)
+  - [NicheGraphics E-Ink Drivers](#nichegraphics-e-ink-drivers)
+  - [InkHUD Applets](#inkhud-applets)
+- [Adding a Variant](#adding-a-variant)
+  - [platformio.ini](#platformioini)
+  - [nicheGraphics.h](#nichegraphicsh)
+- [Class Notes](#class-notes)
+  - [`InkHUD::InkHUD`](#inkhudinkhud)
+  - [`InkHUD::Persistence`](#inkhudpersistence)
+  - [`InkHUD::Persistence::Settings`](#inkhudpersistencesettings)
+  - [`InkHUD::Persistence::LatestMessage`](#inkhudpersistencelatestmessage)
+  - [`InkHUD::WindowManager`](#inkhudwindowmanager)
+  - [`InkHUD::Renderer`](#inkhudrenderer)
+  - [`InkHUD::Renderer::DisplayHealth`](#inkhudrendererdisplayhealth)
+  - [`InkHUD::Events`](#inkhudevents)
+  - [`InkHUD::Applet`](#inkhudapplet)
+  - [`InkHUD::SystemApplet`](#inkhudsystemapplet)
+  - [`InkHUD::Tile`](#inkhudtile)
+  - [`InkHUD::AppletFont`](#inkhudappletfont)
+
+## Purpose
+
+InkHUD is a minimal UI for E-Ink devices. It displays the user's choice of info, as statically as possible, to minimize the amount of display refreshing.
+
+It is intended to supplement a connected client app.
+
+## Design Principles
+
+### Self-Contained
+
+- Keep InkHUD code within `/src/graphics/niche/InkHUD`.
+- Place reusable components within `/src/graphics/niche`, for other UIs to take advantage of.
+- Interact with the firmware code using the **Module API**, **Observables**, and other similarly non-intrusive hooks.
+
+### Static
+
+Information should be displayed as statically as possible. Unnecessary updates should be avoided.
+
+As as example, fixed timestamps are used instead of `X seconds ago` labels, as these need to be constantly updated to remain current.
+
+### Non-interactive
+
+InkHUD aims to be a "heads up display". The intention is for the user to glance at the display. The intention is _not_ for the user to frequently interact with the display.
+
+Some interactivity is tolerated as a means to an end: the display _should_ be customizable, but this should be minimized as much as possible.
+
+_Edit: there's significant demand for keyboard support, so some sort of free-text feature will need to be added eventually, although it does go against the original design principles._
+
+### Customizable
+
+The user should be given the choice to decide which information they would like to receive, and how they would like to receive it.
+
+### Event-Driven Rendering
+
+The display image does not update "automatically". Individual applets are responsible for deciding when they have new information to show, and then requesting a display update.
+
+### No `#ifdef` spaghetti
+
+**Don't** use preprocessor macros for device-specific configuration. This should be achieved with config methods, in [`nicheGraphics.h`](#nichegraphicsh).
+
+**Do** use preprocessor macros to guard all files
+
+- `#ifdef MESHTASTIC_INCLUDE_INKHUD` for InkHUD files
+- `#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS` for reusable components (drivers, etc)
+
+## The Implementation
+
+- Variant's platformio.ini file extends `inkhud` (defined in InkHUD/PlatformioConfig.ini)
+  - original screen class suppressed: `MESHTASTIC_EXCLUDE_SCREEN`
+  - ButtonThread suppressed: `HAS_BUTTON=0`
+  - NicheGraphics components included: `MESHTASTIC_INCLUDE_NICHE_GRAPHICS`
+  - InkHUD components included: `MESHTASTIC_INCLUDE_INKHUD`
+- `main.cpp`
+  - includes `nicheGraphics.h` (from variant folder)
+  - calls `setupNicheGraphics`, (from nicheGraphics.h)
+- `nicheGraphics.h`
+  - includes InkHUD components
+  - includes shared NicheGraphics components
+  - `setupNicheGraphics`
+    - configures and connects components
+    - `inkhud->begin`
+
+## The Rendering Process
+
+(animated diagram)
+
+<img src="rendering.gif" alt="animated process diagram of InkHUD rendering" height="480"/>
+
+An overview:
+
+- A component calls `requestUpdate` (applets only) or `InkHUD::forceUpdate`
+- `Renderer` schedules a render cycle for the next loop(), using `Renderer::runOnce`
+- `Renderer` determines whether the update request is valid
+- `Renderer` asks relevant applets to render
+- Applet dimensions are updated (by Applet's `Tile`)
+- Applets generate pixel output, and pass this to their `Tile`
+- Tiles shift these "relative" pixels to their true region, for multiplexing
+- Tiles pass the pixels to `Renderer`
+- `Renderer` applies any global display rotation to the pixels
+- `Renderer` combines the pixels into the finished image
+- The finished image is passed to the display driver, starting the physical update process
+
+## Concepts
+
+### NicheGraphics Framework
+
+InkHUD is implemented as a _NicheGraphics_ UI.
+
+Intended as a pattern / philosophy for implementing self-contained UIs, to suit various niche devices, which are best served by their own custom user interface.
+
+Hypothetical examples: E-Ink, 1602 LCDs, tiny OLEDs, smart watches, etc
+
+A NicheGraphics UI:
+
+- Is self-contained
+- Makes use of the loose collection of resources (drivers, input methods, etc) gathered in the `/src/graphics/niche` folder.
+- Implements a `setupNicheGraphics()` method.
+
+### NicheGraphics E-Ink Drivers
+
+InkHUD uses a set of custom E-Ink drivers. These are not based on GxEPD2, or any other code base. They are written directly on-top of the Meshtastic firmware, to make use of the OSThread class for asynchronous display updates.
+
+Interacting with the drivers is straightforward. InkHUD generates a frame of 1-bit image data. This image data is passed to the driver, along with the type of refresh to use (FULL or FAST).
+
+`driver->update(uint8_t* buffer, EInk::UpdateTypes::FULL)`
+
+For more information, see the documentation in `src/graphics/niche/Drivers/EInk`
+
+### InkHUD Applets
+
+An InkHUD applet is a class which generates a screen of info for the display.
+
+Consider: `DMApplet.h` (displays most recent direct message) and `RecentsList.h` (displays a list of recently heard nodes)
+
+- Applets are modular: they are easy to write, and easy to implement. Users select which applets they want, using the menu.
+- Applets use responsive design. They should scale for different screens / layouts / fonts.
+- Applets decide when to update. They use the Module API, Observers, etc, to retrieve information, and request a display update when they have something interesting to show.
+
+See `src/graphics/niche/InkHUD/Applets/Examples` for example code.
+
+#### Writing an Applet
+
+Your new applet class will inherit `InkHUD::Applet`.
+
+```cpp
+class BasicExampleApplet : public Applet
+{
+  public:
+    // You must have an onRender() method
+    // All drawing happens here
+
+    void onRender() override;
+};
+```
+
+The `onRender` method is called when the display image is redrawn. This can happen at any time, so be ready!
+
+```cpp
+// All drawing happens here
+// Our basic example doesn't do anything useful. It just passively prints some text.
+void InkHUD::BasicExampleApplet::onRender()
+{
+    printAt(0, 0, "Hello, world!");
+}
+```
+
+Your applet will need to scale automatically, to suit a variety of screens / layouts / fonts. Make sure you draw relative to applet's size.
+
+| edge   | coordinate | shorthand |
+| ------ | ---------- | --------- |
+| left   | 0          | `X(0.0)`  |
+| top    | 0          | `Y(0.0)`  |
+| right  | `width()`  | `X(1.0)`  |
+| bottom | `height()` | `Y(1.0)`  |
+
+The same principles apply for drawing text. Methods like `AppletFont::lineHeight` and `getTextWidth` are useful here.
+
+```cpp
+std::string line1 = "Line 1";
+printAt(0, Y(0.5), line1);
+drawRect(0, Y(0.5), getTextWidth(line1), fontSmall.lineHeight(), BLACK);
+```
+
+Your applet will only be redrawn when _something_ requests a display update. Your applet is welcome to request a display update, when it determines that it has new info to display, by calling `requestUpdate`.
+
+Exactly how you determine this, depends on what your applet actually does. Here's a code snippet from one of the example applets. The applet is requesting an update when a new message is received.
+
+```cpp
+// We configured the Module API to call this method when we receive a new text message
+ProcessMessage InkHUD::NewMsgExampleApplet::handleReceived(const meshtastic_MeshPacket &mp)
+{
+
+    // Abort if applet fully deactivated
+    // Don't waste time: we wouldn't be rendered anyway
+    if (!isActive())
+        return ProcessMessage::CONTINUE;
+
+    // Check that this is an incoming message
+    // Outgoing messages (sent by us) will also call handleReceived
+
+    if (!isFromUs(&mp)) {
+        // Store the sender's nodenum
+        // We need to keep this information, so we can re-use it anytime render() is called
+        haveMessage = true;
+        fromWho = mp.from;
+
+        // Tell InkHUD that we have something new to show on the screen
+        requestUpdate();
+    }
+
+    // Tell Module API to continue informing other firmware components about this message
+    // We're not the only component which is interested in new text messages
+    return ProcessMessage::CONTINUE;
+}
+```
+
+#### Implementing an Applet
+
+Incorporating your new applet into InkHUD is easy.
+
+In a variant's `nicheGraphics.h`:
+
+- `#include` your applet
+- `inkhud->addApplet("My Applet", new InkHUD::MyApplet);`
+
+You will need to add these lines to any variants which will use your applet.
+
+#### Applet Bases
+
+If you need to create several similar applets, it might make sense to create a reusable base class. Several of these already exist in `src/graphics/niche/InkHUD/Applets/Bases`, but use these with caution, as they may be modified in future.
+
+#### System Applets
+
+So far, we have been talking about "user applets". We also recognize a separate category of "system applets". These handle things like the menu, and the boot screen. These often need special handling, and need to be implemented manually.
+
+## Adding a Variant
+
+In `/variants/<YOUR_VARIANT>/`:
+
+### platformio.ini
+
+Extend `inkhud`, then combine with any other platformio config your hardware variant requires.
+
+_(Example shows only config required by InkHUD. This is not a complete `env` definition.)_
+
+```ini
+[env:YOUR_VARIANT-inkhud]
+extends = esp32s3_base, inkhud ; or nrf52840_base, etc
+
+build_src_filter =
+${esp32_base.build_src_filter}
+${inkhud.build_src_filter}
+
+build_flags =
+${esp32s3_base.build_flags}
+${inkhud.build_flags}
+
+lib_deps =
+${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX
+${esp32s3_base.lib_deps}
+```
+
+### nicheGraphics.h
+
+⚠ Wrap this file in `#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS`
+
+`nicheGraphics.h` should be placed in the same folder as your variant's `platformio.ini`. If this is not possible, modify `build_src_filter`.
+
+`nicheGraphics.h` should contain a `setupNicheGraphics` method, which creates and configures the various components for InkHUD.
+
+- Display
+  - Start SPI
+  - Create display driver
+- InkHUD
+  - Create InkHUD instance
+  - Set E-Ink fast refresh limit (`setDisplayResilience`)
+  - Set fonts
+  - Set default user-settings
+  - Select applets to build (`addApplet`)
+  - Start InkHUD
+- Buttons
+  - Setup `TwoButton` driver (user button, optional "auxiliary" button)
+  - Connect to InkHUD handlers (use lambdas)
+
+For well commented examples, see:
+
+- `variants/heltec_vision_master_e290/nicheGraphics.h` (ESP32)
+- `variants/t-echo/nicheGraphics.h` (NRF52)
+
+## Class Notes
+
+### `InkHUD::InkHUD`
+
+_`src/graphics/niche/InkHUD/InkHUD.h`_
+
+- singleton
+- mediator between other InkHUD components
+
+#### `getInstance()`
+
+Gets access to the class.
+First `getInstance` call instantiates the class, and the subclasses:
+
+- `InkHUD::Persistence`
+- `InkHUD::WindowManager`
+- `InkHUD::Renderer`
+- `InkHUD::Events`
+
+For convenience, many InkHUD components call this on `begin`, and store it as `InkHUD* inkhud`.
+
+---
+
+### `InkHUD::Persistence`
+
+_`src/graphics/niche/InkHUD/Persistence.h`_
+
+Stores InkHUD data in flash
+
+- settings
+- most recent text message received (both for broadcast and DM)
+
+In rare cases, applets may store their own specific data separately (e.g. `ThreadedMessageApplet`)
+
+Data saved only on shutdown / reboot. Not saved if power is removed unexpectedly.
+
+---
+
+### `InkHUD::Persistence::Settings`
+
+_`src/graphics/niche/InkHUD/Persistence.h`_
+
+Settings which relate to InkHUD. Mostly user's customization, but some values record the UI's state (e.g. `tips.safeShutdownSeen`)
+
+- stored using `FlashData.h` (a shared Niche Graphics tool)
+- not encoded as protobufs
+- serialized directly as bytes of struct
+
+#### Defaults
+
+Global default values are set when the struct is defined (Persistence.h).
+Per-variant defaults are set by modifying the values of the settings instance during `setupNicheGraphics()`, before `inkhud->begin` is called.
+
+```cpp
+inkhud->persistence->settings.userTiles.count = 2;
+inkhud->persistence->settings.userTiles.maxCount = 4;
+inkhud->persistence->settings.rotation = 3;
+```
+
+By modifying the values at this point, they will be used if we fail to load previous settings from flash (not yet saved, old version, etc)
+
+---
+
+### `InkHUD::Persistence::LatestMessage`
+
+_`src/graphics/niche/InkHUD/Persistence.h`_
+
+Most recently received text message
+
+- most recent DM
+- most recent broadcast
+
+Collected here, so various user applets don't all have to store their own copy of this info.
+
+We are unable to use `devicestate.rx_text_message` for this purpose, because:
+
+- it is cleared by an outgoing text message
+- we want to store both a recent broadcast and a recent DM
+
+#### Saving / Loading
+
+_A bit of a hack.._
+Stored to flash using `InkHUD::MessageStore`, which is really intended for storing a thread of messages (see `ThreadedMessageApplet`). Used because it stores strings more efficiently than `FlashData.h`.
+
+The hack is:
+
+- If most recent message was a DM, we only store the DM.
+- If most recent message was a broadcast, we store both a DM and a broadcast. The DM may be 0-length string.
+
+---
+
+### `InkHUD::WindowManager`
+
+_`src/graphics/niche/InkHUD/WindowManager.h`_
+
+Manages which applets are shown, and their size / position (by manipulating the "tiles")
+
+- owns the `Tile` instances
+- creates and destroys tiles; sets size and position:
+  - at startup
+  - at runtime, when config changes (layout, rotation, etc)
+- activates (or deactivates) applets
+- cycling through applets (e.g. on button press)
+
+The window manager doesn't process pixels; that is handled by the `InkHUD::Tile` objects.
+
+Note: Some of the methods (incl. `changeLayout`, `changeActivatedApplets`) don't trigger changes themselves. They should be called _after_ the relevant values in `inkhud->persistence->settings` have been modified.
+
+---
+
+### `InkHUD::Renderer`
+
+_`src/graphics/niche/InkHUD/Renderer.h`_
+
+Get pixel output from applets (via a tile), combine, and pass to the driver.
+
+- triggered by `requestUpdate` or `forceUpdate`
+- not run immediately: allows multiple applets to share one render cycle
+- calls `Applet::onRender` for relevant applets
+- applies global rotation
+- passes finalized image to driver
+
+`requestUpdate` is for applets (user or system). Renderer will honor the request if the applet is visible. `forceUpdate` can be used anywhere, but not from user applets, please.
+
+#### Asynchronous updates
+
+`requestUpdate` and `forceUpdate` do not block code execution. They schedule rendering for "ASAP", using `Renderer::runOnce`. Renderer then gets pixel output from relevant applets, and hands the assembled image to the driver. Driver's update process is also asynchronous. If the driver is busy when `requestUpdate` or `forceUpdate` is called, another rendering will run as soon as possible. This is handled by `Renderer::runOnce`
+
+#### Blocking updates
+
+If needed, call `forceUpdate` with the optional argument `async=false` to wait while an update runs (> 1 second). Additionally, the `awaitUpdate` method can be used to block until any previous update has completed. An example usage of this is waiting to draw the shutdown screen.
+
+#### Global rotation
+
+The exact size / position / rotation of InkHUD applets is configurable by the user. To achieve this, applets draw pixels between 0,0 and `Applet::width()`, `Applet::height()`
+
+- **Scaling**: Applet's `width()` and `height()` are set by `Tile` before rendering starts
+- **Translation**: `Tile` shifts applet pixels up/down/left/right
+- **Rotation**: `Renderer` rotates all pixels it receives, before placing them into the final image buffer
+
+---
+
+### `InkHUD::Renderer::DisplayHealth`
+
+_`src/graphics/niche/InkHUD/DisplayHealth.h`_
+
+Responsible for maintaining display health, by optimizing the ratio of FAST vs FULL refreshes
+
+- count number of FAST vs FULL refreshes (debt)
+- suggest either FAST or FULL type
+- periodically FULL refresh the display unprovoked, if needed
+
+#### Background Info
+
+When the image on an E-Ink display is updated, different procedures can be used to move the pixels to their new states. We have defined two procedures: `FAST` and `FULL`.
+
+A `FAST` update moves pixels directly from their old position, to their new position. This is aesthetically pleasing, and quick, _but_ it is challenging for the display hardware. If used excessively, pixels can build up residual charge, which negatively impacts the display's lifespan and image quality.
+
+A `FULL` update first moves all pixels between black and white, before letting them eventually settle at their final position. This causes an unpleasant flashing of the display image, but is best for the display health and image quality.
+
+Most displays readily tolerate `FAST` updates, so long as a `FULL` update is occasionally performed. How often this `FULL` update is required depends on the display model.
+
+#### Debt
+
+`InkHUD::DisplayHealth` records how many `FAST` refreshes have occurred since the previous `FULL` refresh.
+
+This is referred to as the "full refresh debt".
+
+If an update of a specific type (`FULL` / `FAST`) is requested / forced, this will be granted.
+
+If an update is requested / forced _without_ a specified type (`UpdateTypes::UNSPECIFIED`), `DisplayHealth` will select either `FAST` or `FULL`, in an attempt to maintain a target ratio of fast to full updates.
+
+This target is set by `InkHUD::setDisplayResilience`, when setting up in `nichegraphics.h`
+
+If an _excessive_ amount of `FAST` refreshes are performed back-to-back, `DisplayHealth` will begin artificially inflating the full refresh debt. This will cause the next few `UNSPECIFIED` updates to _all_ be performed as `FULL`, while the debt is paid down.
+
+This system of "full refresh debt" allows us to increase perceived responsiveness by tolerating additional strain on the display during periods of user interaction, and attempting to "repair the damage" later, once user interaction ceases.
+
+#### Maintenance
+
+The system of "full refresh debt" assumes that the display will perform many updates of `UNSPECIFIED` type between periods of user interaction. Depending on the amount of mesh traffic / applet selection, this may not be the case.
+
+If debt is particularly high, and no updates are taking place organically, `DisplayHealth` will begin infrequently performing `FULL` updates, purely to pay down the full refresh debt.
+
+---
+
+### `InkHUD::Events`
+
+Handles events which impact the InkHUD system generally (e.g. shutdown, button press).
+
+Applets themselves do also listen separately for various events, but for the purpose of gathering information which they would like to display.
+
+#### Buttons
+
+Button input is sometimes handled by a system applet. `InkHUD::Events` determines whether the button should be handled by a specific system applet, or should instead trigger a default behavior
+
+---
+
+### `InkHUD::Applet`
+
+A base class for applets. An applet is one "program", which may show info on the display.
+
+To oversimplify, all of the InkHUD code "under the hood" only exists to support applets. Applets are what actually shows useful information to the user. This base class exposes the functionality needed to write an applet.
+
+#### Drawing Methods
+
+`Applet` implements most AdafruitGFX drawing methods. Exception is the text handling. `printAt`, `printWrapped`, and `printThick` should be used instead. These are intended to be more convenient, but they also implement the character substitution system which powers the foreign alphabet support.
+
+`Applet` also adds methods for drawing several design elements which are re-used commonly though-out InkHUD.
+
+#### InkHUD Events
+
+Applets undergo a number of state changes: activated / deactivated by user, brought to foreground / hidden to background by user button press, etc. The `Applet` class provides a set of virtual methods, which an applet can override to appropriately handle these events.
+
+The `onRender` virtual method is one example. This is called when an applet is rendered, and should execute all drawing code. An applet _must_ implement this method.
+
+#### Responsive Design
+
+An applet's size will vary depending on the screen size, and the user's layout (multiplexing). Immediately before `onRender` is called, an applet's dimensions are updated, so that `width()` and `height()` will give the required size. The applet should draw its graphical elements relative to these values. The methods `X(float)` and `Y(float)` are also provided for convenience.
+
+| edge   | coordinate | shorthand |
+| ------ | ---------- | --------- |
+| left   | 0          | `X(0.0)`  |
+| top    | 0          | `Y(0.0)`  |
+| right  | `width()`  | `X(1.0)`  |
+| bottom | `height()` | `Y(1.0)`  |
+
+The same principles apply for drawing text. Methods like `AppletFont::lineHeight` and `getTextWidth` are useful here.
+
+Applets should always draw relative to their top left corner, at _x=0, y=0._ The applet's pixels are automatically moved to the correct position on-screen by an InkHUD::Tile.
+
+#### User Applets
+
+User applets are the "normal" applets, each one displaying a specific set of information to the user. They can be activated / deactivated at run-time using the on-screen menu. Examples include `DMApplet.h` and `PositionsApplet.h`. User applets are not expected to interact with lower layers of the InkHUD code.
+
+Users applets are instantiated in a variant's `setupNicheGraphics` method, and passed to `InkHUD::addApplet`. Their class should not be mentioned elsewhere, so that its code can be stripped away during compilation if a variant does not implement the specific applet. Internal processing of user applets treats them all as the generic `Applet` type only.
+
+#### Activated / Deactivated
+
+User applets can be activated or deactivated. This changes at run-time: the user selects which applets should be active using the on-screen menu. An applet should not process data while it is deactivated. It can unobserve any observables, ignore `handleReceived` calls, etc.
+
+An applet can implement the virtual `onActivate` and `onDeactivate` methods to handle this change in state. It can check this state internally by calling `isActive`.
+
+System applets cannot be deactivated.
+
+#### Foreground / Background
+
+An activated applet can either be _foreground_ or _background_. A foreground applet is one which will be rendered to a tile when the screen updates. A background applet will not be drawn. The applet cycling which takes place when the user button is pressed is implemented using foreground / background.
+
+Regardless of whether it is foreground or background, an activated applet should continue to collect / process data, and request update when it has new info to display. This is because of the _autoshow_ mechanic, which might bring a background applet to foreground in order to display its data. If an applet remains background, its update requests will be safely ignored.
+
+#### Autoshow
+
+Autoshow is a feature which allows the user to select which applets (if any) they would like to be shown automatically. If autoshow is enabled for an applet, it will be brought to foreground when it has new information to display. The user grants this privilege on a per-applet basis, using the on-screen menu. If an event causes an applet to be autoshown, NotificationApplet should not be shown for the same event.
+
+An applet needs to decide when it has information worthy of autoshowing. It signals this by calling `requestAutoshow`, in addition to the usual `requestUpdate` call.
+
+---
+
+### `InkHUD::SystemApplet`
+
+_System applets_ are applets with special roles, which require special handling. Examples include `BatteryIconApplet.h` and `LogoApplet.h`. These are manually implemented, one-by-one, in `WindowManager.h`.
+
+This class is a slight extension of `Applet`. It adds extra flags for some special features which are restricted to system applets: exclusive use of the display, and the handling of user input. Having a separate system applet class also allows us to make it clear within the code when system applets are being handled, rather than user applets
+
+We store reference to these as a `vector<SystemApplets*>`. This parallels how we treat user applets, and makes rendering convenient.
+Because system applets do have unique roles, there are times when we will need to interact with a specific applet. Rather than keeping an extra set of references, we access them from the `vector<SystemApplet*>`. Use `InkHUD::getSystemApplet` to access the applet by its `Applet::name` value, and then typecast.
+
+---
+
+### `InkHUD::Tile`
+
+A tile represents a region of the display. A tile controls the size and position of an applet.
+
+For an applet to render, it must be assigned to a tile. When an applet is assigned to a tile, the two become linked. The applet is aware of the tile; the tile is aware of the applet. Applets cannot share a tile; assigning a different applet will remove any existing link.
+
+Before an applet renders, its width and height are set to the dimensions of the tile. During `onRender`, an applet's drawing methods generate pixels between _x=0, y=0_ and _x=Applet::width(), y=Applet::height()_. These pixels are passed to its tile's `Tile::handleAppletPixel` method. The tile then applies x and y offset, "translating" these pixels to the tile's region of the display. These translated pixels are then passed on to the `InkHUD::Renderer`.
+
+![depiction of a tile translating applet pixels](./tile_translation.png)
+
+#### User Tiles
+
+_User applets_ are the "normal" applets. They can be activated / deactivated at run-time using the on-screen menu. User applets are rendered to one of the **user tiles**.
+
+The user can customize the "layout", using the on-screen menu. Depending on their selected layout, a certain number of _user tiles_ are created. These tiles are automatically positioned and sized so that they fill the entire screen.
+
+Often, a user will have enabled more applets than they have tiles. Pressing the user-button will cycle through these applets. The old applet is sent to _background_, the new applet is brought to _foreground_. When a user applet is brought to foreground, it becomes assigned to a user tile (the focused tile). When it renders, its size will be set by this tile, and its pixels will be translated to this tile's region. The user applet which was sent to background loses its assignment; it no longer has an assigned tile.
+
+#### Focused Tile
+
+The focused tile is one of the user tiles. This is tile whose applet will change when the user button is pressed. This also the tile where the menu will appear on longpress. The focused tile is identified by its index in `vector<Tile*> userTiles`.
+
+#### Highlighting
+
+In addition to the user button, some devices have a second "auxiliary button". The function of this button can vary from device to device, but it is sometimes used to focus a different tile. When this happens, the newly focused tile is temporarily "highlighted", by drawing it with a border. This border is automatically removed after several seconds. As drawing code may only be executed by applets, this highlighting is a collaborative effort between a `Tile` and an `Applet`: performed in `Applet::render`, after the virtual `onRender` method has already run.
+
+Highlighting is only used when `nextTile` is fired by an aux button. It does not occur if performed via the on-screen menu.
+
+#### System Tiles
+
+_System applets_ are applets with special roles, which require special handling. Examples include `BatteryIconApplet.h` and `LogoApplet.h`. _Mostly_, these applets do not render to user tiles. Instead, they are given their own unique tile, which is positioned / dimensioned manually. The only reference we keep to these special tiles is stored within the linked system applet. They can be accessed with `Applet::getTile`.
+
+---
+
+### `InkHUD::AppletFont`
+
+Wrapper which extends the functionality of an AdafruitGFX font.
+
+#### Dimension Info
+
+The AppletFont class pre-calculates some info about a font's dimensions, which is useful for design (`AppletFont::lineHeight`), and is used to power InkHUD's custom text handling.
+
+The default AdafruitGFX text handling places characters "upon a line", as if hand-written on a sheet of ruled paper. `InkHUD::AppletFont` measures the character set of the font, so that we instead draw fixed-height lines of text, positioned by the bounding box, with optional horizontal and vertical alignment.
+
+![text origins in InkHUD vs AdafruitGFX](./appletfont.png)
+
+The height of this box is `AppletFont::lineHeight`, which is the height of the tallest character in the font. This gives us a fixed-height for text, which is much tighter than with AdafruitGFX's default line spacing.
+
+#### UTF-8 Substitutions
+
+To enable non-English text, the `AppletFont` class includes a mechanism to detect specific UTF-8 characters, and replace them with alternative glyphs from the AdafruitGFX font. This can be used to remap characters for a custom font, or to offer a suitable ASCII replacement.
+
+```cpp
+// With a custom font
+// ї is ASCII 0xBF, in Windows-1251 encoding
+addSubstitution("ї", "\xBF");
+
+// Substitution (with a default font)
+addSubstitution("ö", "oe");
+```
+
+These substitutions should be performed in a variant's `setupNicheGraphics` method. For convenience, some common ASCII encodings have ready-to-go sets of substitutions you can apply, for example `AppletFont::addSubstitutionsWin1251`
diff --git a/src/graphics/niche/InkHUD/docs/appletfont.png b/src/graphics/niche/InkHUD/docs/appletfont.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0b11d3236bde64a4ab3385c33bc0d2bac6f03ef
GIT binary patch
literal 7797
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
OG<9Vir5Xk6kpBTCAtn9*

literal 0
HcmV?d00001

diff --git a/src/graphics/niche/InkHUD/docs/disclaimer.jpg b/src/graphics/niche/InkHUD/docs/disclaimer.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d4c2c890e56705770336672cfa426fe449950a1c
GIT binary patch
literal 17942
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

literal 0
HcmV?d00001

diff --git a/src/graphics/niche/InkHUD/docs/rendering.gif b/src/graphics/niche/InkHUD/docs/rendering.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cb712381b91c13f5ce3bf7ebe81f998057c57722
GIT binary patch
literal 78402
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

literal 0
HcmV?d00001

diff --git a/src/graphics/niche/InkHUD/docs/tile_translation.png b/src/graphics/niche/InkHUD/docs/tile_translation.png
new file mode 100644
index 0000000000000000000000000000000000000000..7bbf6364309b32ab5a0d3ab1109c9665649d1e6e
GIT binary patch
literal 5832
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

literal 0
HcmV?d00001

diff --git a/variants/heltec_vision_master_e213/nicheGraphics.h b/variants/heltec_vision_master_e213/nicheGraphics.h
index b14c72896..75e4423be 100644
--- a/variants/heltec_vision_master_e213/nicheGraphics.h
+++ b/variants/heltec_vision_master_e213/nicheGraphics.h
@@ -67,25 +67,20 @@ void setupNicheGraphics()
     InkHUD::Applet::fontSmall.addSubstitutionsWin1251();
     */
 
-    // Init settings, and customize defaults
+    // Customize default settings
     inkhud->persistence->settings.userTiles.maxCount = 2; // How many tiles can the display handle?
     inkhud->persistence->settings.rotation = 3;           // 270 degrees clockwise
     inkhud->persistence->settings.userTiles.count = 1;    // One tile only by default, keep things simple for new users
     inkhud->persistence->settings.optionalMenuItems.nextTile = false; // Behavior handled by aux button instead
 
     // Pick applets
-    // Note: order of applets determines priority of "auto-show" feature
-    // Optional arguments for defaults:
-    // - is activated?
-    // - is autoshown?
-    // - is foreground on a specific tile (index)?
     inkhud->addApplet("All Messages", new InkHUD::AllMessageApplet, true, true); // Activated, autoshown
-    inkhud->addApplet("DMs", new InkHUD::DMApplet);
-    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0));
-    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1));
-    inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true); // Activated
-    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet);
-    inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0); // Activated, not autoshown, default on tile 0
+    inkhud->addApplet("DMs", new InkHUD::DMApplet);                              // Inactive
+    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0));        // Inactive
+    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1));        // Inactive
+    inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true);           // Activated
+    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet);            // Inactive
+    inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0);         // Activated, not autoshown, default on tile 0
     // inkhud->addApplet("Basic", new InkHUD::BasicExampleApplet);
     // inkhud->addApplet("NewMsg", new InkHUD::NewMsgExampleApplet);
 
diff --git a/variants/heltec_vision_master_e290/nicheGraphics.h b/variants/heltec_vision_master_e290/nicheGraphics.h
index c14ee76ec..2674436b8 100644
--- a/variants/heltec_vision_master_e290/nicheGraphics.h
+++ b/variants/heltec_vision_master_e290/nicheGraphics.h
@@ -80,25 +80,27 @@ void setupNicheGraphics()
     InkHUD::Applet::fontSmall.addSubstitutionsWin1251();
     */
 
-    // Init settings, and customize defaults
+    // Customize default settings
     inkhud->persistence->settings.userTiles.maxCount = 2; // How many tiles can the display handle?
     inkhud->persistence->settings.rotation = 1;           // 90 degrees clockwise
     inkhud->persistence->settings.userTiles.count = 1;    // One tile only by default, keep things simple for new users
     inkhud->persistence->settings.optionalMenuItems.nextTile = false; // Behavior handled by aux button instead
 
     // Pick applets
-    // Note: order of applets determines priority of "auto-show" feature
-    // Optional arguments for defaults:
-    // - is activated?
-    // - is autoshown?
-    // - is foreground on a specific tile (index)?
+
+    // Order of applets determines priority of "auto-show" feature.
+    // Optional arguments for default state:
+    //   - is activated?
+    //   - is autoshown?
+    //   - is foreground on a specific tile (index)?
+
     inkhud->addApplet("All Messages", new InkHUD::AllMessageApplet, true, true); // Activated, autoshown
-    inkhud->addApplet("DMs", new InkHUD::DMApplet);
-    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0));
-    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1));
-    inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true); // Activated
-    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet);
-    inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0); // Activated, not autoshown, default on tile 0
+    inkhud->addApplet("DMs", new InkHUD::DMApplet);                              // Inactive
+    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0));        // Inactive
+    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1));        // Inactive
+    inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true);           // Activated
+    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet);            // Inactive
+    inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0);         // Activated, not autoshown, default on tile 0
     // inkhud->addApplet("Basic", new InkHUD::BasicExampleApplet);
     // inkhud->addApplet("NewMsg", new InkHUD::NewMsgExampleApplet);
 
diff --git a/variants/heltec_wireless_paper/nicheGraphics.h b/variants/heltec_wireless_paper/nicheGraphics.h
index 44405b8f6..ece4225d0 100644
--- a/variants/heltec_wireless_paper/nicheGraphics.h
+++ b/variants/heltec_wireless_paper/nicheGraphics.h
@@ -67,26 +67,21 @@ void setupNicheGraphics()
     InkHUD::Applet::fontSmall.addSubstitutionsWin1251();
     */
 
-    // Init settings, and customize defaults
+    // Customize default settings
     inkhud->persistence->settings.userTiles.maxCount = 2; // How many tiles can the display handle?
     inkhud->persistence->settings.rotation = 3;           // 270 degrees clockwise
     inkhud->persistence->settings.userTiles.count = 1;    // One tile only by default, keep things simple for new users
 
     // Pick applets
-    // Note: order of applets determines priority of "auto-show" feature
-    // Optional arguments for defaults:
-    // - is activated?
-    // - is autoshown?
-    // - is foreground on a specific tile (index)?
     inkhud->addApplet("All Messages", new InkHUD::AllMessageApplet, true, true); // Activated, autoshown
-    inkhud->addApplet("DMs", new InkHUD::DMApplet);
-    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0));
-    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1));
-    inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true); // Activated
-    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet);
-    inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0); // Activated, not autoshown, default on tile 0
+    inkhud->addApplet("DMs", new InkHUD::DMApplet);                              // Inactive
+    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0));        // Inactive
+    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1));        // Inactive
+    inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true);           // Activated
+    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet);            // Inactive
+    inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0);         // Activated, not autoshown, default on tile 0
     // inkhud->addApplet("Basic", new InkHUD::BasicExampleApplet);
-    //  inkhud->addApplet("NewMsg", new InkHUD::NewMsgExampleApplet);
+    // inkhud->addApplet("NewMsg", new InkHUD::NewMsgExampleApplet);
 
     // Start running InkHUD
     inkhud->begin();
diff --git a/variants/t-echo/nicheGraphics.h b/variants/t-echo/nicheGraphics.h
index f0ffe4108..e8a9232f1 100644
--- a/variants/t-echo/nicheGraphics.h
+++ b/variants/t-echo/nicheGraphics.h
@@ -68,8 +68,7 @@ void setupNicheGraphics()
     InkHUD::Applet::fontSmall.addSubstitutionsWin1251();
     */
 
-    // Init settings, and customize defaults
-    // Values ignored individually if found saved to flash
+    // Customize default settings
     inkhud->persistence->settings.userTiles.maxCount = 2;              // Two applets side-by-side
     inkhud->persistence->settings.rotation = 3;                        // 270 degrees clockwise
     inkhud->persistence->settings.optionalFeatures.batteryIcon = true; // Device definitely has a battery
@@ -106,6 +105,7 @@ void setupNicheGraphics()
 
     // Setup the main user button
     buttons->setWiring(MAIN_BUTTON, BUTTON_PIN, LOW);
+    buttons->setTiming(MAIN_BUTTON, 75, 500);
     buttons->setHandlerShortPress(MAIN_BUTTON, []() { InkHUD::InkHUD::getInstance()->shortpress(); });
     buttons->setHandlerLongPress(MAIN_BUTTON, []() { InkHUD::InkHUD::getInstance()->longpress(); });
 

From 72db671e007bcccc0cb67c6a44889aed0ad94e59 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Mon, 31 Mar 2025 02:54:27 -0500
Subject: [PATCH 111/116] Try-fix some import of configuration inconsistencies
 (#6364)

---
 src/modules/AdminModule.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp
index c04c26a5a..88109bc78 100644
--- a/src/modules/AdminModule.cpp
+++ b/src/modules/AdminModule.cpp
@@ -265,7 +265,7 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
         disableBluetooth();
         LOG_INFO("Commit transaction for edited settings");
         hasOpenEditTransaction = false;
-        saveChanges(SEGMENT_CONFIG | SEGMENT_MODULECONFIG | SEGMENT_DEVICESTATE | SEGMENT_CHANNELS);
+        saveChanges(SEGMENT_CONFIG | SEGMENT_MODULECONFIG | SEGMENT_DEVICESTATE | SEGMENT_CHANNELS | SEGMENT_NODEDATABASE);
         break;
     }
     case meshtastic_AdminMessage_get_device_connection_status_request_tag: {
@@ -334,7 +334,7 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
         node->position = TypeConversions::ConvertToPositionLite(r->set_fixed_position);
         nodeDB->setLocalPosition(r->set_fixed_position);
         config.position.fixed_position = true;
-        saveChanges(SEGMENT_DEVICESTATE | SEGMENT_NODEDATABASE | SEGMENT_CONFIG, false);
+        saveChanges(SEGMENT_NODEDATABASE | SEGMENT_CONFIG, false);
 #if !MESHTASTIC_EXCLUDE_GPS
         if (gps != nullptr)
             gps->enable();
@@ -347,7 +347,7 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
         LOG_INFO("Client received remove_fixed_position command");
         nodeDB->clearLocalPosition();
         config.position.fixed_position = false;
-        saveChanges(SEGMENT_DEVICESTATE | SEGMENT_NODEDATABASE | SEGMENT_CONFIG, false);
+        saveChanges(SEGMENT_NODEDATABASE | SEGMENT_CONFIG, false);
         break;
     }
     case meshtastic_AdminMessage_set_time_only_tag: {
@@ -574,7 +574,6 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)
         config.has_position = true;
         config.position = c.payload_variant.position;
         // Save nodedb as well in case we got a fixed position packet
-        saveChanges(SEGMENT_DEVICESTATE, false);
         break;
     case meshtastic_Config_power_tag:
         LOG_INFO("Set config: Power");

From 3314b00fcc9500a722ac3e0fc700871a88ce74dd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 31 Mar 2025 11:16:13 +0200
Subject: [PATCH 112/116] Upgrade trunk (#6471)

Co-authored-by: sachaw <11172820+sachaw@users.noreply.github.com>
---
 .trunk/trunk.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
index 8f938ce9e..4c570c856 100644
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -9,12 +9,12 @@ plugins:
 lint:
   enabled:
     - prettier@3.5.3
-    - trufflehog@3.88.18
+    - trufflehog@3.88.20
     - yamllint@1.37.0
     - bandit@1.8.3
     - checkov@3.2.394
     - terrascan@1.19.9
-    - trivy@0.60.0
+    - trivy@0.61.0
     - taplo@0.9.3
     - ruff@0.11.2
     - isort@6.0.1

From 39408fd3b1f39c6799caf9d214cc3dd613d4824c Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Mon, 31 Mar 2025 05:50:53 -0500
Subject: [PATCH 113/116] Disable network config for non-eth_gateway nrf52 and
 non-W RP2040 targets (#6462)

* Disable network config for non-eth_gateway nrf52 and non-W RP2040 targets

* Use HAS_ETHERNET logic
---
 src/main.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index 59cd6d8e9..f8443f9e9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1274,6 +1274,12 @@ extern meshtastic_DeviceMetadata getDeviceMetadata()
     deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_AMBIENTLIGHTING_CONFIG;
 #endif
 
+#if defined(ARCH_NRF52) && !HAS_ETHERNET // nrf52 doesn't have network unless it's a RAK ethernet gateway currently
+    deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_NETWORK_CONFIG; // No network on nRF52
+#elif defined(ARCH_RP2040) && !HAS_WIFI && !HAS_ETHERNET
+    deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_NETWORK_CONFIG; // No network on RP2040
+#endif
+
 #if !(MESHTASTIC_EXCLUDE_PKI)
     deviceMetadata.hasPKC = true;
 #endif

From 886bffe8f3b1e27b087c7f866129d7d763bc22de Mon Sep 17 00:00:00 2001
From: todd-herbert <herbert.todd@gmail.com>
Date: Tue, 1 Apr 2025 00:03:44 +1300
Subject: [PATCH 114/116] fix: honor user button customization (#6400)

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
---
 src/graphics/niche/Inputs/TwoButton.cpp       | 38 ++++++++++++++++++-
 src/graphics/niche/Inputs/TwoButton.h         |  4 +-
 .../heltec_vision_master_e213/nicheGraphics.h |  2 +-
 .../heltec_vision_master_e290/nicheGraphics.h |  4 +-
 .../heltec_wireless_paper/nicheGraphics.h     |  2 +-
 variants/t-echo/nicheGraphics.h               |  2 +-
 6 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/src/graphics/niche/Inputs/TwoButton.cpp b/src/graphics/niche/Inputs/TwoButton.cpp
index 10d89ef41..b270d56cf 100644
--- a/src/graphics/niche/Inputs/TwoButton.cpp
+++ b/src/graphics/niche/Inputs/TwoButton.cpp
@@ -2,6 +2,7 @@
 
 #include "./TwoButton.h"
 
+#include "NodeDB.h" // For the helper function TwoButton::getUserButtonPin
 #include "PowerFSM.h"
 #include "sleep.h"
 
@@ -57,14 +58,47 @@ void TwoButton::stop()
         detachInterrupt(buttons[1].pin);
 }
 
+// Attempt to resolve a GPIO pin for the user button, honoring userPrefs.jsonc and device settings
+// This helper method isn't used by the TweButton class itself, it could be moved elsewhere.
+// Intention is to pass this value to TwoButton::setWiring in the setupNicheGraphics method.
+uint8_t TwoButton::getUserButtonPin()
+{
+    uint8_t pin = 0xFF; // Unset
+
+    // Use default pin for variant, if no better source
+#ifdef BUTTON_PIN
+    pin = BUTTON_PIN;
+#endif
+
+    // From userPrefs.jsonc, if set
+#ifdef USERPREFS_BUTTON_PIN
+    pin = USERPREFS_BUTTON_PIN;
+#endif
+
+    // From user's override in device settings, if set
+    if (config.device.button_gpio)
+        pin = config.device.button_gpio;
+
+    return pin;
+}
+
 // Configures the wiring and logic of either button
 // Called when outlining your NicheGraphics implementation, in variant/nicheGraphics.cpp
 void TwoButton::setWiring(uint8_t whichButton, uint8_t pin, bool internalPullup)
 {
+    // Prevent the same GPIO being assigned to multiple buttons
+    // Allows an edge case when the user remaps hardware buttons using device settings, due to a broken user button
+    for (uint8_t i = 0; i < whichButton; i++) {
+        if (buttons[i].pin == pin) {
+            LOG_WARN("Attempted reuse of GPIO %d. Ignoring assignment whichButton=%d", pin, whichButton);
+            return;
+        }
+    }
+
     assert(whichButton < 2);
     buttons[whichButton].pin = pin;
-    buttons[whichButton].activeLogic = LOW;
-    buttons[whichButton].mode = internalPullup ? INPUT_PULLUP : INPUT; // fix me
+    buttons[whichButton].activeLogic = LOW; // Unimplemented
+    buttons[whichButton].mode = internalPullup ? INPUT_PULLUP : INPUT;
 
     pinMode(buttons[whichButton].pin, buttons[whichButton].mode);
 }
diff --git a/src/graphics/niche/Inputs/TwoButton.h b/src/graphics/niche/Inputs/TwoButton.h
index 1e1576256..f1e18dd89 100644
--- a/src/graphics/niche/Inputs/TwoButton.h
+++ b/src/graphics/niche/Inputs/TwoButton.h
@@ -30,6 +30,8 @@ class TwoButton : protected concurrency::OSThread
   public:
     typedef std::function<void()> Callback;
 
+    static uint8_t getUserButtonPin(); // Resolve the GPIO, considering the various possible source of definition
+
     static TwoButton *getInstance(); // Create or get the singleton instance
     void start();                    // Start handling button input
     void stop();                     // Stop handling button input (disconnect ISRs for sleep)
@@ -62,7 +64,7 @@ class TwoButton : protected concurrency::OSThread
       public:
         // Per-button config
         uint8_t pin = 0xFF;                 // 0xFF: unset
-        bool activeLogic = LOW;             // Active LOW by default. Todo: remove, unused
+        bool activeLogic = LOW;             // Active LOW by default. Currently unimplemented.
         uint8_t mode = INPUT;               // Whether to use internal pull up / pull down resistors
         uint32_t debounceLength = 50;       // Minimum length for shortpress, in ms
         uint32_t longpressLength = 500;     // How long after button down to fire longpress, in ms
diff --git a/variants/heltec_vision_master_e213/nicheGraphics.h b/variants/heltec_vision_master_e213/nicheGraphics.h
index 75e4423be..d6983bafe 100644
--- a/variants/heltec_vision_master_e213/nicheGraphics.h
+++ b/variants/heltec_vision_master_e213/nicheGraphics.h
@@ -95,7 +95,7 @@ void setupNicheGraphics()
     constexpr uint8_t AUX_BUTTON = 1;
 
     // Setup the main user button
-    buttons->setWiring(MAIN_BUTTON, BUTTON_PIN);
+    buttons->setWiring(MAIN_BUTTON, Inputs::TwoButton::getUserButtonPin());
     buttons->setHandlerShortPress(MAIN_BUTTON, []() { InkHUD::InkHUD::getInstance()->shortpress(); });
     buttons->setHandlerLongPress(MAIN_BUTTON, []() { InkHUD::InkHUD::getInstance()->longpress(); });
 
diff --git a/variants/heltec_vision_master_e290/nicheGraphics.h b/variants/heltec_vision_master_e290/nicheGraphics.h
index 2674436b8..c2f26c7ff 100644
--- a/variants/heltec_vision_master_e290/nicheGraphics.h
+++ b/variants/heltec_vision_master_e290/nicheGraphics.h
@@ -19,7 +19,7 @@ Different NicheGraphics UIs and different hardware variants will each have their
 
 // InkHUD-specific components
 // ---------------------------
-#include "graphics/niche/InkHUD/WindowManager.h"
+#include "graphics/niche/InkHUD/InkHUD.h"
 
 // Applets
 #include "graphics/niche/InkHUD/Applets/User/AllMessage/AllMessageApplet.h"
@@ -113,7 +113,7 @@ void setupNicheGraphics()
     Inputs::TwoButton *buttons = Inputs::TwoButton::getInstance(); // A shared NicheGraphics component
 
     // Setup the main user button (0)
-    buttons->setWiring(0, BUTTON_PIN);
+    buttons->setWiring(0, Inputs::TwoButton::getUserButtonPin());
     buttons->setHandlerShortPress(0, []() { InkHUD::InkHUD::getInstance()->shortpress(); });
     buttons->setHandlerLongPress(0, []() { InkHUD::InkHUD::getInstance()->longpress(); });
 
diff --git a/variants/heltec_wireless_paper/nicheGraphics.h b/variants/heltec_wireless_paper/nicheGraphics.h
index ece4225d0..5e938fa64 100644
--- a/variants/heltec_wireless_paper/nicheGraphics.h
+++ b/variants/heltec_wireless_paper/nicheGraphics.h
@@ -93,7 +93,7 @@ void setupNicheGraphics()
     constexpr uint8_t MAIN_BUTTON = 0;
 
     // Setup the main user button
-    buttons->setWiring(MAIN_BUTTON, BUTTON_PIN);
+    buttons->setWiring(MAIN_BUTTON, Inputs::TwoButton::getUserButtonPin());
     buttons->setHandlerShortPress(MAIN_BUTTON, []() { InkHUD::InkHUD::getInstance()->shortpress(); });
     buttons->setHandlerLongPress(MAIN_BUTTON, []() { InkHUD::InkHUD::getInstance()->longpress(); });
 
diff --git a/variants/t-echo/nicheGraphics.h b/variants/t-echo/nicheGraphics.h
index e8a9232f1..f5dde6b19 100644
--- a/variants/t-echo/nicheGraphics.h
+++ b/variants/t-echo/nicheGraphics.h
@@ -104,7 +104,7 @@ void setupNicheGraphics()
     constexpr uint8_t TOUCH_BUTTON = 1;
 
     // Setup the main user button
-    buttons->setWiring(MAIN_BUTTON, BUTTON_PIN, LOW);
+    buttons->setWiring(MAIN_BUTTON, Inputs::TwoButton::getUserButtonPin());
     buttons->setTiming(MAIN_BUTTON, 75, 500);
     buttons->setHandlerShortPress(MAIN_BUTTON, []() { InkHUD::InkHUD::getInstance()->shortpress(); });
     buttons->setHandlerLongPress(MAIN_BUTTON, []() { InkHUD::InkHUD::getInstance()->longpress(); });

From a5efbfccd784f77784ec429794378b599476935e Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Mon, 31 Mar 2025 06:32:54 -0500
Subject: [PATCH 115/116] Disable bluetooth config on rp2040, portduino (for
 now), and stm32 (#6465)

* Disable bluetooth config on rp2040, portduino (for now), and stm32

* Add comments and exclude C6
---
 src/main.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index f8443f9e9..05eeef2ae 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1274,6 +1274,13 @@ extern meshtastic_DeviceMetadata getDeviceMetadata()
     deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_AMBIENTLIGHTING_CONFIG;
 #endif
 
+// No bluetooth on these targets (yet):
+// Pico W / 2W may get it at some point
+// Portduino and ESP32-C6 are excluded because we don't have a working bluetooth stacks integrated yet.
+#if defined(ARCH_RP2040) || defined(ARCH_PORTDUINO) || defined(ARCH_STM32WL) || defined(CONFIG_IDF_TARGET_ESP32C6)
+    deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_BLUETOOTH_CONFIG;
+#endif
+
 #if defined(ARCH_NRF52) && !HAS_ETHERNET // nrf52 doesn't have network unless it's a RAK ethernet gateway currently
     deviceMetadata.excluded_modules |= meshtastic_ExcludedModules_NETWORK_CONFIG; // No network on nRF52
 #elif defined(ARCH_RP2040) && !HAS_WIFI && !HAS_ETHERNET

From 2c01fad798e17bcc5e6feb4644ba15c12e32fffa Mon Sep 17 00:00:00 2001
From: Austin <vidplace7@gmail.com>
Date: Mon, 31 Mar 2025 08:31:54 -0400
Subject: [PATCH 116/116] meshtasticd: Add FrequencyLabs MeshAdv-Mini Hat
 (#6458)

---
 bin/config.d/lora-MeshAdv-900M30S.yaml      |  4 +++-
 bin/config.d/lora-MeshAdv-Mini-900M22S.yaml | 11 +++++++++++
 src/platform/portduino/PortduinoGlue.h      |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 bin/config.d/lora-MeshAdv-Mini-900M22S.yaml

diff --git a/bin/config.d/lora-MeshAdv-900M30S.yaml b/bin/config.d/lora-MeshAdv-900M30S.yaml
index 113901d5e..5c148bf68 100644
--- a/bin/config.d/lora-MeshAdv-900M30S.yaml
+++ b/bin/config.d/lora-MeshAdv-900M30S.yaml
@@ -1,3 +1,5 @@
+# MeshAdv-Pi E22-900M30S
+# https://github.com/chrismyers2000/MeshAdv-Pi-Hat
 Lora:
   Module: sx1262
   CS: 21
@@ -9,4 +11,4 @@ Lora:
   DIO3_TCXO_VOLTAGE: true
   # Only for E22-900M33S:
   # Limit the output power to 8 dBm
-  # SX126X_MAX_POWER: 8
\ No newline at end of file
+  # SX126X_MAX_POWER: 8
diff --git a/bin/config.d/lora-MeshAdv-Mini-900M22S.yaml b/bin/config.d/lora-MeshAdv-Mini-900M22S.yaml
new file mode 100644
index 000000000..554116b57
--- /dev/null
+++ b/bin/config.d/lora-MeshAdv-Mini-900M22S.yaml
@@ -0,0 +1,11 @@
+# MeshAdv Mini E22-900M22S
+# https://github.com/chrismyers2000/MeshAdv-Mini
+Lora:
+  Module: sx1262  # Ebyte E22-900M22S 
+  CS: 8
+  IRQ: 16
+  Busy: 20
+  Reset: 24
+  TXen: 13
+  DIO2_AS_RF_SWITCH: true
+  DIO3_TCXO_VOLTAGE: true
diff --git a/src/platform/portduino/PortduinoGlue.h b/src/platform/portduino/PortduinoGlue.h
index a7aea1c3e..4e074be71 100644
--- a/src/platform/portduino/PortduinoGlue.h
+++ b/src/platform/portduino/PortduinoGlue.h
@@ -11,6 +11,7 @@
 inline const std::unordered_map<std::string, std::string> configProducts = {{"MESHTOAD", "lora-usb-meshtoad-e22.yaml"},
                                                                             {"MESHSTICK", "lora-meshstick-1262.yaml"},
                                                                             {"MESHADV-PI", "lora-MeshAdv-900M30S.yaml"},
+                                                                            {"MESHADV-MINI", "lora-MeshAdv-Mini-900M22S.yaml"},
                                                                             {"POWERPI", "lora-MeshAdv-900M30S.yaml"}};
 
 enum configNames {