Merge pull request #2174 from meshtastic/SH1107

Sh1107 support (128x128)
2025-05-06 13:48:29 +00:00 · 2023-01-20 22:15:02 +01:00 · 2023-01-20 22:15:02 +01:00 · 8f5338dc85
commit 8f5338dc85
parent 9a7121d8c9 8c434c7084
8 changed files with 157 additions and 149 deletions
--- a/platformio.ini
+++ b/platformio.ini
@ -58,7 +58,7 @@ build_flags = -Wno-missing-field-initializers
 monitor_speed = 115200

 lib_deps =
-  https://github.com/meshtastic/esp8266-oled-ssd1306.git#53580644255b48ebb7a737343c6b4e71c7e11cf2 ; ESP8266_SSD1306 
+  https://github.com/meshtastic/esp8266-oled-ssd1306.git#da1ede4dfcd91074283b029080759fd744120909 ; ESP8266_SSD1306 
  mathertel/OneButton@^2.0.3 ; OneButton library for non-blocking button debounce
  https://github.com/meshtastic/arduino-fsm.git#7db3702bf0cfe97b783d6c72595e3f38e0b19159
  https://github.com/meshtastic/TinyGPSPlus.git#127ad674ef85f0201cb68a065879653ed94792c4
--- a/src/graphics/EInkDisplay2.cpp
+++ b/src/graphics/EInkDisplay2.cpp
@ -1,11 +1,11 @@
 #include "configuration.h"

 #ifdef USE_EINK
-#include "main.h"
 #include "EInkDisplay2.h"
-#include "SPILock.h"
-#include <SPI.h>
 #include "GxEPD2_BW.h"
+#include "SPILock.h"
+#include "main.h"
+#include <SPI.h>

 #define COLORED GxEPD_BLACK
 #define UNCOLORED GxEPD_WHITE
@ -14,7 +14,8 @@
 #define TECHO_DISPLAY_MODEL GxEPD2_154_D67
 #elif defined(RAK4630)

-//GxEPD2_213_BN - RAK14000 2.13 inch b/w 250x122 - changed from GxEPD2_213_B74 - which was not going to give partial update support
+// GxEPD2_213_BN - RAK14000 2.13 inch b/w 250x122 - changed from GxEPD2_213_B74 - which was not going to give partial update
+// support
 #define TECHO_DISPLAY_MODEL GxEPD2_213_BN

 // 4.2 inch 300x400 - GxEPD2_420_M01
@ -40,7 +41,7 @@

 GxEPD2_BW<TECHO_DISPLAY_MODEL, TECHO_DISPLAY_MODEL::HEIGHT> *adafruitDisplay;

