From fbc499e709849c05840cc2d7693a84bdb45f1507 Mon Sep 17 00:00:00 2001 From: agessaman Date: Fri, 7 Nov 2025 16:31:00 -0800 Subject: [PATCH] removed cayennelpp patching script and just updated to the newest ArduinoJson like we should have from the beginning --- variants/heltec_v3/platformio.ini | 3 ++- variants/heltec_v4/platformio.ini | 39 +++++++++++++++++++++++++++++ variants/station_g2/platformio.ini | 6 +++-- variants/xiao_s3_wio/platformio.ini | 39 +++++++++++++++++++++++++++++ 4 files changed, 84 insertions(+), 3 deletions(-) diff --git a/variants/heltec_v3/platformio.ini b/variants/heltec_v3/platformio.ini index 2bb63aa9..28311042 100644 --- a/variants/heltec_v3/platformio.ini +++ b/variants/heltec_v3/platformio.ini @@ -142,7 +142,8 @@ lib_deps = ${esp32_ota.lib_deps} ; PsychicMqttClient - unified MQTT client with WebSocket support elims/PsychicMqttClient@^0.2.4 - bblanchon/ArduinoJson @ 6.17.3 + ; Using latest ArduinoJson (7.x) - compatible with CayenneLPP without patching + bblanchon/ArduinoJson arduino-libraries/NTPClient JChristensen/Timezone diff --git a/variants/heltec_v4/platformio.ini b/variants/heltec_v4/platformio.ini index c26a5bc6..d5ef2558 100644 --- a/variants/heltec_v4/platformio.ini +++ b/variants/heltec_v4/platformio.ini @@ -89,6 +89,45 @@ lib_deps = ${Heltec_lora32_v4.lib_deps} ${esp32_ota.lib_deps} +[env:heltec_v4_repeater_bridge_mqtt] +extends = Heltec_lora32_v4 +build_flags = + ${Heltec_lora32_v4.build_flags} + -D DISPLAY_CLASS=SSD1306Display + -D ADVERT_NAME='"MQTT Bridge"' + -D ADVERT_LAT=0.0 + -D ADVERT_LON=0.0 + -D ADMIN_PASSWORD='"password"' + -D MAX_NEIGHBOURS=50 + -D WITH_MQTT_BRIDGE=1 + -D MAX_MQTT_BROKERS=3 + -D MQTT_MAX_PACKET_SIZE=1024 + -D MQTT_DEBUG=1 + -D MESH_PACKET_LOGGING=1 + -D MESH_DEBUG=1 + -D CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y +# -D WIFI_SSID='"ssid"' +# -D WIFI_PWD='"password"' +# -D MQTT_SERVER='"your-mqtt-broker.com"' +# -D MQTT_PORT=1883 +# -D MQTT_USERNAME='"your-username"' +# -D MQTT_PASSWORD='"your-password"' +build_src_filter = ${Heltec_lora32_v4.build_src_filter} + + + + + + + + + +<../examples/simple_repeater> +lib_deps = + ${Heltec_lora32_v4.lib_deps} + ${esp32_ota.lib_deps} + ; PsychicMqttClient - unified MQTT client with WebSocket support + elims/PsychicMqttClient@^0.2.4 + ; Using latest ArduinoJson (7.x) - compatible with CayenneLPP without patching + bblanchon/ArduinoJson + arduino-libraries/NTPClient + JChristensen/Timezone + [env:heltec_v4_room_server] extends = Heltec_lora32_v4 build_flags = diff --git a/variants/station_g2/platformio.ini b/variants/station_g2/platformio.ini index a9132cbc..c2c646c2 100644 --- a/variants/station_g2/platformio.ini +++ b/variants/station_g2/platformio.ini @@ -1,7 +1,6 @@ [Station_G2] extends = esp32_base board = station-g2 -board_build.partitions = huge_app.csv build_flags = ${esp32_base.build_flags} ${sensor_base.build_flags} @@ -43,6 +42,7 @@ lib_deps = [env:Station_G2_repeater] extends = Station_G2 +board_build.partitions = default_16MB.csv ; standard 16MB partition table (compatible with MQTT bridge) build_flags = ${Station_G2.build_flags} -D ADVERT_NAME='"Station G2 Repeater"' @@ -245,6 +245,7 @@ lib_deps = [env:Station_G2_repeater_bridge_mqtt] extends = Station_G2 +board_build.partitions = default_16MB.csv ; standard 16MB partition table build_flags = ${Station_G2.build_flags} -D ADVERT_NAME='"MQTT Bridge"' @@ -276,6 +277,7 @@ lib_deps = ${esp32_ota.lib_deps} ; PsychicMqttClient - unified MQTT client with WebSocket support elims/PsychicMqttClient@^0.2.4 - bblanchon/ArduinoJson @ 6.17.3 + ; Using latest ArduinoJson (7.x) - compatible with CayenneLPP without patching + bblanchon/ArduinoJson arduino-libraries/NTPClient JChristensen/Timezone diff --git a/variants/xiao_s3_wio/platformio.ini b/variants/xiao_s3_wio/platformio.ini index 8979edc2..24db5d7f 100644 --- a/variants/xiao_s3_wio/platformio.ini +++ b/variants/xiao_s3_wio/platformio.ini @@ -95,6 +95,45 @@ lib_deps = ${Xiao_S3_WIO.lib_deps} ${esp32_ota.lib_deps} +[env:Xiao_S3_WIO_repeater_bridge_mqtt] +extends = Xiao_S3_WIO +build_flags = + ${Xiao_S3_WIO.build_flags} + -D ADVERT_NAME='"MQTT Bridge"' + -D ADVERT_LAT=0.0 + -D ADVERT_LON=0.0 + -D ADMIN_PASSWORD='"password"' + -D MAX_NEIGHBOURS=50 + -D WITH_MQTT_BRIDGE=1 + -D MAX_MQTT_BROKERS=3 + -D MQTT_MAX_PACKET_SIZE=1024 + -D MQTT_DEBUG=1 + -D MESH_PACKET_LOGGING=1 + -D MESH_DEBUG=1 + -D CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y +# -D WIFI_SSID='"ssid"' +# -D WIFI_PWD='"password"' +# -D MQTT_SERVER='"your-mqtt-broker.com"' +# -D MQTT_PORT=1883 +# -D MQTT_USERNAME='"your-username"' +# -D MQTT_PASSWORD='"your-password"' + +; Use ESP32's built-in certificate bundle +build_src_filter = ${Xiao_S3_WIO.build_src_filter} + + + + + + + +<../examples/simple_repeater> +lib_deps = + ${Xiao_S3_WIO.lib_deps} + ${esp32_ota.lib_deps} + ; PsychicMqttClient - unified MQTT client with WebSocket support + elims/PsychicMqttClient@^0.2.4 + ; Using latest ArduinoJson (7.x) - compatible with CayenneLPP without patching + bblanchon/ArduinoJson + arduino-libraries/NTPClient + JChristensen/Timezone + [env:Xiao_S3_WIO_room_server] extends = Xiao_S3_WIO build_src_filter = ${Xiao_S3_WIO.build_src_filter}