* Heltec tracker, now using /ui-new

* variants with no DISPLAY_CLASS .ini fixes
10 months ago · 37d7257f04
16 changed files with 33 additions and 27 deletions
--- a/variants/heltec_ct62/platformio.ini
+++ b/variants/heltec_ct62/platformio.ini
@ -61,7 +61,7 @@ build_flags =
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_ct62.build_src_filter}
-  +<../examples/companion_radio>
+  +<../examples/companion_radio/*.cpp>
 lib_deps =
  ${Heltec_ct62.lib_deps}
  ${esp32_ota.lib_deps}
@ -80,7 +80,7 @@ build_flags =
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_ct62.build_src_filter}
-  +<../examples/companion_radio>
+  +<../examples/companion_radio/*.cpp>
  +<helpers/esp32/SerialBLEInterface.cpp>
 lib_deps =
  ${Heltec_ct62.lib_deps}
--- a/variants/heltec_mesh_solar/platformio.ini
+++ b/variants/heltec_mesh_solar/platformio.ini
@ -68,7 +68,7 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_mesh_solar.build_src_filter}
  +<helpers/nrf52/SerialBLEInterface.cpp>
-  +<../examples/companion_radio>
+  +<../examples/companion_radio/*.cpp>
 lib_deps =
  ${Heltec_mesh_solar.lib_deps}
  densaugeo/base64 @ ~1.4.0
@ -85,7 +85,7 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_mesh_solar.build_src_filter}
  +<helpers/nrf52/*.cpp>
-  +<../examples/companion_radio>
+  +<../examples/companion_radio/*.cpp>
 lib_deps =
  ${Heltec_mesh_solar.lib_deps}
  densaugeo/base64 @ ~1.4.0
--- a/variants/heltec_tracker/platformio.ini
+++ b/variants/heltec_tracker/platformio.ini
@ -39,6 +39,7 @@ extends = Heltec_tracker_base
 build_flags =
  ${Heltec_tracker_base.build_flags}
  -I src/helpers/ui
+  -I examples/companion_radio/ui-new
  -D ARDUINO_USB_CDC_ON_BOOT=1      ; need for Serial
  -D DISPLAY_ROTATION=1
  -D DISPLAY_CLASS=ST7735Display
@ -51,7 +52,9 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_tracker_base.build_src_filter}
  +<helpers/esp32/*.cpp>
-  +<../examples/companion_radio>
+  +<helpers/ui/MomentaryButton.cpp>
+  +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
  +<helpers/ui/ST7735Display.cpp>
 lib_deps =
  ${Heltec_tracker_base.lib_deps}
--- a/variants/heltec_tracker/target.cpp
+++ b/variants/heltec_tracker/target.cpp
@ -21,6 +21,7 @@ HWTSensorManager sensors = HWTSensorManager(nmea);

 #ifdef DISPLAY_CLASS
  DISPLAY_CLASS display(&board.periph_power);   // peripheral power pin is shared
+  MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
 #endif

 bool radio_init() {
--- a/variants/heltec_tracker/target.h
+++ b/variants/heltec_tracker/target.h
@ -10,6 +10,7 @@
 #include <helpers/sensors/LocationProvider.h>
 #ifdef DISPLAY_CLASS
  #include <helpers/ui/ST7735Display.h>
+  #include <helpers/ui/MomentaryButton.h>
 #endif

 class HWTSensorManager : public SensorManager {
@ -36,6 +37,7 @@ extern HWTSensorManager sensors;

 #ifdef DISPLAY_CLASS
  extern DISPLAY_CLASS display;
+  extern MomentaryButton user_btn;
 #endif

 bool radio_init();
--- a/variants/lilygo_tbeam_SX1262/platformio.ini
+++ b/variants/lilygo_tbeam_SX1262/platformio.ini
@ -49,7 +49,7 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${LilyGo_TBeam_SX1262.build_src_filter}
  +<helpers/esp32/*.cpp>
-  +<../examples/companion_radio>
+  +<../examples/companion_radio/*.cpp>
 lib_deps =
  ${LilyGo_TBeam_SX1262.lib_deps}
  densaugeo/base64 @ ~1.4.0
--- a/variants/lilygo_tbeam_SX1276/platformio.ini
+++ b/variants/lilygo_tbeam_SX1276/platformio.ini
@ -46,7 +46,7 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${LilyGo_TBeam_SX1276.build_src_filter}
  +<helpers/esp32/*.cpp>
-  +<../examples/companion_radio>
+  +<../examples/companion_radio/*.cpp>
 lib_deps =
  ${LilyGo_TBeam_SX1276.lib_deps}
  densaugeo/base64 @ ~1.4.0
--- a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini
+++ b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini
@ -82,7 +82,7 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${T_Beam_S3_Supreme_SX1262.build_src_filter}
  +<helpers/esp32/*.cpp>
-  +<../examples/companion_radio>
+  +<../examples/companion_radio/*.cpp>
 lib_deps =
  ${T_Beam_S3_Supreme_SX1262.lib_deps}
  densaugeo/base64 @ ~1.4.0
--- a/variants/lilygo_tlora_c6/platformio.ini
+++ b/variants/lilygo_tlora_c6/platformio.ini
@ -79,7 +79,7 @@ build_flags = ${tlora_c6.build_flags}
 build_src_filter = ${tlora_c6.build_src_filter}
  +<helpers/esp32/*.cpp>
  -<helpers/esp32/ESPNOWRadio.cpp>
-  +<../examples/companion_radio>
+  +<../examples/companion_radio/*.cpp>
 lib_deps =
  ${tlora_c6.lib_deps}
  densaugeo/base64 @ ~1.4.0
--- a/variants/lilygo_tlora_v2_1/platformio.ini
+++ b/variants/lilygo_tlora_v2_1/platformio.ini
@ -89,7 +89,7 @@ build_flags =
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter}
  +<helpers/ui/SSD1306Display.cpp>
-  +<../examples/companion_radio>
+  +<../examples/companion_radio/*.cpp>
 lib_deps =
  ${LilyGo_TLora_V2_1_1_6.lib_deps}
  densaugeo/base64 @ ~1.4.0
@ -108,7 +108,7 @@ build_flags =
 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter}
  +<helpers/esp32/*.cpp>
  +<helpers/ui/SSD1306Display.cpp>
-  +<../examples/companion_radio>
+  +<../examples/companion_radio/*.cpp>
 lib_deps =
  ${LilyGo_TLora_V2_1_1_6.lib_deps}
  densaugeo/base64 @ ~1.4.0
--- a/variants/meshadventurer/platformio.ini
+++ b/variants/meshadventurer/platformio.ini
@ -78,7 +78,7 @@ lib_deps =
 [env:Meshadventurer_sx1262_companion_radio_usb]
 extends = Meshadventurer
 build_src_filter = ${Meshadventurer.build_src_filter}
-  +<../examples/companion_radio>
+  +<../examples/companion_radio/*.cpp>
  +<helpers/ui/SSD1306Display.cpp>
 build_flags =
  ${Meshadventurer.build_flags}
@ -96,7 +96,7 @@ lib_deps =
 [env:Meshadventurer_sx1262_companion_radio_ble]
 extends = Meshadventurer
 build_src_filter = ${Meshadventurer.build_src_filter}
-  +<../examples/companion_radio>
+  +<../examples/companion_radio/*.cpp>
  +<helpers/esp32/*.cpp>
  +<helpers/ui/SSD1306Display.cpp>
 build_flags =
@ -157,7 +157,7 @@ lib_deps =
 [env:Meshadventurer_sx1268_companion_radio_usb]
 extends = Meshadventurer
 build_src_filter = ${Meshadventurer.build_src_filter}
-  +<../examples/companion_radio>
+  +<../examples/companion_radio/*.cpp>
  +<helpers/ui/SSD1306Display.cpp>
 build_flags =
  ${Meshadventurer.build_flags}
@ -175,7 +175,7 @@ lib_deps =
 [env:Meshadventurer_sx1268_companion_radio_ble]
 extends = Meshadventurer
 build_src_filter = ${Meshadventurer.build_src_filter}
-  +<../examples/companion_radio>
+  +<../examples/companion_radio/*.cpp>
  +<helpers/esp32/*.cpp>
  +<helpers/ui/SSD1306Display.cpp>
 build_flags =
--- a/variants/picow/platformio.ini
+++ b/variants/picow/platformio.ini
@ -52,7 +52,7 @@ build_flags = ${picow.build_flags}
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${picow.build_src_filter}
-  +<../examples/companion_radio>
+  +<../examples/companion_radio/*.cpp>
 lib_deps = ${picow.lib_deps}
  densaugeo/base64 @ ~1.4.0

@ -66,7 +66,7 @@ lib_deps = ${picow.lib_deps}
 ; ;  -D MESH_PACKET_LOGGING=1
 ; ;  -D MESH_DEBUG=1
 ; build_src_filter = ${picow.build_src_filter}
-;   +<../examples/companion_radio>
+;   +<../examples/companion_radio/*.cpp>
 ; lib_deps = ${picow.lib_deps}
 ;   densaugeo/base64 @ ~1.4.0

@ -81,7 +81,7 @@ lib_deps = ${picow.lib_deps}
 ; ;  -D MESH_PACKET_LOGGING=1
 ; ;  -D MESH_DEBUG=1
 ; build_src_filter = ${picow.build_src_filter}
-;   +<../examples/companion_radio>
+;   +<../examples/companion_radio/*.cpp>
 ; lib_deps = ${picow.lib_deps}
 ;   densaugeo/base64 @ ~1.4.0

--- a/variants/sensecap_solar/platformio.ini
+++ b/variants/sensecap_solar/platformio.ini
@ -85,7 +85,7 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${SenseCap_Solar.build_src_filter}
  +<helpers/nrf52/SerialBLEInterface.cpp>
-  +<../examples/companion_radio>
+  +<../examples/companion_radio/*.cpp>
 lib_deps =
  ${SenseCap_Solar.lib_deps}
  densaugeo/base64 @ ~1.4.0
@ -100,7 +100,7 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${SenseCap_Solar.build_src_filter}
  +<helpers/nrf52/SerialBLEInterface.cpp>
-  +<../examples/companion_radio>
+  +<../examples/companion_radio/*.cpp>
 lib_deps =
  ${SenseCap_Solar.lib_deps}
  densaugeo/base64 @ ~1.4.0
--- a/variants/waveshare_rp2040_lora/platformio.ini
+++ b/variants/waveshare_rp2040_lora/platformio.ini
@ -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_DEBUG=1
 build_src_filter = ${waveshare_rp2040_lora.build_src_filter}
-  +<../examples/companion_radio>
+  +<../examples/companion_radio/*.cpp>
 lib_deps = ${waveshare_rp2040_lora.lib_deps}
  densaugeo/base64 @ ~1.4.0

@ -75,7 +75,7 @@ lib_deps = ${waveshare_rp2040_lora.lib_deps}
 ; ;  -D MESH_PACKET_LOGGING=1
 ; ;  -D MESH_DEBUG=1
 ; build_src_filter = ${waveshare_rp2040_lora.build_src_filter}
-;   +<../examples/companion_radio>
+;   +<../examples/companion_radio/*.cpp>
 ; lib_deps = ${waveshare_rp2040_lora.lib_deps}
 ;   densaugeo/base64 @ ~1.4.0

@ -90,7 +90,7 @@ lib_deps = ${waveshare_rp2040_lora.lib_deps}
 ; ;  -D MESH_PACKET_LOGGING=1
 ; ;  -D MESH_DEBUG=1
 ; build_src_filter = ${waveshare_rp2040_lora.build_src_filter}
-;   +<../examples/companion_radio>
+;   +<../examples/companion_radio/*.cpp>
 ; lib_deps = ${waveshare_rp2040_lora.lib_deps}
 ;   densaugeo/base64 @ ~1.4.0

--- a/variants/xiao_c3/platformio.ini
+++ b/variants/xiao_c3/platformio.ini
@ -66,7 +66,7 @@ lib_deps =
 [env:Xiao_C3_companion_radio_ble]
 extends = Xiao_esp32_C3
 build_src_filter = ${Xiao_esp32_C3.build_src_filter}
-  +<../examples/companion_radio>
+  +<../examples/companion_radio/*.cpp>
  +<helpers/esp32/*.cpp>
 build_flags =
  ${Xiao_esp32_C3.build_flags}
@ -89,7 +89,7 @@ lib_deps =
 [env:Xiao_C3_companion_radio_usb]
 extends = Xiao_esp32_C3
 build_src_filter = ${Xiao_esp32_C3.build_src_filter}
-  +<../examples/companion_radio>
+  +<../examples/companion_radio/*.cpp>
  +<helpers/esp32/*.cpp>
 build_flags =
  ${Xiao_esp32_C3.build_flags}
--- a/variants/xiao_c6/platformio.ini
+++ b/variants/xiao_c6/platformio.ini
@ -62,7 +62,7 @@ build_flags = ${Xiao_C6.build_flags}
 build_src_filter = ${Xiao_C6.build_src_filter}
  +<helpers/esp32/*.cpp>
  -<helpers/esp32/ESPNOWRadio.cpp>
-  +<../examples/companion_radio>
+  +<../examples/companion_radio/*.cpp>
 lib_deps =
  ${Xiao_C6.lib_deps}
  densaugeo/base64 @ ~1.4.0
@ -117,7 +117,7 @@ build_flags = ${Meshimi.build_flags}
 build_src_filter = ${Meshimi.build_src_filter}
                   +<helpers/esp32/*.cpp>
                   -<helpers/esp32/ESPNOWRadio.cpp>
-                   +<../examples/companion_radio>
+                   +<../examples/companion_radio/*.cpp>
 lib_deps =
  ${Meshimi.lib_deps}
  densaugeo/base64 @ ~1.4.0