From 7ffdb51d1f91f8c7601723c2ecac08c8ddaad33a Mon Sep 17 00:00:00 2001
From: DigiH <github@digih.net>
Date: Mon, 20 Feb 2023 20:05:35 +0100
Subject: [PATCH] New Logo for SSD1306 (#1471)

* New Logo for SSD1306

New Logo Display hard coded coordinates and vectors for SSD1306.

* Improved Lines
---
 main/ZdisplaySSD1306.ino | 97 +++++++++++-----------------------------
 main/config_SSD1306.h    |  5 +--
 2 files changed, 28 insertions(+), 74 deletions(-)

diff --git a/main/ZdisplaySSD1306.ino b/main/ZdisplaySSD1306.ino
index b353373..3ca577d 100644
--- a/main/ZdisplaySSD1306.ino
+++ b/main/ZdisplaySSD1306.ino
@@ -107,7 +107,7 @@ void loopSSD1306() {
 #  if DISPLAY_IDLE_LOGO
   if (uptime() > nextDisplayPage + 1 && !logoDisplayed) {
     Oled.fillScreen(WHITE);
-    Oled.drawLogo((int)OLED_WIDTH * 0.24, (int)(OLED_WIDTH / 2) - OLED_WIDTH * 0.2, (int)(OLED_HEIGHT / 2) + OLED_HEIGHT * 0.2, true, true, true, true, true, true); // Name
+    Oled.drawLogo();
     logoDisplayed = true;
   } else {
     logoDisplayed = false;
@@ -495,7 +495,7 @@ void OledSerial::begin() {
   display->setColor(WHITE);
   display->fillRect(0, 0, OLED_WIDTH, OLED_HEIGHT);
   display->display();
-  ssd1306Intro(OLED_WIDTH * 0.24, (OLED_WIDTH / 2) - OLED_WIDTH * 0.2, (OLED_HEIGHT / 2) + OLED_HEIGHT * 0.2);
+  drawLogo();
   display->setLogBuffer(OLED_TEXT_ROWS, OLED_TEXT_BUFFER);
   delay(1000);
 }
@@ -587,80 +587,37 @@ boolean OledSerial::displayPage(displayQueueMessage* message) {
   }
 }
 
-/*
-Display Animated OpenMQTTGateway logo, used on inital boot 
-- borrowed from ZboardM5.ino and tweaked for ssd1306 display ( removed color and tweaked size/location )
-*/
-void OledSerial::ssd1306Intro(int scale, int displayWidth, int displayHeight) {
-  drawLogo(scale, displayWidth, displayHeight, false, true, false, false, false, false); // Circle 2
-  drawLogo(scale, displayWidth, displayHeight, false, false, true, false, false, false); // Circle 3
-  drawLogo(scale, displayWidth, displayHeight, false, true, true, true, false, false); // Line 1
-  drawLogo(scale, displayWidth, displayHeight, false, true, true, false, true, false); // Line 2
-  drawLogo(scale, displayWidth, displayHeight, true, true, true, true, true, false); // Circle 1
-  drawLogo(scale, displayWidth, displayHeight, true, true, true, true, true, true); // Name
-}
-
 /*
 Primitives behind OpenMQTTGateway logo
 */
-void OledSerial::drawLogo(int logoSize, int circle1X, int circle1Y, bool circle1, bool circle2, bool circle3, bool line1, bool line2, bool name) {
+void OledSerial::drawLogo() {
   if (xSemaphoreTake(semaphoreOLEDOperation, pdMS_TO_TICKS(30000)) == pdTRUE) {
-    int circle1T = logoSize / 15;
-    int circle2T = logoSize / 25;
-    int circle3T = logoSize / 30;
+    display->setColor(BLACK);
 
-    int circle3Y = circle1Y - (logoSize * 1.2);
-    int circle3X = circle1X - (logoSize * 0.13);
-    int circle2X = circle1X - (logoSize * 1.05);
-    int circle2Y = circle1Y - (logoSize * 0.8);
+    // line 1
+    display->drawLine(15, 28, 20, 31);
+    display->drawLine(15, 29, 20, 32);
+    // line 2
+    display->drawLine(25, 29, 22, 21);
+    display->drawLine(26, 29, 23, 21);
+    // circle 1
+    display->fillCircle(25, 35, 7);
+    display->setColor(WHITE);
+    display->fillCircle(25, 35, 5);
+    // circle 2
+    display->setColor(BLACK);
+    display->fillCircle(23, 18, 4);
+    display->setColor(WHITE);
+    display->fillCircle(23, 18, 2);
+    // circle 3
+    display->setColor(BLACK);
+    display->fillCircle(11, 25, 5);
+    display->setColor(WHITE);
+    display->fillCircle(11, 25, 3);
+    // name
+    display->setColor(BLACK);
+    display->drawString(32, 32, "penMQTTGateway");
 
-    if (line1) {
-      display->setColor(BLACK);
-      display->drawLine(circle1X - 2, circle1Y, circle2X - 2, circle2Y);
-      display->drawLine(circle1X - 1, circle1Y, circle2X - 1, circle2Y);
-      display->drawLine(circle1X, circle1Y, circle2X, circle2Y);
-      display->drawLine(circle1X + 1, circle1Y, circle2X + 1, circle2Y);
-      display->drawLine(circle1X + 2, circle1Y, circle2X + 2, circle2Y);
-      display->setColor(WHITE);
-      display->fillCircle(circle3X, circle3Y, logoSize / 4 - circle3T * 2); // , WHITE);
-    }
-    if (line2) {
-      display->setColor(BLACK);
-      display->drawLine(circle1X - 2, circle1Y, circle3X - 2, circle3Y);
-      display->drawLine(circle1X - 1, circle1Y, circle3X - 1, circle3Y);
-      display->drawLine(circle1X, circle1Y, circle3X, circle3Y);
-      display->drawLine(circle1X + 1, circle1Y, circle3X + 1, circle3Y);
-      display->setColor(WHITE);
-      display->fillCircle(circle2X, circle2Y, logoSize / 3 - circle2T * 2); // , WHITE);
-    }
-    if (circle1) {
-      display->setColor(WHITE);
-      display->fillCircle(circle1X, circle1Y, logoSize / 2); // , WHITE);
-      display->setColor(BLACK);
-      display->fillCircle(circle1X, circle1Y, logoSize / 2 - circle1T); // , TFT_GREEN);
-      display->setColor(WHITE);
-      display->fillCircle(circle1X, circle1Y, logoSize / 2 - circle1T * 2); // , WHITE);
-    }
-    if (circle2) {
-      display->setColor(WHITE);
-      display->fillCircle(circle2X, circle2Y, logoSize / 3); // , WHITE);
-      display->setColor(BLACK);
-      display->fillCircle(circle2X, circle2Y, logoSize / 3 - circle2T); // , TFT_ORANGE);
-      display->setColor(WHITE);
-      display->fillCircle(circle2X, circle2Y, logoSize / 3 - circle2T * 2); // , WHITE);
-    }
-    if (circle3) {
-      display->setColor(WHITE);
-      display->fillCircle(circle3X, circle3Y, logoSize / 4); // , WHITE);
-      display->setColor(BLACK);
-      display->fillCircle(circle3X, circle3Y, logoSize / 4 - circle3T); // , TFT_PINK);
-      display->setColor(WHITE);
-      display->fillCircle(circle3X, circle3Y, logoSize / 4 - circle3T * 2); // , WHITE);
-    }
-    if (name) {
-      display->setColor(BLACK);
-      display->drawString(circle1X + (circle1X * 0.27), circle1Y, "penMQTTGateway");
-    }
     display->display();
     delay(50);
     xSemaphoreGive(semaphoreOLEDOperation);
diff --git a/main/config_SSD1306.h b/main/config_SSD1306.h
index f81cf4f..053c4a0 100644
--- a/main/config_SSD1306.h
+++ b/main/config_SSD1306.h
@@ -135,13 +135,10 @@ struct displayQueueMessage {
 // This pattern was borrowed from HardwareSerial and modified to support the ssd1306 display
 
 class OledSerial : public Stream {
-private:
-  void ssd1306Intro(int scale, int displayWidth, int displayHeight);
-
 public:
   OledSerial(int);
   void begin();
-  void drawLogo(int logoSize, int circle1X, int circle1Y, bool circle1, bool circle2, bool circle3, bool line1, bool line2, bool name);
+  void drawLogo();
   boolean displayPage(displayQueueMessage*);
 
   SSD1306Wire* display;