Increase MAX_NUM_NODES on high-flash ESP32_S3 (#6311)

2025-03-18 20:19:51 -05:00
parent 8efc9702d3
commit 6673cb9292
34 changed files with 155 additions and 79 deletions
@@ -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
@@ -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
@@ -88,6 +88,7 @@ debug_tool = jlink
 [env:t-energy-s3_e22]
 extends = esp32s3_base
 board = esp32-s3-devkitc-1
+board_build.partitions = default_16MB.csv
 board_level = extra
 board_upload.flash_size = 16MB ;Specify the FLASH capacity as 16MB
 board_build.arduino.memory_type = qio_opi ;Enable internal PSRAM
@@ -100,4 +101,4 @@ build_flags =
  -D BOARD_HAS_PSRAM
  -D ARDUINO_USB_MODE=0
  -D ARDUINO_USB_CDC_ON_BOOT=1
-  -I variants/diy/t-energy-s3_e22
+  -I variants/diy/t-energy-s3_e22
@@ -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
@@ -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
@@ -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
@@ -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.
@@ -1,8 +1,9 @@
 [env:heltec-vision-master-e213]
 extends = esp32s3_base
 board = heltec_vision_master_e213
+board_build.partitions = default_8MB.csv
 build_flags = 
-  ${esp32s3_base.build_flags} 
+  ${esp32s3_base.build_flags}
  -Ivariants/heltec_vision_master_e213 
  -DHELTEC_VISION_MASTER_E213
  -DUSE_EINK
@@ -22,6 +23,7 @@ upload_speed = 115200
 [env:heltec-vision-master-e213-inkhud]
 extends = esp32s3_base, inkhud
 board = heltec_vision_master_e213
+board_build.partitions = default_8MB.csv
 build_src_filter =
  ${esp32_base.build_src_filter}
  ${inkhud.build_src_filter}
@@ -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}
@@ -1,11 +1,11 @@
 [env:heltec-vision-master-t190]
 extends = esp32s3_base
 board = heltec_vision_master_t190
+board_build.partitions = default_8MB.csv
 build_flags = 
  ${esp32s3_base.build_flags} 
  -Ivariants/heltec_vision_master_t190
-  -DHELTEC_VISION_MASTER_T190  
- ; -D PRIVATE_HW 
+  -DHELTEC_VISION_MASTER_T190
 lib_deps =
  ${esp32s3_base.lib_deps}
  lewisxhe/PCF8563_Library@^1.0.1
@@ -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}
@@ -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 
@@ -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 = 
@@ -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
@@ -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.
@@ -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
+  -DARDUINO_USB_MODE=0
@@ -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} 
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 =
@@ -2,6 +2,7 @@
 extends = esp32s3_base
 board = station-g2
 board_check = true
+board_build.partitions = default_16MB.csv
 board_build.mcu = esp32s3
 upload_protocol = esptool
 ;upload_port = /dev/ttyACM0
@@ -13,6 +14,6 @@ build_unflags =
  -DARDUINO_USB_MODE=1
 build_flags = 
  ${esp32s3_base.build_flags} -D STATION_G2 -I variants/station-g2
-  -DBOARD_HAS_PSRAM 
+  -DBOARD_HAS_PSRAM
  -DSTATION_G2
-  -DARDUINO_USB_MODE=0
+  -DARDUINO_USB_MODE=0
@@ -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
@@ -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
@@ -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} 
@@ -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 =
@@ -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 = 
@@ -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
@@ -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