diff --git a/examples/companion_radio/UITask.cpp b/examples/companion_radio/UITask.cpp index e0c2ec51..4a04337f 100644 --- a/examples/companion_radio/UITask.cpp +++ b/examples/companion_radio/UITask.cpp @@ -85,7 +85,7 @@ void UITask::newMsg(uint8_t path_len, const char* from_name, const char* text, i } } -void renderBatteryIndicator(DisplayDriver* _display, uint16_t batteryMilliVolts) { +void UITask::renderBatteryIndicator(uint16_t batteryMilliVolts) { // Convert millivolts to percentage const int minMilliVolts = 3000; // Minimum voltage (e.g., 3.0V) const int maxMilliVolts = 4200; // Maximum voltage (e.g., 4.2V) @@ -155,7 +155,7 @@ void UITask::renderCurrScreen() { _display->print(_node_prefs->node_name); // battery voltage - renderBatteryIndicator(_display, _board->getBattMilliVolts()); + renderBatteryIndicator(_board->getBattMilliVolts()); // freq / sf _display->setCursor(0, 20); diff --git a/examples/companion_radio/UITask.h b/examples/companion_radio/UITask.h index 5edaa8e2..58d68564 100644 --- a/examples/companion_radio/UITask.h +++ b/examples/companion_radio/UITask.h @@ -22,6 +22,7 @@ class UITask { void renderCurrScreen(); void buttonHandler(); void userLedHandler(); + void renderBatteryIndicator(uint16_t batteryMilliVolts); public: diff --git a/examples/companion_radio/main.cpp b/examples/companion_radio/main.cpp index 02f16ab0..2cfb833b 100644 --- a/examples/companion_radio/main.cpp +++ b/examples/companion_radio/main.cpp @@ -60,30 +60,7 @@ #define PUBLIC_GROUP_PSK "izOH6cXN6mrJ5e26oRXNcg==" -#ifdef DISPLAY_CLASS // TODO: refactor this -- move to variants/*/target - #include "UITask.h" - #ifdef ST7735 - #include - #elif ST7789 - #include - #elif SH1106 - #include - #elif defined(HAS_GxEPD) - #include - #else - #include - #endif - - #if defined(HELTEC_LORA_V3) && defined(ST7735) - static DISPLAY_CLASS display(&board.periph_power); // peripheral power pin is shared - #else - static DISPLAY_CLASS display; - #endif - - #define HAS_UI -#endif - -#if defined(HAS_UI) +#ifdef DISPLAY_CLASS #include "UITask.h" static UITask ui_task(&board); @@ -609,7 +586,7 @@ protected: } else { soundBuzzer(); } - #ifdef HAS_UI + #ifdef DISPLAY_CLASS ui_task.newMsg(path_len, from.name, text, offline_queue_len); #endif } @@ -660,7 +637,7 @@ protected: } else { soundBuzzer(); } - #ifdef HAS_UI + #ifdef DISPLAY_CLASS ui_task.newMsg(path_len, "Public", text, offline_queue_len); #endif } @@ -895,7 +872,7 @@ public: #ifdef BLE_PIN_CODE if (_prefs.ble_pin == 0) { - #ifdef HAS_UI + #ifdef DISPLAY_CLASS if (has_display) { StdRNG rng; _active_ble_pin = rng.nextInt(100000, 999999); // random pin each session @@ -1244,7 +1221,7 @@ public: int out_len; if ((out_len = getFromOfflineQueue(out_frame)) > 0) { _serial->writeFrame(out_frame, out_len); - #ifdef HAS_UI + #ifdef DISPLAY_CLASS ui_task.msgRead(offline_queue_len); #endif } else { @@ -1572,7 +1549,7 @@ public: checkConnections(); } - #ifdef HAS_UI + #ifdef DISPLAY_CLASS ui_task.setHasConnection(_serial->isConnected()); ui_task.loop(); #endif @@ -1643,16 +1620,14 @@ void setup() { board.begin(); -#ifdef HAS_UI +#ifdef DISPLAY_CLASS DisplayDriver* disp = NULL; - #ifdef DISPLAY_CLASS if (display.begin()) { disp = &display; disp->startFrame(); disp->print("Please wait..."); disp->endFrame(); } - #endif #endif if (!radio_init()) { halt(); } @@ -1662,7 +1637,7 @@ void setup() { #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM) InternalFS.begin(); the_mesh.begin(InternalFS, - #ifdef HAS_UI + #ifdef DISPLAY_CLASS disp != NULL #else false @@ -1680,7 +1655,7 @@ void setup() { #elif defined(RP2040_PLATFORM) LittleFS.begin(); the_mesh.begin(LittleFS, - #ifdef HAS_UI + #ifdef DISPLAY_CLASS disp != NULL #else false @@ -1705,7 +1680,7 @@ void setup() { #elif defined(ESP32) SPIFFS.begin(true); the_mesh.begin(SPIFFS, - #ifdef HAS_UI + #ifdef DISPLAY_CLASS disp != NULL #else false @@ -1733,7 +1708,7 @@ void setup() { sensors.begin(); -#ifdef HAS_UI +#ifdef DISPLAY_CLASS ui_task.begin(disp, the_mesh.getNodePrefs(), FIRMWARE_BUILD_DATE, FIRMWARE_VERSION, the_mesh.getBLEPin()); #endif } diff --git a/examples/simple_repeater/main.cpp b/examples/simple_repeater/main.cpp index 7b38f5c3..5e04de54 100644 --- a/examples/simple_repeater/main.cpp +++ b/examples/simple_repeater/main.cpp @@ -60,10 +60,6 @@ #endif #ifdef DISPLAY_CLASS - #include - - static DISPLAY_CLASS display; - #include "UITask.h" static UITask ui_task(display); #endif @@ -735,7 +731,7 @@ void setup() { board.begin(); #ifdef DISPLAY_CLASS - if(display.begin()){ + if (display.begin()) { display.startFrame(); display.print("Please wait..."); display.endFrame(); diff --git a/examples/simple_room_server/main.cpp b/examples/simple_room_server/main.cpp index c041c621..5ffef515 100644 --- a/examples/simple_room_server/main.cpp +++ b/examples/simple_room_server/main.cpp @@ -68,10 +68,6 @@ #endif #ifdef DISPLAY_CLASS - #include - - static DISPLAY_CLASS display; - #include "UITask.h" static UITask ui_task(display); #endif @@ -909,7 +905,7 @@ void setup() { board.begin(); #ifdef DISPLAY_CLASS - if(display.begin()){ + if (display.begin()) { display.startFrame(); display.print("Please wait..."); display.endFrame(); diff --git a/src/helpers/ui/ST7735Display.cpp b/src/helpers/ui/ST7735Display.cpp index 91c40ea5..e9eea69b 100644 --- a/src/helpers/ui/ST7735Display.cpp +++ b/src/helpers/ui/ST7735Display.cpp @@ -1,5 +1,3 @@ -#ifdef ST7735 - #include "ST7735Display.h" #ifndef DISPLAY_ROTATION @@ -130,5 +128,3 @@ uint16_t ST7735Display::getTextWidth(const char* str) { void ST7735Display::endFrame() { // display.display(); } - -#endif \ No newline at end of file diff --git a/variants/heltec_tracker/platformio.ini b/variants/heltec_tracker/platformio.ini index e0ad8b0f..f54eda86 100644 --- a/variants/heltec_tracker/platformio.ini +++ b/variants/heltec_tracker/platformio.ini @@ -38,7 +38,6 @@ build_flags = ${Heltec_tracker_base.build_flags} -I src/helpers/ui ; -D ARDUINO_USB_CDC_ON_BOOT=1 ; need for debugging - -D ST7735 -D DISPLAY_ROTATION=1 -D DISPLAY_CLASS=ST7735Display -D MAX_CONTACTS=100 diff --git a/variants/heltec_tracker/target.cpp b/variants/heltec_tracker/target.cpp index 461b7cac..042c7c0d 100644 --- a/variants/heltec_tracker/target.cpp +++ b/variants/heltec_tracker/target.cpp @@ -19,6 +19,10 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1); HWTSensorManager sensors = HWTSensorManager(nmea); +#ifdef DISPLAY_CLASS + DISPLAY_CLASS display(&board.periph_power); // peripheral power pin is shared +#endif + #ifndef LORA_CR #define LORA_CR 5 #endif diff --git a/variants/heltec_tracker/target.h b/variants/heltec_tracker/target.h index 422e6f14..3184bec9 100644 --- a/variants/heltec_tracker/target.h +++ b/variants/heltec_tracker/target.h @@ -8,6 +8,9 @@ #include #include #include +#ifdef DISPLAY_CLASS + #include +#endif class HWTSensorManager : public SensorManager { bool gps_active = false; @@ -31,6 +34,10 @@ extern WRAPPER_CLASS radio_driver; extern AutoDiscoverRTCClock rtc_clock; extern HWTSensorManager sensors; +#ifdef DISPLAY_CLASS + extern DISPLAY_CLASS display; +#endif + bool radio_init(); uint32_t radio_get_rng_seed(); void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr); diff --git a/variants/heltec_v2/target.cpp b/variants/heltec_v2/target.cpp index 44eb8def..a7e9fa67 100644 --- a/variants/heltec_v2/target.cpp +++ b/variants/heltec_v2/target.cpp @@ -16,6 +16,10 @@ ESP32RTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); SensorManager sensors; +#ifdef DISPLAY_CLASS + DISPLAY_CLASS display; +#endif + #ifndef LORA_CR #define LORA_CR 5 #endif diff --git a/variants/heltec_v2/target.h b/variants/heltec_v2/target.h index 92aec7f2..f758c193 100644 --- a/variants/heltec_v2/target.h +++ b/variants/heltec_v2/target.h @@ -7,12 +7,19 @@ #include #include #include +#ifdef DISPLAY_CLASS + #include +#endif extern HeltecV2Board board; extern WRAPPER_CLASS radio_driver; extern AutoDiscoverRTCClock rtc_clock; extern SensorManager sensors; +#ifdef DISPLAY_CLASS + extern DISPLAY_CLASS display; +#endif + bool radio_init(); uint32_t radio_get_rng_seed(); void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr); diff --git a/variants/heltec_v3/target.cpp b/variants/heltec_v3/target.cpp index 27e0ebf9..ab9b709f 100644 --- a/variants/heltec_v3/target.cpp +++ b/variants/heltec_v3/target.cpp @@ -16,6 +16,10 @@ ESP32RTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); SensorManager sensors; +#ifdef DISPLAY_CLASS + DISPLAY_CLASS display; +#endif + #ifndef LORA_CR #define LORA_CR 5 #endif diff --git a/variants/heltec_v3/target.h b/variants/heltec_v3/target.h index b6ab2577..76ad58a7 100644 --- a/variants/heltec_v3/target.h +++ b/variants/heltec_v3/target.h @@ -7,12 +7,19 @@ #include #include #include +#ifdef DISPLAY_CLASS + #include +#endif extern HeltecV3Board board; extern WRAPPER_CLASS radio_driver; extern AutoDiscoverRTCClock rtc_clock; extern SensorManager sensors; +#ifdef DISPLAY_CLASS + extern DISPLAY_CLASS display; +#endif + bool radio_init(); uint32_t radio_get_rng_seed(); void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr); diff --git a/variants/lilygo_t3s3/target.cpp b/variants/lilygo_t3s3/target.cpp index 4073518f..7fa45e54 100644 --- a/variants/lilygo_t3s3/target.cpp +++ b/variants/lilygo_t3s3/target.cpp @@ -16,6 +16,10 @@ ESP32RTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); SensorManager sensors; +#ifdef DISPLAY_CLASS + DISPLAY_CLASS display; +#endif + #ifndef LORA_CR #define LORA_CR 5 #endif diff --git a/variants/lilygo_t3s3/target.h b/variants/lilygo_t3s3/target.h index eef923ab..609248ae 100644 --- a/variants/lilygo_t3s3/target.h +++ b/variants/lilygo_t3s3/target.h @@ -7,12 +7,19 @@ #include #include #include +#ifdef DISPLAY_CLASS + #include +#endif extern ESP32Board board; extern WRAPPER_CLASS radio_driver; extern AutoDiscoverRTCClock rtc_clock; extern SensorManager sensors; +#ifdef DISPLAY_CLASS + extern DISPLAY_CLASS display; +#endif + bool radio_init(); uint32_t radio_get_rng_seed(); void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr); diff --git a/variants/lilygo_tbeam/target.cpp b/variants/lilygo_tbeam/target.cpp index 4e761cb2..116088d6 100644 --- a/variants/lilygo_tbeam/target.cpp +++ b/variants/lilygo_tbeam/target.cpp @@ -16,6 +16,10 @@ ESP32RTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); SensorManager sensors; +#ifdef DISPLAY_CLASS + DISPLAY_CLASS display; +#endif + #ifndef LORA_CR #define LORA_CR 5 #endif diff --git a/variants/lilygo_tbeam/target.h b/variants/lilygo_tbeam/target.h index 2c1897ef..4a9f0b3c 100644 --- a/variants/lilygo_tbeam/target.h +++ b/variants/lilygo_tbeam/target.h @@ -7,12 +7,19 @@ #include #include #include +#ifdef DISPLAY_CLASS + #include +#endif extern TBeamBoard board; extern WRAPPER_CLASS radio_driver; extern AutoDiscoverRTCClock rtc_clock; extern SensorManager sensors; +#ifdef DISPLAY_CLASS + extern DISPLAY_CLASS display; +#endif + bool radio_init(); uint32_t radio_get_rng_seed(); void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr); diff --git a/variants/lilygo_tbeam_SX1262/target.cpp b/variants/lilygo_tbeam_SX1262/target.cpp index 4dcc3cf1..2f6666c5 100644 --- a/variants/lilygo_tbeam_SX1262/target.cpp +++ b/variants/lilygo_tbeam_SX1262/target.cpp @@ -16,6 +16,10 @@ ESP32RTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); SensorManager sensors; +#ifdef DISPLAY_CLASS + DISPLAY_CLASS display; +#endif + #ifndef LORA_CR #define LORA_CR 5 #endif diff --git a/variants/lilygo_tbeam_SX1262/target.h b/variants/lilygo_tbeam_SX1262/target.h index bcc80ef1..3f4d77fa 100644 --- a/variants/lilygo_tbeam_SX1262/target.h +++ b/variants/lilygo_tbeam_SX1262/target.h @@ -7,12 +7,19 @@ #include #include #include +#ifdef DISPLAY_CLASS + #include +#endif extern TBeamBoardSX1262 board; extern WRAPPER_CLASS radio_driver; extern AutoDiscoverRTCClock rtc_clock; extern SensorManager sensors; +#ifdef DISPLAY_CLASS + extern DISPLAY_CLASS display; +#endif + bool radio_init(); uint32_t radio_get_rng_seed(); void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr); diff --git a/variants/lilygo_tlora_v2_1/target.cpp b/variants/lilygo_tlora_v2_1/target.cpp index f5c14fe7..4d513ed9 100644 --- a/variants/lilygo_tlora_v2_1/target.cpp +++ b/variants/lilygo_tlora_v2_1/target.cpp @@ -12,6 +12,10 @@ ESP32RTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); SensorManager sensors; +#ifdef DISPLAY_CLASS + DISPLAY_CLASS display; +#endif + #ifndef LORA_CR #define LORA_CR 5 #endif diff --git a/variants/lilygo_tlora_v2_1/target.h b/variants/lilygo_tlora_v2_1/target.h index 9e73bc37..edf28eb4 100644 --- a/variants/lilygo_tlora_v2_1/target.h +++ b/variants/lilygo_tlora_v2_1/target.h @@ -7,12 +7,19 @@ #include #include #include +#ifdef DISPLAY_CLASS + #include +#endif extern LilyGoTLoraBoard board; extern WRAPPER_CLASS radio_driver; extern AutoDiscoverRTCClock rtc_clock; extern SensorManager sensors; +#ifdef DISPLAY_CLASS + extern DISPLAY_CLASS display; +#endif + bool radio_init(); uint32_t radio_get_rng_seed(); void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr); diff --git a/variants/nano_g2_ultra/platformio.ini b/variants/nano_g2_ultra/platformio.ini index e4a25423..dc8e81ac 100644 --- a/variants/nano_g2_ultra/platformio.ini +++ b/variants/nano_g2_ultra/platformio.ini @@ -39,7 +39,6 @@ build_flags = -D BLE_PIN_CODE=0 -D BLE_DEBUG_LOGGING=1 -D OFFLINE_QUEUE_SIZE=256 - -D SH1106 -D DISPLAY_CLASS=SH1106Display ; -D ENABLE_PRIVATE_KEY_IMPORT=1 ; -D ENABLE_PRIVATE_KEY_EXPORT=1 diff --git a/variants/nano_g2_ultra/target.cpp b/variants/nano_g2_ultra/target.cpp index e3f2eb7e..d8c5ef8e 100644 --- a/variants/nano_g2_ultra/target.cpp +++ b/variants/nano_g2_ultra/target.cpp @@ -12,6 +12,10 @@ VolatileRTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); SensorManager sensors; +#ifdef DISPLAY_CLASS + DISPLAY_CLASS display; +#endif + #ifndef LORA_CR #define LORA_CR 5 #endif diff --git a/variants/nano_g2_ultra/target.h b/variants/nano_g2_ultra/target.h index e8f3974a..b0af0a8d 100644 --- a/variants/nano_g2_ultra/target.h +++ b/variants/nano_g2_ultra/target.h @@ -7,12 +7,19 @@ #include #include #include +#ifdef DISPLAY_CLASS + #include +#endif extern NanoG2Ultra board; extern WRAPPER_CLASS radio_driver; extern AutoDiscoverRTCClock rtc_clock; extern SensorManager sensors; +#ifdef DISPLAY_CLASS + extern DISPLAY_CLASS display; +#endif + bool radio_init(); uint32_t radio_get_rng_seed(); void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr); diff --git a/variants/promicro/platformio.ini b/variants/promicro/platformio.ini index 1cae8cdd..51fbc92f 100644 --- a/variants/promicro/platformio.ini +++ b/variants/promicro/platformio.ini @@ -9,7 +9,6 @@ build_flags = ${nrf52840_base.build_flags} -D LORA_TX_POWER=22 -D SX126X_CURRENT_LIMIT=140 -D SX126X_RX_BOOSTED_GAIN=1 - -D DISPLAY_CLASS=SSD1306Display -D PIN_BOARD_SCL=7 -D PIN_BOARD_SDA=8 -D PIN_OLED_RESET=-1 @@ -35,6 +34,7 @@ build_flags = -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=8 + -D DISPLAY_CLASS=SSD1306Display ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 lib_deps = ${Faketec.lib_deps} @@ -51,6 +51,7 @@ build_flags = ${Faketec.build_flags} -D ADVERT_LON=0.0 -D ADMIN_PASSWORD='"password"' -D ROOM_PASSWORD='"hello"' + -D DISPLAY_CLASS=SSD1306Display ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 lib_deps = ${Faketec.lib_deps} @@ -74,6 +75,7 @@ extends = Faketec build_flags = ${Faketec.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 + -D DISPLAY_CLASS=SSD1306Display ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 build_src_filter = ${Faketec.build_src_filter} @@ -93,6 +95,7 @@ build_flags = ${Faketec.build_flags} -D ENABLE_PRIVATE_KEY_EXPORT=1 -D ENABLE_PRIVATE_KEY_IMPORT=1 -D OFFLINE_QUEUE_SIZE=256 + -D DISPLAY_CLASS=SSD1306Display ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${Faketec.build_src_filter} diff --git a/variants/promicro/target.cpp b/variants/promicro/target.cpp index b945fcf4..6e3dc938 100644 --- a/variants/promicro/target.cpp +++ b/variants/promicro/target.cpp @@ -12,6 +12,10 @@ VolatileRTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); PromicroSensorManager sensors; +#ifdef DISPLAY_CLASS + DISPLAY_CLASS display; +#endif + #ifndef LORA_CR #define LORA_CR 5 #endif diff --git a/variants/promicro/target.h b/variants/promicro/target.h index d77c4d1d..b7475b4a 100644 --- a/variants/promicro/target.h +++ b/variants/promicro/target.h @@ -11,6 +11,9 @@ #include #include #include +#ifdef DISPLAY_CLASS + #include +#endif #define NUM_SENSOR_SETTINGS 3 @@ -18,6 +21,9 @@ extern PromicroBoard board; extern WRAPPER_CLASS radio_driver; extern AutoDiscoverRTCClock rtc_clock; +#ifdef DISPLAY_CLASS + extern DISPLAY_CLASS display; +#endif bool radio_init(); uint32_t radio_get_rng_seed(); diff --git a/variants/rak4631/target.cpp b/variants/rak4631/target.cpp index aaa3e8f1..9b23af83 100644 --- a/variants/rak4631/target.cpp +++ b/variants/rak4631/target.cpp @@ -12,6 +12,10 @@ VolatileRTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); SensorManager sensors; +#ifdef DISPLAY_CLASS + DISPLAY_CLASS display; +#endif + #ifndef LORA_CR #define LORA_CR 5 #endif diff --git a/variants/rak4631/target.h b/variants/rak4631/target.h index 91f1d719..a50d6f2c 100644 --- a/variants/rak4631/target.h +++ b/variants/rak4631/target.h @@ -7,12 +7,19 @@ #include #include #include +#ifdef DISPLAY_CLASS + #include +#endif extern RAK4631Board board; extern WRAPPER_CLASS radio_driver; extern AutoDiscoverRTCClock rtc_clock; extern SensorManager sensors; +#ifdef DISPLAY_CLASS + extern DISPLAY_CLASS display; +#endif + bool radio_init(); uint32_t radio_get_rng_seed(); void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr); diff --git a/variants/t1000-e/NullDisplayDriver.h b/variants/t1000-e/NullDisplayDriver.h new file mode 100644 index 00000000..2a9670bd --- /dev/null +++ b/variants/t1000-e/NullDisplayDriver.h @@ -0,0 +1,24 @@ +#pragma once + +#include + +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() { } +}; diff --git a/variants/t1000-e/platformio.ini b/variants/t1000-e/platformio.ini index 9f1a3b06..927655af 100644 --- a/variants/t1000-e/platformio.ini +++ b/variants/t1000-e/platformio.ini @@ -46,7 +46,7 @@ build_flags = ${t1000-e.build_flags} -D OFFLINE_QUEUE_SIZE=256 -D RX_BOOSTED_GAIN=true -D RF_SWITCH_TABLE - -D HAS_UI + -D DISPLAY_CLASS=NullDisplayDriver build_src_filter = ${t1000-e.build_src_filter} + +<../examples/companion_radio/*.cpp> diff --git a/variants/t1000-e/target.cpp b/variants/t1000-e/target.cpp index 9449dd2c..be82ca76 100644 --- a/variants/t1000-e/target.cpp +++ b/variants/t1000-e/target.cpp @@ -12,6 +12,10 @@ VolatileRTCClock rtc_clock; MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1); T1000SensorManager sensors = T1000SensorManager(nmea); +#ifdef DISPLAY_CLASS + NullDisplayDriver display; +#endif + #ifndef LORA_CR #define LORA_CR 5 #endif diff --git a/variants/t1000-e/target.h b/variants/t1000-e/target.h index 8e9fd9c7..1b569481 100644 --- a/variants/t1000-e/target.h +++ b/variants/t1000-e/target.h @@ -8,6 +8,9 @@ #include #include #include +#ifdef DISPLAY_CLASS + #include "NullDisplayDriver.h" +#endif class T1000SensorManager: public SensorManager { bool gps_active = false; @@ -27,6 +30,10 @@ public: bool setSettingValue(const char* name, const char* value) override; }; +#ifdef DISPLAY_CLASS + extern NullDisplayDriver display; +#endif + extern T1000eBoard board; extern WRAPPER_CLASS radio_driver; extern VolatileRTCClock rtc_clock; diff --git a/variants/t114/target.cpp b/variants/t114/target.cpp index 3e34ff92..fe3d14f9 100644 --- a/variants/t114/target.cpp +++ b/variants/t114/target.cpp @@ -14,6 +14,10 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1); T114SensorManager sensors = T114SensorManager(nmea); +#ifdef DISPLAY_CLASS + DISPLAY_CLASS display; +#endif + #ifndef LORA_CR #define LORA_CR 5 #endif diff --git a/variants/t114/target.h b/variants/t114/target.h index 38d0e02a..0f6ebaa1 100644 --- a/variants/t114/target.h +++ b/variants/t114/target.h @@ -8,6 +8,9 @@ #include #include #include +#ifdef DISPLAY_CLASS + #include +#endif class T114SensorManager : public SensorManager { bool gps_active = false; @@ -32,6 +35,10 @@ extern WRAPPER_CLASS radio_driver; extern AutoDiscoverRTCClock rtc_clock; extern T114SensorManager sensors; +#ifdef DISPLAY_CLASS + extern DISPLAY_CLASS display; +#endif + bool radio_init(); uint32_t radio_get_rng_seed(); void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr); diff --git a/variants/techo/platformio.ini b/variants/techo/platformio.ini index d9346948..c4bc8f85 100644 --- a/variants/techo/platformio.ini +++ b/variants/techo/platformio.ini @@ -64,7 +64,6 @@ build_flags = -D BLE_DEBUG_LOGGING=1 -D DISPLAY_CLASS=GxEPDDisplay -D OFFLINE_QUEUE_SIZE=256 - -D HAS_GxEPD ; -D ENABLE_PRIVATE_KEY_IMPORT=1 ; -D ENABLE_PRIVATE_KEY_EXPORT=1 ; -D MESH_PACKET_LOGGING=1 diff --git a/variants/techo/target.cpp b/variants/techo/target.cpp index 0aabfd47..880af612 100644 --- a/variants/techo/target.cpp +++ b/variants/techo/target.cpp @@ -12,6 +12,10 @@ VolatileRTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); SensorManager sensors; +#ifdef DISPLAY_CLASS + DISPLAY_CLASS display; +#endif + #ifndef LORA_CR #define LORA_CR 5 #endif diff --git a/variants/techo/target.h b/variants/techo/target.h index 0ec9ab04..15524111 100644 --- a/variants/techo/target.h +++ b/variants/techo/target.h @@ -7,12 +7,20 @@ #include #include #include +#ifdef DISPLAY_CLASS + #include +#endif + extern TechoBoard board; extern WRAPPER_CLASS radio_driver; extern AutoDiscoverRTCClock rtc_clock; extern SensorManager sensors; +#ifdef DISPLAY_CLASS + extern DISPLAY_CLASS display; +#endif + bool radio_init(); uint32_t radio_get_rng_seed(); void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr); diff --git a/variants/thinknode_m1/platformio.ini b/variants/thinknode_m1/platformio.ini index eec255d0..9bad98e2 100644 --- a/variants/thinknode_m1/platformio.ini +++ b/variants/thinknode_m1/platformio.ini @@ -70,7 +70,6 @@ build_flags = -D BLE_DEBUG_LOGGING=1 -D DISPLAY_ROTATION=4 -D DISPLAY_CLASS=GxEPDDisplay - -D HAS_GxEPD -D OFFLINE_QUEUE_SIZE=256 ; -D ENABLE_PRIVATE_KEY_IMPORT=1 ; -D ENABLE_PRIVATE_KEY_EXPORT=1 diff --git a/variants/thinknode_m1/target.cpp b/variants/thinknode_m1/target.cpp index c31749f6..5a09eb9a 100644 --- a/variants/thinknode_m1/target.cpp +++ b/variants/thinknode_m1/target.cpp @@ -12,6 +12,10 @@ VolatileRTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); SensorManager sensors; +#ifdef DISPLAY_CLASS + DISPLAY_CLASS display; +#endif + #ifndef LORA_CR #define LORA_CR 5 #endif diff --git a/variants/thinknode_m1/target.h b/variants/thinknode_m1/target.h index 73e8a134..c958d0e3 100644 --- a/variants/thinknode_m1/target.h +++ b/variants/thinknode_m1/target.h @@ -7,12 +7,19 @@ #include #include #include +#ifdef DISPLAY_CLASS + #include +#endif extern ThinkNodeM1Board board; extern WRAPPER_CLASS radio_driver; extern AutoDiscoverRTCClock rtc_clock; extern SensorManager sensors; +#ifdef DISPLAY_CLASS + extern DISPLAY_CLASS display; +#endif + bool radio_init(); uint32_t radio_get_rng_seed(); void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr); diff --git a/variants/xiao_s3_wio/target.cpp b/variants/xiao_s3_wio/target.cpp index 517b9ef6..09ee5daa 100644 --- a/variants/xiao_s3_wio/target.cpp +++ b/variants/xiao_s3_wio/target.cpp @@ -16,6 +16,10 @@ ESP32RTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); SensorManager sensors; +#ifdef DISPLAY_CLASS + DISPLAY_CLASS display; +#endif + #ifndef LORA_CR #define LORA_CR 5 #endif diff --git a/variants/xiao_s3_wio/target.h b/variants/xiao_s3_wio/target.h index eef923ab..609248ae 100644 --- a/variants/xiao_s3_wio/target.h +++ b/variants/xiao_s3_wio/target.h @@ -7,12 +7,19 @@ #include #include #include +#ifdef DISPLAY_CLASS + #include +#endif extern ESP32Board board; extern WRAPPER_CLASS radio_driver; extern AutoDiscoverRTCClock rtc_clock; extern SensorManager sensors; +#ifdef DISPLAY_CLASS + extern DISPLAY_CLASS display; +#endif + bool radio_init(); uint32_t radio_get_rng_seed(); void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);