diff --git a/examples/companion_radio/main.cpp b/examples/companion_radio/main.cpp index be2fed28..0a25f23a 100644 --- a/examples/companion_radio/main.cpp +++ b/examples/companion_radio/main.cpp @@ -120,11 +120,11 @@ static uint32_t _atoi(const char* sp) { #define FIRMWARE_VER_CODE 2 #ifndef FIRMWARE_BUILD_DATE - #define FIRMWARE_BUILD_DATE "3 Mar 2025" + #define FIRMWARE_BUILD_DATE "7 Mar 2025" #endif #ifndef FIRMWARE_VERSION - #define FIRMWARE_VERSION "v1.0.0" + #define FIRMWARE_VERSION "v1.2.0" #endif #define CMD_APP_START 1 @@ -1239,10 +1239,6 @@ void setup() { float tcxo = 1.6f; #endif -#ifdef DISPLAY_CLASS - display.begin(); -#endif - #if defined(NRF52_PLATFORM) SPI.setPins(P_LORA_MISO, P_LORA_SCLK, P_LORA_MOSI); SPI.begin(); @@ -1303,6 +1299,7 @@ void setup() { #endif #ifdef DISPLAY_CLASS + display.begin(); ui_task.begin(the_mesh.getNodeName(), FIRMWARE_BUILD_DATE, the_mesh.getBLEPin()); #endif } diff --git a/examples/simple_repeater/main.cpp b/examples/simple_repeater/main.cpp index a5f06c1d..d41fd3e7 100644 --- a/examples/simple_repeater/main.cpp +++ b/examples/simple_repeater/main.cpp @@ -22,11 +22,11 @@ /* ------------------------------ Config -------------------------------- */ #ifndef FIRMWARE_BUILD_DATE - #define FIRMWARE_BUILD_DATE "3 Mar 2025" + #define FIRMWARE_BUILD_DATE "7 Mar 2025" #endif #ifndef FIRMWARE_VERSION - #define FIRMWARE_VERSION "v1.0.0" + #define FIRMWARE_VERSION "v1.2.0" #endif #ifndef LORA_FREQ @@ -662,10 +662,6 @@ void setup() { float tcxo = 1.6f; #endif -#ifdef DISPLAY_CLASS - display.begin(); -#endif - #if defined(NRF52_PLATFORM) SPI.setPins(P_LORA_MISO, P_LORA_SCLK, P_LORA_MOSI); SPI.begin(); @@ -719,6 +715,7 @@ void setup() { the_mesh.begin(fs); #ifdef DISPLAY_CLASS + display.begin(); ui_task.begin(the_mesh.getNodeName(), FIRMWARE_BUILD_DATE); #endif diff --git a/examples/simple_room_server/main.cpp b/examples/simple_room_server/main.cpp index 04266e11..51e9ab3f 100644 --- a/examples/simple_room_server/main.cpp +++ b/examples/simple_room_server/main.cpp @@ -22,11 +22,11 @@ /* ------------------------------ Config -------------------------------- */ #ifndef FIRMWARE_BUILD_DATE - #define FIRMWARE_BUILD_DATE "6 Mar 2025" + #define FIRMWARE_BUILD_DATE "7 Mar 2025" #endif #ifndef FIRMWARE_VERSION - #define FIRMWARE_VERSION "v1.1.0" + #define FIRMWARE_VERSION "v1.2.0" #endif #ifndef LORA_FREQ @@ -716,10 +716,6 @@ void setup() { float tcxo = 1.6f; #endif -#ifdef DISPLAY_CLASS - display.begin(); -#endif - #if defined(NRF52_PLATFORM) SPI.setPins(P_LORA_MISO, P_LORA_SCLK, P_LORA_MOSI); SPI.begin(); @@ -772,6 +768,7 @@ void setup() { the_mesh.begin(fs); #ifdef DISPLAY_CLASS + display.begin(); ui_task.begin(the_mesh.getNodeName(), FIRMWARE_BUILD_DATE); #endif diff --git a/src/helpers/ui/SSD1306Display.cpp b/src/helpers/ui/SSD1306Display.cpp index 84db7d13..fe5be0ca 100644 --- a/src/helpers/ui/SSD1306Display.cpp +++ b/src/helpers/ui/SSD1306Display.cpp @@ -1,7 +1,7 @@ #include "SSD1306Display.h" bool SSD1306Display::begin() { - return display.begin(SSD1306_SWITCHCAPVCC, DISPLAY_ADDRESS); + return display.begin(SSD1306_SWITCHCAPVCC, DISPLAY_ADDRESS, true, false); } void SSD1306Display::turnOn() {