Merge branch 'master' into multicast-IGMP-routing

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

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

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>

.trunk/trunk.yaml

@@ -10,13 +10,13 @@ lint:
   enabled:
     - prettier@3.5.3
     - trufflehog@3.88.17
-    - yamllint@1.36.0
+    - yamllint@1.36.2
     - bandit@1.8.3
     - checkov@3.2.386
     - terrascan@1.19.9
     - trivy@0.60.0
     - taplo@0.9.3
-    - ruff@0.10.0
+    - ruff@0.11.0
     - isort@6.0.1
     - markdownlint@0.44.0
     - oxipng@9.1.4

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>

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

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 "BIGDB8=0"
-SET "TFT16=0"
+SET "BIGDB16=0"
 SET "ESPTOOL_BAUD=115200"
 SET "ESPTOOL_CMD="
 SET "LOGCOUNTER=0"
 
+@REM FIXME: Determine mcu from PlatformIO variant, this is unmaintainable.
+SET "S3=s3 v3 t-deck wireless-paper wireless-tracker station-g2 unphone"
+SET "C3=esp32c3"
+@REM FIXME: Determine flash size from PlatformIO variant, this is unmaintainable.
+SET "BIGDB_8MB=picomputer-s3 unphone seeed-sensecap-indicator crowpanel-esp32s3 heltec_capsule_sensor_v3 heltec-v3 heltec-vision-master-e213 heltec-vision-master-e290 heltec-vision-master-t190 heltec-wireless-paper heltec-wireless-tracker heltec-wsl-v3 icarus seeed-xiao-s3 tbeam-s3-core tracksenger"
+SET "BIGDB_16MB=t-deck mesh-tab t-energy-s3 dreamcatcher ESP32-S3-Pico m5stack-cores3 station-g2 t-eth-elite t-watch-s3"
+
 GOTO getopts
 :help
 ECHO Flash image file to device, but first erasing and writing system information.
@@ -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
+FOR %%a IN (%BIGDB_8MB%) DO (
-SET "TFT8MB=picomputer-s3 unphone seeed-sensecap-indicator"
-FOR %%a IN (%TFT8MB%) DO (
     IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
-        @REM We are working with any of %TFT8MB%.
+        @REM We are working with any of %BIGDB_8MB%.
-        SET "TFT8=1"
+        SET "BIGDB8=1"
-        GOTO end_loop_tft8mb
+        GOTO end_loop_bigdb_8mb
     )
 )
-:end_loop_tft8mb
+:end_loop_bigdb_8mb
 
