From 4cc846ed4d71a5059d8db4f105cd41d685be4c3d Mon Sep 17 00:00:00 2001 From: mrWheel <5585427+mrWheel@users.noreply.github.com> Date: Tue, 31 Mar 2020 14:06:04 +0200 Subject: [PATCH] v1.2.1 Third Official Release --- DSMRloggerAPI.h | 13 +- DSMRloggerAPI.ino | 267 ++++++++++++++++++++++------------------ Debug.h | 2 +- FSexplorer.ino | 2 +- MQTTstuff.ino | 2 +- MinderGas.ino | 2 +- README.md | 6 +- SPIFFSstuff.ino | 30 +++-- convertPRD2RING.ino | 2 +- data/DSMRindex.css | 2 +- data/DSMRindex.html | 2 +- data/DSMRindex.html.inc | 2 +- data/DSMRindex.js | 32 +---- data/DSMRindexEDGE.html | 2 +- data/DSMRversion.dat | 2 +- data/FSexplorer.html | 2 +- edge/DSMRgraphics.js | 2 +- edge/DSMRindex.js | 32 +---- handleSlimmeMeter.ino | 7 +- helperStuff.ino | 4 +- jsonStuff.ino | 2 +- menuStuff.ino | 8 +- networkStuff.h | 27 ++-- ntpStuff.ino | 2 +- oledStuff.h | 20 +-- processTelegram.ino | 7 +- restAPI.ino | 11 +- settingsStuff.ino | 44 ++++--- timeStuff.ino | 2 +- 29 files changed, 254 insertions(+), 284 deletions(-) diff --git a/DSMRloggerAPI.h b/DSMRloggerAPI.h index 7f70e1c..50de352 100644 --- a/DSMRloggerAPI.h +++ b/DSMRloggerAPI.h @@ -1,7 +1,7 @@ /* *************************************************************************** ** Program : DSMRloggerAPI.h - definitions for DSMRloggerAPI -** Version : v1.1.3 +** Version : v1.2.1 ** ** Copyright (c) 2020 Willem Aandewiel ** @@ -68,16 +68,7 @@ enum { PERIOD_UNKNOWN, HOURS, DAYS, MONTHS, YEARS }; #include "Debug.h" - -uint16_t settingOledSleep; // needs to be declared before the oledStuff.h include -uint8_t settingOledFlip; // olse needs to be declared before oledStuff.h - -#if defined( HAS_OLED_SSD1306 ) && defined( HAS_OLED_SH1106 ) - #error Only one OLED display can be defined -#endif -#if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) - #include "oledStuff.h" -#endif +#include "oledStuff.h" #include "networkStuff.h" /** diff --git a/DSMRloggerAPI.ino b/DSMRloggerAPI.ino index 528f76d..7153fdf 100644 --- a/DSMRloggerAPI.ino +++ b/DSMRloggerAPI.ino @@ -2,7 +2,7 @@ *************************************************************************** ** Program : DSMRloggerAPI (restAPI) */ -#define _FW_VERSION "v1.1.3 (30-03-2020)" +#define _FW_VERSION "v1.2.1 (31-03-2020)" /* ** Copyright (c) 2020 Willem Aandewiel ** @@ -36,8 +36,6 @@ /******************** compiler options ********************************************/ #define USE_REQUEST_PIN // define if it's a esp8266 with GPIO 12 connected to SM DTR pin #define USE_UPDATE_SERVER // define if there is enough memory and updateServer to be used -//#define HAS_OLED_SSD1306 // define if a 0.96" OLED display is present - #define HAS_OLED_SH1106 // define if a 1.3" OLED display is present // #define USE_BELGIUM_PROTOCOL // define if Slimme Meter is a Belgium Smart Meter // #define USE_PRE40_PROTOCOL // define if Slimme Meter is pre DSMR 4.0 (2.2 .. 3.0) // #define USE_NTP_TIME // define to generate Timestamp from NTP (Only Winter Time for now) @@ -72,25 +70,26 @@ struct showValues { //=========================================================================================== void displayStatus() { -#if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) - switch(msgMode) { - case 1: snprintf(cMsg, sizeof(cMsg), "Up:%15.15s", upTime().c_str()); - break; - case 2: snprintf(cMsg, sizeof(cMsg), "WiFi RSSI:%4d dBm", WiFi.RSSI()); - break; - case 3: snprintf(cMsg, sizeof(cMsg), "Heap:%7d Bytes", ESP.getFreeHeap()); - break; - case 4: if (WiFi.status() != WL_CONNECTED) - snprintf(cMsg, sizeof(cMsg), "**** NO WIFI ****"); - else snprintf(cMsg, sizeof(cMsg), "IP %s", WiFi.localIP().toString().c_str()); - break; - default: snprintf(cMsg, sizeof(cMsg), "Telgrms:%6d/%3d", telegramCount, telegramErrors); - break; - } - oled_Print_Msg(3, cMsg, 0); - msgMode= (msgMode+1) % 5; //modular 5 = number of message displayed (hence it cycles thru the messages -#endif - + if (settingOledType > 0) + { + switch(msgMode) { + case 1: snprintf(cMsg, sizeof(cMsg), "Up:%-15.15s", upTime().c_str()); + break; + case 2: snprintf(cMsg, sizeof(cMsg), "WiFi RSSI:%4d dBm", WiFi.RSSI()); + break; + case 3: snprintf(cMsg, sizeof(cMsg), "Heap:%7d Bytes", ESP.getFreeHeap()); + break; + case 4: if (WiFi.status() != WL_CONNECTED) + snprintf(cMsg, sizeof(cMsg), "**** NO WIFI ****"); + else snprintf(cMsg, sizeof(cMsg), "IP %s", WiFi.localIP().toString().c_str()); + break; + default: snprintf(cMsg, sizeof(cMsg), "Telgrms:%6d/%3d", telegramCount, telegramErrors); + break; + } + + oled_Print_Msg(3, cMsg, 0); + msgMode= (msgMode+1) % 5; //modular 5 = number of message displayed (hence it cycles thru the messages + } } // displayStatus() @@ -101,18 +100,20 @@ void openSysLog(bool empty) if (sysLog.begin(500, 100, empty)) // 500 lines use existing sysLog file { DebugTln("Succes opening sysLog!"); -#if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) - oled_Print_Msg(0, "", 0); - oled_Print_Msg(3, "Syslog OK!", 500); -#endif // has_oled_ssd1306 + if (settingOledType > 0) + { + oled_Print_Msg(0, " ", 0); + oled_Print_Msg(3, "Syslog OK!", 500); + } } else { DebugTln("Error opening sysLog!"); -#if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) - oled_Print_Msg(0, "", 0); - oled_Print_Msg(3, "Error Syslog", 1500); -#endif // has_oled_ssd1306 + if (settingOledType > 0) + { + oled_Print_Msg(0, " ", 0); + oled_Print_Msg(3, "Error Syslog", 1500); + } } sysLog.setDebugLvl(1); @@ -155,49 +156,54 @@ void setup() snprintf(settingHostname, sizeof(settingHostname), "%s", _DEFAULT_HOSTNAME); Serial.printf("\n\nBooting....[%s]\r\n\r\n", String(_FW_VERSION).c_str()); -#if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) - oled_Init(); - oled_Clear(); // clear the screen so we can paint the menu. - oled_Print_Msg(0, "", 0); - int8_t sPos = String(_FW_VERSION).indexOf(' '); - snprintf(cMsg, sizeof(cMsg), "(c)2020 [%s]", String(_FW_VERSION).substring(0,sPos).c_str()); - oled_Print_Msg(1, cMsg, 0); - oled_Print_Msg(2, " Willem Aandewiel", 0); - oled_Print_Msg(3, " >> Have fun!! <<", 1000); - yield(); -#else // don't blink if oled-screen attatched - for(int I=0; I<8; I++) + if (settingOledType > 0) { - digitalWrite(LED_BUILTIN, !digitalRead(LED_BUILTIN)); - delay(500); + oled_Init(); + oled_Clear(); // clear the screen so we can paint the menu. + oled_Print_Msg(0, " ", 0); + int8_t sPos = String(_FW_VERSION).indexOf(' '); + snprintf(cMsg, sizeof(cMsg), "(c)2020 [%s]", String(_FW_VERSION).substring(0,sPos).c_str()); + oled_Print_Msg(1, cMsg, 0); + oled_Print_Msg(2, " Willem Aandewiel", 0); + oled_Print_Msg(3, " >> Have fun!! <<", 1000); + yield(); + } + else // don't blink if oled-screen attatched + { + for(int I=0; I<8; I++) + { + digitalWrite(LED_BUILTIN, !digitalRead(LED_BUILTIN)); + delay(500); + } } -#endif digitalWrite(LED_BUILTIN, LED_OFF); // HIGH is OFF lastReset = ESP.getResetReason(); startTelnet(); -#if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) - oled_Print_Msg(0, "", 0); - oled_Print_Msg(3, "telnet (poort 23)", 2500); -#endif // has_oled_ssd1306 - + if (settingOledType > 0) + { + oled_Print_Msg(0, " ", 0); + oled_Print_Msg(3, "telnet (poort 23)", 2500); + } + //================ SPIFFS =========================================== if (SPIFFS.begin()) { DebugTln(F("SPIFFS Mount succesfull\r")); SPIFFSmounted = true; -#if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) - oled_Print_Msg(0, "", 0); - oled_Print_Msg(3, "SPIFFS mounted", 1500); -#endif // has_oled_ssd1306 - + if (settingOledType > 0) + { + oled_Print_Msg(0, " ", 0); + oled_Print_Msg(3, "SPIFFS mounted", 1500); + } } else { DebugTln(F("SPIFFS Mount failed\r")); // Serious problem with SPIFFS SPIFFSmounted = false; -#if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) - oled_Print_Msg(0, "", 0); - oled_Print_Msg(3, "SPIFFS FAILED!", 2000); -#endif // has_oled_ssd1306 + if (settingOledType > 0) + { + oled_Print_Msg(0, " ", 0); + oled_Print_Msg(3, "SPIFFS FAILED!", 2000); + } } //------ read status file for last Timestamp -------------------- @@ -212,24 +218,26 @@ void setup() , nrReboots++ , slotErrors); readSettings(true); + oled_Init(); //=============start Networkstuff================================== -#if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) - if (settingOledFlip) oled_Init(); // only if true restart(init) oled screen - oled_Clear(); // clear the screen - oled_Print_Msg(0, "", 0); - oled_Print_Msg(1, "Verbinden met WiFi", 500); -#endif // has_oled_ssd1306 - + if (settingOledType > 0) + { + if (settingOledFlip) oled_Init(); // only if true restart(init) oled screen + oled_Clear(); // clear the screen + oled_Print_Msg(0, " ", 0); + oled_Print_Msg(1, "Verbinden met WiFi", 500); + } digitalWrite(LED_BUILTIN, LED_ON); startWiFi(settingHostname, 240); // timeout 4 minuten -#if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) - oled_Print_Msg(0, "", 0); - oled_Print_Msg(1, WiFi.SSID(), 0); - snprintf(cMsg, sizeof(cMsg), "IP %s", WiFi.localIP().toString().c_str()); - oled_Print_Msg(2, cMsg, 1500); -#endif // has_oled_ssd1306 + if (settingOledType > 0) + { + oled_Print_Msg(0, " ", 0); + oled_Print_Msg(1, WiFi.SSID(), 0); + snprintf(cMsg, sizeof(cMsg), "IP %s", WiFi.localIP().toString().c_str()); + oled_Print_Msg(2, cMsg, 1500); + } digitalWrite(LED_BUILTIN, LED_OFF); Debugln(); @@ -255,36 +263,40 @@ void setup() #endif startMDNS(settingHostname); -#if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) - oled_Print_Msg(3, "mDNS gestart", 1500); -#endif // has_oled_ssd1306 - + if (settingOledType > 0) + { + oled_Print_Msg(3, "mDNS gestart", 1500); + } + //=============end Networkstuff====================================== #if defined(USE_NTP_TIME) //USE_NTP //================ startNTP ========================================= - #if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) + if (settingOledType > 0) //USE_NTP + { //USE_NTP oled_Print_Msg(3, "setup NTP server", 100); //USE_NTP - #endif // has_oled_ssd1306 //USE_NTP + } //USE_NTP //USE_NTP if (!startNTP()) //USE_NTP { //USE_NTP DebugTln(F("ERROR!!! No NTP server reached!\r\n\r")); //USE_NTP - #if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) - oled_Print_Msg(0, "", 0); //USE_NTP - oled_Print_Msg(2, "geen reactie van", 100); //USE_NTP - oled_Print_Msg(2, "NTP server's", 100); //USE_NTP - oled_Print_Msg(3, "Reboot DSMR-logger", 2000); //USE_NTP - #endif // has_oled_ssd1306 //USE_NTP + if (settingOledType > 0) //USE_NTP + { //USE_NTP + oled_Print_Msg(0, " ", 0); //USE_NTP + oled_Print_Msg(2, "geen reactie van", 100); //USE_NTP + oled_Print_Msg(2, "NTP server's", 100); //USE_NTP + oled_Print_Msg(3, "Reboot DSMR-logger", 2000); //USE_NTP + } //USE_NTP delay(2000); //USE_NTP ESP.restart(); //USE_NTP delay(3000); //USE_NTP } //USE_NTP - #if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) - oled_Print_Msg(0, "", 0); //USE_NTP + if (settingOledType > 0) //USE_NTP + { //USE_NTP + oled_Print_Msg(0, " ", 0); //USE_NTP oled_Print_Msg(3, "NTP gestart", 1500); //USE_NTP - prevNtpHour = hour(); //USE_NTP - #endif //USE_NTP + } //USE_NTP + prevNtpHour = hour(); //USE_NTP //USE_NTP #endif //USE_NTP_TIME //USE_NTP //================ end NTP ========================================= @@ -355,20 +367,23 @@ void setup() DebugTf("Time is set to [%s] from NTP\r\n", cMsg); //USE_NTP #endif // use_dsmr_30 -#if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) - snprintf(cMsg, sizeof(cMsg), "DT: %02d%02d%02d%02d0101W", thisYear, thisMonth, thisDay, thisHour); - oled_Print_Msg(0, "", 0); - oled_Print_Msg(3, cMsg, 1500); -#endif // has_oled_ssd1306 + if (settingOledType > 0) + { + snprintf(cMsg, sizeof(cMsg), "DT: %02d%02d%02d%02d0101W", thisYear + , thisMonth, thisDay, thisHour); + oled_Print_Msg(0, " ", 0); + oled_Print_Msg(3, cMsg, 1500); + } //================ Start MQTT ====================================== #ifdef USE_MQTT //USE_MQTT connectMQTT(); //USE_MQTT - #if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) //USE_MQTT - oled_Print_Msg(0, "", 0); //USE_MQTT + if (settingOledType > 0) //USE_MQTT + { //USE_MQTT + oled_Print_Msg(0, " ", 0); //USE_MQTT oled_Print_Msg(3, "MQTT server set!", 1500); //USE_MQTT - #endif // has_oled_ssd1306 //USE_MQTT + } //USE_MQTT #endif //USE_MQTT //================ End of Start MQTT =============================== @@ -378,12 +393,13 @@ void setup() if (!spiffsNotPopulated) { DebugTln(F("SPIFFS correct populated -> normal operation!\r")); -#if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) - oled_Print_Msg(0, "", 0); - oled_Print_Msg(1, "OK, SPIFFS correct", 0); - oled_Print_Msg(2, "Verder met normale", 0); - oled_Print_Msg(3, "Verwerking ;-)", 2500); -#endif // has_oled_ssd1306 + if (settingOledType > 0) + { + oled_Print_Msg(0, " ", 0); + oled_Print_Msg(1, "OK, SPIFFS correct", 0); + oled_Print_Msg(2, "Verder met normale", 0); + oled_Print_Msg(3, "Verwerking ;-)", 2500); + } if (hasAlternativeIndex) { httpServer.serveStatic("/", SPIFFS, settingIndexPage); @@ -404,12 +420,13 @@ void setup() } else { DebugTln(F("Oeps! not all files found on SPIFFS -> present FSexplorer!\r")); spiffsNotPopulated = true; -#if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) - oled_Print_Msg(0, "!OEPS! niet alle", 0); - oled_Print_Msg(1, "files op SPIFFS", 0); - oled_Print_Msg(2, "gevonden! (fout!)", 0); - oled_Print_Msg(3, "Start FSexplorer", 2000); -#endif // has_oled_ssd1306 + if (settingOledType > 0) + { + oled_Print_Msg(0, "!OEPS! niet alle", 0); + oled_Print_Msg(1, "files op SPIFFS", 0); + oled_Print_Msg(2, "gevonden! (fout!)", 0); + oled_Print_Msg(3, "Start FSexplorer", 2000); + } } setupFSexplorer(); @@ -420,12 +437,13 @@ void setup() httpServer.begin(); DebugTln( "HTTP server gestart\r" ); -#if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) //HAS_OLED - oled_Clear(); //HAS_OLED - oled_Print_Msg(0, "", 0); //HAS_OLED - oled_Print_Msg(2, "HTTP server ..", 0); //HAS_OLED - oled_Print_Msg(3, "gestart (poort 80)", 0); //HAS_OLED -#endif // has_oled_ssd1306 //HAS_OLED + if (settingOledType > 0) //HAS_OLED + { //HAS_OLED + oled_Clear(); //HAS_OLED + oled_Print_Msg(0, " ", 0); //HAS_OLED + oled_Print_Msg(2, "HTTP server ..", 0); //HAS_OLED + oled_Print_Msg(3, "gestart (poort 80)", 0); //HAS_OLED + } //HAS_OLED for (int i = 0; i< 10; i++) { @@ -451,12 +469,13 @@ void setup() snprintf(cMsg, sizeof(cMsg), "Last reset reason: [%s]\r", ESP.getResetReason().c_str()); DebugTln(cMsg); -#if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) + if (settingOledType > 0) + { oled_Print_Msg(0, "", 0); oled_Print_Msg(1, "Startup complete", 0); oled_Print_Msg(2, "Wait for first", 0); oled_Print_Msg(3, "telegram .....", 500); -#endif // has_oled_ssd1306 + } //================ Start Slimme Meter =============================== @@ -520,9 +539,10 @@ void doSystemTasks() httpServer.handleClient(); MDNS.update(); handleKeyInput(); -#if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) - checkFlashButton(); -#endif + if (settingOledType > 0) + { + checkFlashButton(); + } yield(); @@ -550,12 +570,13 @@ void loop () } //--- if an OLED screen attached, display the status -#if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) - if DUE(updateDisplay) + if (settingOledType > 0) { - displayStatus(); + if DUE(updateDisplay) + { + displayStatus(); + } } -#endif //--- if mindergas then check #ifdef USE_MINDERGAS diff --git a/Debug.h b/Debug.h index aa684a4..4425a32 100644 --- a/Debug.h +++ b/Debug.h @@ -1,7 +1,7 @@ /* *************************************************************************** ** Program : Debug.h, part of DSMRloggerAPI -** Version : v1.1.0 +** Version : v1.2.1 ** ** Copyright (c) 2020 Willem Aandewiel ** Met dank aan Erik diff --git a/FSexplorer.ino b/FSexplorer.ino index 63fbf2a..47ec2a7 100644 --- a/FSexplorer.ino +++ b/FSexplorer.ino @@ -1,7 +1,7 @@ /* *************************************************************************** ** Program : FSexplorer, part of DSMRloggerAPI -** Version : v1.1.2 +** Version : v1.2.1 ** ** Mostly stolen from https://www.arduinoforum.de/User-Fips ** For more information visit: https://fipsok.de diff --git a/MQTTstuff.ino b/MQTTstuff.ino index 91dd843..6fe2be3 100644 --- a/MQTTstuff.ino +++ b/MQTTstuff.ino @@ -1,7 +1,7 @@ /* *************************************************************************** ** Program : MQTTstuff, part of DSMRloggerAPI -** Version : v1.1.2 +** Version : v1.2.1 ** ** Copyright (c) 2020 Willem Aandewiel ** diff --git a/MinderGas.ino b/MinderGas.ino index a80fb91..08e1bbe 100644 --- a/MinderGas.ino +++ b/MinderGas.ino @@ -1,7 +1,7 @@ /* ************************************************************************** ** Program : MinderGas.ino -** Version : v1.1.2 +** Version : v1.2.1 ** ** Copyright (c) 2020 Robert van den Breemen ** diff --git a/README.md b/README.md index 6da6d53..d141129 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,10 @@ Documentation can be found [here](https://mrwheel-docs.gitbook.io/dsmrloggerapi/ - - +
VersieOpmerking
1.1.2 (dev)Development release + 1.2.1Third Official Release +
Instelling SM_HAS_NO_FASE_INFO nu via settings +
Selectie OLED scherm via settings
Mogelijkheid om het oled scherm 180* te flippen via settings
Check op volgordelijkheid Uren (in de GUI)
macaddress in /api/v1/dev/info (Phyxion) diff --git a/SPIFFSstuff.ino b/SPIFFSstuff.ino index 837ac73..f7aaf48 100644 --- a/SPIFFSstuff.ino +++ b/SPIFFSstuff.ino @@ -1,7 +1,7 @@ /* *************************************************************************** ** Program : SPIFFSstuff, part of DSMRloggerAPI -** Version : v1.1.2 +** Version : v1.2.1 ** ** Copyright (c) 2020 Willem Aandewiel ** @@ -601,29 +601,32 @@ bool DSMRfileExist(const char* fileName, bool doDisplay) strConcat(fName, 29, fileName); DebugTf("check if [%s] exists .. ", fName); -#if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) - oled_Print_Msg(1, "Bestaat:", 10); - oled_Print_Msg(2, fName, 10); - oled_Print_Msg(3, "op SPIFFS?", 250); -#endif + if (settingOledType > 0) + { + oled_Print_Msg(1, "Bestaat:", 10); + oled_Print_Msg(2, fName, 10); + oled_Print_Msg(3, "op SPIFFS?", 250); + } if (!SPIFFS.exists(fName) ) { if (doDisplay) { Debugln(F("NO! Error!!")); - #if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) + if (settingOledType > 0) + { oled_Print_Msg(3, "Nee! FOUT!", 6000); - #endif + } writeToSysLog("Error! File [%s] not found!", fName); return false; } else { Debugln(F("NO! ")); - #if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) + if (settingOledType > 0) + { oled_Print_Msg(3, "Nee! ", 6000); - #endif + } writeToSysLog("File [%s] not found!", fName); return false; } @@ -631,9 +634,10 @@ bool DSMRfileExist(const char* fileName, bool doDisplay) else { Debugln(F("Yes! OK!")); -#if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 ) - oled_Print_Msg(3, "JA! (OK!)", 250); -#endif + if (settingOledType > 0) + { + oled_Print_Msg(3, "JA! (OK!)", 250); + } } return true; diff --git a/convertPRD2RING.ino b/convertPRD2RING.ino index 325c307..83fa903 100644 --- a/convertPRD2RING.ino +++ b/convertPRD2RING.ino @@ -1,7 +1,7 @@ /* *************************************************************************** ** Program : convertPRD2RING, part of DSMRloggerAPI -** Version : v1.1.0 +** Version : v1.2.1 ** ** Copyright (c) 2020 Willem Aandewiel ** diff --git a/data/DSMRindex.css b/data/DSMRindex.css index 0b9c433..79e2708 100644 --- a/data/DSMRindex.css +++ b/data/DSMRindex.css @@ -1,7 +1,7 @@ /* *************************************************************************** ** Program : DSMRindex.css, part of DSMRfirmwareAPI -** Version : v1.1.0 +** Version : v1.2.1 ** ** Copyright (c) 2020 Willem Aandewiel ** diff --git a/data/DSMRindex.html b/data/DSMRindex.html index 6e5133e..9a44f01 100644 --- a/data/DSMRindex.html +++ b/data/DSMRindex.html @@ -1,7 +1,7 @@