Merge remote-tracking branch 'upstream/master' into xiao_esp32c6_with_ble

2025-03-29 11:10:48 +01:00 · 2025-03-29 11:10:48 +01:00 · 1e2b92d1a0
commit 1e2b92d1a0
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@ -29,7 +29,11 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
    gpg \
    gnupg2 \
    libusb-1.0-0-dev \
+    libuv1-dev \
    libi2c-dev \
+    libxcb-xkb-dev \
+    libxkbcommon-dev \
+    libinput-dev \
    && apt-get clean && rm -rf /var/lib/apt/lists/*

 RUN pipx install platformio
--- 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
--- a/.github/ISSUE_TEMPLATE/Bug
+++ b/.github/ISSUE_TEMPLATE/Bug
@ -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:
--- 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
--- 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)
--- 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
--- 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
--- 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
@ -9,14 +9,14 @@ plugins:
 lint:
  enabled:
    - prettier@3.5.3
-    - trufflehog@3.88.15
-    - yamllint@1.35.1
+    - trufflehog@3.88.18
+    - yamllint@1.37.0
    - bandit@1.8.3
-    - checkov@3.2.382
+    - checkov@3.2.394
    - terrascan@1.19.9
    - trivy@0.60.0
    - taplo@0.9.3
-    - ruff@0.9.9
+    - 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]
--- a/4
+++ b/4
@ -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 \
--- 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 \
--- 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>
--- 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#c5bd469ab9b5a6966321e09557b27d906961da63
 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
--- 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
+  Wire
--- 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
+Lora:
+  Module: RF95  # Adafruit RFM9x
+  Reset: 25
+  CS: 7
+  IRQ: 22
+#  Busy: 23
--- a/bin/config.d/lora-usb-meshtoad-e22.yaml
+++ 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
--- 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 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
 ECHO Flash image file to device, but first erasing and writing system information.
@ -34,7 +41,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 +113,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 +128,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!."
@ -133,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%.
@ -179,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%.
@ -208,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"
 )
--- 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"
+	"t-watch-s3"
+	"tracksenger"
+)
+BIGDB_16MB=(
+	"t-deck"
+	"mesh-tab"
+	"t-energy-s3"
+	"dreamcatcher"
+	"ESP32-S3-Pico"
+	"m5stack-cores3"
+	"station-g2"
+	"t-eth-elite"
+)
+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
@ -42,8 +81,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"
@ -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
--- 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!."
--- 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}
--- 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"))

 verPropFile = "version.properties"
--- a/boards/ThinkNode-M1.json
+++ 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"
+}
--- 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"
--- 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,
--- a/extra_scripts/extra_stm32.py
+++ 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",
+    ),
+)
--- 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)
--- 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#b1e862e8b2a604a8d911e9d7a27f6e80f1176c21

 ; Common libs for environmental measurements in telemetry module
 ; (not included in native / portduino)
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 035a8017b87379f17624f7bba9b6a5b127bc026c
+Subproject commit f00e96f12da48abfa9a992f8b5546fd75a370250
--- 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);
    }
--- 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);
@ -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:
--- 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();
--- 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
+#endif // HAS_NETWORKING
--- 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
--- 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)
--- 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
@ -386,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;
@ -536,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);
@ -708,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) || defined(POWER_CFG)
+    power_num = powerStatus2.getBatteryVoltageMv();
+#endif
    newStatus.notifyObservers(&powerStatus2);
 #ifdef DEBUG_HEAP
    if (lastheap != memGet.getFreeHeap()) {
@ -751,9 +759,13 @@ 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++;
+#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
@ -766,7 +778,13 @@ void Power::readPowerStatus()
            }
        } else {
            low_voltage_counter = 0;
+#if defined(ELECROW_ThinkNode_M1)
+            low_voltage_counter_led3 = low_voltage_counter;
+#endif
        }
+#ifdef POWER_CFG
+        low_voltage_counter_led3 = low_voltage_counter;
+#endif
    }
 }

--- 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);
 }
--- 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}};
--- 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();
--- 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
@ -1196,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};
--- 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)
@ -166,7 +174,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 +191,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
    }
--- 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

--- 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;
--- 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);

--- 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();
--- 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
 }

--- 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
@ -262,6 +262,32 @@ void printInfo()
 #ifndef PIO_UNIT_TESTING
 void setup()
 {
+
+#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);
+#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 +351,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);
@ -822,6 +841,13 @@ 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
+    if (config.network.enabled_protocols & meshtastic_Config_NetworkConfig_ProtocolFlags_UDP_BROADCAST) {
+        udpThread->start();
+    }
+#endif
 #endif
    service = new MeshService();
    service->init();
@ -1296,7 +1322,6 @@ void loop()
        mainDelay.delay(delayMsec);
    }
 }
-
 #endif

 #if !defined(CONFIG_AUTOSTART_ARDUINO) && (ESP_IDF_VERSION_MAJOR * 100 + ESP_IDF_VERSION_MINOR * 10 + ESP_IDF_VERSION_PATCH) > 514
--- 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
--- 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);
@ -225,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
--- 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>;
--- 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
@ -311,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++;
 }

@ -325,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++;
 }

@ -339,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++;
 }

--- 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);
--- 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)
@ -400,18 +404,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 +420,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 +581,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)) &&     \
@ -638,6 +628,27 @@ 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
+    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
@ -649,6 +660,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();
 }

@ -1441,13 +1458,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

@ -1612,6 +1630,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)
 {
--- 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);
@ -103,7 +104,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
@ -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);

--- 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.
@ -655,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;
--- 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;
+                p->decoded = decodedtmp;
+                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
    }
--- 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
 */