-EInkDisplay::EInkDisplay(uint8_t address, int sda, int scl)
+EInkDisplay::EInkDisplay(uint8_t address, int sda, int scl, uint8_t screen_model)
 {
 #if defined(TTGO_T_ECHO)
    setGeometry(GEOMETRY_RAWMODE, TECHO_DISPLAY_MODEL::WIDTH, TECHO_DISPLAY_MODEL::HEIGHT);
@ -175,7 +176,6 @@ bool EInkDisplay::connect()
    pinMode(PIN_EINK_EN, OUTPUT);
 #endif

-    
 #if defined(TTGO_T_ECHO)
    {
        auto lowLevel = new TECHO_DISPLAY_MODEL(PIN_EINK_CS, PIN_EINK_DC, PIN_EINK_RES, PIN_EINK_BUSY, SPI1);
@ -218,7 +218,6 @@ bool EInkDisplay::connect()
    adafruitDisplay->setPartialWindow(0, 0, EPD_WIDTH, EPD_HEIGHT);
 #endif

-    
    // adafruitDisplay->setFullWindow();
    // adafruitDisplay->fillScreen(UNCOLORED);
    // adafruitDisplay->drawCircle(100, 100, 20, COLORED);
--- a/src/graphics/EInkDisplay2.h
+++ b/src/graphics/EInkDisplay2.h
@ -22,7 +22,7 @@ class EInkDisplay : public OLEDDisplay
    /* constructor
    FIXME - the parameters are not used, just a temporary hack to keep working like the old displays
    */
-    EInkDisplay(uint8_t address, int sda, int scl);
+    EInkDisplay(uint8_t address, int sda, int scl, uint8_t screen_model);

    // Write the buffer to the display memory (for eink we only do this occasionally)
    virtual void display(void) override;
@ -50,5 +50,3 @@ class EInkDisplay : public OLEDDisplay
    // Connect to the display
    virtual bool connect() override;
 };
-
-
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@ -908,7 +908,10 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
 //     }
 // }
 // #else
-Screen::Screen(uint8_t address, int sda, int scl) : OSThread("Screen"), cmdQueue(32), dispdev(address, sda, scl), ui(&dispdev)
+Screen::Screen(uint8_t address, int sda, int scl)
+    : OSThread("Screen"), cmdQueue(32),
+      dispdev(address, sda, scl, screen_model == Config_DisplayConfig_OledType_OLED_SH1107 ? GEOMETRY_128_128 : GEOMETRY_128_64),
+      ui(&dispdev)
 {
    address_found = address;
    cmdQueue.setReader(this);
@ -958,6 +961,8 @@ void Screen::setup()
    useDisplay = true;

 #ifdef AutoOLEDWire_h
+    if (screen_model == Config_DisplayConfig_OledType_OLED_SH1107)
+        screen_model = Config_DisplayConfig_OledType_OLED_SH1106;
    dispdev.setDetected(screen_model);
 #endif

--- a/src/graphics/Screen.h
+++ b/src/graphics/Screen.h
@ -23,7 +23,7 @@ class Screen
    void startRebootScreen() {}
    void startFirmwareUpdateScreen() {}
 };
-}
+} // namespace graphics

 #else
 #include <cstring>
@ -34,7 +34,7 @@ class Screen

 #ifdef USE_ST7567
 #include <ST7567Wire.h>
-#elif defined(USE_SH1106)
+#elif defined(USE_SH1106) || defined(USE_SH1107)
 #include <SH1106Wire.h>
 #elif defined(USE_SSD1306)
 #include <SSD1306Wire.h>
@ -49,9 +49,9 @@ class Screen
 #include "commands.h"
 #include "concurrency/LockGuard.h"
 #include "concurrency/OSThread.h"
+#include "mesh/MeshModule.h"
 #include "power.h"
 #include <string>
-#include "mesh/MeshModule.h"

 // 0 to 255, though particular variants might define different defaults
 #ifndef BRIGHTNESS_DEFAULT
@ -132,7 +132,8 @@ class Screen : public concurrency::OSThread
    void setOn(bool on)
    {
        if (!on)
-            handleSetOn(false); // We handle off commands immediately, because they might be called because the CPU is shutting down
+            handleSetOn(
+                false); // We handle off commands immediately, because they might be called because the CPU is shutting down
        else
            enqueueCmd(ScreenCmd{.cmd = on ? Cmd::SET_ON : Cmd::SET_OFF});
    }
@ -232,18 +233,22 @@ class Screen : public concurrency::OSThread
            return (uint8_t)(ch | 0xC0);
        }
        // map UTF-8 cyrillic chars to it Windows-1251 (CP-1251) ASCII codes
-            // note: in this case we must use compatible font - provided ArialMT_Plain_10/16/24 by 'ThingPulse/esp8266-oled-ssd1306' library
-            // have empty chars for non-latin ASCII symbols
+        // note: in this case we must use compatible font - provided ArialMT_Plain_10/16/24 by 'ThingPulse/esp8266-oled-ssd1306'
+        // library have empty chars for non-latin ASCII symbols
        case 0xD0: {
            SKIPREST = false;
-                if (ch == 129) return (uint8_t)(168); // Ё
-                if (ch > 143 && ch < 192) return (uint8_t)(ch + 48);
+            if (ch == 129)
+                return (uint8_t)(168); // Ё
+            if (ch > 143 && ch < 192)
+                return (uint8_t)(ch + 48);
            break;
        }
        case 0xD1: {
            SKIPREST = false;
-                if (ch == 145) return (uint8_t)(184); // ё
-                if (ch > 127 && ch < 144) return (uint8_t)(ch + 112);
+            if (ch == 145)
+                return (uint8_t)(184); // ё
+            if (ch > 127 && ch < 144)
+                return (uint8_t)(ch + 112);
            break;
        }
        }
