DG4MLK/MeshCore-Evo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* display.begin() delayed in setup().

Browse Source 
* all firmwares now bumped to v1.2.0
This commit is contained in:
Scott Powell
2025-03-07 17:19:27 +11:00
parent 1f4a81360b
commit cf17091588
4 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
examples/companion_radio/main.cpp
View File

@@ -120,11 +120,11 @@ static uint32_t _atoi(const char* sp) {
#define FIRMWARE_VER_CODE 2 #define FIRMWARE_VER_CODE 2
#ifndef FIRMWARE_BUILD_DATE #ifndef FIRMWARE_BUILD_DATE
#define FIRMWARE_BUILD_DATE "3 Mar 2025" #define FIRMWARE_BUILD_DATE "7 Mar 2025"
#endif #endif
#ifndef FIRMWARE_VERSION #ifndef FIRMWARE_VERSION
#define FIRMWARE_VERSION "v1.0.0" #define FIRMWARE_VERSION "v1.2.0"
#endif #endif
#define CMD_APP_START 1 #define CMD_APP_START 1
@@ -1239,10 +1239,6 @@ void setup() {
float tcxo = 1.6f; float tcxo = 1.6f;
#endif #endif
#ifdef DISPLAY_CLASS
display.begin();
#endif
#if defined(NRF52_PLATFORM) #if defined(NRF52_PLATFORM)
SPI.setPins(P_LORA_MISO, P_LORA_SCLK, P_LORA_MOSI); SPI.setPins(P_LORA_MISO, P_LORA_SCLK, P_LORA_MOSI);
SPI.begin(); SPI.begin();
@@ -1303,6 +1299,7 @@ void setup() {
#endif #endif
#ifdef DISPLAY_CLASS #ifdef DISPLAY_CLASS
display.begin();
ui_task.begin(the_mesh.getNodeName(), FIRMWARE_BUILD_DATE, the_mesh.getBLEPin()); ui_task.begin(the_mesh.getNodeName(), FIRMWARE_BUILD_DATE, the_mesh.getBLEPin());
#endif #endif
} }

9
examples/simple_repeater/main.cpp
View File

@@ -22,11 +22,11 @@
/* ------------------------------ Config -------------------------------- */ /* ------------------------------ Config -------------------------------- */
#ifndef FIRMWARE_BUILD_DATE #ifndef FIRMWARE_BUILD_DATE
#define FIRMWARE_BUILD_DATE "3 Mar 2025" #define FIRMWARE_BUILD_DATE "7 Mar 2025"
#endif #endif
#ifndef FIRMWARE_VERSION #ifndef FIRMWARE_VERSION
#define FIRMWARE_VERSION "v1.0.0" #define FIRMWARE_VERSION "v1.2.0"
#endif #endif
#ifndef LORA_FREQ #ifndef LORA_FREQ
@@ -662,10 +662,6 @@ void setup() {
float tcxo = 1.6f; float tcxo = 1.6f;
#endif #endif
#ifdef DISPLAY_CLASS
display.begin();
#endif
#if defined(NRF52_PLATFORM) #if defined(NRF52_PLATFORM)
SPI.setPins(P_LORA_MISO, P_LORA_SCLK, P_LORA_MOSI); SPI.setPins(P_LORA_MISO, P_LORA_SCLK, P_LORA_MOSI);
SPI.begin(); SPI.begin();
@@ -719,6 +715,7 @@ void setup() {
the_mesh.begin(fs); the_mesh.begin(fs);
#ifdef DISPLAY_CLASS #ifdef DISPLAY_CLASS
display.begin();
ui_task.begin(the_mesh.getNodeName(), FIRMWARE_BUILD_DATE); ui_task.begin(the_mesh.getNodeName(), FIRMWARE_BUILD_DATE);
#endif #endif

9
examples/simple_room_server/main.cpp
View File

@@ -22,11 +22,11 @@
/* ------------------------------ Config -------------------------------- */ /* ------------------------------ Config -------------------------------- */
#ifndef FIRMWARE_BUILD_DATE #ifndef FIRMWARE_BUILD_DATE
#define FIRMWARE_BUILD_DATE "6 Mar 2025" #define FIRMWARE_BUILD_DATE "7 Mar 2025"
#endif #endif
#ifndef FIRMWARE_VERSION #ifndef FIRMWARE_VERSION
#define FIRMWARE_VERSION "v1.1.0" #define FIRMWARE_VERSION "v1.2.0"
#endif #endif
#ifndef LORA_FREQ #ifndef LORA_FREQ
@@ -716,10 +716,6 @@ void setup() {
float tcxo = 1.6f; float tcxo = 1.6f;
#endif #endif
#ifdef DISPLAY_CLASS
display.begin();
#endif
#if defined(NRF52_PLATFORM) #if defined(NRF52_PLATFORM)
SPI.setPins(P_LORA_MISO, P_LORA_SCLK, P_LORA_MOSI); SPI.setPins(P_LORA_MISO, P_LORA_SCLK, P_LORA_MOSI);
SPI.begin(); SPI.begin();
@@ -772,6 +768,7 @@ void setup() {
the_mesh.begin(fs); the_mesh.begin(fs);
#ifdef DISPLAY_CLASS #ifdef DISPLAY_CLASS
display.begin();
ui_task.begin(the_mesh.getNodeName(), FIRMWARE_BUILD_DATE); ui_task.begin(the_mesh.getNodeName(), FIRMWARE_BUILD_DATE);
#endif #endif

2
src/helpers/ui/SSD1306Display.cpp
View File

@@ -1,7 +1,7 @@
#include "SSD1306Display.h" #include "SSD1306Display.h"
bool SSD1306Display::begin() { bool SSD1306Display::begin() {
return display.begin(SSD1306_SWITCHCAPVCC, DISPLAY_ADDRESS); return display.begin(SSD1306_SWITCHCAPVCC, DISPLAY_ADDRESS, true, false);
} }
void SSD1306Display::turnOn() { void SSD1306Display::turnOn() {