Refactor display driver inclusion for Heltec T114 to support configurations without a display

variants/heltec_t114/NullDisplayDriver.h

@@ -0,0 +1,24 @@
+#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() { }
+};

variants/heltec_t114/platformio.ini

@@ -1,3 +1,6 @@
+;
+; Heltec T114 without display
+;
 [Heltec_t114]
 extends = nrf52_base
 board = heltec_t114
@@ -24,15 +27,11 @@ build_flags = ${nrf52_base.build_flags}
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
   -D SX126X_RX_BOOSTED_GAIN=1
+  -D DISPLAY_CLASS=NullDisplayDriver
   -D ST7789
-  -D DISPLAY_CLASS=ST7789Display
 build_src_filter = ${nrf52_base.build_src_filter}
   +<helpers/*.cpp>
   +<../variants/heltec_t114>
-  +<helpers/ui/ST7789Display.cpp>
-  +<helpers/ui/MomentaryButton.cpp>
-  +<helpers/ui/OLEDDisplay.cpp>
-  +<helpers/ui/OLEDDisplayFonts.cpp>
 lib_deps =
   ${nrf52_base.lib_deps}
   stevemarple/MicroNMEA @ ^2.0.6
@@ -40,7 +39,7 @@ lib_deps =
 debug_tool = jlink
 upload_protocol = nrfutil
 
-[env:Heltec_t114_repeater]
+[env:Heltec_t114_without_display_repeater]
 extends = Heltec_t114
 build_src_filter = ${Heltec_t114.build_src_filter}
   +<../examples/simple_repeater>
@@ -55,7 +54,7 @@ build_flags =
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 
-[env:Heltec_t114_room_server]
+[env:Heltec_t114_without_display_room_server]
 extends = Heltec_t114
 build_src_filter = ${Heltec_t114.build_src_filter}
   +<../examples/simple_room_server>
@@ -69,7 +68,7 @@ build_flags =
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 
-[env:Heltec_t114_companion_radio_ble]
+[env:Heltec_t114_without_display_companion_radio_ble]
 extends = Heltec_t114
 build_flags =
   ${Heltec_t114.build_flags}
@@ -89,7 +88,7 @@ lib_deps =
   ${Heltec_t114.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:Heltec_t114_companion_radio_usb]
+[env:Heltec_t114_without_display_companion_radio_usb]
 extends = Heltec_t114
 build_flags =
   ${Heltec_t114.build_flags}
@@ -106,4 +105,92 @@ build_src_filter = ${Heltec_t114.build_src_filter}
   +<../examples/companion_radio/ui-new/*.cpp>
 lib_deps =
   ${Heltec_t114.lib_deps}
+  densaugeo/base64 @ ~1.4.0
+
+;
+; Heltec T114 with ST7789 display
+;
+[Heltec_t114_with_display]
+extends = Heltec_t114
+board = heltec_t114
+board_build.ldscript = boards/nrf52840_s140_v6.ld
+build_flags = ${Heltec_t114.build_flags}
+  -D HELTEC_T114_WITH_DISPLAY
+  -D DISPLAY_CLASS=ST7789Display
+build_src_filter = ${Heltec_t114.build_src_filter}
+  +<helpers/ui/ST7789Display.cpp>
+  +<helpers/ui/MomentaryButton.cpp>
+  +<helpers/ui/OLEDDisplay.cpp>
+  +<helpers/ui/OLEDDisplayFonts.cpp>
+lib_deps =
+  ${Heltec_t114.lib_deps}
+debug_tool = jlink
+upload_protocol = nrfutil
+
+[env:Heltec_t114_repeater]
+extends = Heltec_t114_with_display
+build_src_filter = ${Heltec_t114_with_display.build_src_filter}
+  +<../examples/simple_repeater>
+
+build_flags =
+  ${Heltec_t114_with_display.build_flags}
+  -D ADVERT_NAME='"Heltec_T114 Repeater"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D ADMIN_PASSWORD='"password"'
+  -D MAX_NEIGHBOURS=8
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+
+[env:Heltec_t114_room_server]
+extends = Heltec_t114_with_display
+build_src_filter = ${Heltec_t114_with_display.build_src_filter}
+  +<../examples/simple_room_server>
+build_flags =
+  ${Heltec_t114_with_display.build_flags}
+  -D ADVERT_NAME='"Heltec_T114 Room"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D ADMIN_PASSWORD='"password"'
+  -D ROOM_PASSWORD='"hello"'
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+
+[env:Heltec_t114_companion_radio_ble]
+extends = Heltec_t114_with_display
+build_flags =
+  ${Heltec_t114_with_display.build_flags}
+  -I examples/companion_radio/ui-new
+  -D MAX_CONTACTS=100
+  -D MAX_GROUP_CHANNELS=8
+  -D BLE_PIN_CODE=123456
+;  -D BLE_DEBUG_LOGGING=1
+  -D OFFLINE_QUEUE_SIZE=256
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter = ${Heltec_t114_with_display.build_src_filter}
+  +<helpers/nrf52/SerialBLEInterface.cpp>
+  +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
+lib_deps =
+  ${Heltec_t114_with_display.lib_deps}
+  densaugeo/base64 @ ~1.4.0
+
+[env:Heltec_t114_companion_radio_usb]
+extends = Heltec_t114_with_display
+build_flags =
+  ${Heltec_t114_with_display.build_flags}
+  -I examples/companion_radio/ui-new
+  -D MAX_CONTACTS=100
+  -D MAX_GROUP_CHANNELS=8
+;  -D BLE_PIN_CODE=123456
+;  -D BLE_DEBUG_LOGGING=1
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter = ${Heltec_t114_with_display.build_src_filter}
+  +<helpers/nrf52/*.cpp>
+  +<../examples/companion_radio/*.cpp>
+  +<../examples/companion_radio/ui-new/*.cpp>
+lib_deps =
+  ${Heltec_t114_with_display.lib_deps}
   densaugeo/base64 @ ~1.4.0

variants/heltec_t114/target.h

@@ -8,9 +8,14 @@
 #include <helpers/AutoDiscoverRTCClock.h>
 #include <helpers/SensorManager.h>
 #include <helpers/sensors/LocationProvider.h>
+
 #ifdef DISPLAY_CLASS
-  #include <helpers/ui/ST7789Display.h>
-  #include <helpers/ui/MomentaryButton.h>
+#include <helpers/ui/MomentaryButton.h>
+#ifdef HELTEC_T114_WITH_DISPLAY
+#include <helpers/ui/ST7789Display.h>
+#else
+#include "NullDisplayDriver.h"
+#endif
 #endif
 
 class T114SensorManager : public SensorManager {