fix: update repeater MQTT partition layouts for 4 MB boards
Этот коммит содержится в:
@@ -2,6 +2,7 @@
|
|||||||
"build": {
|
"build": {
|
||||||
"arduino": {
|
"arduino": {
|
||||||
"ldscript": "esp32s3_out.ld",
|
"ldscript": "esp32s3_out.ld",
|
||||||
|
"partitions": "default_16MB.csv",
|
||||||
"memory_type": "qio_opi"
|
"memory_type": "qio_opi"
|
||||||
},
|
},
|
||||||
"core": "esp32",
|
"core": "esp32",
|
||||||
|
|||||||
@@ -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_TBeam_1W | ESP32S3 | 512 KB | 8 MB | 16 MB | SX1262 | OLED (SH1106) | ✅ | ✅ |
|
||||||
| LilyGo_TDeck | ESP32S3 | 512 KB | No | 16 MB | SX1262 | TFT (ST7789) | ✅ | 🧪 |
|
| LilyGo_TDeck | ESP32S3 | 512 KB | No | 16 MB | SX1262 | TFT (ST7789) | ✅ | 🧪 |
|
||||||
| LilyGo_Tlora_C6 | ESP32C6 | 512 KB | No | 4 MB | SX1262 | None | | |
|
| 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 | ✅ | |
|
| M5Stack_Unit_C6L | ESP32C6 | 512 KB | No | 4 MB | SX1262 | None | ✅ | |
|
||||||
| Meshadventurer_sx1262 | ESP32 | 520 KB | No | 4 MB | SX1262 | OLED (SSD1306) | ✅ | |
|
| Meshadventurer_sx1262 | ESP32 | 520 KB | No | 4 MB | SX1262 | OLED (SSD1306) | ✅ | |
|
||||||
| Meshadventurer_sx1268 | ESP32 | 520 KB | No | 4 MB | SX1268 | OLED (SSD1306) | ✅ | |
|
| Meshadventurer_sx1268 | ESP32 | 520 KB | No | 4 MB | SX1268 | OLED (SSD1306) | ✅ | |
|
||||||
|
|||||||
@@ -83,7 +83,6 @@ LilyGo_T3S3_sx1276_repeater_mqtt
|
|||||||
LilyGo_TBeam_1W_repeater_mqtt
|
LilyGo_TBeam_1W_repeater_mqtt
|
||||||
LilyGo_TDeck_repeater_mqtt
|
LilyGo_TDeck_repeater_mqtt
|
||||||
LilyGo_Tlora_C6_repeater_mqtt
|
LilyGo_Tlora_C6_repeater_mqtt
|
||||||
LilyGo_TLora_V2_1_1_6_repeater_mqtt
|
|
||||||
M5Stack_Unit_C6L_repeater_mqtt
|
M5Stack_Unit_C6L_repeater_mqtt
|
||||||
Meshadventurer_sx1262_repeater_mqtt
|
Meshadventurer_sx1262_repeater_mqtt
|
||||||
Meshadventurer_sx1268_repeater_mqtt
|
Meshadventurer_sx1268_repeater_mqtt
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
[env:Ebyte_EoRa-S3_Repeater_mqtt]
|
[env:Ebyte_EoRa-S3_Repeater_mqtt]
|
||||||
extends = Ebyte_EoRa-S3
|
extends = Ebyte_EoRa-S3
|
||||||
|
board_build.partitions = min_spiffs.csv
|
||||||
build_flags =
|
build_flags =
|
||||||
${Ebyte_EoRa-S3.build_flags}
|
${Ebyte_EoRa-S3.build_flags}
|
||||||
-D DISPLAY_CLASS=SSD1306Display
|
-D DISPLAY_CLASS=SSD1306Display
|
||||||
@@ -25,6 +26,7 @@ lib_deps =
|
|||||||
|
|
||||||
[env:Generic_E22_sx1262_repeater_mqtt]
|
[env:Generic_E22_sx1262_repeater_mqtt]
|
||||||
extends = Generic_E22
|
extends = Generic_E22
|
||||||
|
board_build.partitions = min_spiffs.csv ; get around 4mb flash limit
|
||||||
build_src_filter = ${Generic_E22.build_src_filter}
|
build_src_filter = ${Generic_E22.build_src_filter}
|
||||||
+<../examples/simple_repeater/*.cpp>
|
+<../examples/simple_repeater/*.cpp>
|
||||||
+<helpers/mqtt/*.cpp>
|
+<helpers/mqtt/*.cpp>
|
||||||
@@ -51,6 +53,7 @@ lib_deps =
|
|||||||
|
|
||||||
[env:Generic_E22_sx1268_repeater_mqtt]
|
[env:Generic_E22_sx1268_repeater_mqtt]
|
||||||
extends = Generic_E22
|
extends = Generic_E22
|
||||||
|
board_build.partitions = min_spiffs.csv ; get around 4mb flash limit
|
||||||
build_src_filter = ${Generic_E22.build_src_filter}
|
build_src_filter = ${Generic_E22.build_src_filter}
|
||||||
+<../examples/simple_repeater/*.cpp>
|
+<../examples/simple_repeater/*.cpp>
|
||||||
+<helpers/mqtt/*.cpp>
|
+<helpers/mqtt/*.cpp>
|
||||||
@@ -359,6 +362,7 @@ lib_deps =
|
|||||||
|
|
||||||
[env:LilyGo_T3S3_sx1262_repeater_mqtt]
|
[env:LilyGo_T3S3_sx1262_repeater_mqtt]
|
||||||
extends = LilyGo_T3S3_sx1262
|
extends = LilyGo_T3S3_sx1262
|
||||||
|
board_build.partitions = min_spiffs.csv ; get around 4mb flash limit
|
||||||
build_flags =
|
build_flags =
|
||||||
${LilyGo_T3S3_sx1262.build_flags}
|
${LilyGo_T3S3_sx1262.build_flags}
|
||||||
-D DISPLAY_CLASS=SSD1306Display
|
-D DISPLAY_CLASS=SSD1306Display
|
||||||
@@ -384,6 +388,7 @@ lib_deps =
|
|||||||
|
|
||||||
[env:LilyGo_T3S3_sx1276_repeater_mqtt]
|
[env:LilyGo_T3S3_sx1276_repeater_mqtt]
|
||||||
extends = LilyGo_T3S3_sx1276
|
extends = LilyGo_T3S3_sx1276
|
||||||
|
board_build.partitions = min_spiffs.csv ; get around 4mb flash limit
|
||||||
build_flags =
|
build_flags =
|
||||||
${LilyGo_T3S3_sx1276.build_flags}
|
${LilyGo_T3S3_sx1276.build_flags}
|
||||||
-D DISPLAY_CLASS=SSD1306Display
|
-D DISPLAY_CLASS=SSD1306Display
|
||||||
@@ -478,29 +483,6 @@ build_flags =
|
|||||||
lib_deps =
|
lib_deps =
|
||||||
${tlora_c6.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>
|
|
||||||
+<helpers/mqtt/*.cpp>
|
|
||||||
+<helpers/web/*.cpp>
|
|
||||||
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]
|
[env:M5Stack_Unit_C6L_repeater_mqtt]
|
||||||
extends = M5Stack_Unit_C6L
|
extends = M5Stack_Unit_C6L
|
||||||
build_src_filter = ${M5Stack_Unit_C6L.build_src_filter}
|
build_src_filter = ${M5Stack_Unit_C6L.build_src_filter}
|
||||||
@@ -601,6 +583,7 @@ lib_deps =
|
|||||||
|
|
||||||
[env:nibble_screen_connect_repeater_mqtt]
|
[env:nibble_screen_connect_repeater_mqtt]
|
||||||
extends = nibble_screen_connect_base
|
extends = nibble_screen_connect_base
|
||||||
|
board_build.partitions = min_spiffs.csv ; get around 4mb flash limit
|
||||||
build_flags =
|
build_flags =
|
||||||
${nibble_screen_connect_base.build_flags}
|
${nibble_screen_connect_base.build_flags}
|
||||||
-D DISPLAY_CLASS=SSD1306Display
|
-D DISPLAY_CLASS=SSD1306Display
|
||||||
@@ -648,17 +631,15 @@ lib_deps =
|
|||||||
${esp32_ota.lib_deps}
|
${esp32_ota.lib_deps}
|
||||||
bakercp/CRC32 @ ^2.0.0
|
bakercp/CRC32 @ ^2.0.0
|
||||||
|
|
||||||
[env:Station_G2_logging_repeater_mqtt]
|
[env:Station_G2_repeater_mqtt]
|
||||||
extends = Station_G2
|
extends = Station_G2
|
||||||
build_flags =
|
build_flags =
|
||||||
${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_LAT=0.0
|
||||||
-D ADVERT_LON=0.0
|
-D ADVERT_LON=0.0
|
||||||
-D ADMIN_PASSWORD='"password"'
|
-D ADMIN_PASSWORD='"password"'
|
||||||
-D MAX_NEIGHBOURS=50
|
-D MAX_NEIGHBOURS=50
|
||||||
-D MESH_PACKET_LOGGING=1
|
|
||||||
-D SX126X_RX_BOOSTED_GAIN=1
|
|
||||||
-D WITH_MQTT_UPLINK=1
|
-D WITH_MQTT_UPLINK=1
|
||||||
-D MQTT_DEBUG=1
|
-D MQTT_DEBUG=1
|
||||||
-D WIFI_SSID='"myssid"'
|
-D WIFI_SSID='"myssid"'
|
||||||
@@ -673,15 +654,17 @@ lib_deps =
|
|||||||
${Station_G2.lib_deps}
|
${Station_G2.lib_deps}
|
||||||
${esp32_ota.lib_deps}
|
${esp32_ota.lib_deps}
|
||||||
|
|
||||||
[env:Station_G2_repeater_mqtt]
|
[env:Station_G2_logging_repeater_mqtt]
|
||||||
extends = Station_G2
|
extends = Station_G2
|
||||||
build_flags =
|
build_flags =
|
||||||
${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_LAT=0.0
|
||||||
-D ADVERT_LON=0.0
|
-D ADVERT_LON=0.0
|
||||||
-D ADMIN_PASSWORD='"password"'
|
-D ADMIN_PASSWORD='"password"'
|
||||||
-D MAX_NEIGHBOURS=50
|
-D MAX_NEIGHBOURS=50
|
||||||
|
-D MESH_PACKET_LOGGING=1
|
||||||
|
-D SX126X_RX_BOOSTED_GAIN=1
|
||||||
-D WITH_MQTT_UPLINK=1
|
-D WITH_MQTT_UPLINK=1
|
||||||
-D MQTT_DEBUG=1
|
-D MQTT_DEBUG=1
|
||||||
-D WIFI_SSID='"myssid"'
|
-D WIFI_SSID='"myssid"'
|
||||||
@@ -768,6 +751,7 @@ lib_deps =
|
|||||||
|
|
||||||
[env:ThinkNode_M2_Repeater_mqtt]
|
[env:ThinkNode_M2_Repeater_mqtt]
|
||||||
extends = ThinkNode_M2
|
extends = ThinkNode_M2
|
||||||
|
board_build.partitions = min_spiffs.csv ; get around 4mb flash limit
|
||||||
build_src_filter = ${ThinkNode_M2.build_src_filter}
|
build_src_filter = ${ThinkNode_M2.build_src_filter}
|
||||||
+<../examples/simple_repeater/*.cpp>
|
+<../examples/simple_repeater/*.cpp>
|
||||||
+<helpers/mqtt/*.cpp>
|
+<helpers/mqtt/*.cpp>
|
||||||
@@ -791,6 +775,7 @@ lib_deps =
|
|||||||
|
|
||||||
[env:ThinkNode_M5_Repeater_mqtt]
|
[env:ThinkNode_M5_Repeater_mqtt]
|
||||||
extends = ThinkNode_M5
|
extends = ThinkNode_M5
|
||||||
|
board_build.partitions = min_spiffs.csv ; get around 4mb flash limit
|
||||||
build_src_filter = ${ThinkNode_M5.build_src_filter}
|
build_src_filter = ${ThinkNode_M5.build_src_filter}
|
||||||
+<../examples/simple_repeater/*.cpp>
|
+<../examples/simple_repeater/*.cpp>
|
||||||
+<helpers/mqtt/*.cpp>
|
+<helpers/mqtt/*.cpp>
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ build_flags =
|
|||||||
-D HAS_NEOPIXEL
|
-D HAS_NEOPIXEL
|
||||||
-D NEOPIXEL_COUNT=1
|
-D NEOPIXEL_COUNT=1
|
||||||
-D NEOPIXEL_DATA=21
|
-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_DIO2_AS_RF_SWITCH=true
|
||||||
-D SX126X_DIO3_TCXO_VOLTAGE=1.8
|
-D SX126X_DIO3_TCXO_VOLTAGE=1.8
|
||||||
-D SX126X_CURRENT_LIMIT=140
|
-D SX126X_CURRENT_LIMIT=140
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ build_src_filter = ${esp32_base.build_src_filter}
|
|||||||
lib_deps = ${esp32_base.lib_deps}
|
lib_deps = ${esp32_base.lib_deps}
|
||||||
adafruit/Adafruit SH110X @ ~2.1.13
|
adafruit/Adafruit SH110X @ ~2.1.13
|
||||||
adafruit/Adafruit GFX Library @ ^1.12.1
|
adafruit/Adafruit GFX Library @ ^1.12.1
|
||||||
|
end2endzone/NonBlockingRTTTL @ ^1.4.0
|
||||||
|
|
||||||
[env:ThinkNode_M2_Repeater]
|
[env:ThinkNode_M2_Repeater]
|
||||||
extends = ThinkNode_M2
|
extends = ThinkNode_M2
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user