DG4MLK/MeshCore-Evo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Heltec tracker, now using /ui-new

Browse Source 
* variants with no DISPLAY_CLASS .ini fixes
This commit is contained in:
Scott Powell
2025-08-16 21:53:36 +10:00
parent e14b022a7c
commit 37d7257f04
16 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
variants/heltec_ct62/platformio.ini
View File

@@ -61,7 +61,7 @@ build_flags =
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
build_src_filter = ${Heltec_ct62.build_src_filter} build_src_filter = ${Heltec_ct62.build_src_filter}
+<../examples/companion_radio> +<../examples/companion_radio/*.cpp>
lib_deps = lib_deps =
${Heltec_ct62.lib_deps} ${Heltec_ct62.lib_deps}
${esp32_ota.lib_deps} ${esp32_ota.lib_deps}
@@ -80,7 +80,7 @@ build_flags =
; -D MESH_PACKET_LOGGING=1 ; -D MESH_PACKET_LOGGING=1
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
build_src_filter = ${Heltec_ct62.build_src_filter} build_src_filter = ${Heltec_ct62.build_src_filter}
+<../examples/companion_radio> +<../examples/companion_radio/*.cpp>
+<helpers/esp32/SerialBLEInterface.cpp> +<helpers/esp32/SerialBLEInterface.cpp>
lib_deps = lib_deps =
${Heltec_ct62.lib_deps} ${Heltec_ct62.lib_deps}

4
variants/heltec_mesh_solar/platformio.ini
View File

@@ -68,7 +68,7 @@ build_flags =
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
build_src_filter = ${Heltec_mesh_solar.build_src_filter} build_src_filter = ${Heltec_mesh_solar.build_src_filter}
+<helpers/nrf52/SerialBLEInterface.cpp> +<helpers/nrf52/SerialBLEInterface.cpp>
+<../examples/companion_radio> +<../examples/companion_radio/*.cpp>
lib_deps = lib_deps =
${Heltec_mesh_solar.lib_deps} ${Heltec_mesh_solar.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
@@ -85,7 +85,7 @@ build_flags =
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
build_src_filter = ${Heltec_mesh_solar.build_src_filter} build_src_filter = ${Heltec_mesh_solar.build_src_filter}
+<helpers/nrf52/*.cpp> +<helpers/nrf52/*.cpp>
+<../examples/companion_radio> +<../examples/companion_radio/*.cpp>
lib_deps = lib_deps =
${Heltec_mesh_solar.lib_deps} ${Heltec_mesh_solar.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0

5
variants/heltec_tracker/platformio.ini
View File

@@ -39,6 +39,7 @@ extends = Heltec_tracker_base
build_flags = build_flags =
${Heltec_tracker_base.build_flags} ${Heltec_tracker_base.build_flags}
-I src/helpers/ui -I src/helpers/ui
-I examples/companion_radio/ui-new
-D ARDUINO_USB_CDC_ON_BOOT=1 ; need for Serial -D ARDUINO_USB_CDC_ON_BOOT=1 ; need for Serial
-D DISPLAY_ROTATION=1 -D DISPLAY_ROTATION=1
-D DISPLAY_CLASS=ST7735Display -D DISPLAY_CLASS=ST7735Display
@@ -51,7 +52,9 @@ build_flags =
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
build_src_filter = ${Heltec_tracker_base.build_src_filter} build_src_filter = ${Heltec_tracker_base.build_src_filter}
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<../examples/companion_radio> +<helpers/ui/MomentaryButton.cpp>
+<../examples/companion_radio/*.cpp>
+<../examples/companion_radio/ui-new/*.cpp>
+<helpers/ui/ST7735Display.cpp> +<helpers/ui/ST7735Display.cpp>
lib_deps = lib_deps =
${Heltec_tracker_base.lib_deps} ${Heltec_tracker_base.lib_deps}

1
variants/heltec_tracker/target.cpp
View File

@@ -21,6 +21,7 @@ HWTSensorManager sensors = HWTSensorManager(nmea);
#ifdef DISPLAY_CLASS #ifdef DISPLAY_CLASS
DISPLAY_CLASS display(&board.periph_power); // peripheral power pin is shared DISPLAY_CLASS display(&board.periph_power); // peripheral power pin is shared
MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
#endif #endif
bool radio_init() { bool radio_init() {

2
variants/heltec_tracker/target.h
View File

@@ -10,6 +10,7 @@
#include <helpers/sensors/LocationProvider.h> #include <helpers/sensors/LocationProvider.h>
#ifdef DISPLAY_CLASS #ifdef DISPLAY_CLASS
#include <helpers/ui/ST7735Display.h> #include <helpers/ui/ST7735Display.h>
#include <helpers/ui/MomentaryButton.h>
#endif #endif
class HWTSensorManager : public SensorManager { class HWTSensorManager : public SensorManager {
@@ -36,6 +37,7 @@ extern HWTSensorManager sensors;
#ifdef DISPLAY_CLASS #ifdef DISPLAY_CLASS
extern DISPLAY_CLASS display; extern DISPLAY_CLASS display;
extern MomentaryButton user_btn;
#endif #endif
bool radio_init(); bool radio_init();

2
variants/lilygo_tbeam_SX1262/platformio.ini
View File

@@ -49,7 +49,7 @@ build_flags =
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter} build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter}
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<../examples/companion_radio> +<../examples/companion_radio/*.cpp>
lib_deps = lib_deps =
${LilyGo_TBeam_SX1262.lib_deps} ${LilyGo_TBeam_SX1262.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0

2
variants/lilygo_tbeam_SX1276/platformio.ini
View File

@@ -46,7 +46,7 @@ build_flags =
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
build_src_filter = ${LilyGo_TBeam_SX1276.build_src_filter} build_src_filter = ${LilyGo_TBeam_SX1276.build_src_filter}
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<../examples/companion_radio> +<../examples/companion_radio/*.cpp>
lib_deps = lib_deps =
${LilyGo_TBeam_SX1276.lib_deps} ${LilyGo_TBeam_SX1276.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0

2
variants/lilygo_tbeam_supreme_SX1262/platformio.ini
View File

@@ -82,7 +82,7 @@ build_flags =
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
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>
+<../examples/companion_radio> +<../examples/companion_radio/*.cpp>
lib_deps = lib_deps =
${T_Beam_S3_Supreme_SX1262.lib_deps} ${T_Beam_S3_Supreme_SX1262.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0

2
variants/lilygo_tlora_c6/platformio.ini
View File

@@ -79,7 +79,7 @@ build_flags = ${tlora_c6.build_flags}
build_src_filter = ${tlora_c6.build_src_filter} build_src_filter = ${tlora_c6.build_src_filter}
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
-<helpers/esp32/ESPNOWRadio.cpp> -<helpers/esp32/ESPNOWRadio.cpp>
+<../examples/companion_radio> +<../examples/companion_radio/*.cpp>
lib_deps = lib_deps =
${tlora_c6.lib_deps} ${tlora_c6.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0

4
variants/lilygo_tlora_v2_1/platformio.ini
View File

@@ -89,7 +89,7 @@ build_flags =
; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1
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/ui/SSD1306Display.cpp> +<helpers/ui/SSD1306Display.cpp>
+<../examples/companion_radio> +<../examples/companion_radio/*.cpp>
lib_deps = lib_deps =
${LilyGo_TLora_V2_1_1_6.lib_deps} ${LilyGo_TLora_V2_1_1_6.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
@@ -108,7 +108,7 @@ build_flags =
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/ui/SSD1306Display.cpp> +<helpers/ui/SSD1306Display.cpp>
+<../examples/companion_radio> +<../examples/companion_radio/*.cpp>
lib_deps = lib_deps =
${LilyGo_TLora_V2_1_1_6.lib_deps} ${LilyGo_TLora_V2_1_1_6.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0

8
variants/meshadventurer/platformio.ini
View File

@@ -78,7 +78,7 @@ lib_deps =
[env:Meshadventurer_sx1262_companion_radio_usb] [env:Meshadventurer_sx1262_companion_radio_usb]
extends = Meshadventurer extends = Meshadventurer
build_src_filter = ${Meshadventurer.build_src_filter} build_src_filter = ${Meshadventurer.build_src_filter}
+<../examples/companion_radio> +<../examples/companion_radio/*.cpp>
+<helpers/ui/SSD1306Display.cpp> +<helpers/ui/SSD1306Display.cpp>
build_flags = build_flags =
${Meshadventurer.build_flags} ${Meshadventurer.build_flags}
@@ -96,7 +96,7 @@ lib_deps =
[env:Meshadventurer_sx1262_companion_radio_ble] [env:Meshadventurer_sx1262_companion_radio_ble]
extends = Meshadventurer extends = Meshadventurer
build_src_filter = ${Meshadventurer.build_src_filter} build_src_filter = ${Meshadventurer.build_src_filter}
+<../examples/companion_radio> +<../examples/companion_radio/*.cpp>
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/ui/SSD1306Display.cpp> +<helpers/ui/SSD1306Display.cpp>
build_flags = build_flags =
@@ -157,7 +157,7 @@ lib_deps =
[env:Meshadventurer_sx1268_companion_radio_usb] [env:Meshadventurer_sx1268_companion_radio_usb]
extends = Meshadventurer extends = Meshadventurer
build_src_filter = ${Meshadventurer.build_src_filter} build_src_filter = ${Meshadventurer.build_src_filter}
+<../examples/companion_radio> +<../examples/companion_radio/*.cpp>
+<helpers/ui/SSD1306Display.cpp> +<helpers/ui/SSD1306Display.cpp>
build_flags = build_flags =
${Meshadventurer.build_flags} ${Meshadventurer.build_flags}
@@ -175,7 +175,7 @@ lib_deps =
[env:Meshadventurer_sx1268_companion_radio_ble] [env:Meshadventurer_sx1268_companion_radio_ble]
extends = Meshadventurer extends = Meshadventurer
build_src_filter = ${Meshadventurer.build_src_filter} build_src_filter = ${Meshadventurer.build_src_filter}
+<../examples/companion_radio> +<../examples/companion_radio/*.cpp>
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
+<helpers/ui/SSD1306Display.cpp> +<helpers/ui/SSD1306Display.cpp>
build_flags = build_flags =

6
variants/picow/platformio.ini
View File

@@ -52,7 +52,7 @@ build_flags = ${picow.build_flags}
; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1
; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1
build_src_filter = ${picow.build_src_filter} build_src_filter = ${picow.build_src_filter}
+<../examples/companion_radio> +<../examples/companion_radio/*.cpp>
lib_deps = ${picow.lib_deps} lib_deps = ${picow.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
@@ -66,7 +66,7 @@ lib_deps = ${picow.lib_deps}
; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_PACKET_LOGGING=1
; ; -D MESH_DEBUG=1 ; ; -D MESH_DEBUG=1
; build_src_filter = ${picow.build_src_filter} ; build_src_filter = ${picow.build_src_filter}
; +<../examples/companion_radio> ; +<../examples/companion_radio/*.cpp>
; lib_deps = ${picow.lib_deps} ; lib_deps = ${picow.lib_deps}
; densaugeo/base64 @ ~1.4.0 ; densaugeo/base64 @ ~1.4.0
@@ -81,7 +81,7 @@ lib_deps = ${picow.lib_deps}
; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_PACKET_LOGGING=1
; ; -D MESH_DEBUG=1 ; ; -D MESH_DEBUG=1
; build_src_filter = ${picow.build_src_filter} ; build_src_filter = ${picow.build_src_filter}
; +<../examples/companion_radio> ; +<../examples/companion_radio/*.cpp>
; lib_deps = ${picow.lib_deps} ; lib_deps = ${picow.lib_deps}
; densaugeo/base64 @ ~1.4.0 ; densaugeo/base64 @ ~1.4.0

4
variants/sensecap_solar/platformio.ini
View File

@@ -85,7 +85,7 @@ build_flags =
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
build_src_filter = ${SenseCap_Solar.build_src_filter} build_src_filter = ${SenseCap_Solar.build_src_filter}
+<helpers/nrf52/SerialBLEInterface.cpp> +<helpers/nrf52/SerialBLEInterface.cpp>
+<../examples/companion_radio> +<../examples/companion_radio/*.cpp>
lib_deps = lib_deps =
${SenseCap_Solar.lib_deps} ${SenseCap_Solar.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
@@ -100,7 +100,7 @@ build_flags =
; -D MESH_DEBUG=1 ; -D MESH_DEBUG=1
build_src_filter = ${SenseCap_Solar.build_src_filter} build_src_filter = ${SenseCap_Solar.build_src_filter}
+<helpers/nrf52/SerialBLEInterface.cpp> +<helpers/nrf52/SerialBLEInterface.cpp>
+<../examples/companion_radio> +<../examples/companion_radio/*.cpp>
lib_deps = lib_deps =
${SenseCap_Solar.lib_deps} ${SenseCap_Solar.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0

6
variants/waveshare_rp2040_lora/platformio.ini
View File

@@ -61,7 +61,7 @@ build_flags = ${waveshare_rp2040_lora.build_flags}
; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1
; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1
build_src_filter = ${waveshare_rp2040_lora.build_src_filter} build_src_filter = ${waveshare_rp2040_lora.build_src_filter}
+<../examples/companion_radio> +<../examples/companion_radio/*.cpp>
lib_deps = ${waveshare_rp2040_lora.lib_deps} lib_deps = ${waveshare_rp2040_lora.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
@@ -75,7 +75,7 @@ lib_deps = ${waveshare_rp2040_lora.lib_deps}
; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_PACKET_LOGGING=1
; ; -D MESH_DEBUG=1 ; ; -D MESH_DEBUG=1
; build_src_filter = ${waveshare_rp2040_lora.build_src_filter} ; build_src_filter = ${waveshare_rp2040_lora.build_src_filter}
; +<../examples/companion_radio> ; +<../examples/companion_radio/*.cpp>
; lib_deps = ${waveshare_rp2040_lora.lib_deps} ; lib_deps = ${waveshare_rp2040_lora.lib_deps}
; densaugeo/base64 @ ~1.4.0 ; densaugeo/base64 @ ~1.4.0
@@ -90,7 +90,7 @@ lib_deps = ${waveshare_rp2040_lora.lib_deps}
; ; -D MESH_PACKET_LOGGING=1 ; ; -D MESH_PACKET_LOGGING=1
; ; -D MESH_DEBUG=1 ; ; -D MESH_DEBUG=1
; build_src_filter = ${waveshare_rp2040_lora.build_src_filter} ; build_src_filter = ${waveshare_rp2040_lora.build_src_filter}
; +<../examples/companion_radio> ; +<../examples/companion_radio/*.cpp>
; lib_deps = ${waveshare_rp2040_lora.lib_deps} ; lib_deps = ${waveshare_rp2040_lora.lib_deps}
; densaugeo/base64 @ ~1.4.0 ; densaugeo/base64 @ ~1.4.0

4
variants/xiao_c3/platformio.ini
View File

@@ -66,7 +66,7 @@ lib_deps =
[env:Xiao_C3_companion_radio_ble] [env:Xiao_C3_companion_radio_ble]
extends = Xiao_esp32_C3 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> +<../examples/companion_radio/*.cpp>
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
build_flags = build_flags =
${Xiao_esp32_C3.build_flags} ${Xiao_esp32_C3.build_flags}
@@ -89,7 +89,7 @@ lib_deps =
[env:Xiao_C3_companion_radio_usb] [env:Xiao_C3_companion_radio_usb]
extends = Xiao_esp32_C3 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> +<../examples/companion_radio/*.cpp>
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
build_flags = build_flags =
${Xiao_esp32_C3.build_flags} ${Xiao_esp32_C3.build_flags}

4
variants/xiao_c6/platformio.ini
View File

@@ -62,7 +62,7 @@ build_flags = ${Xiao_C6.build_flags}
build_src_filter = ${Xiao_C6.build_src_filter} build_src_filter = ${Xiao_C6.build_src_filter}
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
-<helpers/esp32/ESPNOWRadio.cpp> -<helpers/esp32/ESPNOWRadio.cpp>
+<../examples/companion_radio> +<../examples/companion_radio/*.cpp>
lib_deps = lib_deps =
${Xiao_C6.lib_deps} ${Xiao_C6.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
@@ -117,7 +117,7 @@ build_flags = ${Meshimi.build_flags}
build_src_filter = ${Meshimi.build_src_filter} build_src_filter = ${Meshimi.build_src_filter}
+<helpers/esp32/*.cpp> +<helpers/esp32/*.cpp>
-<helpers/esp32/ESPNOWRadio.cpp> -<helpers/esp32/ESPNOWRadio.cpp>
+<../examples/companion_radio> +<../examples/companion_radio/*.cpp>
lib_deps = lib_deps =
${Meshimi.lib_deps} ${Meshimi.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0