@ -342,10 +347,7 @@ class Screen : public concurrency::OSThread

    /// Display device

-// #ifdef RAK4630
-//     EInkDisplay dispdev;
-//     AutoOLEDWire dispdev_oled;
-#ifdef USE_SH1106
+#if defined(USE_SH1106) || defined(USE_SH1107)
    SH1106Wire dispdev;
 #elif defined(USE_SSD1306)
    SSD1306Wire dispdev;
--- a/src/graphics/TFTDisplay.cpp
+++ b/src/graphics/TFTDisplay.cpp
@ -8,7 +8,7 @@

 static TFT_eSPI tft = TFT_eSPI(); // Invoke library, pins defined in User_Setup.h

-TFTDisplay::TFTDisplay(uint8_t address, int sda, int scl)
+TFTDisplay::TFTDisplay(uint8_t address, int sda, int scl, uint8_t screen_model)
 {
 #ifdef SCREEN_ROTATE
    setGeometry(GEOMETRY_RAWMODE, TFT_HEIGHT, TFT_WIDTH);
--- a/src/graphics/TFTDisplay.h
+++ b/src/graphics/TFTDisplay.h
@ -18,7 +18,7 @@ class TFTDisplay : public OLEDDisplay
    /* constructor
    FIXME - the parameters are not used, just a temporary hack to keep working like the old displays
    */
-    TFTDisplay(uint8_t address, int sda, int scl);
+    TFTDisplay(uint8_t address, int sda, int scl, uint8_t screen_model);

    // Write the buffer to the display memory
    virtual void display(void) override;
--- a/src/main.cpp
+++ b/src/main.cpp
@ -3,12 +3,12 @@
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"
+#include "ReliableRouter.h"
 #include "airtime.h"
 #include "buzz.h"
 #include "configuration.h"
 #include "error.h"
 #include "power.h"
-#include "ReliableRouter.h"
 // #include "debug.h"
 #include "FSCommon.h"
 #include "RTC.h"
@ -27,8 +27,8 @@
 #include <Wire.h>
 // #include <driver/rtc_io.h>

-#include "mesh/http/WiFiAPClient.h"
 #include "mesh/eth/ethClient.h"
+#include "mesh/http/WiFiAPClient.h"

 #ifdef ARCH_ESP32
 #include "mesh/http/WebServer.h"
@ -98,7 +98,8 @@ uint32_t serialSinceMsec;
 bool pmu_found;

 // Array map of sensor types (as array index) and i2c address as value we'll find in the i2c scan
-uint8_t nodeTelemetrySensorsMap[_TelemetrySensorType_MAX + 1] = { 0 }; // one is enough, missing elements will be initialized to 0 anyway.
+uint8_t nodeTelemetrySensorsMap[_TelemetrySensorType_MAX + 1] = {
+    0}; // one is enough, missing elements will be initialized to 0 anyway.

 Router *router = NULL; // Users of router don't care what sort of subclass implements that API

@ -249,7 +250,6 @@ void setup()
    powerStatus->observe(&power->newStatus);
    power->setup(); // Must be after status handler is installed, so that handler gets notified of the initial configuration

-
 #ifdef LILYGO_TBEAM_S3_CORE
    // In T-Beam-S3-core, the I2C device cannot be scanned before power initialization, otherwise the device will be stuck
    // PCF8563 RTC in tbeam-s3 uses Wire1 to share I2C bus
@ -305,6 +305,10 @@ void setup()
    if (config.display.oled != Config_DisplayConfig_OledType_OLED_AUTO)
        screen_model = config.display.oled;

+#if defined(USE_SH1107)
+    screen_model = Config_DisplayConfig_OledType_OLED_SH1107; // set dimension of 128x128
+#endif
+
    // Init our SPI controller (must be before screen and lora)
    initSPI();
 #ifndef ARCH_ESP32