v2.0.1 First Final Release

mrWheel · mrWheel · commit 2393d6770935 · 2020-04-17T11:55:22.000+02:00
diff --git a/DSMRloggerAPI.h b/DSMRloggerAPI.h
@@ -1,7 +1,7 @@
 /*
 ***************************************************************************  
 **  Program  : DSMRloggerAPI.h - definitions for DSMRloggerAPI
-**  Version  : v1.2.1
+**  Version  : v2.0.1
 **
 **  Copyright (c) 2020 Willem Aandewiel
 **
diff --git a/DSMRloggerAPI.ino b/DSMRloggerAPI.ino
@@ -2,7 +2,7 @@
 ***************************************************************************  
 **  Program  : DSMRloggerAPI (restAPI)
 */
-#define _FW_VERSION "v1.2.4 (16-04-2020)"
+#define _FW_VERSION "v2.0.1 (17-04-2020)"
 /*
 **  Copyright (c) 2020 Willem Aandewiel
 **
diff --git a/Debug.h b/Debug.h
@@ -1,7 +1,7 @@
 /* 
 ***************************************************************************  
 **  Program  : Debug.h, part of DSMRloggerAPI
-**  Version  : v1.2.1
+**  Version  : v2.0.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.2.1
+**  Version  : v2.0.1
 **
 **  Mostly stolen from https://www.arduinoforum.de/User-Fips
 **  For more information visit: https://fipsok.de
@@ -240,7 +240,7 @@ void updateFirmware()
   DebugTln(F("Redirect to updateIndex .."));
   doRedirect("wait ... ", 1, "/updateIndex", false);
 #else
-  doRedirect("UpdateServer not implemented", 10, "/", false);
+  doRedirect("UpdateServer not available", 10, "/", false);
 #endif
       
 } // updateFirmware()
diff --git a/MQTTstuff.ino b/MQTTstuff.ino
@@ -1,7 +1,7 @@
 /* 
 ***************************************************************************  
 **  Program  : MQTTstuff, part of DSMRloggerAPI
-**  Version  : v1.2.1
+**  Version  : v2.0.1
 **
 **  Copyright (c) 2020 Willem Aandewiel
 **
diff --git a/MinderGas.ino b/MinderGas.ino
@@ -1,7 +1,7 @@
 /*
 **************************************************************************
 **  Program  : MinderGas.ino
-**  Version  : v1.2.2
+**  Version  : v2.0.1
 **
 **  Copyright (c) 2020 Robert van den Breemen
 **
diff --git a/README.md b/README.md
@@ -10,8 +10,14 @@ 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.2.4</td>
-   <td>Bug Fixes
+   <td valign="top">2.0.1</td>
+   <td>First Final Release
+   <br>Implementing DSMRloggerWS actual api (for bacwards compatibility)
+   <br>More robust way to write hourly data to the RING-files
+   <br>Bugfix PRE40 gasmeter reading
+   <br>Remove validity check on meterstanden editor
+   <br>Better FieldName transaltion
+   <br>Bugfix mindergas processing
    </td>
 </tr>
    <td valign="top">1.2.1</td>
diff --git a/SPIFFSstuff.ino b/SPIFFSstuff.ino
@@ -1,7 +1,7 @@
 /* 
 ***************************************************************************  
 **  Program  : SPIFFSstuff, part of DSMRloggerAPI
-**  Version  : v1.2.1
+**  Version  : v2.0.1
 **
 **  Copyright (c) 2020 Willem Aandewiel
 **
diff --git a/convertPRD2RING.ino b/convertPRD2RING.ino
@@ -1,7 +1,7 @@
 /* 
 ***************************************************************************  
 **  Program  : convertPRD2RING, part of DSMRloggerAPI
-**  Version  : v1.2.1
+**  Version  : v2.0.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.2.2
+**  Version  : v1.3.1
 **
 **  Copyright (c) 2020 Willem Aandewiel
 **
@@ -94,8 +94,8 @@
     timeTimer = setInterval(refreshDevTime, 10 * 1000); // repeat every 10s
 
     openPage("mainPage");
-    openTab("ActualTab");
     initActualGraph();
+    openTab("ActualTab");
     setPresentationType('TAB');
     readGitHubVersion();
       
@@ -1106,6 +1106,7 @@ http://DSMR-API.local/api/v1/dev/settings</pre>", false);
     
     addAPIdoc("v1/sm/info",       "Smart Meter info in JSON format", true);
     addAPIdoc("v1/sm/actual",     "Smart Meter Actual data in JSON format", true);
+    addAPIdoc("v0/sm/actual",     "Smart Meter Actual data in JSON format (backwards compatibility)", true);
     addAPIdoc("v1/sm/fields",     "Smart Meter all fields data in JSON format\
         <br>JSON format: {\"fields\":[{\"name\":\"&lt;fieldName&gt;\",\"value\":&lt;value&gt;,\"unit\":\"&lt;unit&gt;\"}]} ", true);
     addAPIdoc("v1/sm/fields/{fieldName}", "Smart Meter one field data in JSON format", false);
diff --git a/data/DSMRversion.dat b/data/DSMRversion.dat
@@ -1 +1 @@
-v1.2.1 - Third Official Release
+v2.0.1 - First Final Release
diff --git a/edge/DSMRgraphics.js b/edge/DSMRgraphics.js
@@ -1,7 +1,7 @@
 /*
 ***************************************************************************  
 **  Program  : DSMRgraphics.js, part of DSMRloggerAPI
-**  Version  : v1.2.1
+**  Version  : v0.3.5
 **
 **  Copyright (c) 2020 Willem Aandewiel
 **
diff --git a/edge/DSMRindex.css b/edge/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/handleSlimmeMeter.ino b/handleSlimmeMeter.ino
@@ -1,7 +1,7 @@
 /*
 ***************************************************************************  
 **  Program  : handleSlimmeMeter - part of DSMRloggerAPI
-**  Version  : v1.2.1
+**  Version  : v2.0.1
 **
 **  Copyright (c) 2020 Willem Aandewiel
 **
diff --git a/helperStuff.ino b/helperStuff.ino
@@ -1,7 +1,7 @@
 /* 
 ***************************************************************************  
 **  Program  : helperStuff, part of DSMRloggerAPI
-**  Version  : v1.2.1
+**  Version  : v2.0.1
 **
 **  Copyright (c) 2020 Willem Aandewiel
 **
diff --git a/jsonStuff.ino b/jsonStuff.ino
@@ -1,7 +1,7 @@
 /* 
 ***************************************************************************  
 **  Program  : jsonStuff, part of DSMRloggerAPI
-**  Version  : v1.2.1
+**  Version  : v2.0.1
 **
 **  Copyright (c) 2020 Willem Aandewiel
 **
@@ -218,6 +218,61 @@ void sendNestedJsonObj(const char *cName, float fValue)
 } // sendNestedJsonObj(*char, float)
 
 
+//=======================================================================
+//----- v0 api ----------------------------------------------------------
+//=======================================================================
+void sendNestedJsonV0Obj(const char *cName, uint32_t uValue)
+{
+  char jsonBuff[200] = "";
+  
+  snprintf(jsonBuff, sizeof(jsonBuff), "%s \"%s\": %u"
+                                      , objSprtr, cName, uValue);
+
+  httpServer.sendContent(jsonBuff);
+  sprintf(objSprtr, ",\r\n");
+
+} // sendNestedJsonV0Obj(*char, uint)
+
+//---------------------------------------------------------------
+void sendNestedJsonV0Obj(const char *cName, float fValue)
+{
+  char jsonBuff[200] = "";
+  
+  snprintf(jsonBuff, sizeof(jsonBuff), "%s \"%s\": %.3f"
+                                      , objSprtr, cName, fValue);
+
+  httpServer.sendContent(jsonBuff);
+  sprintf(objSprtr, ",\r\n");
+  
+} // sendNestedJsonV0Obj(*char, float)
+
+//---------------------------------------------------------------
+void sendNestedJsonV0Obj(const char *cName, int32_t iValue)
+{
+  char jsonBuff[200] = "";
+  
+  snprintf(jsonBuff, sizeof(jsonBuff), "%s \"%s\": %u"
+                                      , objSprtr, cName, iValue);
+
+  httpServer.sendContent(jsonBuff);
+  sprintf(objSprtr, ",\r\n");
+  
+} // sendNestedV0Obj(*char, int)
+
+//---------------------------------------------------------------
+void sendNestedJsonV0Obj(const char *cName, String sValue)
+{
+  char jsonBuff[200] = "";
+  
+  snprintf(jsonBuff, sizeof(jsonBuff), "%s \"%s\": \"%s\""
+                                      , objSprtr, cName
+                                      , sValue.substring(0,(150 - (strlen(cName)))).c_str());
+
+  httpServer.sendContent(jsonBuff);
+  sprintf(objSprtr, ",\r\n");
+  
+} // sendNestedJsonV0Obj(*char, String)
+
 
 //=======================================================================
 // ************ function to build Json Settings string ******************
diff --git a/menuStuff.ino b/menuStuff.ino
@@ -1,7 +1,7 @@
 /* 
 ***************************************************************************  
 **  Program  : menuStuff, part of DSMRloggerAPI
-**  Version  : v1.2.1
+**  Version  : v2.0.1
 **
 **  Copyright (c) 2020 Willem Aandewiel
 **
diff --git a/networkStuff.h b/networkStuff.h
@@ -1,7 +1,7 @@
 /*
 ***************************************************************************  
 **  Program  : networkStuff.h, part of DSMRloggerAPI
-**  Version  : v1.2.1
+**  Version  : v2.0.1
 **
 **  Copyright (c) 2020 Willem Aandewiel
 **
diff --git a/ntpStuff.ino b/ntpStuff.ino
@@ -1,7 +1,7 @@
 /*
 ***************************************************************************  
 **  Program  : ntpStuff, part of DSMRloggerAPI
-**  Version  : v1.2.1
+**  Version  : v2.0.1
 **
 **  Copyright (c) 2020 Willem Aandewiel
 **
diff --git a/oledStuff.h b/oledStuff.h
@@ -1,7 +1,7 @@
 /*
 ***************************************************************************  
 **  Program  : oledStuff.h, part of DSMRloggerAPI
-**  Version  : v1.2.1
+**  Version  : v2.0.1
 **
 **  Copyright (c) 2020 Willem Aandewiel
 **
diff --git a/processTelegram.ino b/processTelegram.ino
@@ -1,7 +1,7 @@
 /* 
 ***************************************************************************  
 **  Program  : processTelegram, part of DSMRloggerAPI
-**  Version  : v1.2.1
+**  Version  : v2.0.1
 **
 **  Copyright (c) 2020 Willem Aandewiel
 **
@@ -28,33 +28,54 @@ void processTelegram()
   }
                                                     
   strcpy(newTimestamp, DSMRdata.timestamp.c_str()); 
-
-  newT = epoch(newTimestamp, strlen(newTimestamp), false); // do NOT update system time
+  //--- newTimestamp is the timestamp from the last telegram
+  newT = epoch(newTimestamp, strlen(newTimestamp), true); // update system time
+  //--- actTimestamp is the timestamp from the previous telegram
   actT = epoch(actTimestamp, strlen(actTimestamp), false);
   
-  // Skip first 3 telegrams .. just to settle down a bit ;-)
-  
+  //--- Skip first 3 telegrams .. just to settle down a bit ;-)
   if ((int32_t)(telegramCount - telegramErrors) < 3) 
   {
     strCopy(actTimestamp, sizeof(actTimestamp), newTimestamp);
-    actT = epoch(actTimestamp, strlen(actTimestamp), true);   // update system time
+    actT = epoch(actTimestamp, strlen(actTimestamp), false);   // update system time
     return;
   }
   
   DebugTf("actHour[%02d] -- newHour[%02d]\r\n", hour(actT), hour(newT));
+  //--- if we have a new hour() update the previous hour
   if (hour(actT) != hour(newT)) {
     writeToSysLog("actHour[%02d] -- newHour[%02d]", hour(actT), hour(newT));
   }
-  // has the hour changed (or the day or month)  
-  // in production testing on hour only would
-  // suffice, but in testing I need all three
+  //--- has the hour changed (or the day or month)  
+  //--- in production testing on hour only would
+  //--- suffice, but in testing I need all three
+  //--- if we have a new hour() update the previous hour(actT)
   if (     (hour(actT) != hour(newT)  ) 
        ||   (day(actT) != day(newT)   ) 
        || (month(actT) != month(newT) ) )
   {
     writeToSysLog("Update RING-files");
     writeDataToFiles();
     writeLastStatus();
+    //--- now see if the day() has changed also
+    if ( day(actT) != day(newT) )
+    {
+      //--- YES! actTimestamp := newTimestamp
+      //--- and update the files with the actTimestamp
+      strCopy(actTimestamp, sizeof(actTimestamp), newTimestamp);
+      writeDataToFiles();
+    }
+    else  //--- NO, only the hour has changed
+    {
+      char      record[DATA_RECLEN + 1] = "";
+      //--- actTimestamp := newTimestamp
+      strCopy(actTimestamp, sizeof(actTimestamp), newTimestamp);
+      buildDataRecordFromSM(record);
+      uint16_t recSlot = timestampToHourSlot(actTimestamp, strlen(actTimestamp));
+      //--- and update the files with the actTimestamp
+      writeDataToFile(HOURS_FILE, record, recSlot, HOURS);
+      DebugTf(">%s\r\n", record); // record ends in a \n
+    }
   }
 
   if ( DUE(publishMQTTtimer) )
diff --git a/restAPI.ino b/restAPI.ino
diff --git a/settingsStuff.ino b/settingsStuff.ino
diff --git a/timeStuff.ino b/timeStuff.ino
