v1.2.1 Third Official Release

mrWheel · Mar 31, 2020 · 4cc846e · 4cc846e
1 parent 59e27b9
commit 4cc846e
Show file tree

Hide file tree

Showing 29 changed files with 254 additions and 284 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -10,8 +10,10 @@ Documentation can be found [here](https://mrwheel-docs.gitbook.io/dsmrloggerapi/
 <table>
 <tr><th>Versie</th><th>Opmerking</th></tr>
 <tr>
-   <td valign="top">1.1.2 (dev)</td>
-   <td>Development release
+   <td valign="top">1.2.1</td>
+   <td>Third Official Release
+      <br>Instelling SM_HAS_NO_FASE_INFO nu via settings
+      <br>Selectie OLED scherm via settings
       <br>Mogelijkheid om het oled scherm 180* te flippen via settings
       <br>Check op volgordelijkheid Uren (in de GUI)
       <br>macaddress in /api/v1/dev/info (Phyxion)

diff --git 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,39 +601,43 @@ 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;
     }
   } 
   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
@@ -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
@@ -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
@@ -1,7 +1,7 @@
 <!--
 ***************************************************************************  
 **  Program  : DSMRindex.html, part of DSMRloggerAPI
-**  Version  : v1.1.2
+**  Version  : v1.2.1
 **
 **  Copyright (c) 2020 Willem Aandewiel
 **

diff --git a/data/DSMRindex.html.inc b/data/DSMRindex.html.inc
@@ -1,7 +1,7 @@
 <!--
 ***************************************************************************  
 **  Program  : DSMRindex.html.inc, part of DSMRloggerAPI
-**  Version  : v1.1.2
+**  Version  : v1.2.1
 **
 **  Copyright (c) 2020 Willem Aandewiel
 **

