Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-11-02 10:51:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address review: per-variant wifi src, real SSID reply, rename PicoW env

Browse Source
This commit is contained in:
Michael Graff
2026-09-06 21:28:04 -05:00
parent b9fa450f52
commit b11a779843
24 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/companion_radio/MyMesh.cpp
+1 -1
View File
@@ -2181,7 +2181,7 @@ bool MyMesh::handleCommand(const char* command, uint32_t sender_timestamp, char*
return true; return true;
} }
if (strcmp(command, "get wifi.ssid") == 0) { // no 'get wifi.pwd', by design if (strcmp(command, "get wifi.ssid") == 0) { // no 'get wifi.pwd', by design
sprintf(reply, "> %s", _prefs.wifi_ssid[0] ? _prefs.wifi_ssid : "(build-time)"); sprintf(reply, "> %s", _prefs.wifi_ssid[0] ? _prefs.wifi_ssid : WIFI_SSID);
return true; return true;
} }
} }
platformio.ini
-1
View File
@@ -64,7 +64,6 @@ build_flags = ${arduino_base.build_flags}
-D ESP32_PLATFORM -D ESP32_PLATFORM
; -D ESP32_CPU_FREQ=80 ; change it to your need ; -D ESP32_CPU_FREQ=80 ; change it to your need
build_src_filter = ${arduino_base.build_src_filter} build_src_filter = ${arduino_base.build_src_filter}
+<helpers/wifi/*.cpp>
[esp32_ota] [esp32_ota]
lib_deps = lib_deps =
variants/heltec_rc32/platformio.ini
+2
View File
@@ -185,6 +185,7 @@ build_src_filter = ${Heltec_RC32.build_src_filter}
+<helpers/ui/buzzer.cpp> +<helpers/ui/buzzer.cpp>
+<helpers/ui/NullDisplayDriver.cpp> +<helpers/ui/NullDisplayDriver.cpp>
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp> +<../examples/companion_radio/ui-new/*.cpp>
lib_deps = lib_deps =
@@ -324,6 +325,7 @@ build_flags =
build_src_filter = ${Heltec_RC32_with_display.build_src_filter} build_src_filter = ${Heltec_RC32_with_display.build_src_filter}
+<helpers/ui/buzzer.cpp> +<helpers/ui/buzzer.cpp>
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp> +<../examples/companion_radio/ui-new/*.cpp>
lib_deps = lib_deps =
variants/heltec_tracker_v2/platformio.ini
+1
View File
@@ -195,6 +195,7 @@ build_src_filter = ${Heltec_tracker_v2.build_src_filter}
+<helpers/ui/ST7735Display.cpp> +<helpers/ui/ST7735Display.cpp>
+<helpers/ui/MomentaryButton.cpp> +<helpers/ui/MomentaryButton.cpp>
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp> +<../examples/companion_radio/ui-new/*.cpp>
lib_deps = lib_deps =
variants/heltec_v2/platformio.ini
+1
View File
@@ -189,6 +189,7 @@ build_flags =
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
build_src_filter = ${Heltec_lora32_v2.build_src_filter} build_src_filter = ${Heltec_lora32_v2.build_src_filter}
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<helpers/ui/SSD1306Display.cpp> +<helpers/ui/SSD1306Display.cpp>
+<helpers/ui/MomentaryButton.cpp> +<helpers/ui/MomentaryButton.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
variants/heltec_v3/platformio.ini
+2
View File
@@ -198,6 +198,7 @@ build_src_filter = ${Heltec_lora32_v3.build_src_filter}
+<helpers/ui/SSD1306Display.cpp> +<helpers/ui/SSD1306Display.cpp>
+<helpers/ui/MomentaryButton.cpp> +<helpers/ui/MomentaryButton.cpp>
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp> +<../examples/companion_radio/ui-new/*.cpp>
lib_deps = lib_deps =
@@ -350,6 +351,7 @@ build_flags =
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
build_src_filter = ${Heltec_lora32_v3.build_src_filter} build_src_filter = ${Heltec_lora32_v3.build_src_filter}
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
lib_deps = lib_deps =
${Heltec_lora32_v3.lib_deps} ${Heltec_lora32_v3.lib_deps}
variants/heltec_v4/platformio.ini
+2
View File
@@ -241,6 +241,7 @@ build_src_filter = ${heltec_v4_oled.build_src_filter}
+<helpers/ui/SSD1306Display.cpp> +<helpers/ui/SSD1306Display.cpp>
+<helpers/ui/MomentaryButton.cpp> +<helpers/ui/MomentaryButton.cpp>
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp> +<../examples/companion_radio/ui-new/*.cpp>
lib_deps = lib_deps =
@@ -406,6 +407,7 @@ build_src_filter = ${heltec_v4_tft.build_src_filter}
+<helpers/ui/ST7789LCDDisplay.cpp> +<helpers/ui/ST7789LCDDisplay.cpp>
+<helpers/ui/MomentaryButton.cpp> +<helpers/ui/MomentaryButton.cpp>
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp> +<../examples/companion_radio/ui-new/*.cpp>
lib_deps = lib_deps =
variants/heltec_v4_r8/platformio.ini
+2
View File
@@ -186,6 +186,7 @@ build_src_filter = ${heltec_v4_r8_oled.build_src_filter}
+<helpers/ui/SSD1306Display.cpp> +<helpers/ui/SSD1306Display.cpp>
+<helpers/ui/MomentaryButton.cpp> +<helpers/ui/MomentaryButton.cpp>
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp> +<../examples/companion_radio/ui-new/*.cpp>
lib_deps = lib_deps =
@@ -311,6 +312,7 @@ build_src_filter = ${heltec_v4_r8_tft.build_src_filter}
+<helpers/ui/ST7789LCDDisplay.cpp> +<helpers/ui/ST7789LCDDisplay.cpp>
+<helpers/ui/MomentaryButton.cpp> +<helpers/ui/MomentaryButton.cpp>
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp> +<../examples/companion_radio/ui-new/*.cpp>
lib_deps = lib_deps =
variants/lilygo_tbeam_1w/platformio.ini
+1
View File
@@ -165,6 +165,7 @@ build_flags =
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
build_src_filter = ${LilyGo_TBeam_1W.build_src_filter} build_src_filter = ${LilyGo_TBeam_1W.build_src_filter}
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp> +<../examples/companion_radio/ui-new/*.cpp>
lib_deps = lib_deps =
variants/lilygo_tbeam_supreme_SX1262/platformio.ini
+1
View File
@@ -160,6 +160,7 @@ build_flags =
; -D CORE_DEBUG_LEVEL=4 ; -D CORE_DEBUG_LEVEL=4
build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter} build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter}
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<helpers/ui/MomentaryButton.cpp> +<helpers/ui/MomentaryButton.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp> +<../examples/companion_radio/ui-new/*.cpp>
variants/lilygo_tlora_v2_1/platformio.ini
+1
View File
@@ -140,6 +140,7 @@ build_flags =
-D OFFLINE_QUEUE_SIZE=128 -D OFFLINE_QUEUE_SIZE=128
build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter}
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<helpers/ui/MomentaryButton.cpp> +<helpers/ui/MomentaryButton.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp> +<../examples/companion_radio/ui-new/*.cpp>
variants/meshnology_w12/platformio.ini
+1
View File
@@ -184,6 +184,7 @@ build_src_filter = ${meshnology_w12.build_src_filter}
+<helpers/ui/SSD1306Display.cpp> +<helpers/ui/SSD1306Display.cpp>
+<helpers/ui/MomentaryButton.cpp> +<helpers/ui/MomentaryButton.cpp>
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp> +<../examples/companion_radio/ui-new/*.cpp>
lib_deps = lib_deps =
variants/nibble_screen_connect/platformio.ini
+1
View File
@@ -154,6 +154,7 @@ build_src_filter = ${nibble_screen_connect_base.build_src_filter}
+<helpers/ui/SSD1306Display.cpp> +<helpers/ui/SSD1306Display.cpp>
+<helpers/ui/MomentaryButton.cpp> +<helpers/ui/MomentaryButton.cpp>
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp> +<../examples/companion_radio/ui-new/*.cpp>
lib_deps = lib_deps =
variants/nibble_zero_connect/platformio.ini
+1
View File
@@ -150,6 +150,7 @@ build_src_filter = ${nibble_zero_connect_base.build_src_filter}
+<helpers/ui/SSD1306Display.cpp> +<helpers/ui/SSD1306Display.cpp>
+<helpers/ui/MomentaryButton.cpp> +<helpers/ui/MomentaryButton.cpp>
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp> +<../examples/companion_radio/ui-new/*.cpp>
lib_deps = lib_deps =
variants/rak3112/platformio.ini
+1
View File
@@ -182,6 +182,7 @@ build_flags =
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
build_src_filter = ${rak3112.build_src_filter} build_src_filter = ${rak3112.build_src_filter}
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-orig/*.cpp> +<../examples/companion_radio/ui-orig/*.cpp>
lib_deps = lib_deps =
variants/rpi_picow/platformio.ini
+1 -1
View File
@@ -84,7 +84,7 @@ lib_deps = ${rpi_picow.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
; USB + WiFi + BLE together; the interface manager fans frames out to all of them ; USB + WiFi + BLE together; the interface manager fans frames out to all of them
[env:PicoW_companion_radio_all] [env:PicoW_companion_radio]
extends = rpi_picow extends = rpi_picow
build_flags = ${rpi_picow.build_flags} build_flags = ${rpi_picow.build_flags}
-D MAX_CONTACTS=100 -D MAX_CONTACTS=100
variants/station_g2/platformio.ini
+1
View File
@@ -234,6 +234,7 @@ build_flags =
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
build_src_filter = ${Station_G2.build_src_filter} build_src_filter = ${Station_G2.build_src_filter}
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp> +<../examples/companion_radio/ui-new/*.cpp>
lib_deps = lib_deps =
variants/station_g3_esp32/platformio.ini
+1
View File
@@ -149,6 +149,7 @@ build_flags =
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
build_src_filter = ${Station_G3_ESP32.build_src_filter} build_src_filter = ${Station_G3_ESP32.build_src_filter}
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp> +<../examples/companion_radio/ui-new/*.cpp>
lib_deps = lib_deps =
variants/thinknode_m2/platformio.ini
+1
View File
@@ -184,6 +184,7 @@ build_flags =
-D WIFI_PWD='"mypwd"' -D WIFI_PWD='"mypwd"'
build_src_filter = ${ThinkNode_M2.build_src_filter} build_src_filter = ${ThinkNode_M2.build_src_filter}
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<helpers/ui/MomentaryButton.cpp> +<helpers/ui/MomentaryButton.cpp>
+<helpers/ui/buzzer.cpp> +<helpers/ui/buzzer.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
variants/thinknode_m5/platformio.ini
+1
View File
@@ -198,6 +198,7 @@ build_flags =
-D WIFI_PWD='"mypwd"' -D WIFI_PWD='"mypwd"'
build_src_filter = ${ThinkNode_M5.build_src_filter} build_src_filter = ${ThinkNode_M5.build_src_filter}
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<helpers/ui/MomentaryButton.cpp> +<helpers/ui/MomentaryButton.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp> +<../examples/companion_radio/ui-new/*.cpp>
variants/thinknode_m7/platformio.ini
+1
View File
@@ -145,6 +145,7 @@ build_flags =
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
build_src_filter = ${ThinkNode_M7.build_src_filter} build_src_filter = ${ThinkNode_M7.build_src_filter}
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<helpers/ui/MomentaryButton.cpp> +<helpers/ui/MomentaryButton.cpp>
+<helpers/ui/NullDisplayDriver.cpp> +<helpers/ui/NullDisplayDriver.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
variants/thinknode_m9/platformio.ini
+1
View File
@@ -146,6 +146,7 @@ build_flags =
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
build_src_filter = ${ThinkNode_M9.build_src_filter} build_src_filter = ${ThinkNode_M9.build_src_filter}
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<helpers/ui/buzzer.cpp> +<helpers/ui/buzzer.cpp>
+<helpers/ui/MomentaryButton.cpp> +<helpers/ui/MomentaryButton.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
variants/xiao_c3/platformio.ini
+1
View File
@@ -115,6 +115,7 @@ extends = Xiao_esp32_C3
build_src_filter = ${Xiao_esp32_C3.build_src_filter} build_src_filter = ${Xiao_esp32_C3.build_src_filter}
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
build_flags = build_flags =
${Xiao_esp32_C3.build_flags} ${Xiao_esp32_C3.build_flags}
-D MAX_CONTACTS=350 -D MAX_CONTACTS=350
variants/xiao_s3_wio/platformio.ini
+1
View File
@@ -202,6 +202,7 @@ extends = Xiao_S3_WIO
build_src_filter = ${Xiao_S3_WIO.build_src_filter} build_src_filter = ${Xiao_S3_WIO.build_src_filter}
+<helpers/ui/NullDisplayDriver.cpp> +<helpers/ui/NullDisplayDriver.cpp>
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/wifi/*.cpp>
+<helpers/ui/MomentaryButton.cpp> +<helpers/ui/MomentaryButton.cpp>
+<../examples/companion_radio/*.cpp> +<../examples/companion_radio/*.cpp>
build_flags = build_flags =