rich/MeshCore
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(thinknode-m7): make the MQTT observer envs Ethernet-preferred

Browse Source 
Fold the CH390 overlay and NETWORK_PREFER_ETHERNET into
ThinkNode_M7_{repeater,room_server}_observer_mqtt and drop the separate
*_observer_mqtt_ethernet twins. The env names (and so the OTA manifests)
are unchanged, so existing M7 observers OTA into the Ethernet-preferred
image; without a cable they select stored Wi-Fi after a brief boot probe.
This commit is contained in:
agessaman committed 2026-09-19 10:14:23 -07:00
1 parent a129420804
commit 854d4e2ec3
2 files changed
+17 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

variants/thinknode_m7/platformio.ini
+9 -26
View File
@@ -191,10 +191,9 @@ extends = ThinkNode_M7
build_src_filter = ${ThinkNode_M7.build_src_filter}
+<../examples/kiss_modem/>
; Wi-Fi remains the default observer transport. Ethernet twins below select the
; onboard CH390 through the Ethernet-preferred network manager without enabling the legacy CLI
; transport. The board has PSRAM, so MAX_NEIGHBOURS enables
; WITH_MQTT_NEIGHBORS (see MQTTBridge.h).
; MQTT observers prefer the onboard CH390 Ethernet and fall back to Wi-Fi, without
; enabling the legacy Ethernet CLI transport (no ETHERNET_ENABLED). 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 =
@@ -204,6 +203,8 @@ board_ssl_cert_source = adafruit-full
board_build.embed_files = src/certs/x509_crt_bundle.bin
build_flags =
${ThinkNode_M7.build_flags}
${ThinkNode_M7_ch390.build_flags}
-D NETWORK_PREFER_ETHERNET=1
-D ADVERT_NAME='"MQTT Observer"'
-D ADVERT_LAT=0.0
-D ADVERT_LON=0.0
@@ -231,6 +232,7 @@ build_src_filter = ${ThinkNode_M7.build_src_filter}
+<../examples/simple_repeater>
lib_deps =
${ThinkNode_M7.lib_deps}
${ThinkNode_M7_ch390.lib_deps}
${esp32_ota.lib_deps}
elims/PsychicMqttClient@^0.2.4
bblanchon/ArduinoJson @ 7.4.3
@@ -239,17 +241,6 @@ 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_PREFER_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 =
@@ -259,6 +250,8 @@ board_ssl_cert_source = adafruit-full
board_build.embed_files = src/certs/x509_crt_bundle.bin
build_flags =
${ThinkNode_M7.build_flags}
${ThinkNode_M7_ch390.build_flags}
-D NETWORK_PREFER_ETHERNET=1
-D ADVERT_NAME='"ThinkNode M7 Room Observer"'
-D ADVERT_LAT=0.0
-D ADVERT_LON=0.0
@@ -287,6 +280,7 @@ build_src_filter = ${ThinkNode_M7.build_src_filter}
+<../examples/simple_room_server>
lib_deps =
${ThinkNode_M7.lib_deps}
${ThinkNode_M7_ch390.lib_deps}
${esp32_ota.lib_deps}
elims/PsychicMqttClient@^0.2.4
bblanchon/ArduinoJson @ 7.4.3
@@ -294,14 +288,3 @@ 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_PREFER_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}