diff --git a/data/DSMRindex.js b/data/DSMRindex.js
@@ -1,7 +1,7 @@
 /*
 ***************************************************************************  
 **  Program  : DSMRindex.js, part of DSMRfirmwareAPI
-**  Version  : v1.1.3
+**  Version  : v1.2.1
 **
 **  Copyright (c) 2020 Willem Aandewiel
 **
@@ -62,6 +62,7 @@
                     ,"gd_tariff","electr_netw_costs"
                     ,"gas_netw_costs"
                     ,"smhasfaseinfo", "sm_has_fase_info"
+                    ,"oled_type"
                     ,"oled_flip_screen"
                     ,"tlgrm_interval","telegraminterval"
                     ,"index_page"
@@ -98,6 +99,7 @@
                     ,"Gas Verbruik Tarief/m3","Netwerkkosten Energie/maand"
                     ,"Netwerkkosten Gas/maand"
                     ,"SM Has Fase Info (0=No, 1=Yes)","SM Has Fase Info (0=No, 1=Yes)"
+                    ,"OLED type (0=None, 1=SDD1306, 2=SH1106)"
                     ,"Flip OLED scherm (0=No, 1=Yes)"
                     ,"Telegram Lees Interval (Sec.)"
                     ,"Telegram Lees Interval (Sec.)"
@@ -115,34 +117,6 @@
   let monthType        = "ED";
   let settingBgColor   = 'deepskyblue';
   let settingFontColor = 'white'
-
-  var longFieldsSettings = [ "ed_tariff1","ed_tariff2"
-                    ,"er_tariff1","er_tariff2"
-                    ,"gd_tariff","electr_netw_costs"
-                    ,"gas_netw_costs","smhasfaseinfo"
-                    ,"tlgrm_interval"
-                    ,"index_page"
-                    ,"oled_screen_time"
-                    ,"mqtt_broker","mqtt_broker_port"
-                    ,"mqtt_user","mqtt_passwd","mqtt_toptopic"
-                    ,"mqtt_interval","mindergas_token"
-                    ,"\0"
-                  ];
-
-  var humanFieldsSettings = [ "Energy Verbruik Tarief-1/kWh","Energy Verbruik Tarief-2/kWh"
-                    ,"Energy Opgewekt Tarief-1/kWh","Energy Opgewekt Tarief-2/kWh"
-                    ,"Gas Verbruik Tarief/m3","Netwerkkosten Energie/maand"
-                    ,"Netwerkkosten Gas/maand","SM Has Fase Info (1=Yes, 0=No)"
-                    ,"Telegram Lees Interval (Sec.)"
-                    ,"Te Gebruiken index.html Pagina"
-                    ,"Oled Screen Time (Min., 0=infinite)"
-                    ,"MQTT Broker IP/URL","MQTT Broker Poort"
-                    ,"MQTT Gebruiker","Password MQTT Gebruiker"
-                    ,"MQTT Top Topic"
-                    ,"Verzend MQTT Berichten (Sec.)"
-                    ,"Mindergas Token"
-                    ,"\0"
-                  ];
 
   var monthNames = [ "indxNul","Januari","Februari","Maart","April","Mei","Juni"
                     ,"Juli","Augustus","September","Oktober","November","December"

diff --git a/data/DSMRindexEDGE.html b/data/DSMRindexEDGE.html
@@ -1,7 +1,7 @@
 <!--
 ***************************************************************************  
 **  Program  : DSMRindexEDGE.html, part of DSMRloggerAPI
-**  Version  : v1.1.2
+**  Version  : v1.2.1
 **
 **  Copyright (c) 2020 Willem Aandewiel
 **

diff --git a/data/DSMRversion.dat b/data/DSMRversion.dat
@@ -1 +1 @@
-v1.1.0 - Second Official Release
+v1.2.1 - Third Official Release
diff --git a/data/FSexplorer.html b/data/FSexplorer.html
@@ -1,7 +1,7 @@
 <!--
 ***************************************************************************  
 **  Program  : FSexplorer.html, part of DSMRloggerAPI
-**  Version  : v1.1.0
+**  Version  : v1.2.1
 **
 **  Copyright (c) 2020 Willem Aandewiel
 **

diff --git a/edge/DSMRgraphics.js b/edge/DSMRgraphics.js
@@ -1,7 +1,7 @@
 /*
 ***************************************************************************  
 **  Program  : DSMRgraphics.js, part of DSMRloggerAPI
-**  Version  : v0.3.5
+**  Version  : v1.2.1
 **
 **  Copyright (c) 2020 Willem Aandewiel
 **

diff --git a/edge/DSMRindex.js b/edge/DSMRindex.js
@@ -1,7 +1,7 @@
 /*
 ***************************************************************************  
 **  Program  : DSMRindex.js, part of DSMRfirmwareAPI
-**  Version  : v1.1.3
+**  Version  : v1.2.1
 **
 **  Copyright (c) 2020 Willem Aandewiel
 **
@@ -62,6 +62,7 @@
                     ,"gd_tariff","electr_netw_costs"
                     ,"gas_netw_costs"
                     ,"smhasfaseinfo", "sm_has_fase_info"
+                    ,"oled_type"
                     ,"oled_flip_screen"
                     ,"tlgrm_interval","telegraminterval"
                     ,"index_page"
@@ -98,6 +99,7 @@
                     ,"Gas Verbruik Tarief/m3","Netwerkkosten Energie/maand"
                     ,"Netwerkkosten Gas/maand"
                     ,"SM Has Fase Info (0=No, 1=Yes)","SM Has Fase Info (0=No, 1=Yes)"
+                    ,"OLED type (0=None, 1=SDD1306, 2=SH1106)"
                     ,"Flip OLED scherm (0=No, 1=Yes)"
                     ,"Telegram Lees Interval (Sec.)"
                     ,"Telegram Lees Interval (Sec.)"
@@ -115,34 +117,6 @@
   let monthType        = "ED";
   let settingBgColor   = 'deepskyblue';
   let settingFontColor = 'white'
-
-  var longFieldsSettings = [ "ed_tariff1","ed_tariff2"
-                    ,"er_tariff1","er_tariff2"
-                    ,"gd_tariff","electr_netw_costs"
-                    ,"gas_netw_costs","smhasfaseinfo"
-                    ,"tlgrm_interval"
-                    ,"index_page"
-                    ,"oled_screen_time"
-                    ,"mqtt_broker","mqtt_broker_port"
-                    ,"mqtt_user","mqtt_passwd","mqtt_toptopic"
-                    ,"mqtt_interval","mindergas_token"
-                    ,"\0"
-                  ];
-
-  var humanFieldsSettings = [ "Energy Verbruik Tarief-1/kWh","Energy Verbruik Tarief-2/kWh"
-                    ,"Energy Opgewekt Tarief-1/kWh","Energy Opgewekt Tarief-2/kWh"
-                    ,"Gas Verbruik Tarief/m3","Netwerkkosten Energie/maand"
-                    ,"Netwerkkosten Gas/maand","SM Has Fase Info (1=Yes, 0=No)"
-                    ,"Telegram Lees Interval (Sec.)"
-                    ,"Te Gebruiken index.html Pagina"
-                    ,"Oled Screen Time (Min., 0=infinite)"
-                    ,"MQTT Broker IP/URL","MQTT Broker Poort"
-                    ,"MQTT Gebruiker","Password MQTT Gebruiker"
-                    ,"MQTT Top Topic"
-                    ,"Verzend MQTT Berichten (Sec.)"
-                    ,"Mindergas Token"
-                    ,"\0"
-                  ];
 
   var monthNames = [ "indxNul","Januari","Februari","Maart","April","Mei","Juni"
                     ,"Juli","Augustus","September","Oktober","November","December"

diff --git a/handleSlimmeMeter.ino b/handleSlimmeMeter.ino
@@ -1,7 +1,7 @@
 /*
 ***************************************************************************  
 **  Program  : handleSlimmeMeter - part of DSMRloggerAPI
-**  Version  : v1.1.3
+**  Version  : v1.2.1
 **
 **  Copyright (c) 2020 Willem Aandewiel
 **
@@ -40,13 +40,14 @@ void processSlimmemeterRaw()
     return;
   }
 
-  #if defined( HAS_OLED_SSD1306 ) || defined( HAS_OLED_SH1106 )
+  if (settingOledType > 0)
+  {
     oled_Print_Msg(0, "<DSMRloggerAPI>", 0);
     oled_Print_Msg(1, "-------------------------",0);
     oled_Print_Msg(2, "Raw Format",0);
     snprintf(cMsg, sizeof(cMsg), "Raw Count %4d", showRawCount);
     oled_Print_Msg(3, cMsg, 0);
-  #endif
+  }
 
   slimmeMeter.enable(true);
   Serial.setTimeout(5000);  // 5 seconds must be enough ..

diff --git a/helperStuff.ino b/helperStuff.ino
@@ -1,7 +1,7 @@
 /* 
 ***************************************************************************  
 **  Program  : helperStuff, part of DSMRloggerAPI
-**  Version  : v1.1.0
+**  Version  : v1.2.1
 **
 **  Copyright (c) 2020 Willem Aandewiel
 **
@@ -143,7 +143,7 @@ String upTime()
 {
   char    calcUptime[20];
 
-  snprintf(calcUptime, sizeof(calcUptime), "%d(d):%02d(h):%02d(m)"
+  snprintf(calcUptime, sizeof(calcUptime), "%d(d)-%02d:%02d(H:m)"
                                           , int((upTimeSeconds / (60 * 60 * 24)) % 365)
                                           , int((upTimeSeconds / (60 * 60)) % 24)
                                           , int((upTimeSeconds / (60)) % 60));

diff --git a/jsonStuff.ino b/jsonStuff.ino
@@ -1,7 +1,7 @@
 /* 
 ***************************************************************************  
 **  Program  : jsonStuff, part of DSMRloggerAPI
-**  Version  : v1.1.0
+**  Version  : v1.2.1
 **
 **  Copyright (c) 2020 Willem Aandewiel
 **