feat: abstract MQTT network transport

This commit is contained in:
agessaman committed 2026-09-01 16:31:28 -07:00
1 parent f8fc35a11a
commit 03c0ad81fe
19 files changed
+731 -306

No files matched your search

+39 -7
View File
@@ -37,22 +37,31 @@ build_src_filter = ${esp32_base.build_src_filter}
lib_deps = ${esp32_base.lib_deps}
stevemarple/MicroNMEA @ ^2.0.6
[ThinkNode_M7_ethernet]
[ThinkNode_M7_ch390]
build_flags =
-D ETHERNET_ENABLED
-D ETHERNET_USE_CH390
-D ETHERNET_CLASS=CH390EthernetInterface
-D ETH_MISO_PIN=14
-D ETH_MOSI_PIN=48
-D ETH_SCLK_PIN=47
-D ETH_CS_PIN=21
-D ETH_INT_PIN=45
-D ETHERNET_DEBUG_LOGGING=1
lib_deps =
https://github.com/liamcottle/ESP32-CH390.git#47b401f1de546118b03c18b5689dedec45871f2d
; Existing companion/CLI transport overlay. MQTT Ethernet observers consume the
; CH390 fragment above without ETHERNET_ENABLED, whose meaning in the simple
; repeater/room entry points is the legacy nRF52 Ethernet CLI.
[ThinkNode_M7_ethernet]
build_flags =
${ThinkNode_M7_ch390.build_flags}
-D ETHERNET_ENABLED
-D ETHERNET_CLASS=CH390EthernetInterface
build_src_filter =
+<helpers/ethernet/*.cpp>
+<helpers/ethernet/ch390/>
lib_deps =
https://github.com/liamcottle/ESP32-CH390.git#47b401f1de546118b03c18b5689dedec45871f2d
${ThinkNode_M7_ch390.lib_deps}
[env:ThinkNode_M7_repeater]
extends = ThinkNode_M7
@@ -180,9 +189,10 @@ extends = ThinkNode_M7
build_src_filter = ${ThinkNode_M7.build_src_filter}
+<../examples/kiss_modem/>
; MQTT observer envs are WiFi-only: the bridge's link management is bound to the
; WiFi station API, so the onboard CH390 cannot carry MQTT yet. The board has
; PSRAM, so MAX_NEIGHBOURS enables WITH_MQTT_NEIGHBORS (see MQTTBridge.h).
; Wi-Fi remains the default observer transport. Ethernet twins below select the
; onboard CH390 through NETWORK_USE_ETHERNET without enabling the legacy CLI
; transport. The board has PSRAM, so MAX_NEIGHBOURS enables
; WITH_MQTT_NEIGHBORS (see MQTTBridge.h).
[env:ThinkNode_M7_repeater_observer_mqtt]
extends = ThinkNode_M7
extra_scripts =
@@ -227,6 +237,17 @@ lib_deps =
paulstoffregen/Time@1.6.1
0neblock/SNMP_Agent
[env:ThinkNode_M7_repeater_observer_mqtt_ethernet]
extends = env:ThinkNode_M7_repeater_observer_mqtt
build_flags =
${env:ThinkNode_M7_repeater_observer_mqtt.build_flags}
${ThinkNode_M7_ch390.build_flags}
-D NETWORK_USE_ETHERNET=1
build_src_filter = ${env:ThinkNode_M7_repeater_observer_mqtt.build_src_filter}
lib_deps =
${env:ThinkNode_M7_repeater_observer_mqtt.lib_deps}
${ThinkNode_M7_ch390.lib_deps}
[env:ThinkNode_M7_room_server_observer_mqtt]
extends = ThinkNode_M7
extra_scripts =
@@ -271,3 +292,14 @@ lib_deps =
JChristensen/Timezone
paulstoffregen/Time@1.6.1
0neblock/SNMP_Agent
[env:ThinkNode_M7_room_server_observer_mqtt_ethernet]
extends = env:ThinkNode_M7_room_server_observer_mqtt
build_flags =
${env:ThinkNode_M7_room_server_observer_mqtt.build_flags}
${ThinkNode_M7_ch390.build_flags}
-D NETWORK_USE_ETHERNET=1
build_src_filter = ${env:ThinkNode_M7_room_server_observer_mqtt.build_src_filter}
lib_deps =
${env:ThinkNode_M7_room_server_observer_mqtt.lib_deps}
${ThinkNode_M7_ch390.lib_deps}