Merge pull request #615 from MikesAllotment/new-companion-ui

UI Refresh changes for HeltecV2 and Faketec ProMicro

variants/heltec_v2/platformio.ini

@@ -35,6 +35,7 @@ build_flags =
 build_src_filter = ${Heltec_lora32_v2.build_src_filter}
   +<../examples/simple_repeater>
   +<helpers/ui/SSD1306Display.cpp>
+  +<helpers/ui/MomentaryButton.cpp>
 lib_deps =
   ${Heltec_lora32_v2.lib_deps}
   ${esp32_ota.lib_deps}
@@ -53,6 +54,7 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_lora32_v2.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
+  +<helpers/ui/MomentaryButton.cpp>
   +<../examples/simple_room_server>
 lib_deps =
   ${Heltec_lora32_v2.lib_deps}
@@ -84,6 +86,7 @@ build_flags =
 build_src_filter = ${Heltec_lora32_v2.build_src_filter}
   +<helpers/esp32/*.cpp>
   +<helpers/ui/SSD1306Display.cpp>
+  +<helpers/ui/MomentaryButton.cpp>
   +<../examples/companion_radio>
 lib_deps =
   ${Heltec_lora32_v2.lib_deps}
@@ -104,6 +107,7 @@ build_flags =
 build_src_filter = ${Heltec_lora32_v2.build_src_filter}
   +<helpers/esp32/*.cpp>
   +<helpers/ui/SSD1306Display.cpp>
+  +<helpers/ui/MomentaryButton.cpp>
   +<../examples/companion_radio>
 lib_deps =
   ${Heltec_lora32_v2.lib_deps}

variants/heltec_v2/target.cpp

@@ -18,6 +18,7 @@ SensorManager sensors;
 
 #ifdef DISPLAY_CLASS
   DISPLAY_CLASS display;
+  MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
 #endif
 
 bool radio_init() {

variants/heltec_v2/target.h

@@ -9,6 +9,7 @@
 #include <helpers/SensorManager.h>
 #ifdef DISPLAY_CLASS
   #include <helpers/ui/SSD1306Display.h>
+  #include <helpers/ui/MomentaryButton.h>
 #endif
 
 extern HeltecV2Board board;
@@ -18,6 +19,7 @@ extern SensorManager sensors;
 
 #ifdef DISPLAY_CLASS
   extern DISPLAY_CLASS display;
+  extern MomentaryButton user_btn;
 #endif
 
 bool radio_init();

variants/promicro/platformio.ini

@@ -39,6 +39,7 @@ extends = Faketec
 build_src_filter = ${Faketec.build_src_filter}
   +<../examples/simple_repeater>
   +<helpers/ui/SSD1306Display.cpp>
+  +<helpers/ui/MomentaryButton.cpp>
 build_flags =
   ${Faketec.build_flags}
   -D ADVERT_NAME='"Faketec Repeater"'
@@ -57,6 +58,7 @@ extends = Faketec
 build_src_filter = ${Faketec.build_src_filter}
   +<../examples/simple_room_server>
   +<helpers/ui/SSD1306Display.cpp>
+  +<helpers/ui/MomentaryButton.cpp>
 build_flags = ${Faketec.build_flags}
   -D ADVERT_NAME='"Faketec Room"'
   -D ADVERT_LAT=0.0
@@ -93,6 +95,7 @@ build_flags = ${Faketec.build_flags}
 build_src_filter = ${Faketec.build_src_filter}
   +<../examples/companion_radio>
   +<helpers/ui/SSD1306Display.cpp>
+  +<helpers/ui/MomentaryButton.cpp>
 lib_deps = ${Faketec.lib_deps}
   adafruit/RTClib @ ^2.1.3
   densaugeo/base64 @ ~1.4.0
@@ -112,6 +115,7 @@ build_src_filter = ${Faketec.build_src_filter}
   +<helpers/nrf52/SerialBLEInterface.cpp>
   +<../examples/companion_radio>
   +<helpers/ui/SSD1306Display.cpp>
+  +<helpers/ui/MomentaryButton.cpp>
 lib_deps = ${Faketec.lib_deps}
   adafruit/RTClib @ ^2.1.3
   densaugeo/base64 @ ~1.4.0
@@ -129,6 +133,7 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Faketec.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
+  +<helpers/ui/MomentaryButton.cpp>
   +<../examples/simple_sensor>
 lib_deps =
   ${Faketec.lib_deps}

variants/promicro/target.cpp

@@ -20,6 +20,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock);
 
 #ifdef DISPLAY_CLASS
   DISPLAY_CLASS display;
+  MomentaryButton user_btn(PIN_USER_BTN, 1000, true, true);
 #endif
 
 bool radio_init() {

variants/promicro/target.h

@@ -8,6 +8,7 @@
 #include <helpers/AutoDiscoverRTCClock.h>
 #ifdef DISPLAY_CLASS
   #include <helpers/ui/SSD1306Display.h>
+  #include <helpers/ui/MomentaryButton.h>
 #endif
 
 #include <helpers/sensors/EnvironmentSensorManager.h>
@@ -19,6 +20,7 @@ extern EnvironmentSensorManager sensors;
 
 #ifdef DISPLAY_CLASS
   extern DISPLAY_CLASS display;
+  extern MomentaryButton user_btn;
 #endif
 
 bool radio_init();