Skip to content

Add SPI support for SSD1306 display and boot status UI #1467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kotovasia5120 wants to merge 1 commit into
base: dev
Choose a base branch
from
+96 −1
Open

Add SPI support for SSD1306 display and boot status UI #1467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 50 additions & 1 deletion examples/companion_radio/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
#include <Mesh.h>
#include "MyMesh.h"

// Optional on-screen boot status for boards with a display.
#if defined(DISPLAY_CLASS) && defined(DISPLAY_BOOT_STATUS)
static void showBootStatus(DisplayDriver* disp, const char* msg) {
if (!disp) return;
disp->startFrame();
disp->drawTextCentered(disp->width() / 2, 28, msg);
disp->endFrame();
}
#endif

// Believe it or not, this std C function is busted on some platforms!
static uint32_t _atoi(const char* sp) {
uint32_t n = 0;
Expand Down Expand Up @@ -123,11 +133,22 @@ void setup() {
}
#endif

if (!radio_init()) { halt(); }
#if defined(DISPLAY_CLASS) && defined(DISPLAY_BOOT_STATUS)
showBootStatus(disp, "Radio...");
#endif
if (!radio_init()) {
#if defined(DISPLAY_CLASS) && defined(DISPLAY_BOOT_STATUS)
showBootStatus(disp, "Radio fail");
#endif
halt();
}

fast_rng.begin(radio_get_rng_seed());

#if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
#if defined(DISPLAY_CLASS) && defined(DISPLAY_BOOT_STATUS)
showBootStatus(disp, "FS...");
#endif
InternalFS.begin();
#if defined(QSPIFLASH)
if (!QSPIFlash.begin()) {
Expand All @@ -142,6 +163,9 @@ void setup() {
#endif
#endif
store.begin();
#if defined(DISPLAY_CLASS) && defined(DISPLAY_BOOT_STATUS)
showBootStatus(disp, "Mesh...");
#endif
the_mesh.begin(
#ifdef DISPLAY_CLASS
disp != NULL
Expand All @@ -154,11 +178,20 @@ void setup() {
serial_interface.begin(BLE_NAME_PREFIX, the_mesh.getNodePrefs()->node_name, the_mesh.getBLEPin());
#else
serial_interface.begin(Serial);
#endif
#if defined(DISPLAY_CLASS) && defined(DISPLAY_BOOT_STATUS)
showBootStatus(disp, "Iface...");
#endif
the_mesh.startInterface(serial_interface);
#elif defined(RP2040_PLATFORM)
#if defined(DISPLAY_CLASS) && defined(DISPLAY_BOOT_STATUS)
showBootStatus(disp, "FS...");
#endif
LittleFS.begin();
store.begin();
#if defined(DISPLAY_CLASS) && defined(DISPLAY_BOOT_STATUS)
showBootStatus(disp, "Mesh...");
#endif
the_mesh.begin(
#ifdef DISPLAY_CLASS
disp != NULL
Expand All @@ -181,10 +214,19 @@ void setup() {
#else
serial_interface.begin(Serial);
#endif
#if defined(DISPLAY_CLASS) && defined(DISPLAY_BOOT_STATUS)
showBootStatus(disp, "Iface...");
#endif
the_mesh.startInterface(serial_interface);
#elif defined(ESP32)
#if defined(DISPLAY_CLASS) && defined(DISPLAY_BOOT_STATUS)
showBootStatus(disp, "FS...");
#endif
SPIFFS.begin(true);
store.begin();
#if defined(DISPLAY_CLASS) && defined(DISPLAY_BOOT_STATUS)
showBootStatus(disp, "Mesh...");
#endif
the_mesh.begin(
#ifdef DISPLAY_CLASS
disp != NULL
Expand All @@ -204,6 +246,9 @@ void setup() {
serial_interface.begin(companion_serial);
#else
serial_interface.begin(Serial);
#endif
#if defined(DISPLAY_CLASS) && defined(DISPLAY_BOOT_STATUS)
showBootStatus(disp, "Iface...");
#endif
the_mesh.startInterface(serial_interface);
#else
Expand All @@ -215,6 +260,10 @@ void setup() {
#ifdef DISPLAY_CLASS
ui_task.begin(disp, &sensors, the_mesh.getNodePrefs()); // still want to pass this in as dependency, as prefs might be moved
#endif

#if defined(DISPLAY_CLASS) && defined(DISPLAY_BOOT_STATUS)
showBootStatus(disp, "Ready");
#endif
}

void loop() {
Expand Down
7 changes: 7 additions & 0 deletions src/helpers/ui/SSD1306Display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
#include "SSD1306Display.h"

#ifndef USE_SPI_SSD1306
bool SSD1306Display::i2c_probe(TwoWire& wire, uint8_t addr) {
wire.beginTransmission(addr);
uint8_t error = wire.endTransmission();
return (error == 0);
}
#endif

bool SSD1306Display::begin() {
#ifdef DISPLAY_ROTATION
display.setRotation(DISPLAY_ROTATION);
#endif
#ifdef USE_SPI_SSD1306
DISPLAY_SPI.begin(PIN_OLED_SCK, PIN_OLED_MISO, PIN_OLED_MOSI, PIN_OLED_CS);
return display.begin(SSD1306_SWITCHCAPVCC, 0, true, false);
#else
return display.begin(SSD1306_SWITCHCAPVCC, DISPLAY_ADDRESS, true, false) && i2c_probe(Wire, DISPLAY_ADDRESS);
#endif
}

void SSD1306Display::turnOn() {
Expand Down
39 changes: 39 additions & 0 deletions src/helpers/ui/SSD1306Display.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,44 @@
#include <Adafruit_GFX.h>
#define SSD1306_NO_SPLASH
#include <Adafruit_SSD1306.h>
#ifdef USE_SPI_SSD1306 // Note: current display implementation shares the same SPI bus as the radio.
#include <SPI.h>
#if defined(DISPLAY_SPI) && (DISPLAY_SPI == 1)
#undef DISPLAY_SPI
#define DISPLAY_SPI spi
#endif
#ifndef DISPLAY_SPI
#define DISPLAY_SPI SPI
#endif
extern SPIClass DISPLAY_SPI;
#endif

#ifndef PIN_OLED_RESET
#define PIN_OLED_RESET 21 // Reset pin # (or -1 if sharing Arduino reset pin)
#endif

#ifdef USE_SPI_SSD1306
#ifndef PIN_OLED_CS
#define PIN_OLED_CS 5
#endif
#ifndef PIN_OLED_DC
#define PIN_OLED_DC 4
#endif
#ifndef PIN_OLED_SCK
#define PIN_OLED_SCK SCK
#endif
#ifndef PIN_OLED_MISO
#ifdef P_LORA_MISO
#define PIN_OLED_MISO P_LORA_MISO
#else
#define PIN_OLED_MISO MISO
#endif
#endif
#ifndef PIN_OLED_MOSI
#define PIN_OLED_MOSI MOSI
#endif
#endif

#ifndef DISPLAY_ADDRESS
#define DISPLAY_ADDRESS 0x3C
#endif
Expand All @@ -19,9 +52,15 @@ class SSD1306Display : public DisplayDriver {
bool _isOn;
uint8_t _color;

#ifndef USE_SPI_SSD1306
bool i2c_probe(TwoWire& wire, uint8_t addr);
#endif
public:
#ifdef USE_SPI_SSD1306
SSD1306Display() : DisplayDriver(128, 64), display(128, 64, &DISPLAY_SPI, PIN_OLED_DC, PIN_OLED_RESET, PIN_OLED_CS) { _isOn = false; }
#else
SSD1306Display() : DisplayDriver(128, 64), display(128, 64, &Wire, PIN_OLED_RESET) { _isOn = false; }
#endif
bool begin();

bool isOn() override { return _isOn; }
Expand Down