Skip to content

Commit cf17091

Browse files
author
Scott Powell
committed
* display.begin() delayed in setup().
* all firmwares now bumped to v1.2.0
1 parent 1f4a813 commit cf17091

File tree

4 files changed

+10
-19
lines changed

4 files changed

+10
-19
lines changed

examples/companion_radio/main.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,11 @@ static uint32_t _atoi(const char* sp) {
120120
#define FIRMWARE_VER_CODE 2
121121

122122
#ifndef FIRMWARE_BUILD_DATE
123-
#define FIRMWARE_BUILD_DATE "3 Mar 2025"
123+
#define FIRMWARE_BUILD_DATE "7 Mar 2025"
124124
#endif
125125

126126
#ifndef FIRMWARE_VERSION
127-
#define FIRMWARE_VERSION "v1.0.0"
127+
#define FIRMWARE_VERSION "v1.2.0"
128128
#endif
129129

130130
#define CMD_APP_START 1
@@ -1239,10 +1239,6 @@ void setup() {
12391239
float tcxo = 1.6f;
12401240
#endif
12411241

1242-
#ifdef DISPLAY_CLASS
1243-
display.begin();
1244-
#endif
1245-
12461242
#if defined(NRF52_PLATFORM)
12471243
SPI.setPins(P_LORA_MISO, P_LORA_SCLK, P_LORA_MOSI);
12481244
SPI.begin();
@@ -1303,6 +1299,7 @@ void setup() {
13031299
#endif
13041300

13051301
#ifdef DISPLAY_CLASS
1302+
display.begin();
13061303
ui_task.begin(the_mesh.getNodeName(), FIRMWARE_BUILD_DATE, the_mesh.getBLEPin());
13071304
#endif
13081305
}

examples/simple_repeater/main.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
/* ------------------------------ Config -------------------------------- */
2323

2424
#ifndef FIRMWARE_BUILD_DATE
25-
#define FIRMWARE_BUILD_DATE "3 Mar 2025"
25+
#define FIRMWARE_BUILD_DATE "7 Mar 2025"
2626
#endif
2727

2828
#ifndef FIRMWARE_VERSION
29-
#define FIRMWARE_VERSION "v1.0.0"
29+
#define FIRMWARE_VERSION "v1.2.0"
3030
#endif
3131

3232
#ifndef LORA_FREQ
@@ -662,10 +662,6 @@ void setup() {
662662
float tcxo = 1.6f;
663663
#endif
664664

665-
#ifdef DISPLAY_CLASS
666-
display.begin();
667-
#endif
668-
669665
#if defined(NRF52_PLATFORM)
670666
SPI.setPins(P_LORA_MISO, P_LORA_SCLK, P_LORA_MOSI);
671667
SPI.begin();
@@ -719,6 +715,7 @@ void setup() {
719715
the_mesh.begin(fs);
720716

721717
#ifdef DISPLAY_CLASS
718+
display.begin();
722719
ui_task.begin(the_mesh.getNodeName(), FIRMWARE_BUILD_DATE);
723720
#endif
724721

examples/simple_room_server/main.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
/* ------------------------------ Config -------------------------------- */
2323

2424
#ifndef FIRMWARE_BUILD_DATE
25-
#define FIRMWARE_BUILD_DATE "6 Mar 2025"
25+
#define FIRMWARE_BUILD_DATE "7 Mar 2025"
2626
#endif
2727

2828
#ifndef FIRMWARE_VERSION
29-
#define FIRMWARE_VERSION "v1.1.0"
29+
#define FIRMWARE_VERSION "v1.2.0"
3030
#endif
3131

3232
#ifndef LORA_FREQ
@@ -716,10 +716,6 @@ void setup() {
716716
float tcxo = 1.6f;
717717
#endif
718718

719-
#ifdef DISPLAY_CLASS
720-
display.begin();
721-
#endif
722-
723719
#if defined(NRF52_PLATFORM)
724720
SPI.setPins(P_LORA_MISO, P_LORA_SCLK, P_LORA_MOSI);
725721
SPI.begin();
@@ -772,6 +768,7 @@ void setup() {
772768
the_mesh.begin(fs);
773769

774770
#ifdef DISPLAY_CLASS
771+
display.begin();
775772
ui_task.begin(the_mesh.getNodeName(), FIRMWARE_BUILD_DATE);
776773
#endif
777774

src/helpers/ui/SSD1306Display.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "SSD1306Display.h"
22

33
bool SSD1306Display::begin() {
4-
return display.begin(SSD1306_SWITCHCAPVCC, DISPLAY_ADDRESS);
4+
return display.begin(SSD1306_SWITCHCAPVCC, DISPLAY_ADDRESS, true, false);
55
}
66

77
void SSD1306Display::turnOn() {

0 commit comments

Comments
 (0)