From 6aeb8782d98c04e1fd0a030429dac4d324486c0e Mon Sep 17 00:00:00 2001 From: Jared Dohrman Date: Sun, 19 Apr 2026 15:33:04 +1000 Subject: [PATCH] fix: update repeater MQTT partition layouts for 4 MB boards --- boards/station-g2.json | 1 + docs/boards.md | 1 - docs/local-builds.md | 1 - variants/eastmesh_mqtt/platformio.ini | 43 ++++++------------- variants/nibble_screen_connect/platformio.ini | 2 +- variants/thinknode_m2/platformio.ini | 1 + 6 files changed, 17 insertions(+), 32 deletions(-) diff --git a/boards/station-g2.json b/boards/station-g2.json index 8ea6ebc6..718ae3cb 100644 --- a/boards/station-g2.json +++ b/boards/station-g2.json @@ -2,6 +2,7 @@ "build": { "arduino": { "ldscript": "esp32s3_out.ld", + "partitions": "default_16MB.csv", "memory_type": "qio_opi" }, "core": "esp32", diff --git a/docs/boards.md b/docs/boards.md index 45872975..2542fe21 100644 --- a/docs/boards.md +++ b/docs/boards.md @@ -103,7 +103,6 @@ This table includes all repeater MQTT targets currently defined in `variants/eas | LilyGo_TBeam_1W | ESP32S3 | 512 KB | 8 MB | 16 MB | SX1262 | OLED (SH1106) | โœ… | โœ… | | LilyGo_TDeck | ESP32S3 | 512 KB | No | 16 MB | SX1262 | TFT (ST7789) | โœ… | ๐Ÿงช | | LilyGo_Tlora_C6 | ESP32C6 | 512 KB | No | 4 MB | SX1262 | None | | | -| LilyGo_TLora_V2_1_1_6 | ESP32 | 520 KB | No | 4 MB | SX1276 | OLED (SSD1306) | โœ… | | | M5Stack_Unit_C6L | ESP32C6 | 512 KB | No | 4 MB | SX1262 | None | โœ… | | | Meshadventurer_sx1262 | ESP32 | 520 KB | No | 4 MB | SX1262 | OLED (SSD1306) | โœ… | | | Meshadventurer_sx1268 | ESP32 | 520 KB | No | 4 MB | SX1268 | OLED (SSD1306) | โœ… | | diff --git a/docs/local-builds.md b/docs/local-builds.md index a96585f9..4951b478 100644 --- a/docs/local-builds.md +++ b/docs/local-builds.md @@ -83,7 +83,6 @@ LilyGo_T3S3_sx1276_repeater_mqtt LilyGo_TBeam_1W_repeater_mqtt LilyGo_TDeck_repeater_mqtt LilyGo_Tlora_C6_repeater_mqtt -LilyGo_TLora_V2_1_1_6_repeater_mqtt M5Stack_Unit_C6L_repeater_mqtt Meshadventurer_sx1262_repeater_mqtt Meshadventurer_sx1268_repeater_mqtt diff --git a/variants/eastmesh_mqtt/platformio.ini b/variants/eastmesh_mqtt/platformio.ini index 16ca89b9..72ea9879 100644 --- a/variants/eastmesh_mqtt/platformio.ini +++ b/variants/eastmesh_mqtt/platformio.ini @@ -1,5 +1,6 @@ [env:Ebyte_EoRa-S3_Repeater_mqtt] extends = Ebyte_EoRa-S3 +board_build.partitions = min_spiffs.csv build_flags = ${Ebyte_EoRa-S3.build_flags} -D DISPLAY_CLASS=SSD1306Display @@ -25,6 +26,7 @@ lib_deps = [env:Generic_E22_sx1262_repeater_mqtt] extends = Generic_E22 +board_build.partitions = min_spiffs.csv ; get around 4mb flash limit build_src_filter = ${Generic_E22.build_src_filter} +<../examples/simple_repeater/*.cpp> + @@ -51,6 +53,7 @@ lib_deps = [env:Generic_E22_sx1268_repeater_mqtt] extends = Generic_E22 +board_build.partitions = min_spiffs.csv ; get around 4mb flash limit build_src_filter = ${Generic_E22.build_src_filter} +<../examples/simple_repeater/*.cpp> + @@ -359,6 +362,7 @@ lib_deps = [env:LilyGo_T3S3_sx1262_repeater_mqtt] extends = LilyGo_T3S3_sx1262 +board_build.partitions = min_spiffs.csv ; get around 4mb flash limit build_flags = ${LilyGo_T3S3_sx1262.build_flags} -D DISPLAY_CLASS=SSD1306Display @@ -384,6 +388,7 @@ lib_deps = [env:LilyGo_T3S3_sx1276_repeater_mqtt] extends = LilyGo_T3S3_sx1276 +board_build.partitions = min_spiffs.csv ; get around 4mb flash limit build_flags = ${LilyGo_T3S3_sx1276.build_flags} -D DISPLAY_CLASS=SSD1306Display @@ -478,29 +483,6 @@ build_flags = lib_deps = ${tlora_c6.lib_deps} -[env:LilyGo_TLora_V2_1_1_6_repeater_mqtt] -extends = LilyGo_TLora_V2_1_1_6 -build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} - +<../examples/simple_repeater> - + - + -build_flags = - ${LilyGo_TLora_V2_1_1_6.build_flags} - -D ADVERT_NAME='"TLora-V2.1-1.6 Repeater"' - -D ADVERT_LAT=0.0 - -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D MAX_NEIGHBOURS=50 - -D WITH_MQTT_UPLINK=1 - -D MQTT_DEBUG=1 - -D WIFI_SSID='"myssid"' - -D WIFI_PWD='"mypwd"' - -D MQTT_DEFAULT_IATA='"MEL"' - -D CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=1 -lib_deps = - ${LilyGo_TLora_V2_1_1_6.lib_deps} - ${esp32_ota.lib_deps} - [env:M5Stack_Unit_C6L_repeater_mqtt] extends = M5Stack_Unit_C6L build_src_filter = ${M5Stack_Unit_C6L.build_src_filter} @@ -601,6 +583,7 @@ lib_deps = [env:nibble_screen_connect_repeater_mqtt] extends = nibble_screen_connect_base +board_build.partitions = min_spiffs.csv ; get around 4mb flash limit build_flags = ${nibble_screen_connect_base.build_flags} -D DISPLAY_CLASS=SSD1306Display @@ -648,17 +631,15 @@ lib_deps = ${esp32_ota.lib_deps} bakercp/CRC32 @ ^2.0.0 -[env:Station_G2_logging_repeater_mqtt] +[env:Station_G2_repeater_mqtt] extends = Station_G2 build_flags = ${Station_G2.build_flags} - -D ADVERT_NAME='"Station G2 Logging Repeater"' + -D ADVERT_NAME='"Station G2 Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 - -D MESH_PACKET_LOGGING=1 - -D SX126X_RX_BOOSTED_GAIN=1 -D WITH_MQTT_UPLINK=1 -D MQTT_DEBUG=1 -D WIFI_SSID='"myssid"' @@ -673,15 +654,17 @@ lib_deps = ${Station_G2.lib_deps} ${esp32_ota.lib_deps} -[env:Station_G2_repeater_mqtt] +[env:Station_G2_logging_repeater_mqtt] extends = Station_G2 build_flags = ${Station_G2.build_flags} - -D ADVERT_NAME='"Station G2 Repeater"' + -D ADVERT_NAME='"Station G2 Logging Repeater"' -D ADVERT_LAT=0.0 -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 + -D MESH_PACKET_LOGGING=1 + -D SX126X_RX_BOOSTED_GAIN=1 -D WITH_MQTT_UPLINK=1 -D MQTT_DEBUG=1 -D WIFI_SSID='"myssid"' @@ -768,6 +751,7 @@ lib_deps = [env:ThinkNode_M2_Repeater_mqtt] extends = ThinkNode_M2 +board_build.partitions = min_spiffs.csv ; get around 4mb flash limit build_src_filter = ${ThinkNode_M2.build_src_filter} +<../examples/simple_repeater/*.cpp> + @@ -791,6 +775,7 @@ lib_deps = [env:ThinkNode_M5_Repeater_mqtt] extends = ThinkNode_M5 +board_build.partitions = min_spiffs.csv ; get around 4mb flash limit build_src_filter = ${ThinkNode_M5.build_src_filter} +<../examples/simple_repeater/*.cpp> + diff --git a/variants/nibble_screen_connect/platformio.ini b/variants/nibble_screen_connect/platformio.ini index 8a4e63ca..80437124 100644 --- a/variants/nibble_screen_connect/platformio.ini +++ b/variants/nibble_screen_connect/platformio.ini @@ -18,7 +18,7 @@ build_flags = -D HAS_NEOPIXEL -D NEOPIXEL_COUNT=1 -D NEOPIXEL_DATA=21 - -D NEOPIXEL_TYPE=(NEO_GRB+NEO_KHZ800) + -DNEOPIXEL_TYPE=NEO_GRB+NEO_KHZ800 -D SX126X_DIO2_AS_RF_SWITCH=true -D SX126X_DIO3_TCXO_VOLTAGE=1.8 -D SX126X_CURRENT_LIMIT=140 diff --git a/variants/thinknode_m2/platformio.ini b/variants/thinknode_m2/platformio.ini index a765d9c7..b65ad41b 100644 --- a/variants/thinknode_m2/platformio.ini +++ b/variants/thinknode_m2/platformio.ini @@ -39,6 +39,7 @@ build_src_filter = ${esp32_base.build_src_filter} lib_deps = ${esp32_base.lib_deps} adafruit/Adafruit SH110X @ ~2.1.13 adafruit/Adafruit GFX Library @ ^1.12.1 + end2endzone/NonBlockingRTTTL @ ^1.4.0 [env:ThinkNode_M2_Repeater] extends = ThinkNode_M2