-SET "TFT16MB=t-deck"
+FOR %%a IN (%BIGDB_16MB%) DO (
-FOR %%a IN (%TFT16MB%) DO (
     IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
-        @REM We are working with any of %TFT16MB%.
+        @REM We are working with any of %BIGDB_16MB%.
-        SET "TFT16=1"
+        SET "BIGDB16=1"
-        GOTO end_loop_tft16mb
+        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 %BIGDB8% EQU 1 CALL :LOG_MESSAGE INFO "BigDB 8mb partition selected."
-IF %TFT16% EQU 1 CALL :LOG_MESSAGE INFO "tft and MUI 16mb selected."
+IF %BIGDB16% EQU 1 CALL :LOG_MESSAGE INFO "BigDB 16mb partition selected."
-
-:no_tft
 
 @REM Extract BASENAME from %FILENAME% for later use.
 SET "BASENAME=!FILENAME:firmware-=!"
 CALL :LOG_MESSAGE DEBUG "Computed firmware basename: !BASENAME!"
 
 @REM Account for S3 and C3 board's different OTA partition.
-SET "S3=s3 v3 t-deck wireless-paper wireless-tracker station-g2 unphone"
 FOR %%a IN (%S3%) DO (
     IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
         @REM We are working with any of %S3%.
@@ -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.
+@REM Offsets for BigDB 8mb.
-IF %TFT8% EQU 1 IF %TFT_BUILD% EQU 1 (
+IF %BIGDB8% EQU 1 (
     SET "OTA_OFFSET=0x340000"
     SET "SPIFFS_OFFSET=0x670000"
 )
 
-@REM Offsets for MUI 16mb.
+@REM Offsets for BigDB 16mb.
-IF %TFT16% EQU 1 IF %TFT_BUILD% EQU 1 (
+IF %BIGDB16% EQU 1 (
     SET "OTA_OFFSET=0x650000"
     SET "SPIFFS_OFFSET=0xc90000"
 )

bin/device-install.sh

@@ -2,9 +2,48 @@
 
 PYTHON=${PYTHON:-$(which python3 python | head -n 1)}
 WEB_APP=false
-TFT8=false
-TFT16=false
 TFT_BUILD=false
+MCU=""
+
+# Variant groups
+BIGDB_8MB=(
+	"picomputer-s3"
+	"unphone"
+	"seeed-sensecap-indicator"
+	"crowpanel-esp32s3"
+	"heltec_capsule_sensor_v3"
+	"heltec-v3"
+	"heltec-vision-master-e213"
+	"heltec-vision-master-e290"
+	"heltec-vision-master-t190"
+	"heltec-wireless-paper"
+	"heltec-wireless-tracker"
+	"heltec-wsl-v3"
+	"icarus"
+	"seeed-xiao-s3"
+	"tbeam-s3-core"
+	"tracksenger"
+)
+BIGDB_16MB=(
+	"t-deck"
+	"mesh-tab"
+	"t-energy-s3"
+	"dreamcatcher"
+	"ESP32-S3-Pico"
+	"m5stack-cores3"
+	"station-g2"
+	"t-eth-elite"
+	"t-watch-s3"
+)
+S3_VARIANTS=(
+	"s3"
+	"-v3"
+	"t-deck"
+	"wireless-paper"
+	"wireless-tracker"
+	"station-g2"
+	"unphone"
+)
 
 # Determine the correct esptool command to use
 if "$PYTHON" -m esptool version >/dev/null 2>&1; then
@@ -42,8 +81,8 @@ while [ $# -gt 0 ]; do
 		exit 0
 		;;
 	-p)
-		ESPTOOL_PORT="$2"
+		ESPTOOL_CMD="$ESPTOOL_CMD --port $2"
-		shift # Shift past the option argument
+		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.
+	# littlefs* offset for BigDB 8mb and OTA OFFSET.
-	if [ "$TFT8" = true ] && [ "$TFT_BUILD" = true ]; then
+	for variant in "${BIGDB_8MB[@]}"; do
-		OFFSET=0x670000
+		if [ -n "${FILENAME##*"$variant"*}" ]; then
-		OTA_OFFSET=0x340000
+			OFFSET=0x670000
-	fi
+			OTA_OFFSET=0x340000
+		fi
+	done
 
-	# littlefs* offset for MUI 16mb and OTA OFFSET.
+	# littlefs* offset for BigDB 16mb and OTA OFFSET.
-	if [ "$TFT16" = true ] && [ "$TFT_BUILD" = true ]; then
+	for variant in "${BIGDB_16MB[@]}"; do
-		OFFSET=0xc90000
+		if [ -n "${FILENAME##*"$variant"*}" ]; then
-		OTA_OFFSET=0x650000
+			OFFSET=0xc90000
-	fi
+			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

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!."

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}

bin/platformio-custom.py

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

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

variants/CDEBYTE_E77-MBL/variant.h

@@ -14,7 +14,6 @@ Do not expect a working Meshtastic device with this target.
 #define _VARIANT_EBYTE_E77_
 
 #define USE_STM32WLx
-#define MAX_NUM_NODES 10
 
 #define LED_PIN PB4 // LED1
 // #define LED_PIN PB3 // LED2

variants/crowpanel-esp32s3-5-epaper/platformio.ini

@@ -5,6 +5,7 @@ board_build.flash_mode = qio
 board_build.psram_type = opi
 board_upload.flash_size = 8MB
 board_upload.maximum_size = 8388608
+board_build.partitions = default_8MB.csv
 board = esp32-s3-devkitc-1
 ;upload_port = /dev/ttyUSB0
 board_level = extra
@@ -32,6 +33,7 @@ board_build.flash_mode = qio
 board_build.psram_type = opi
 board_upload.flash_size = 8MB
 board_upload.maximum_size = 8388608
+board_build.partitions = default_8MB.csv
 board = esp32-s3-devkitc-1
 ;upload_port = /dev/ttyUSB0
 board_level = extra
@@ -59,6 +61,7 @@ board_build.flash_mode = qio
 board_build.psram_type = opi
 board_upload.flash_size = 8MB
 board_upload.maximum_size = 8388608
+board_build.partitions = default_8MB.csv
 board = esp32-s3-devkitc-1
 ;upload_port = /dev/ttyUSB0
 board_level = extra

variants/diy/platformio.ini

@@ -88,6 +88,7 @@ debug_tool = jlink
 [env:t-energy-s3_e22]
 extends = esp32s3_base
 board = esp32-s3-devkitc-1
+board_build.partitions = default_16MB.csv
 board_level = extra
 board_upload.flash_size = 16MB ;Specify the FLASH capacity as 16MB
 board_build.arduino.memory_type = qio_opi ;Enable internal PSRAM

variants/dreamcatcher/platformio.ini

@@ -1,6 +1,7 @@
 [env:dreamcatcher] ; 2301, latest revision
 extends = esp32s3_base
 board = esp32s3box
+board_build.partitions = default_16MB.csv
 board_level = extra
 
 build_flags = 
@@ -8,7 +9,7 @@ build_flags =
   -D PRIVATE_HW
   -D OTHERNET_DC_REV=2301
   -I variants/dreamcatcher
-  -DARDUINO_USB_CDC_ON_BOOT=1
+  -D ARDUINO_USB_CDC_ON_BOOT=1
 
 lib_deps = ${esp32s3_base.lib_deps}
   earlephilhower/ESP8266Audio@^1.9.9
@@ -17,6 +18,7 @@ lib_deps = ${esp32s3_base.lib_deps}
 [env:dreamcatcher-2206] 
 extends = esp32s3_base
 board = esp32s3box
+board_build.partitions = default_16MB.csv
 board_level = extra
 
 build_flags = 
@@ -24,4 +26,4 @@ build_flags =
   -D PRIVATE_HW
   -D OTHERNET_DC_REV=2206
   -I variants/dreamcatcher
-  -DARDUINO_USB_CDC_ON_BOOT=1
+  -D ARDUINO_USB_CDC_ON_BOOT=1

variants/esp32-s3-pico/platformio.ini

@@ -4,6 +4,7 @@ board_level = extra
 extends = esp32s3_base
 upload_protocol = esptool
 board = esp32-s3-pico
+board_build.partitions = default_16MB.csv
 
 board_upload.use_1200bps_touch = yes
 board_upload.wait_for_upload_port = yes

variants/heltec_capsule_sensor_v3/platformio.ini

@@ -2,7 +2,7 @@
 extends = esp32s3_base
 board = heltec_wifi_lora_32_V3
 board_check = true
-
+board_build.partitions = default_8MB.csv
 build_flags = 
   ${esp32s3_base.build_flags} -I variants/heltec_capsule_sensor_v3
   -D HELTEC_CAPSULE_SENSOR_V3

variants/heltec_v3/platformio.ini

@@ -2,7 +2,7 @@
 extends = esp32s3_base
 board = heltec_wifi_lora_32_V3
 board_check = true
-# Temporary until espressif creates a release with this new target
+board_build.partitions = default_8MB.csv
 build_flags = 
   ${esp32s3_base.build_flags} -D HELTEC_V3 -I variants/heltec_v3
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
+  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.

variants/heltec_vision_master_e213/platformio.ini

@@ -1,6 +1,7 @@
 [env:heltec-vision-master-e213]
 extends = esp32s3_base
 board = heltec_vision_master_e213
+board_build.partitions = default_8MB.csv
 build_flags = 
   ${esp32s3_base.build_flags}
   -Ivariants/heltec_vision_master_e213 
@@ -22,6 +23,7 @@ upload_speed = 115200
 [env:heltec-vision-master-e213-inkhud]
 extends = esp32s3_base, inkhud
 board = heltec_vision_master_e213
+board_build.partitions = default_8MB.csv
 build_src_filter =
   ${esp32_base.build_src_filter}
   ${inkhud.build_src_filter}

variants/heltec_vision_master_e290/platformio.ini

@@ -2,6 +2,7 @@
 [env:heltec-vision-master-e290]
 extends = esp32s3_base
 board = heltec_vision_master_e290
+board_build.partitions = default_8MB.csv
 build_flags = 
   ${esp32s3_base.build_flags} 
   -I variants/heltec_vision_master_e290
@@ -26,6 +27,7 @@ upload_speed = 115200
 [env:heltec-vision-master-e290-inkhud]
 extends = esp32s3_base, inkhud
 board = heltec_vision_master_e290
+board_build.partitions = default_8MB.csv
 build_src_filter = 
   ${esp32_base.build_src_filter} 
   ${inkhud.build_src_filter}

variants/heltec_vision_master_t190/platformio.ini

@@ -1,11 +1,11 @@
 [env:heltec-vision-master-t190]
 extends = esp32s3_base
 board = heltec_vision_master_t190
+board_build.partitions = default_8MB.csv
 build_flags = 
   ${esp32s3_base.build_flags} 
   -Ivariants/heltec_vision_master_t190
   -DHELTEC_VISION_MASTER_T190
- ; -D PRIVATE_HW 
 lib_deps =
   ${esp32s3_base.lib_deps}
   lewisxhe/PCF8563_Library@^1.0.1

variants/heltec_wireless_paper/platformio.ini

@@ -2,6 +2,7 @@
 [env:heltec-wireless-paper]
 extends = esp32s3_base
 board = heltec_wifi_lora_32_V3
+board_build.partitions = default_8MB.csv
 build_flags = 
   ${esp32s3_base.build_flags} 
   -I variants/heltec_wireless_paper
@@ -23,6 +24,7 @@ upload_speed = 115200
 [env:heltec-wireless-paper-inkhud]
 extends = esp32s3_base, inkhud
 board = heltec_wifi_lora_32_V3
+board_build.partitions = default_8MB.csv
 build_src_filter =
   ${esp32_base.build_src_filter} 
   ${inkhud.build_src_filter}

variants/heltec_wireless_paper_v1/platformio.ini

@@ -2,6 +2,7 @@
 extends = esp32s3_base
 board_level = extra
 board = heltec_wifi_lora_32_V3
+board_build.partitions = default_8MB.csv
 build_flags = 
   ${esp32s3_base.build_flags} 
   -I variants/heltec_wireless_paper_v1 

variants/heltec_wireless_tracker/platformio.ini

@@ -1,6 +1,7 @@
 [env:heltec-wireless-tracker]
 extends = esp32s3_base
 board = heltec_wireless_tracker
+board_build.partitions = default_8MB.csv
 upload_protocol = esptool
 
 build_flags = 

variants/heltec_wireless_tracker_V1_0/platformio.ini

@@ -2,6 +2,7 @@
 extends = esp32s3_base
 board_level = extra
 board = heltec_wireless_tracker
+board_build.partitions = default_8MB.csv
 upload_protocol = esptool
 build_flags = 
   ${esp32s3_base.build_flags} -I variants/heltec_wireless_tracker_V1_0

variants/heltec_wsl_v3/platformio.ini

@@ -1,7 +1,8 @@
 [env:heltec-wsl-v3] 
 extends = esp32s3_base
 board = heltec_wifi_lora_32_V3
+board_build.partitions = default_8MB.csv
 # Temporary until espressif creates a release with this new target
 build_flags = 
   ${esp32s3_base.build_flags} -D HELTEC_WSL_V3 -I variants/heltec_wsl_v3
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
+  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.

variants/icarus/platformio.ini

@@ -4,6 +4,7 @@ board = icarus
 board_level = extra
 board_check = true
 board_build.mcu = esp32s3
+board_build.partitions = default_8MB.csv
 upload_protocol = esptool
 upload_speed = 921600
 platform_packages = platformio/framework-arduinoespressif32@https://github.com/PowerFeather/powerfeather-meshtastic-arduino-lib/releases/download/2.0.16a/esp32-2.0.16.zip
@@ -15,5 +16,4 @@ build_unflags =
 build_flags = 
   ${esp32s3_base.build_flags} -D PRIVATE_HW -I variants/icarus
   -DBOARD_HAS_PSRAM 
-
   -DARDUINO_USB_MODE=0

variants/m5stack_cores3/platformio.ini

@@ -3,6 +3,7 @@
 extends = esp32s3_base
 board = m5stack-cores3
 board_check = true
+board_build.partitions = default_16MB.csv
 upload_protocol = esptool
 
 build_flags = ${esp32_base.build_flags} 

variants/mesh-tab/platformio.ini

@@ -28,7 +28,6 @@ build_flags = ${esp32s3_base.build_flags}
   -D USE_LOG_DEBUG
   -D LOG_DEBUG_INC=\"DebugConfiguration.h\"
   -D RADIOLIB_SPI_PARANOID=0
-  -D MAX_NUM_NODES=250
   -D MAX_THREADS=40
   -D HAS_SCREEN=0
   -D HAS_TFT=1

variants/picomputer-s3/platformio.ini

@@ -2,6 +2,7 @@
 extends = esp32s3_base
 board = bpi_picow_esp32_s3
 board_check = true
+board_build.partitions = default_8MB.csv
 ;OpenOCD flash method
 ;upload_protocol = esp-builtin
 ;Normal method
@@ -22,7 +23,6 @@ build_src_filter =
 
 [env:picomputer-s3-tft]
 extends = env:picomputer-s3
-board_build.partitions = default_8MB.csv ; just for test
 
 build_flags =
   ${env:picomputer-s3.build_flags}
@@ -35,7 +35,6 @@ build_flags =
   -D INPUTDRIVER_MATRIX_TYPE=1
   -D USE_PIN_BUZZER=PIN_BUZZER
   -D USE_SX127x
-  -D MAX_NUM_NODES=200
   -D HAS_SCREEN=0
   -D HAS_TFT=1
   -D RAM_SIZE=1024

variants/rak3172/variant.h

@@ -7,6 +7,5 @@ Do not expect a working Meshtastic device with this target.
 #define _VARIANT_RAK3172_
 
 #define USE_STM32WLx
-#define MAX_NUM_NODES 10
 
 #endif

variants/seeed-sensecap-indicator/platformio.ini

@@ -6,6 +6,7 @@ platform_packages =
 
 board = seeed-sensecap-indicator
 board_check = true
+board_build.partitions = default_8MB.csv
 upload_protocol = esptool
 
 build_flags = ${esp32_base.build_flags}
@@ -32,7 +33,6 @@ lib_deps = ${esp32s3_base.lib_deps}
 extends = env:seeed-sensecap-indicator
 board_level = main
 upload_speed = 460800
-board_build.partitions = default_8MB.csv ; must be here for some reason, board.json is not enough !?
 
 build_flags =
   ${env:seeed-sensecap-indicator.build_flags}
@@ -46,7 +46,6 @@ build_flags =
   -D INPUTDRIVER_BUTTON_TYPE=38
   -D HAS_TELEMETRY=0
   -D CONFIG_DISABLE_HAL_LOCKS=1
-  -D MAX_NUM_NODES=250
   -D HAS_SCREEN=0
   -D HAS_TFT=1
   -D DISPLAY_SET_RESOLUTION

variants/seeed_xiao_s3/platformio.ini

@@ -2,7 +2,7 @@
 extends = esp32s3_base
 board = seeed-xiao-s3
 board_check = true
-board_build.mcu = esp32s3
+board_build.partitions = default_8MB.csv
 upload_protocol = esptool
 upload_speed = 921600
 lib_deps =

variants/station-g2/platformio.ini

@@ -2,6 +2,7 @@
 extends = esp32s3_base
 board = station-g2
 board_check = true
+board_build.partitions = default_16MB.csv
 board_build.mcu = esp32s3
 upload_protocol = esptool
 ;upload_port = /dev/ttyACM0

variants/t-deck/platformio.ini

@@ -3,6 +3,7 @@
 extends = esp32s3_base
 board = t-deck
 board_check = true
+board_build.partitions = default_16MB.csv
 upload_protocol = esptool
 
 build_flags = ${esp32s3_base.build_flags} 
@@ -20,7 +21,6 @@ lib_deps = ${esp32s3_base.lib_deps}
 
 [env:t-deck-tft]
 extends = env:t-deck
-board_build.partitions = default_16MB.csv
 
 build_flags =
   ${env:t-deck.build_flags}
@@ -38,7 +38,6 @@ build_flags =
   -D INPUTDRIVER_ENCODER_DOWN=15
   -D INPUTDRIVER_ENCODER_BTN=0
   -D INPUTDRIVER_BUTTON_TYPE=0
-  -D MAX_NUM_NODES=250
   -D HAS_SDCARD
   -D HAS_SCREEN=0
   -D HAS_TFT=1

variants/t-eth-elite/platformio.ini

@@ -2,11 +2,12 @@
 extends = esp32s3_base
 board = esp32s3box
 board_check = true
+board_build.partitions = default_16MB.csv
 build_flags = 
   ${esp32s3_base.build_flags}
   -D T_ETH_ELITE
   -I variants/t-eth-elite
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
+  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 
 lib_ignore = 
     Ethernet

variants/t-watch-s3/platformio.ini

@@ -3,6 +3,7 @@
 extends = esp32s3_base
 board = t-watch-s3
 board_check = true
+board_build.partitions = default_16MB.csv
 upload_protocol = esptool
 
 build_flags = ${esp32_base.build_flags} 

variants/tbeam-s3-core/platformio.ini

@@ -2,6 +2,7 @@
 [env:tbeam-s3-core]
 extends = esp32s3_base
 board = tbeam-s3-core
+board_build.partitions = default_8MB.csv
 board_check = true
 
 lib_deps =

variants/tracksenger/platformio.ini

@@ -1,6 +1,7 @@
 [env:tracksenger]
 extends = esp32s3_base
 board = heltec_wireless_tracker
+board_build.partitions = default_8MB.csv
 upload_protocol = esp-builtin
 
 build_flags = 
@@ -16,6 +17,7 @@ lib_deps =
 [env:tracksenger-lcd]
 extends = esp32s3_base
 board = heltec_wireless_tracker
+board_build.partitions = default_8MB.csv
 upload_protocol = esp-builtin
 
 build_flags = 
@@ -31,6 +33,7 @@ lib_deps =
 [env:tracksenger-oled]
 extends = esp32s3_base
 board = heltec_wireless_tracker
+board_build.partitions = default_8MB.csv
 upload_protocol = esp-builtin
 
 build_flags = 

variants/unphone/platformio.ini

@@ -3,6 +3,7 @@
 [env:unphone]
 extends = esp32s3_base
 board = unphone
+board_build.partitions = default_8MB.csv
 upload_speed = 921600
 monitor_speed = 115200
 monitor_filters = esp32_exception_decoder
@@ -32,7 +33,6 @@ lib_deps = ${esp32s3_base.lib_deps}
 
 [env:unphone-tft]
 extends = env:unphone
-board_build.partitions = default_8MB.csv
 build_flags =
   ${env:unphone.build_flags}
   -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
@@ -42,7 +42,6 @@ build_flags =
   -D MESHTASTIC_EXCLUDE_SERIAL=1
   -D MESHTASTIC_EXCLUDE_SOCKETAPI=1
   -D INPUTDRIVER_BUTTON_TYPE=21
-  -D MAX_NUM_NODES=200
   -D MAX_THREADS=40
   -D HAS_SCREEN=0
   -D HAS_TFT=1

variants/wio-e5/variant.h

@@ -13,7 +13,6 @@ Do not expect a working Meshtastic device with this target.
 #define _VARIANT_WIOE5_
 
 #define USE_STM32WLx
-#define MAX_NUM_NODES 10
 
 #define LED_PIN PB5
 #define LED_STATE_ON 1

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 6
-build = 1
+build = 2