From 3a7d087628dd6df260e450fb387e39c594b66667 Mon Sep 17 00:00:00 2001 From: Chipster Date: Sun, 11 Jun 2023 10:35:39 -0500 Subject: [PATCH 1/2] Removed extranneous `m_display.startscrolldiagleft` func. --- OLED.cpp | 6 +----- Version.h | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/OLED.cpp b/OLED.cpp index 7a823b1..3955f0a 100644 --- a/OLED.cpp +++ b/OLED.cpp @@ -258,10 +258,6 @@ void COLED::setIdleInt() m_display.clearDisplay(); OLED_statusbar(); - if (m_displayScroll && m_displayLogoScreensaver) - m_display.startscrolldiagleft(0x00,0x0f); //the MMDVM logo scrolls the whole screen - m_display.display(); - unsigned char info[100U]; CNetworkInfo* m_network; @@ -325,7 +321,7 @@ void COLED::setIdleInt() } if (m_displayScroll && m_displayLogoScreensaver) - m_display.startscrolldiagleft(0x00, 0x0f); // the MMDVM logo scrolls the whole screen + m_display.startscrolldiagleft(0x00,0x0f); // the MMDVM logo scrolls the whole screen m_display.display(); } diff --git a/Version.h b/Version.h index f5c6244..75f257c 100644 --- a/Version.h +++ b/Version.h @@ -19,6 +19,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20220523"; +const char* VERSION = "20230611"; #endif From 8837696b23a27c4320d882931711bbb7a94262ee Mon Sep 17 00:00:00 2001 From: Chipster Date: Sun, 11 Jun 2023 14:14:39 -0500 Subject: [PATCH 2/2] Fix version # per G4KLX, fix OLED IP spacing in idle mode, improve auto-ap stats in OLED --- OLED.cpp | 8 ++++---- Version.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OLED.cpp b/OLED.cpp index 3955f0a..2d0f7b7 100644 --- a/OLED.cpp +++ b/OLED.cpp @@ -285,7 +285,7 @@ void COLED::setIdleInt() } // Read ssid value from /etc/hostapd.conf if it exists... std::string ssid; - std::ifstream configFile("/etc/hostapd.conf"); + std::ifstream configFile("/etc/hostapd/hostapd.conf"); if (configFile.is_open()) { std::string line; while (std::getline(configFile, line)) { @@ -306,10 +306,10 @@ void COLED::setIdleInt() m_display.setCursor(0, OLED_LINE3); m_display.setTextSize(1); m_display.printf("Auto-AP Running..."); - m_display.setCursor(0, OLED_LINE4); + m_display.setCursor(0, OLED_LINE5); m_display.setTextSize(1); m_display.printf("SSID: %s", ssid.c_str()); - m_display.setCursor(0, OLED_LINE5); + m_display.setCursor(0, OLED_LINE6); m_display.setTextSize(1); m_display.printf("IP: %s", m_ipaddress.c_str()); } else { // Connected to network - no Auto-AP mode; normal display layout... @@ -317,7 +317,7 @@ void COLED::setIdleInt() m_display.setTextSize(1); m_display.print(" -IDLE-"); m_display.setCursor(0, OLED_LINE5); - m_display.printf(" %s", m_ipaddress.c_str()); + m_display.printf("%s", m_ipaddress.c_str()); } if (m_displayScroll && m_displayLogoScreensaver) diff --git a/Version.h b/Version.h index 75f257c..f5c6244 100644 --- a/Version.h +++ b/Version.h @@ -19,6 +19,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20230611"; +const char* VERSION = "20220523"; #endif