* build fixes for NullDisplayDriver

1 week ago · a96a66aa99
14 changed files with 34 additions and 53 deletions
--- a/src/helpers/ui/NullDisplayDriver.cpp
+++ b/src/helpers/ui/NullDisplayDriver.cpp
@ -0,0 +1,11 @@
+#include "NullDisplayDriver.h"
+
+ColorVal UIColor::window_bkg = 0;
+ColorVal UIColor::title_bkg = 0;
+ColorVal UIColor::title_txt = 0;
+ColorVal UIColor::primary_txt = 0;
+ColorVal UIColor::secondary_txt = 0;
+ColorVal UIColor::warning_txt = 0;
+ColorVal UIColor::popup_bkg = 0;
+ColorVal UIColor::popup_txt = 0;
+ColorVal UIColor::corp_blue = 0;
--- a/variants/heltec_rc32/platformio.ini
+++ b/variants/heltec_rc32/platformio.ini
@ -134,6 +134,7 @@ build_flags =
 build_src_filter = ${Heltec_RC32.build_src_filter}
  +<helpers/ui/MomentaryButton.cpp>
  +<helpers/ui/buzzer.cpp>
+  +<helpers/ui/NullDisplayDriver.cpp>
  +<helpers/esp32/*.cpp>
  +<../examples/companion_radio/*.cpp>
  +<../examples/companion_radio/ui-new/*.cpp>
@ -157,6 +158,7 @@ build_flags =
 build_src_filter = ${Heltec_RC32.build_src_filter}
  +<helpers/ui/MomentaryButton.cpp>
  +<helpers/ui/buzzer.cpp>
+  +<helpers/ui/NullDisplayDriver.cpp>
  +<helpers/esp32/*.cpp>
  +<../examples/companion_radio/*.cpp>
  +<../examples/companion_radio/ui-new/*.cpp>
@ -180,6 +182,7 @@ build_flags =
 build_src_filter = ${Heltec_RC32.build_src_filter}
  +<helpers/ui/MomentaryButton.cpp>
  +<helpers/ui/buzzer.cpp>
+  +<helpers/ui/NullDisplayDriver.cpp>
  +<helpers/esp32/*.cpp>
  +<../examples/companion_radio/*.cpp>
  +<../examples/companion_radio/ui-new/*.cpp>
--- a/variants/heltec_t114/platformio.ini
+++ b/variants/heltec_t114/platformio.ini
@ -109,6 +109,7 @@ build_flags =
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_t114.build_src_filter}
+  +<helpers/ui/NullDisplayDriver.cpp>
  +<helpers/nrf52/SerialBLEInterface.cpp>
  +<../examples/companion_radio/*.cpp>
  +<../examples/companion_radio/ui-new/*.cpp>
@ -128,6 +129,7 @@ build_flags =
  -D MAX_GROUP_CHANNELS=40
 build_src_filter = ${Heltec_t114.build_src_filter}
  +<helpers/nrf52/*.cpp>
+  +<helpers/ui/NullDisplayDriver.cpp>
  +<../examples/companion_radio/*.cpp>
  +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
--- a/variants/heltec_tower_v2/platformio.ini
+++ b/variants/heltec_tower_v2/platformio.ini
@ -69,6 +69,7 @@ build_flags =
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_tower_v2.build_src_filter}
+  +<helpers/ui/NullDisplayDriver.cpp>
  +<helpers/nrf52/SerialBLEInterface.cpp>
  +<../examples/companion_radio/*.cpp>
  +<../examples/companion_radio/ui-new/*.cpp>
@ -91,6 +92,7 @@ build_flags =
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_tower_v2.build_src_filter}
+  +<helpers/ui/NullDisplayDriver.cpp>
  +<helpers/nrf52/*.cpp>
  +<../examples/companion_radio/*.cpp>
  +<../examples/companion_radio/ui-new/*.cpp>
--- a/variants/ikoka_nano_nrf/platformio.ini
+++ b/variants/ikoka_nano_nrf/platformio.ini
@ -31,6 +31,8 @@ debug_tool = jlink
 upload_protocol = nrfutil
 lib_deps = ${nrf52_base.lib_deps}
   ${sensor_base.lib_deps}
+build_src_filter = ${nrf52_base.build_src_filter}
+  +<helpers/ui/NullDisplayDriver.cpp>

 [ikoka_nano_nrf_e22_22dbm]
 extends = ikoka_nano_nrf
@ -42,7 +44,6 @@ build_flags =
 build_src_filter = ${ikoka_nano_nrf.build_src_filter}
  +<helpers/*.cpp>
  +<helpers/sensors>
-  +<helpers/ui/NullDisplayDriver.cpp>
  +<../variants/ikoka_nano_nrf>

 [ikoka_nano_nrf_e22_30dbm]
@ -56,7 +57,6 @@ build_flags =
 build_src_filter = ${ikoka_nano_nrf.build_src_filter}
  +<helpers/*.cpp>
  +<helpers/sensors>
-  +<helpers/ui/NullDisplayDriver.cpp>
  +<../variants/ikoka_nano_nrf>

 [ikoka_nano_nrf_e22_33dbm]
@ -70,7 +70,6 @@ build_flags =
 build_src_filter = ${ikoka_nano_nrf.build_src_filter}
  +<helpers/*.cpp>
  +<helpers/sensors>
-  +<helpers/ui/NullDisplayDriver.cpp>
  +<../variants/ikoka_nano_nrf>

 [ikoka_nano_nrf_companion_radio_ble]
--- a/variants/minewsemi_me25ls01/NullDisplayDriver.h
+++ b/variants/minewsemi_me25ls01/NullDisplayDriver.h
@ -1,24 +0,0 @@
-#pragma once
-
-#include <helpers/ui/DisplayDriver.h>
-
-class NullDisplayDriver : public DisplayDriver {
-public:
-  NullDisplayDriver() : DisplayDriver(128, 64) { }
-  bool begin() { return false; }   // not present
-
-  bool isOn() override { return false; }
-  void turnOn() override { }
-  void turnOff() override { }
-  void clear() override { }
-  void startFrame(Color bkg = DARK) override { }
-  void setTextSize(int sz) override { }
-  void setColor(Color c) override { }
-  void setCursor(int x, int y) override { }
-  void print(const char* str) override { }
-  void fillRect(int x, int y, int w, int h) override { }
-  void drawRect(int x, int y, int w, int h) override { }
-  void drawXbm(int x, int y, const uint8_t* bits, int w, int h) override { }
-  uint16_t getTextWidth(const char* str) override { return 0; }
-  void endFrame() { }
-};
--- a/variants/minewsemi_me25ls01/platformio.ini
+++ b/variants/minewsemi_me25ls01/platformio.ini
@ -55,6 +55,7 @@ build_flags = ${me25ls01.build_flags}
  ;-D PIN_BUZZER=25
  ;-D PIN_BUZZER_EN=37
 build_src_filter = ${me25ls01.build_src_filter}
+  +<helpers/ui/NullDisplayDriver.cpp>
  +<helpers/nrf52/SerialBLEInterface.cpp>
  +<../examples/companion_radio/*.cpp>
  +<../examples/companion_radio/ui-orig/*.cpp>
@ -79,6 +80,7 @@ build_flags = ${me25ls01.build_flags}
  -D DISPLAY_CLASS=NullDisplayDriver
 build_src_filter = ${me25ls01.build_src_filter}
  +<../examples/simple_repeater>
+  +<helpers/ui/NullDisplayDriver.cpp>

 [env:Minewsemi_me25ls01_room_server]
 extends = me25ls01
@ -101,6 +103,7 @@ build_flags = ${me25ls01.build_flags}
  -D DISPLAY_CLASS=NullDisplayDriver
 build_src_filter = ${me25ls01.build_src_filter}
  +<../examples/simple_room_server>
+  +<helpers/ui/NullDisplayDriver.cpp>

 [env:Minewsemi_me25ls01_terminal_chat]
 extends = me25ls01
@ -123,6 +126,7 @@ build_flags = ${me25ls01.build_flags}
  -D DISPLAY_CLASS=NullDisplayDriver
 build_src_filter = ${me25ls01.build_src_filter}
  +<../examples/simple_secure_chat/main.cpp>
+  +<helpers/ui/NullDisplayDriver.cpp>

 [env:Minewsemi_me25ls01_companion_radio_usb]
 extends = me25ls01
@ -142,6 +146,7 @@ build_flags = ${me25ls01.build_flags}
  -D DISPLAY_CLASS=NullDisplayDriver
 build_src_filter = ${me25ls01.build_src_filter}
  +<helpers/nrf52/*.cpp>
+  +<helpers/ui/NullDisplayDriver.cpp>
  +<../examples/companion_radio/*.cpp>
  +<../examples/companion_radio/ui-orig/*.cpp>

--- a/variants/minewsemi_me25ls01/target.h
+++ b/variants/minewsemi_me25ls01/target.h
@ -10,7 +10,7 @@
 #include <helpers/sensors/LocationProvider.h>
 #include <helpers/sensors/EnvironmentSensorManager.h>
 #ifdef DISPLAY_CLASS
-  #include "NullDisplayDriver.h"
+  #include <helpers/ui/NullDisplayDriver.h>
 #endif

 #ifdef DISPLAY_CLASS
--- a/variants/t1000-e/platformio.ini
+++ b/variants/t1000-e/platformio.ini
@ -84,6 +84,7 @@ build_flags = ${t1000-e.build_flags}
  -D PIN_BUZZER_EN=37      ; P1/5 - required for T1000-E
 build_src_filter = ${t1000-e.build_src_filter}
  +<helpers/ui/buzzer.cpp>
+  +<helpers/ui/NullDisplayDriver.cpp>
  +<../examples/companion_radio/*.cpp>
  +<../examples/companion_radio/ui-orig/*.cpp>
 lib_deps = ${t1000-e.lib_deps}
@ -112,6 +113,7 @@ build_flags = ${t1000-e.build_flags}
 build_src_filter = ${t1000-e.build_src_filter}
  +<helpers/nrf52/SerialBLEInterface.cpp>
  +<helpers/ui/buzzer.cpp>
+  +<helpers/ui/NullDisplayDriver.cpp>
  +<../examples/companion_radio/*.cpp>
  +<../examples/companion_radio/ui-orig/*.cpp>
 lib_deps = ${t1000-e.lib_deps}
--- a/variants/thinknode_m3/platformio.ini
+++ b/variants/thinknode_m3/platformio.ini
@ -85,6 +85,7 @@ build_flags = ${ThinkNode_M3.build_flags}
  -D PIN_BUZZER_EN=36
 build_src_filter = ${ThinkNode_M3.build_src_filter}
  +<helpers/ui/buzzer.cpp>
+  +<helpers/ui/NullDisplayDriver.cpp>
  +<../examples/companion_radio/*.cpp>
  +<../examples/companion_radio/ui-orig/*.cpp>
 lib_deps = ${ThinkNode_M3.lib_deps}
@ -111,6 +112,7 @@ build_flags = ${ThinkNode_M3.build_flags}
 build_src_filter = ${ThinkNode_M3.build_src_filter}
  +<helpers/nrf52/SerialBLEInterface.cpp>
  +<helpers/ui/buzzer.cpp>
+  +<helpers/ui/NullDisplayDriver.cpp>
  +<../examples/companion_radio/*.cpp>
  +<../examples/companion_radio/ui-orig/*.cpp>
 lib_deps = ${ThinkNode_M3.lib_deps}
--- a/variants/thinknode_m7/platformio.ini
+++ b/variants/thinknode_m7/platformio.ini
@ -83,6 +83,7 @@ build_flags =
 build_src_filter = ${ThinkNode_M7.build_src_filter}
  +<helpers/esp32/*.cpp>
  +<helpers/ui/MomentaryButton.cpp>
+  +<helpers/ui/NullDisplayDriver.cpp>
  +<../examples/companion_radio/*.cpp>
  +<../examples/companion_radio/ui-orig/*.cpp>
 lib_deps =
@ -122,6 +123,7 @@ build_flags =
 build_src_filter = ${ThinkNode_M7.build_src_filter}
  +<helpers/esp32/*.cpp>
  +<helpers/ui/MomentaryButton.cpp>
+  +<helpers/ui/NullDisplayDriver.cpp>
  +<../examples/companion_radio/*.cpp>
  +<../examples/companion_radio/ui-orig/*.cpp>
 lib_deps =
--- a/variants/wio-e5-mini/NullDisplayDriver.h
+++ b/variants/wio-e5-mini/NullDisplayDriver.h
@ -1,24 +0,0 @@
-#pragma once
-
-#include <helpers/ui/DisplayDriver.h>
-
-class NullDisplayDriver : public DisplayDriver {
-public:
-  NullDisplayDriver() : DisplayDriver(128, 64) { }
-  bool begin() { return false; }   // not present
-
-  bool isOn() override { return false; }
-  void turnOn() override { }
-  void turnOff() override { }
-  void clear() override { }
-  void startFrame(Color bkg = DARK) override { }
-  void setTextSize(int sz) override { }
-  void setColor(Color c) override { }
-  void setCursor(int x, int y) override { }
-  void print(const char* str) override { }
-  void fillRect(int x, int y, int w, int h) override { }
-  void drawRect(int x, int y, int w, int h) override { }
-  void drawXbm(int x, int y, const uint8_t* bits, int w, int h) override { }
-  uint16_t getTextWidth(const char* str) override { return 0; }
-  void endFrame() { }
-};
--- a/variants/wio-e5-mini/platformio.ini
+++ b/variants/wio-e5-mini/platformio.ini
@ -45,6 +45,7 @@ build_flags = ${lora_e5_mini.build_flags}
  -D MAX_GROUP_CHANNELS=8
  -D DISPLAY_CLASS=NullDisplayDriver
 build_src_filter = ${lora_e5_mini.build_src_filter}
+  +<helpers/ui/NullDisplayDriver.cpp>
  +<../examples/companion_radio/*.cpp>
  +<../examples/companion_radio/ui-orig/*.cpp>
 lib_deps = ${lora_e5_mini.lib_deps}
--- a/variants/wio-e5-mini/target.h
+++ b/variants/wio-e5-mini/target.h
@ -8,7 +8,7 @@
 #include <helpers/ArduinoHelpers.h>
 #include <helpers/SensorManager.h>
 #ifdef DISPLAY_CLASS
-  #include "NullDisplayDriver.h"
+  #include <helpers/ui/NullDisplayDriver.h>
 #endif

 #include <BME280I2C.h>