--- 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
+#endif // ARCH_STM32WL
--- 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)
--- 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).
--- 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"

--- 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
--- 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
--- 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;
--- 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) */
--- 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,15 @@ 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,
+    /* 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.
 ------------------------------------------------------------------------------------------------------------------------------------------ */
@ -769,7 +778,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.
--- 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();
    }

--- 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]))
--- 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

@ -17,8 +22,13 @@ class UdpMulticastThread : public concurrency::OSThread

    void start()
    {
-        if (udp.listenMulticast(udpIpAddress, UDP_MULTICAST_DEFAUL_PORT)) {
+        if (udp.listenMulticast(udpIpAddress, UDP_MULTICAST_DEFAUL_PORT, 64)) {
+#ifndef 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");
@ -28,12 +38,13 @@ 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;
-        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
@ -45,13 +56,18 @@ class UdpMulticastThread : public concurrency::OSThread

    bool onSend(const meshtastic_MeshPacket *mp)
    {
-        if (!mp || WiFi.status() != WL_CONNECTED) {
+        if (!mp || !udp) {
            return false;
        }
+#ifndef 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);
-        udp.broadcastTo(buffer, encodedLength, UDP_MULTICAST_DEFAUL_PORT);
+        udp.writeTo(buffer, encodedLength, udpIpAddress, UDP_MULTICAST_DEFAUL_PORT);
        return true;
    }

@ -67,4 +83,4 @@ class UdpMulticastThread : public concurrency::OSThread
    IPAddress udpIpAddress;
    AsyncUDP udp;
 };
-#endif // ARCH_ESP32
+#endif // HAS_UDP_MULTICAST
--- 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")) {
@ -110,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
@ -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");
--- 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();
+uint8_t getWifiDisconnectReason();
+
+#ifdef USE_WS5500
+// Startup Ethernet
+bool initEthernet();
+#endif
--- 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;
    }
@ -370,6 +377,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;
    }
@ -637,6 +680,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;
@ -980,7 +1031,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) {
--- 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
--- 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
--- 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) {

--- 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;
 }

--- 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;
@ -468,81 +469,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;
--- 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
--- 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"
--- 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
+#endif
--- 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"
@ -113,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());
 }

@ -295,6 +300,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
--- 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

--- a/src/platform/esp32/WiFiOTA.cpp
+++ 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
--- a/src/platform/esp32/WiFiOTA.h
+++ 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
--- 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)
@ -176,6 +178,10 @@
 #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
+#elif defined(HELTEC_SENSOR_HUB)
+#define HW_VENDOR meshtastic_HardwareModel_HELTEC_SENSOR_HUB
 #endif

 // -----------------------------------------------------------------------------
--- 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
@ -26,7 +28,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)
@ -105,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());
@ -142,12 +151,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();
--- 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_ThinkNode_M1
 #elif defined(NANO_G2_ULTRA)
 #define HW_VENDOR meshtastic_HardwareModel_NANO_G2_ULTRA
 #elif defined(CANARYONE)
@ -75,6 +77,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
@ -129,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
+#endif
--- 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!");
--- 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);
--- 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 {}

--- a/src/platform/stm32wl/LittleFS.cpp
+++ 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;
+}
--- a/src/platform/stm32wl/LittleFS.h
+++ 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_ */
--- a/src/platform/stm32wl/STM32_LittleFS.cpp
+++ 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
--- a/src/platform/stm32wl/STM32_LittleFS.h
+++ 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_ */
--- a/src/platform/stm32wl/STM32_LittleFS_File.cpp
+++ 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();
+}
--- a/src/platform/stm32wl/STM32_LittleFS_File.h
+++ 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_ */
--- a/src/platform/stm32wl/littlefs/lfs.c
+++ b/src/platform/stm32wl/littlefs/lfs.c
--- a/src/platform/stm32wl/littlefs/lfs.h
+++ 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
--- a/src/platform/stm32wl/littlefs/lfs_util.c
+++ 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
--- a/src/platform/stm32wl/littlefs/lfs_util.h
+++ 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
--- 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) || defined(POWER_CFG)
+    uint8_t low_voltage_counter_led3;
+    int power_num = 0;
+#endif
+
  protected:
    meshtastic::PowerStatus *statusHandler;

--- 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");
--- a/Show More
+++ b/Show More