From 1c0d60d097fe557c57f7ffa89bc5d1304949a3a8 Mon Sep 17 00:00:00 2001
From: Martijn <m.a.hendriks@gmail.com>
Date: Sun, 7 Jun 2020 10:39:17 +0200
Subject: [PATCH] verwijder oude v1 spullen

---
 DSMRloggerAPI.h       |  15 +-
 DSMRloggerAPI.ino     |   9 +-
 JsonCalls.ino         | 203 ++++++++--------
 MQTTstuff.ino         |   1 -
 RingFiles.ino         | 131 ++++++----
 SPIFFSstuff.ino       | 490 -------------------------------------
 convertPRD2RING.ino   |  71 +++---
 data/ADJindex.html    |  18 --
 edge/DSMRindex.js     |   2 +-
 handleSlimmeMeter.ino |   2 -
 menuStuff.ino         |  12 +-
 processTelegram.ino   |   1 -
 restAPI.ino           | 554 ------------------------------------------
 13 files changed, 235 insertions(+), 1274 deletions(-)
 delete mode 100644 data/ADJindex.html
 delete mode 100644 restAPI.ino

diff --git a/DSMRloggerAPI.h b/DSMRloggerAPI.h
index 88d8d4c..07ab614 100644
--- a/DSMRloggerAPI.h
+++ b/DSMRloggerAPI.h
@@ -67,21 +67,12 @@ P1Reader    slimmeMeter(&swSer1, DTR_ENABLE);
 #define DATA_CSV_HEADER   "YYMMDDHH;      EDT1;      EDT2;      ERT1;      ERT2;       GDT;"
 #define DATA_RECLEN       75
 
-#define HOURS_FILE        "/RINGhours.csv"
-#define _NO_HOUR_SLOTS_   (48 +1)
-
-#define DAYS_FILE         "/RINGdays.csv"
-#define _NO_DAY_SLOTS_    (14 +1)
-
-#define MONTHS_FILE       "/RINGmonths.csv"
-#define _NO_MONTH_SLOTS_  (24 +1)
-
 enum    { PERIOD_UNKNOWN, HOURS, DAYS, MONTHS, YEARS };
 
 typedef enum E_ringfiletype {RINGHOURS, RINGDAYS, RINGMONTHS};
 
 typedef struct {
-    String filename;
+    char filename[18];
     int8_t slots;
     unsigned int seconds;
   } S_ringfile;
@@ -158,7 +149,7 @@ using MyData = ParsedData<
 
 enum    { TAB_UNKNOWN, TAB_ACTUEEL, TAB_LAST24HOURS, TAB_LAST7DAYS, TAB_LAST24MONTHS, TAB_GRAPHICS, TAB_SYSINFO, TAB_EDITOR };
 
-typedef struct {
+/*typedef struct {
     uint32_t  Label;
     float     EDT1;
     float     EDT2;
@@ -170,7 +161,7 @@ typedef struct {
 static dataStruct hourData;   // 0 + 1-24
 static dataStruct dayData;    // 1 - 7 (0=header, 1=sunday)
 static dataStruct monthData;  // 0 + year1 1 t/m 12 + year2 1 t/m 12
-
+*/
 const char *weekDayName[]  { "Unknown", "Zondag", "Maandag", "Dinsdag", "Woensdag"
                             , "Donderdag", "Vrijdag", "Zaterdag", "Unknown" };
 const char *monthName[]    { "00", "Januari", "Februari", "Maart", "April", "Mei", "Juni", "Juli"
diff --git a/DSMRloggerAPI.ino b/DSMRloggerAPI.ino
index a70c2ff..3e3e54a 100644
--- a/DSMRloggerAPI.ino
+++ b/DSMRloggerAPI.ino
@@ -10,18 +10,17 @@
 ***************************************************************************      
 *      
 *      TODO
-*      - verwijderen v1
 *      - v1/dev/settings .js file (opslaan settings)
 *      Future development
 *      - ringfile : fout bestaande file - oude renamen en nieuwe maken
 *      - api: laatste 10 errors/excepties
-*      - eport ringfiles to private cloud -> using API
+*      - upload ringfiles to private cloud -> using API
 
-  Arduino-IDE settings for DSMR-logger Version 4 (ESP-12):
+  Arduino-IDE settings for DSMR-logger Version 1 (ESP-M3):
 
     - Board: "Generic ESP8266 Module"
     - Flash mode: "DOUT" | "DIO"    // change only after power-off and on again!
-    - Flash size: "4MB (FS: 2MB OAT:~1019KB)"  << LET OP! 2MB SPIFFS
+    - Flash size: "1MB (FS: 128KB OAT:~438KB)"  
     - DebugT port: "Disabled"
     - DebugT Level: "None"
     - IwIP Variant: "v2 Lower Memory"
@@ -30,7 +29,7 @@
     - VTables: "Flash"
     - Flash Frequency: "40MHz"
     - CPU Frequency: "80 MHz"
-    - Buildin Led: "2"  // GPIO02 for Wemos and ESP-12
+    - Buildin Led: "2"  // GPIO02 
     - Upload Speed: "115200"                                                                                                                                                                                                                                                 
     - Erase Flash: "Only Sketch"
     - Port: <select correct port>
diff --git a/JsonCalls.ino b/JsonCalls.ino
index e1b87fb..8092643 100644
--- a/JsonCalls.ino
+++ b/JsonCalls.ino
@@ -74,15 +74,8 @@ void processAPI() {
     }
     Debugln(" ");
   }
-
-  /* code wordt nooit aabgesproken omdat <> api niet in dit proces komt
-   if (words[1] != "api")
-  {
-    sendApiNotFound2(URI);
-    return;
-  }*/
-
-  if (words[2] != "v1" && words[2] != "v2")
+  
+  if (words[2] != "v2")
   {
     sendApiNotFound(URI);
     return;
@@ -90,18 +83,15 @@ void processAPI() {
 
   if (words[3] == "dev")
   {
-    if (words[2] == "v1") handleDevApi(URI, words[4].c_str(), words[5].c_str(), words[6].c_str()); 
-    else handleDevApiV2(URI, words[4].c_str(), words[5].c_str(), words[6].c_str());
+    handleDevApi(URI, words[4].c_str(), words[5].c_str(), words[6].c_str());
   }
   else if (words[3] == "hist")
   {
-    if (words[2] == "v1") handleHistApi(URI, words[4].c_str(), words[5].c_str(), words[6].c_str());
-    else handleHistApi2(URI, words[4].c_str(), words[5].c_str(), words[6].c_str());
+    handleHistApi(URI, words[4].c_str(), words[5].c_str(), words[6].c_str());
   }
   else if (words[3] == "sm")
   {
-    if (words[2] == "v1") handleSmApi(URI, words[4].c_str(), words[5].c_str(), words[6].c_str());
-    else handleSmApi2(URI, words[4].c_str(), words[5].c_str(), words[6].c_str());
+    handleSmApi(URI, words[4].c_str(), words[5].c_str(), words[6].c_str());
   }
   else sendApiNotFound(URI);
   
@@ -123,7 +113,7 @@ void sendJson(const TSource &doc)
   httpServer.send(200, "application/json", JsonOutput);  
 }
 
-void sendDeviceTime2() 
+void sendDeviceTime() 
 {
   // Allocate a temporary JsonDocument
   // Use arduinojson.org/v6/assistant to compute the capacity.
@@ -137,7 +127,7 @@ void sendDeviceTime2()
 
 } // sendDeviceTime()
 
-void sendDeviceInfo2() 
+void sendDeviceInfo() 
 {
   char compileOptions[200] = "";
   DynamicJsonDocument doc(1500);
@@ -244,9 +234,9 @@ void sendDeviceInfo2()
 } // sendDeviceInfo()
 
 //=======================================================================
-void sendDeviceSettings2() 
+void sendDeviceSettings() 
 {
-  DebugTln("sending device settings ...\r");
+  DebugTln(F("sending device settings ...\r"));
   DynamicJsonDocument doc(1500);
   
   doc["hostname"]["value"] = settingHostname;
@@ -341,7 +331,7 @@ void sendDeviceSettings2()
 //====================================================
 void sendApiNotFound(const char *URI)
 {
-  DebugTln("sending device settings ...\r");
+  DebugTln(F("sending device settings ...\r"));
   char JsonOutput[200];
   DynamicJsonDocument doc(200);
   
@@ -376,7 +366,7 @@ void FillJsonRec(const char *cName, String sValue)
 //=======================================================================
 void FillJsonRec(const char *cName, const char *cValue, const char *cUnit)
 {
-    DebugTln("const char *cName, const char *cValue, const char *cUnit");
+    //DebugTln("const char *cName, const char *cValue, const char *cUnit");
 
   if (strlen(cUnit) == 0)
   {
@@ -394,7 +384,7 @@ void FillJsonRec(const char *cName, const char *cValue, const char *cUnit)
 //---------------------------------------------------------------
 void FillJsonRec(const char *cName, const char *cValue)
 {
-    DebugTln("const char *cName, const char *cValue");
+    //DebugTln(F("const char *cName, const char *cValue"));
     char noUnit[] = {'\0'};
 
   FillJsonRec(cName, cValue, noUnit);
@@ -405,7 +395,7 @@ void FillJsonRec(const char *cName, const char *cValue)
 //=======================================================================
 void FillJsonRec(const char *cName, String sValue, const char *cUnit)
 {
-  DebugTln("const char *cName, String sValue, const char *cUnit ");
+  //DebugTln(F("const char *cName, String sValue, const char *cUnit "));
 
   if (sValue.length() > (JSON_BUFF_MAX - 65) )
   {
@@ -428,7 +418,7 @@ void FillJsonRec(const char *cName, String sValue, const char *cUnit)
 //---------------------------------------------------------------
 void FillJsonRec(const char *cName, float fValue)
 {
-        DebugTln("const char *cName, float fValue");
+        //DebugTln(F("const char *cName, float fValue"));
 
   char noUnit[] = {'\0'};
 
@@ -439,7 +429,7 @@ void FillJsonRec(const char *cName, float fValue)
 //=======================================================================
 void FillJsonRec(const char *cName, float fValue, const char *cUnit)
 {  
-      DebugTln("const char *cName, float fValue, const char *cUnit");
+      //DebugTln(F("const char *cName, float fValue, const char *cUnit"));
 
   if (strlen(cUnit) == 0)
   {
@@ -456,7 +446,7 @@ void FillJsonRec(const char *cName, float fValue, const char *cUnit)
 
 //=======================================================================
 
-struct buildJsonApi2 {
+struct buildJsonApi {
     bool  skip = false;
 
     template<typename Item>
@@ -495,7 +485,7 @@ struct buildJsonApi2 {
       }
   }
 
-};  // buildJsonApi2()
+};  // buildJsonApi()
 
 void ArrayToJson(){
   //send json output
@@ -509,33 +499,30 @@ void ArrayToJson(){
   httpServer.sendHeader("Access-Control-Allow-Origin", "*");
   httpServer.setContentLength(strlen(OneRecord));
   httpServer.send(200, "application/json", OneRecord);  
-  
-  
 }    
+
 //====================================================
-void handleSmApi2(const char *URI, const char *word4, const char *word5, const char *word6)
+void handleSmApi(const char *URI, const char *word4, const char *word5, const char *word6)
 {
   char    tlgrm[1200] = "";
-  uint8_t p=0;  
   bool    stopParsingTelegram = false;
   memset(OneRecord,0,sizeof(OneRecord));//clear onerecord
   OneRecord[0] = '{'; //start Json
   
   //DebugTf("word4[%s], word5[%s], word6[%s]\r\n", word4, word5, word6);
-  char type;
   switch (word4[0]) {
     
   case 'i': //info
     onlyIfPresent = false;
     copyToFieldsArray(infoArray, infoElements);
-    DSMRdata.applyEach(buildJsonApi2());
+    DSMRdata.applyEach(buildJsonApi());
     ArrayToJson() ;
   break;
   
   case 'a': //actual
     onlyIfPresent = true;
     copyToFieldsArray(actualArray, actualElements);
-    DSMRdata.applyEach(buildJsonApi2());
+    DSMRdata.applyEach(buildJsonApi());
     ArrayToJson();
   break;
   
@@ -550,7 +537,7 @@ void handleSmApi2(const char *URI, const char *word4, const char *word5, const c
        fieldsElements = 2;
     }
     //sendJsonFields(word4);
-    DSMRdata.applyEach(buildJsonApi2());
+    DSMRdata.applyEach(buildJsonApi());
     ArrayToJson();
   break;  
   case 't': //telegramm 
@@ -599,19 +586,19 @@ void handleSmApi2(const char *URI, const char *word4, const char *word5, const c
     break;
   }
   
-} // handleSmApi2()
+} // handleSmApi()
 //====================================================
 
-void handleDevApiV2(const char *URI, const char *word4, const char *word5, const char *word6)
+void handleDevApi(const char *URI, const char *word4, const char *word5, const char *word6)
 {
   //DebugTf("word4[%s], word5[%s], word6[%s]\r\n", word4, word5, word6);
   if (strcmp(word4, "info") == 0)
   {
-    sendDeviceInfo2();
+    sendDeviceInfo();
   }
   else if (strcmp(word4, "time") == 0)
   {
-    sendDeviceTime2();
+    sendDeviceTime();
   }
   else if (strcmp(word4, "settings") == 0)
   {
@@ -648,7 +635,7 @@ void handleDevApiV2(const char *URI, const char *word4, const char *word5, const
     }
     else
     {
-      sendDeviceSettings2();
+      sendDeviceSettings();
     }
   }
   else if (strcmp(word4, "debug") == 0)
@@ -657,33 +644,26 @@ void handleDevApiV2(const char *URI, const char *word4, const char *word5, const
   }
   else sendApiNotFound(URI);
   
-} // handleDevApiV2()
+} // handleDevApi()
 
 //====================================================
-void handleHistApi2(const char *URI, const char *word4, const char *word5, const char *word6)
+void handleHistApi(const char *URI, const char *word4, const char *word5, const char *word6)
 {
-  int8_t  fileType     = 0;
-  char    fileName[20] = "";
-  
+
   //DebugTf("word4[%s], word5[%s], word6[%s]\r\n", word4, word5, word6);
   if (   strcmp(word4, "hours") == 0 )
   {
-    //fileType = HOURS;
-    //strCopy(fileName, sizeof(fileName), HOURS_FILE);
-    RingFileToApi(RINGHOURS);
+    RingFileTo(RINGHOURS, true);
     return;
   }
   else if (strcmp(word4, "days") == 0 )
   {
-    //fileType = DAYS;
-    //strCopy(fileName, sizeof(fileName), DAYS_FILE);
-    RingFileToApi(RINGDAYS);
+    RingFileTo(RINGDAYS, true);
     return;
 
   }
   else if (strcmp(word4, "months") == 0)
   {
-    fileType = MONTHS;
     if (httpServer.method() == HTTP_PUT || httpServer.method() == HTTP_POST)
     {
       //------------------------------------------------------------ 
@@ -692,16 +672,9 @@ void handleHistApi2(const char *URI, const char *word4, const char *word5, const
       //               ,"ert1":378.074,"ert2":208.746
       //               ,"gdt":3314.404}
       //------------------------------------------------------------ 
-      char      record[DATA_RECLEN + 1] = "";
-      uint16_t  recSlot;
-
-      String jsonIn  = httpServer.arg(0).c_str();
-      DebugTln(jsonIn);
-      
-      recSlot = buildDataRecordFromJson(record, jsonIn);
-      
+    
       //--- update MONTHS
-      writeDataToFile(MONTHS_FILE, record, recSlot, MONTHS);
+      writeRingFile(RINGMONTHS, httpServer.arg(0).c_str());
       //--- send OK response --
       httpServer.send(200, "application/json", httpServer.arg(0));
       
@@ -709,8 +682,7 @@ void handleHistApi2(const char *URI, const char *word4, const char *word5, const
     }
     else 
     {
-      //strCopy(fileName, sizeof(fileName), MONTHS_FILE);
-      RingFileToApi(RINGMONTHS);
+      RingFileTo(RINGMONTHS,true);
       return;
     }
   }
@@ -719,60 +691,81 @@ void handleHistApi2(const char *URI, const char *word4, const char *word5, const
     sendApiNotFound(URI);
     return;
   }
-  /*if (strcmp(word5, "desc") == 0)
-        sendJsonHist2(fileType, fileName, actTimestamp, true);
-  else  sendJsonHist2(fileType, fileName, actTimestamp, false);
-*/
-} // handleHistApi2()
+
+} // handleHistApi()
 
 //=======================================================================
-void sendJsonHist2(int8_t fileType, const char *fileName, const char *timeStamp, bool desc) 
+void sendDeviceDebug(const char *URI, String tail) 
 {
-  uint8_t startSlot, nrSlots, recNr  = 0;
-  char    typeApi[10];
-  DynamicJsonDocument doc(9500);
-  
-  if (DUE(antiWearTimer))
+#ifdef USE_SYSLOGGER
+  String lLine = "";
+  int lineNr = 0;
+  int tailLines = tail.toInt();
+
+  DebugTf("list [%d] debug lines\r\n", tailLines);
+  sysLog.status();
+  sysLog.setDebugLvl(0);
+  httpServer.sendHeader("Access-Control-Allow-Origin", "*");
+  httpServer.setContentLength(CONTENT_LENGTH_UNKNOWN);
+  if (tailLines > 0)
+        sysLog.startReading((tailLines * -1));  
+  else  sysLog.startReading(0, 0);  
+  while( (lLine = sysLog.readNextLine()) && !(lLine == "EOF")) 
   {
-    writeDataToFiles();
-    writeRingFiles();
-    writeLastStatus();
+    lineNr++;
+    snprintf(cMsg, sizeof(cMsg), "%s\r\n", lLine.c_str());
+    httpServer.sendContent(cMsg);
+
   }
-    
-  switch(fileType) {
-    case HOURS:   startSlot       = timestampToHourSlot(timeStamp, strlen(timeStamp));
-                  nrSlots         = _NO_HOUR_SLOTS_;
-                  strCopy(typeApi, 9, "hours");
-                  break;
-    case DAYS:    startSlot       = timestampToDaySlot(timeStamp, strlen(timeStamp));
-                  nrSlots         = _NO_DAY_SLOTS_;
-                  strCopy(typeApi, 9, "days");
-                  break;
-    case MONTHS:  startSlot       = timestampToMonthSlot(timeStamp, strlen(timeStamp));
-                  nrSlots         = _NO_MONTH_SLOTS_;
-                  strCopy(typeApi, 9, "months");
-                  break;
+  sysLog.setDebugLvl(1);
+
+#else
+  sendApiNotFound(URI);
+#endif
+
+} // sendDeviceDebug()
+
+bool isInFieldsArray(const char* lookUp, int elemts)
+{
+  if (elemts == 0) return true;
+
+  for (int i=0; i<elemts; i++)
+  {
+    //if (Verbose2) DebugTf("[%2d] Looking for [%s] in array[%s]\r\n", i, lookUp, fieldsArray[i]); 
+    if (strcmp(lookUp, fieldsArray[i]) == 0) return true;
   }
+  return false;
+  
+} // isInFieldsArray()
 
-  if (desc)
-        startSlot += nrSlots +1; // <==== voorbij actuele slot!
-  else  startSlot += nrSlots;    // <==== start met actuele slot!
 
-  DebugTf("sendJsonHist startSlot[%02d]\r\n", (startSlot % nrSlots));
+void copyToFieldsArray(const char inArray[][35], int elemts)
+{
+  int i = 0;
+  memset(fieldsArray,0,sizeof(fieldsArray));
+  //if (Verbose2) DebugTln("start copying ....");
   
-  for (uint8_t s = 0; s < nrSlots; s++)
-  { 
-    JsonObject obj = doc.createNestedObject();
-    if (desc)
-          readOneSlot(fileType, fileName, s, (s +startSlot), true, "hist", obj);
-    else  readOneSlot(fileType, fileName, s, (startSlot -s), true, "hist", obj);
+  for ( i=0; i<elemts; i++)
+  {
+    strncpy(fieldsArray[i], inArray[i], 34);
+    //if (Verbose1) DebugTf("[%2d] => inArray[%s] fieldsArray[%s]\r\n", i, inArray[i], fieldsArray[i]); 
+
   }
+  fieldsElements = i;
+  
+} // copyToFieldsArray()
 
-  //DebugTf("sendJson V2 HistoryData");
-  sendJson(doc);
-    
-} // sendJsonHist2()
 
+bool listFieldsArray(char inArray[][35])
+{
+  int i = 0;
+
+  for ( i=0; strlen(inArray[i]) == 0; i++)
+  {
+    DebugTf("[%2d] => inArray[%s]\r\n", i, inArray[i]); 
+  }
+  
+} // listFieldsArray()
 /***************************************************************************
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/MQTTstuff.ino b/MQTTstuff.ino
index 0ddaa16..5445d3d 100644
--- a/MQTTstuff.ino
+++ b/MQTTstuff.ino
@@ -63,7 +63,6 @@ void connectMQTT()
 #endif
 }
 
-
 //===========================================================================================
 bool connectMQTT_FSM() 
 {
diff --git a/RingFiles.ino b/RingFiles.ino
index c59b90f..998fca3 100644
--- a/RingFiles.ino
+++ b/RingFiles.ino
@@ -16,13 +16,12 @@ void createRingFile(E_ringfiletype ringfiletype)
     Debugln(RingFiles[ringfiletype].filename);
     return;
   }
+  
   //fill file with default values
   DynamicJsonDocument doc(9500);
   doc["actSlot"] = 0;
   for (int slot=0; slot < RingFiles[ringfiletype].slots; slot++ ) 
   { 
-    //JsonArray data = doc.createNestedArray("data");
-    //JsonObject Object = data.createNestedObject(String(slot));
     doc["data"][slot]["date"] = "00000000";
     doc["data"][slot]["values"][0] = 0;
     doc["data"][slot]["values"][1] = 0;
@@ -31,17 +30,19 @@ void createRingFile(E_ringfiletype ringfiletype)
     doc["data"][slot]["values"][4] = 0;
   }
   //DebugT(F("RingFile output >"));serializeJson(doc, Serial);   Serial.println();
+  
   //write json to ring file
   DebugT(F("write(): to ringfile ")); Debugln(RingFiles[ringfiletype].filename);
   
   writeToJsonFile(doc, RingFile);
 }
 
-uint8_t CalcSlot(E_ringfiletype ringfiletype) 
+uint8_t CalcSlot(E_ringfiletype ringfiletype, char* Timestamp) 
 {
   //slot positie bepalen
   uint32_t  nr=0;
-  time_t    t1 = epoch((char*)actTimestamp, strlen(actTimestamp), false);
+  //time_t    t1 = epoch((char*)actTimestamp, strlen(actTimestamp), false);
+  time_t    t1 = epoch(Timestamp, strlen(Timestamp), false);
   if (ringfiletype == RINGMONTHS ) nr = ( (year(t1) -1) * 12) + month(t1);    // eg: year(2023) * 12 = 24276 + month(9) = 202309
   else nr = t1 / RingFiles[ringfiletype].seconds;
   uint8_t slot = nr % RingFiles[ringfiletype].slots;
@@ -58,11 +59,16 @@ uint8_t CalcSlot(E_ringfiletype ringfiletype)
   return slot;
 }
 
-
 //---------
-void RingFileToApi(E_ringfiletype ringfiletype) 
+void RingFileTo(E_ringfiletype ringfiletype, bool toFile) 
 {  
   if (bailout()) return; //exit when heapsize is too small
+
+  if (DUE(antiWearTimer))
+  {
+    writeRingFiles();
+    writeLastStatus();
+  }
   
   if (!SPIFFS.exists(RingFiles[ringfiletype].filename))
   {
@@ -77,68 +83,101 @@ void RingFileToApi(E_ringfiletype ringfiletype)
   
   DeserializationError error = deserializeJson(doc, RingFile);
   if (error) {
-    DebugTln(F("read():Failed to read RING*.json file"));
-  } else sendJson(doc); 
+    DebugT(F("read():Failed to read RING*.json file: "));
+    Debugln(error.c_str());
+  } else {
+    
+    if (toFile) {
+      sendJson(doc); 
+    } else {
+      serializeJson(doc, TelnetStream); //print file to telnet output
+      serializeJson(doc, Serial); //print file to serial output
+    }
+
+  }
   
   RingFile.close();
-}
+} //RingFileto
+
 
 //===========================================================================================
-void writeRingFile(E_ringfiletype ringfiletype) 
+void writeRingFile(E_ringfiletype ringfiletype,const char *JsonRec) 
 {
   DynamicJsonDocument doc(9500);
+  DynamicJsonDocument rec(140);
   char key[10] = "";
   uint8_t slot = 0;
-  slot = CalcSlot(ringfiletype);
-  if (slot == 99 ) return;  // stop if slot is invalid
-
-  DebugT("update timeslot: ");
-  Debugln(slot);
-  
-  strncpy(key, actTimestamp, 8);
-  DebugT("update date: ");
-  Debugln(key);
+  uint8_t actSlot = CalcSlot(ringfiletype, actTimestamp);
+  if (actSlot == 99 ) return;  // stop if slot is invalid
+
+  if (strlen(JsonRec) > 1) {
+    DebugTln(JsonRec);
+    DeserializationError error = deserializeJson(rec, JsonRec);
+    if (error) {
+      DebugT(F("convert:Failed to deserialize RECORD: "));
+      Debugln(error.c_str());
+      return;
+    } 
+  }
+  //DebugT("update timeslot: ");
+  //Debugln(slot);
   
   //json openen
   DebugT(F("read(): Ring file "));
   Debugln(RingFiles[ringfiletype].filename);
-      
+  
   File RingFile = SPIFFS.open(RingFiles[ringfiletype].filename, "r"); // open for reading  
   if (!RingFiles) {
     DebugT(F("open ring file FAILED!!! --> Bailout\r\n"));
     Debugln(RingFiles[ringfiletype].filename);
     return;
   }
-
-  
-  DeserializationError error = deserializeJson(doc, RingFile);
-  if (error) {
-    DebugT(F("read():Failed to deserialize ringfile"));
+  yield();
+  DeserializationError error2 = deserializeJson(doc, RingFile);
+  if (error2) {
+    DebugT(F("read():Failed to deserialize RINGFILE"));
     Debugln(RingFiles[ringfiletype].filename);
     return;
   }
   
-  DebugT(F("RingFile input <")); serializeJson(doc, Serial);   Serial.println();
+  DebugT(F("RingFile input <")); serializeJson(doc, Serial);Debugln("");
   
   RingFile.close();
-
+  yield();
   // add/replace new value to json object
-  doc["actSlot"] = slot;
-  //JsonArray data = doc.createNestedArray("data");
-
-  //JsonObject Object = data.createNestedObject(String(slot));
-  doc["data"][slot]["date"] = key;
-  doc["data"][slot]["values"][0] = (float)DSMRdata.energy_delivered_tariff1;
-  doc["data"][slot]["values"][1] = (float)DSMRdata.energy_delivered_tariff2;
-  doc["data"][slot]["values"][2] = (float)DSMRdata.energy_returned_tariff1;
-  doc["data"][slot]["values"][3] = (float)DSMRdata.energy_returned_tariff2;
-  #ifdef USE_PRE40_PROTOCOL
-      doc["data"][slot]["values"][4] = (float)DSMRdata.gas_delivered2;
-  #else
-    doc["data"][slot]["values"][4] = (float)DSMRdata.gas_delivered;
-  #endif
- 
-  DebugT(F("RingFile output >"));serializeJson(doc, Serial);   Serial.println();
+  doc["actSlot"] = actSlot;
+
+  if (strlen(JsonRec) > 1) {
+    strncpy(key, rec["recid"], 8); 
+    slot = CalcSlot(ringfiletype, key);
+    DebugTln("slot from rec: "+slot);
+    DebugT("update date: ");Debugln(key);
+  
+    doc["data"][slot]["date"] = key;
+    doc["data"][slot]["values"][0] = (float)rec["edt1"];
+    doc["data"][slot]["values"][1] = (float)rec["edt2"];
+    doc["data"][slot]["values"][2] = (float)rec["ert1"];
+    doc["data"][slot]["values"][3] = (float)rec["ert2"];
+    doc["data"][slot]["values"][4] = (float)rec["gdt"];
+    
+  } else {
+    strncpy(key, actTimestamp, 8);  
+    DebugTln("actslot: "+slot);
+    DebugT("update date: ");Debugln(key);
+    
+    doc["data"][actSlot]["date"] = key;
+    doc["data"][actSlot]["values"][0] = (float)DSMRdata.energy_delivered_tariff1;
+    doc["data"][actSlot]["values"][1] = (float)DSMRdata.energy_delivered_tariff2;
+    doc["data"][actSlot]["values"][2] = (float)DSMRdata.energy_returned_tariff1;
+    doc["data"][actSlot]["values"][3] = (float)DSMRdata.energy_returned_tariff2;
+    #ifdef USE_PRE40_PROTOCOL
+        doc["data"][actSlot]["values"][4] = (float)DSMRdata.gas_delivered2;
+    #else
+      doc["data"][actSlot]["values"][4] = (float)DSMRdata.gas_delivered;
+    #endif
+  }
+   
+  DebugT(F("RingFile output >"));serializeJson(doc, Serial); Debugln("");
 
   //write json to ring file
   DebugT(F("write(): to ringfile ")); Debugln(RingFiles[ringfiletype].filename);
@@ -159,13 +198,13 @@ void writeRingFile(E_ringfiletype ringfiletype)
 void writeRingFiles() 
 {
   // update HOURS
-  writeRingFile(RINGHOURS);
+  writeRingFile(RINGHOURS, "");
 
   // update DAYS
-  writeRingFile(RINGDAYS);
+  writeRingFile(RINGDAYS, "");
 
   // update MONTHS
-  writeRingFile(RINGMONTHS);
+  writeRingFile(RINGMONTHS, "");
 
 } // writeRingFiles()
 
diff --git a/SPIFFSstuff.ino b/SPIFFSstuff.ino
index 1dbe51e..c04ab18 100644
--- a/SPIFFSstuff.ino
+++ b/SPIFFSstuff.ino
@@ -9,496 +9,6 @@
 ***************************************************************************      
 */
 
-int16_t   bytesWritten;
-
-//static    FSInfo SPIFFSinfo;
-
-//===========================================================================================
-bool buildDataRecordFromSM(char *recIn) 
-{
-  static float GG = 1;
-  char record[DATA_RECLEN + 1] = "";
-  char key[10] = "";
- 
-  uint16_t recSlot = timestampToHourSlot(actTimestamp, strlen(actTimestamp));
-  strCopy(key, 10, actTimestamp, 0, 8);
-
-  snprintf(record, sizeof(record), (char*)DATA_FORMAT, key , (float)DSMRdata.energy_delivered_tariff1
-                                          , (float)DSMRdata.energy_delivered_tariff2
-                                          , (float)DSMRdata.energy_returned_tariff1
-                                          , (float)DSMRdata.energy_returned_tariff2
-#ifdef USE_PRE40_PROTOCOL
-                                          , (float)DSMRdata.gas_delivered2);
-#else
-                                          , (float)DSMRdata.gas_delivered);
-#endif
-  // DATA + \n + \0                                        
-  fillRecord(record, DATA_RECLEN);
-
-  strcpy(recIn, record);
-
-  if (!isNumericp(record, 8))
-  {
-    DebugTf("timeStamp [%-13.13s] not valid\r\n", record);
-    slotErrors++;
-    return false;
-  }
-  return true;
-
-} // buildDataRecordFromSM()
-
-//===========================================================================================
-uint16_t buildDataRecordFromJson(char *recIn, String jsonIn) 
-{
-  //static float GG = 1;
-  char      record[DATA_RECLEN + 1] = "";
-  String    wOut[10];
-  String    wPair[5];
-  char      uKey[15]  = "";
-  float     uEDT1     = 0.0;
-  float     uEDT2     = 0.0;
-  float     uERT1     = 0.0;
-  float     uERT2     = 0.0;
-  float     uGDT      = 0.0;
-  uint16_t  recSlot;
-
-  DebugTln(jsonIn);
-
-  jsonIn.replace("{", "");
-  jsonIn.replace("}", "");
-  jsonIn.replace("\"", "");
-  int8_t wp = splitString(jsonIn.c_str(), ',',  wOut, 9) ;
-  for(int f=0; f<wp; f++)
-  {
-    splitString(wOut[f].c_str(), ':', wPair, 4);
-    if (Verbose2) DebugTf("[%d] -> [%s]\r\n", f, wOut[f].c_str());
-    if (wPair[0].indexOf("recid") == 0)  strCopy(uKey, 10, wPair[1].c_str());
-    if (wPair[0].indexOf("edt1")  == 0)  uEDT1 = wPair[1].toFloat();
-    if (wPair[0].indexOf("edt2")  == 0)  uEDT2 = wPair[1].toFloat();
-    if (wPair[0].indexOf("ert1")  == 0)  uERT1 = wPair[1].toFloat();
-    if (wPair[0].indexOf("ert2")  == 0)  uERT2 = wPair[1].toFloat();
-    if (wPair[0].indexOf("gdt")   == 0)  uGDT  = wPair[1].toFloat();
-  }
-  strConcat(uKey, 15, "0101X");
-  recSlot = timestampToMonthSlot(uKey, strlen(uKey));
- 
-  DebugTf("MONTHS: Write [%s] to slot[%02d] in %s\r\n", uKey, recSlot, MONTHS_FILE);
-  snprintf(record, sizeof(record), (char*)DATA_FORMAT, uKey , (float)uEDT1
-                                           , (float)uEDT2
-                                           , (float)uERT1
-                                           , (float)uERT2
-                                           , (float)uGDT);
-
-  // DATA + \n + \0                                        
-  fillRecord(record, DATA_RECLEN);
-
-  strcpy(recIn, record);
-
-  return recSlot;
-
-} // buildDataRecordFromJson()
-
-
-//===========================================================================================
-void writeDataToFile(const char *fileName, const char *record, uint16_t slot, int8_t fileType) 
-{
-  uint16_t offset = 0;
-  
-  if (!SPIFFS.exists(fileName))
-  {
-    switch(fileType) {
-      case HOURS:   createFile(fileName, _NO_HOUR_SLOTS_);
-                    break;
-      case DAYS:    createFile(fileName, _NO_DAY_SLOTS_);
-                    break;
-      case MONTHS:  createFile(fileName, _NO_MONTH_SLOTS_);
-                    break;
-    }
-  }
-
-  File dataFile = SPIFFS.open(fileName, "r+");  // read and write ..
-  if (!dataFile) 
-  {
-    DebugTf("Error opening [%s]\r\n", fileName);
-    return;
-  }
-  // slot goes from 0 to _NO_OF_SLOTS_
-  // we need to add 1 to slot to skip header record!
-  offset = ((slot + 1) * DATA_RECLEN);
-  dataFile.seek(offset, SeekSet); 
-  int32_t bytesWritten = dataFile.print(record);
-  if (bytesWritten != DATA_RECLEN) 
-  {
-    DebugTf("ERROR! slot[%02d]: written [%d] bytes but should have been [%d]\r\n", slot, bytesWritten, DATA_RECLEN);
-    writeToSysLog("ERROR! slot[%02d]: written [%d] bytes but should have been [%d]", slot, bytesWritten, DATA_RECLEN);
-  }
-  dataFile.close();
-
-} // writeDataToFile()
-
-
-
-//===========================================================================================
-void writeDataToFiles() 
-{
-  char record[DATA_RECLEN + 1] = "";
-  uint16_t recSlot;
-
-  if (!buildDataRecordFromSM(record)) return; // exit because timestamp is invalid
-  
-  DebugTf(">%s\r\n", record); // record ends in a \n
-
-  // update HOURS
-  recSlot = timestampToHourSlot(actTimestamp, strlen(actTimestamp));
-  if (Verbose1) DebugTf("HOURS:  Write to slot[%02d] in %s\r\n", recSlot, HOURS_FILE);
-  writeDataToFile(HOURS_FILE, record, recSlot, HOURS);
-
-  // update DAYS
-  recSlot = timestampToDaySlot(actTimestamp, strlen(actTimestamp));
-  if (Verbose1) DebugTf("DAYS:   Write to slot[%02d] in %s\r\n", recSlot, DAYS_FILE);
-  writeDataToFile(DAYS_FILE, record, recSlot, DAYS);
-
-  // update MONTHS
-  recSlot = timestampToMonthSlot(actTimestamp, strlen(actTimestamp));
-  if (Verbose1) DebugTf("MONTHS: Write to slot[%02d] in %s\r\n", recSlot, MONTHS_FILE);
-  writeDataToFile(MONTHS_FILE, record, recSlot, MONTHS);
-
-} // writeDataToFiles(fileType, dataStruct newDat, int8_t slotNr)
-
-
-//===========================================================================================
-void readOneSlot(int8_t fileType, const char *fileName, uint8_t recNr
-                          , uint8_t readSlot, bool doJson, const char *rName) 
-{
-  uint16_t  slot, maxSlots = 0, offset;
-  char      buffer[DATA_RECLEN +2] = "";
-  char      recID[10]  = "";
-  float     EDT1, EDT2, ERT1, ERT2, GDT;
-
-  switch(fileType) {
-    case HOURS:   maxSlots    = _NO_HOUR_SLOTS_;
-                  break;
-    case DAYS:    maxSlots    = _NO_DAY_SLOTS_;
-                  break;
-    case MONTHS:  maxSlots    = _NO_MONTH_SLOTS_;
-                  break;
-  }
-
-  if (!SPIFFS.exists(fileName))
-  {
-    DebugTf("File [%s] does not excist!\r\n", fileName);
-    return;
-  }
-
-  File dataFile = SPIFFS.open(fileName, "r+");  // read and write ..
-  if (!dataFile) 
-  {
-    DebugTf("Error opening [%s]\r\n", fileName);
-    return;
-  }
-
-    slot    = (readSlot % maxSlots);
-    // slot goes from 0 to _NO_OF_SLOTS_
-    // we need to add 1 to slot to skip header record!
-    offset  = ((slot +1) * DATA_RECLEN);
-    dataFile.seek(offset, SeekSet); 
-    int l = dataFile.readBytesUntil('\n', buffer, sizeof(buffer));
-    buffer[l] = 0;
-    if (l >= (DATA_RECLEN -1))  // '\n' is skipped by readBytesUntil()
-    {
-      if (!isNumericp(buffer, 8)) // first 8 bytes is YYMMDDHH
-      {
-        {
-          Debugf("slot[%02d]==>timeStamp [%-13.13s] not valid!!\r\n", slot, buffer);
-          writeToSysLog("slot[%02d]==>timeStamp [%-13.13s] not valid!!", slot, buffer);
-        }
-      }
-      else
-      {
-        if (doJson)
-        {
-          sscanf(buffer, "%[^;];%f;%f;%f;%f;%f", recID
-                                               , &EDT1, &EDT2, &ERT1, &ERT2, &GDT);
-          sendNestedJsonObj(recNr++, recID, slot, EDT1, EDT2, ERT1, ERT2, GDT);
-
-        }
-        else
-        {
-          Debugf("slot[%02d]->[%s]\r\n", slot, buffer);
-        }
-      }
-
-  }
-  dataFile.close();
-
-} // readOneSlot()
-
-
-//===========================================================================================
-void readOneSlot(int8_t fileType, const char *fileName, uint8_t recNr, uint8_t readSlot, bool doJson, const char *rName, JsonObject &obj) 
-{
-  uint16_t  slot, maxSlots = 0, offset;
-  char      buffer[DATA_RECLEN +2] = "";
-  char      recID[10]  = "";
-  float     EDT1, EDT2, ERT1, ERT2, GDT;
-
-  switch(fileType) {
-    case HOURS:   maxSlots    = _NO_HOUR_SLOTS_;
-                  break;
-    case DAYS:    maxSlots    = _NO_DAY_SLOTS_;
-                  break;
-    case MONTHS:  maxSlots    = _NO_MONTH_SLOTS_;
-                  break;
-  }
-
-  if (!SPIFFS.exists(fileName))
-  {
-    DebugTf("File [%s] does not excist!\r\n", fileName);
-    return;
-  }
-
-  File dataFile = SPIFFS.open(fileName, "r+");  // read and write ..
-  if (!dataFile) 
-  {
-    DebugTf("Error opening [%s]\r\n", fileName);
-    return;
-  }
-
-    slot    = (readSlot % maxSlots);
-    // slot goes from 0 to _NO_OF_SLOTS_
-    // we need to add 1 to slot to skip header record!
-    offset  = ((slot +1) * DATA_RECLEN);
-    dataFile.seek(offset, SeekSet); 
-    int l = dataFile.readBytesUntil('\n', buffer, sizeof(buffer));
-    buffer[l] = 0;
-    if (l >= (DATA_RECLEN -1))  // '\n' is skipped by readBytesUntil()
-    {
-      if (!isNumericp(buffer, 8)) // first 8 bytes is YYMMDDHH
-      {
-        {
-          Debugf("slot[%02d]==>timeStamp [%-13.13s] not valid!!\r\n", slot, buffer);
-          writeToSysLog("slot[%02d]==>timeStamp [%-13.13s] not valid!!", slot, buffer);
-        }
-      }
-      else
-      {
-        if (doJson)
-        {
-          sscanf(buffer, "%[^;];%f;%f;%f;%f;%f", recID, &EDT1, &EDT2, &ERT1, &ERT2, &GDT);
-          obj["recnr"] = recNr++;
-          obj["recid"] = recID;
-          obj["slot"] = slot;
-          obj["edt1"] = EDT1;
-          obj["edt2"] = EDT2;
-          obj["ert1"] = ERT1;
-          obj["ert2"] = ERT2;
-          obj["gdt"] = GDT;
-         
-        }
-        else
-        {
-          Debugf("slot[%02d]->[%s]\r\n", slot, buffer);
-        }
-      }
-
-  }
-  dataFile.close();
-
-} // readOneSlot()
-
-
-
-//===========================================================================================
-void readSlotFromTimestamp(int8_t fileType, const char *fileName, const char *timeStamp
-                          , bool doJson, const char *rName) 
-{
-  uint16_t firstSlot = 0, maxSlots = 0;
-
-  DebugTf("timeStamp[%s]\r\n", timeStamp);
-  
-  switch(fileType) {
-    case HOURS:   firstSlot   = timestampToHourSlot(timeStamp, strlen(timeStamp));
-                  maxSlots    = _NO_HOUR_SLOTS_;
-                  break;
-    case DAYS:    firstSlot   = timestampToDaySlot(timeStamp, strlen(timeStamp));
-                  maxSlots    = _NO_DAY_SLOTS_;
-                  break;
-    case MONTHS:  firstSlot   = timestampToMonthSlot(timeStamp, strlen(timeStamp));
-                  maxSlots    = _NO_MONTH_SLOTS_;
-                  break;
-  }
-
-  firstSlot += maxSlots;
-  DebugTf("firstSlot[%d] -> slot[%d]\r\n", firstSlot, (firstSlot % maxSlots));
-  readOneSlot(fileType, fileName, firstSlot, 0, doJson, rName);
-
-} // readSlotFromTimestamp()
-
-
-//===========================================================================================
-void readAllSlots(int8_t fileType, const char *fileName, const char *timeStamp
-                          , bool doJson, const char *rName) 
-{
-  int16_t startSlot, endSlot, nrSlots, recNr = 0;
-  
-  switch(fileType) {
-    case HOURS:   startSlot       = timestampToHourSlot(timeStamp, strlen(timeStamp));
-                  nrSlots         = _NO_HOUR_SLOTS_;
-                  break;
-    case DAYS:    startSlot       = timestampToDaySlot(timeStamp, strlen(timeStamp));
-                  nrSlots         = _NO_DAY_SLOTS_;
-                  break;
-    case MONTHS:  startSlot       = timestampToMonthSlot(timeStamp, strlen(timeStamp));
-                  nrSlots         = _NO_MONTH_SLOTS_;
-                  break;
-  }
-
-  endSlot   = nrSlots + startSlot;
-  //startSlot += nrSlots;
-  DebugTf("start[%02d], endSlot[%02d]\r\n", (startSlot%nrSlots), endSlot);
-  for( uint16_t s=startSlot; s<endSlot; s++ )
-  {
-    readOneSlot(fileType, fileName, s, recNr++, false, "");
-  }
-  
-} // readAllSlots()
-
-
-//===========================================================================================
-bool createFile(const char *fileName, uint16_t noSlots) 
-{
-    DebugTf("fileName[%s], fileRecLen[%d]\r\n", fileName, DATA_RECLEN);
-
-    File dataFile  = SPIFFS.open(fileName, "a");  // create File
-    // -- first write fileHeader ----------------------------------------
-    snprintf(cMsg, sizeof(cMsg), "%s", DATA_CSV_HEADER);  // you cannot modify *fileHeader!!!
-    fillRecord(cMsg, DATA_RECLEN);
-    DebugT(cMsg); Debugln(F("\r"));
-    bytesWritten = dataFile.print(cMsg);
-    if (bytesWritten != DATA_RECLEN) 
-    {
-      DebugTf("ERROR!! slotNr[%d]: written [%d] bytes but should have been [%d] for Header\r\n", 0, bytesWritten, DATA_RECLEN);
-    }
-    DebugTln(F(".. that went well! Now add next record ..\r"));
-    // -- as this file is empty, write one data record ------------
-    snprintf(cMsg, sizeof(cMsg), "%02d%02d%02d%02d", 0, 0, 0, 0);
-    
-    snprintf(cMsg, sizeof(cMsg), DATA_FORMAT, cMsg, 0.000, 0.000, 0.000, 0.000, 0.000);
-
-    fillRecord(cMsg, DATA_RECLEN);
-    for(int r = 1; r <= noSlots; r++)
-    {
-      DebugTf("Write [%s] Data[%-9.9s]\r\n", fileName, cMsg);
-      dataFile.seek((r * DATA_RECLEN), SeekSet);
-      bytesWritten = dataFile.print(cMsg);
-      if (bytesWritten != DATA_RECLEN) 
-      {
-        DebugTf("ERROR!! recNo[%d]: written [%d] bytes but should have been [%d] \r\n", r, bytesWritten, DATA_RECLEN);
-      }
-    } // for ..
-    
-    dataFile.close();
-    dataFile  = SPIFFS.open(fileName, "r+");       // open for Read & writing
-    if (!dataFile) 
-    {
-      DebugTf("Something is very wrong writing to [%s]\r\n", fileName);
-      return false;
-    }
-    dataFile.close();
-
-    return true;
-  
-} //  createFile()
-
-
-//===========================================================================================
-void fillRecord(char *record, int8_t len) 
-{
-  int8_t s = 0, l = 0;
-  while (record[s] != '\0' && record[s]  != '\n') {s++;}
-  if (Verbose1) DebugTf("Length of record is [%d] bytes\r\n", s);
-  for (l = s; l < (len - 2); l++) {
-    record[l] = ' ';
-  }
-  record[l]   = ';';
-  record[l+1] = '\n';
-  record[len] = '\0';
-
-  while (record[l] != '\0') {l++;}
-  if (Verbose1) DebugTf("Length of record is now [%d] bytes\r\n", l);
-  
-} // fillRecord()
-
-
-//====================================================================
-uint16_t timestampToHourSlot(const char * TS, int8_t len)
-{
-  //char      aSlot[5];
-  time_t    t1 = epoch((char*)TS, strlen(TS), false);
-  uint32_t  nrHours = t1 / SECS_PER_HOUR;
-  //sprintf(aSlot, "%d", ((nrDays % KEEP_DAYS_HOURS) *24) + hour(t1));
-  //uint8_t   uSlot  = String(aSlot).toInt();
-  uint8_t   recSlot = (nrHours % _NO_HOUR_SLOTS_);
-  
-  if (Verbose1) DebugTf("===>>>>>  HOUR[%02d] => recSlot[%02d]\r\n", hour(t1), recSlot);
-
-  if (recSlot < 0 || recSlot >= _NO_HOUR_SLOTS_)
-  {
-    DebugTf("HOUR: Some serious error! Slot is [%d]\r\n", recSlot);
-    recSlot = _NO_HOUR_SLOTS_;
-    slotErrors++;
-  }
-  return recSlot;
-  
-} // timestampToHourSlot()
-
-
-//====================================================================
-uint16_t timestampToDaySlot(const char * TS, int8_t len)
-{
-  //char      aSlot[5];
-  time_t    t1 = epoch((char*)TS, strlen(TS), false);
-  uint32_t  nrDays = t1 / SECS_PER_DAY;
-  uint16_t  recSlot = (nrDays % _NO_DAY_SLOTS_);
-  
-  if (Verbose1) DebugTf("===>>>>>   DAY[%02d] => recSlot[%02d]\r\n", day(t1), recSlot);
-
-  if (recSlot < 0 || recSlot >= _NO_DAY_SLOTS_)
-  {
-    DebugTf("DAY: Some serious error! Slot is [%d]\r\n", recSlot);
-    recSlot = _NO_DAY_SLOTS_;
-    slotErrors++;
-  }
-  return recSlot;
-  
-} // timestampToDaySlot()
-
-
-//====================================================================
-uint16_t timestampToMonthSlot(const char * TS, int8_t len)
-{
-  //char      aSlot[5];
-  time_t    t1 = epoch((char*)TS, strlen(TS), false);
-  uint32_t  nrMonths = ( (year(t1) -1) * 12) + month(t1);    // eg: year(2023) * 12 = 24276 + month(9) = 202309
-  DebugTf("nrMonths: [%f]\r\n", nrMonths);
-  DebugTf("year: [%f]\r\n", year(t1));
-  DebugTf("month: [%f]\r\n", month(t1));
-  
-  uint16_t  recSlot = (nrMonths % _NO_MONTH_SLOTS_); // eg: 24285 % _NO_MONTH_SLOT_
-  
-  if (Verbose1) DebugTf("===>>>>> MONTH[%02d] => recSlot[%02d]\r\n", month(t1), recSlot);
-
-  if (recSlot < 0 || recSlot >= _NO_MONTH_SLOTS_)
-  {
-    DebugTf("MONTH: Some serious error! Slot is [%d]\r\n", recSlot);
-    recSlot = _NO_MONTH_SLOTS_;
-    slotErrors++;
-  }
-  return recSlot;
-  
-} // timestampToMonthSlot()
-
-
 //===========================================================================================
 int32_t freeSpace() 
 {
diff --git a/convertPRD2RING.ino b/convertPRD2RING.ino
index 2875bd1..e93c7f2 100644
--- a/convertPRD2RING.ino
+++ b/convertPRD2RING.ino
@@ -8,54 +8,59 @@
 **  TERMS OF USE: MIT License. See bottom of file.                                                            
 ***************************************************************************      
 */
+//===========================================================================================
+void fillRecord(char *record, int8_t len) 
+{
+  int8_t s = 0, l = 0;
+  while (record[s] != '\0' && record[s]  != '\n') {s++;}
+  if (Verbose1) DebugTf("Length of record is [%d] bytes\r\n", s);
+  for (l = s; l < (len - 2); l++) {
+    record[l] = ' ';
+  }
+  record[l]   = ';';
+  record[l+1] = '\n';
+  record[len] = '\0';
+
+  while (record[l] != '\0') {l++;}
+  if (Verbose1) DebugTf("Length of record is now [%d] bytes\r\n", l);
+  
+} // fillRecord()
 
 //=====================================================================
 void convertPRD2RING()
 {
-    if (DSMRfileExist("PRDhours.csv",  false) )
+    if (DSMRfileExist(RingFiles[RINGHOURS].filename,  false) )
     {
-      SPIFFS.remove(HOURS_FILE);
-      convertPRDfile(HOURS);
+      SPIFFS.remove(RingFiles[RINGHOURS].filename);
+      convertPRDfile(RINGHOURS);
     }
-    if (DSMRfileExist("PRDdays.csv",   false) )
+    if (DSMRfileExist(RingFiles[RINGDAYS].filename,   false) )
     {
-      SPIFFS.remove(DAYS_FILE);
-      convertPRDfile(DAYS);
+      SPIFFS.remove(RingFiles[RINGDAYS].filename);
+      convertPRDfile(RINGDAYS);
     }
-    if (DSMRfileExist("PRDmonths.csv", false) )
+    if (DSMRfileExist(RingFiles[RINGMONTHS].filename, false) )
     {
-      SPIFFS.remove(MONTHS_FILE);
-      convertPRDfile(MONTHS);
+      SPIFFS.remove(RingFiles[RINGMONTHS].filename);
+      convertPRDfile(RINGMONTHS);
     }
     SPIFFS.remove("/!PRDconvert");
 
 } // convertPRD2RING()
 
 //=====================================================================
-void convertPRDfile(int8_t fileType)
+void convertPRDfile(E_ringfiletype ringfiletype)
 {
   char  PRDfileName[30];
   char  buffer[200];
   char  recKey[15];
   float EDT1, EDT2, ERT1, ERT2, GDT;
-  int   offSet = 0, maxRecs = 0;
+  int   offSet = 0, maxRecs = RingFiles[ringfiletype].slots;
 
   Debugln("convertPRDfile() =============================================\r\n");
-  
-  switch(fileType)
-  {
-    case HOURS:   strCopy(PRDfileName, sizeof(PRDfileName), "/PRDhours.csv");
-                  maxRecs = 49;
-                  break;
-    case DAYS:    strCopy(PRDfileName, sizeof(PRDfileName), "/PRDdays.csv");
-                  maxRecs = 15;
-                  break;
-    case MONTHS:  strCopy(PRDfileName, sizeof(PRDfileName), "/PRDmonths.csv");
-                  maxRecs = 25;
-                  break;
-                  
-  } // switch()
-
+ 
+  strCopy(PRDfileName, sizeof(PRDfileName), RingFiles[ringfiletype].filename);
+ 
   File PRDfile  = SPIFFS.open(PRDfileName, "r");    // open for Read 
   if (!PRDfile) 
   {
@@ -84,7 +89,7 @@ void convertPRDfile(int8_t fileType)
       Debugf("recKey[%s] --> \r\n", recKey);
       if (isNumericp(recKey, strlen(recKey)))
       {
-        writeToRINGfile(fileType, recKey, EDT1, EDT2, ERT1, ERT2, GDT);
+       // writeToRINGfile(fileType, recKey, EDT1, EDT2, ERT1, ERT2, GDT);
       }
       yield();
   } // for r ..
@@ -110,13 +115,13 @@ void writeToRINGfile(int8_t fileType, const char *key, float EDT1, float EDT2
   switch(fileType)
   {
     case HOURS:   strConcat(newKey, 14, "0101X");
-                  recSlot = timestampToHourSlot(newKey,  strlen(newKey));
+                  recSlot = CalcSlot(RINGHOURS,newKey);//timestampToHourSlot(newKey,  strlen(newKey));
                   break;
     case DAYS:    strConcat(newKey, 14, "230101X");
-                  recSlot = timestampToDaySlot(newKey,   strlen(newKey));
+                  recSlot = CalcSlot(RINGDAYS,newKey);//timestampToDaySlot(newKey,   strlen(newKey));
                   break;
     case MONTHS:  strConcat(newKey, 14, "01230101X");
-                  recSlot = timestampToMonthSlot(newKey, strlen(newKey));
+                  recSlot = CalcSlot(RINGMONTHS,newKey);//timestampToMonthSlot(newKey, strlen(newKey));
                   break;
                   
   } // switch()
@@ -134,11 +139,11 @@ void writeToRINGfile(int8_t fileType, const char *key, float EDT1, float EDT2
   
   switch(fileType)
   {
-    case HOURS:   writeDataToFile(HOURS_FILE,  record, recSlot, HOURS);
+    case HOURS:   //writeDataToFile(HOURS_FILE,  record, recSlot, HOURS);
                   break;
-    case DAYS:    writeDataToFile(DAYS_FILE,   record, recSlot, DAYS);
+    case DAYS:    //writeDataToFile(DAYS_FILE,   record, recSlot, DAYS);
                   break;
-    case MONTHS:  writeDataToFile(MONTHS_FILE, record, recSlot, MONTHS);
+    case MONTHS:  //writeDataToFile(MONTHS_FILE, record, recSlot, MONTHS);
                   break;
                   
   } // switch()
diff --git a/data/ADJindex.html b/data/ADJindex.html
deleted file mode 100644
index d49bd27..0000000
--- a/data/ADJindex.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html lang=nl>
-
-<head>
-  <meta charset=utf-8>
-  <meta http-equiv=X-UA-Compatible content="IE=edge">
-  <meta name=viewport content="width=device-width,initial-scale=1">
-  <link rel=icon href=/favicon.ico> <title>DSMRloggerGUI</title>
-  <link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
-  <link rel=stylesheet href=https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css> 
-  <link rel=stylesheet href="https://cdn.jsdelivr.net/gh/arjendejong12/dsmrloggergui@master/dist/app.css">
-  <script src="https://cdn.jsdelivr.net/gh/arjendejong12/dsmrloggergui@master/dist/app.js"></script> 
-</head>
-
-<body><noscript><strong>We're sorry but DSMRloggerGUI doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript>
-  <div id=app></div>
-  <script src="https://cdn.jsdelivr.net/gh/arjendejong12/dsmrloggergui@master/dist/app.js"></script> 
-</body> </html>
\ No newline at end of file
diff --git a/edge/DSMRindex.js b/edge/DSMRindex.js
index 75641e6..efed989 100644
--- a/edge/DSMRindex.js
+++ b/edge/DSMRindex.js
@@ -9,7 +9,7 @@
 ***************************************************************************      
 */
 //development//  const APIGW='http://192.168.2.229/api/';
-   const APIGW='http://'+window.location.host+'/api/';
+	const APIGW='http://'+window.location.host+'/api/';
 
   "use strict";
 
diff --git a/handleSlimmeMeter.ino b/handleSlimmeMeter.ino
index 488ee4d..0acfceb 100644
--- a/handleSlimmeMeter.ino
+++ b/handleSlimmeMeter.ino
@@ -39,8 +39,6 @@ void processSlimmemeterRaw()
     showRawCount  = 0;
     return;
   }
-  
-  
 
   slimmeMeter.enable(true);
   swSer1.setTimeout(5000);  // 5 seconds must be enough ..
diff --git a/menuStuff.ino b/menuStuff.ino
index 3769f49..8dbd4e5 100644
--- a/menuStuff.ino
+++ b/menuStuff.ino
@@ -13,24 +13,24 @@
 //===========================================================================================
 void displayHoursHist(bool Telnet=true) 
 {
-    readAllSlots(HOURS, HOURS_FILE, actTimestamp, false, "");
-
+    //readAllSlots(HOURS, HOURS_FILE, actTimestamp, false, "");
+    RingFileTo(RINGHOURS, false);
 } // displayHoursHist()
 
 
 //===========================================================================================
 void displayDaysHist(bool Telnet=true) 
 {
-    readAllSlots(DAYS, DAYS_FILE, actTimestamp, false, "");
-
+    //readAllSlots(DAYS, DAYS_FILE, actTimestamp, false, "");
+    RingFileTo(RINGDAYS, false);
 } // displayDaysHist()
 
 
 //===========================================================================================
 void displayMonthsHist(bool Telnet=true) 
 {
-    readAllSlots(MONTHS, MONTHS_FILE, actTimestamp, false, "");
-
+    //readAllSlots(MONTHS, MONTHS_FILE, actTimestamp, false, "");
+    RingFileTo(RINGMONTHS, false);
 } // displayMonthsHist()
 
 
diff --git a/processTelegram.ino b/processTelegram.ino
index ddb8968..d28cada 100644
--- a/processTelegram.ino
+++ b/processTelegram.ino
@@ -37,7 +37,6 @@ void processTelegram()
        || (month(actT) != month(newT) ) )
   {
     writeToSysLog("Update RING-files");
-    writeDataToFiles();
     writeRingFiles();
     writeLastStatus();
   }
diff --git a/restAPI.ino b/restAPI.ino
deleted file mode 100644
index d32bad8..0000000
--- a/restAPI.ino
+++ /dev/null
@@ -1,554 +0,0 @@
-/* 
-***************************************************************************  
-**  Program  : restAPI, part of DSMRloggerAPI
-**  Version  : v1.2.4
-**
-**  Copyright (c) 2020 Willem Aandewiel
-**
-**  TERMS OF USE: MIT License. See bottom of file.                                                            
-***************************************************************************      
-*/ 
-
-void handleDevApi(const char *URI, const char *word4, const char *word5, const char *word6)
-{
-  //DebugTf("word4[%s], word5[%s], word6[%s]\r\n", word4, word5, word6);
-  if (strcmp(word4, "info") == 0)
-  {
-    sendDeviceInfo();
-  }
-  else if (strcmp(word4, "time") == 0)
-  {
-    sendDeviceTime();
-  }
-  else if (strcmp(word4, "settings") == 0)
-  {
-    if (httpServer.method() == HTTP_PUT || httpServer.method() == HTTP_POST)
-    {
-      //------------------------------------------------------------ 
-      // json string: {"name":"settingInterval","value":9}  
-      // json string: {"name":"settingTelegramInterval","value":123.45}  
-      // json string: {"name":"settingTelegramInterval","value":"abc"}  
-      //------------------------------------------------------------ 
-      // so, why not use ArduinoJSON library?
-      // I say: try it yourself ;-) It won't be easy
-      String wOut[5];
-      String wPair[5];
-      String jsonIn  = httpServer.arg(0).c_str();
-      char field[25] = "";
-      char newValue[101]="";
-      jsonIn.replace("{", "");
-      jsonIn.replace("}", "");
-      jsonIn.replace("\"", "");
-      int8_t wp = splitString(jsonIn.c_str(), ',',  wPair, 5) ;
-      for (int i=0; i<wp; i++)
-      {
-        //DebugTf("[%d] -> pair[%s]\r\n", i, wPair[i].c_str());
-        int8_t wc = splitString(wPair[i].c_str(), ':',  wOut, 5) ;
-        //DebugTf("==> [%s] -> field[%s]->val[%s]\r\n", wPair[i].c_str(), wOut[0].c_str(), wOut[1].c_str());
-        if (wOut[0].equalsIgnoreCase("name"))  strCopy(field, sizeof(field), wOut[1].c_str());
-        if (wOut[0].equalsIgnoreCase("value")) strCopy(newValue, sizeof(newValue), wOut[1].c_str());
-      }
-      //DebugTf("--> field[%s] => newValue[%s]\r\n", field, newValue);
-      updateSetting(field, newValue);
-      httpServer.send(200, "application/json", httpServer.arg(0));
-      writeToSysLog("DSMReditor: Field[%s] changed to [%s]", field, newValue);
-    }
-    else
-    {
-      sendDeviceSettings();
-    }
-  }
-  else if (strcmp(word4, "debug") == 0)
-  {
-    sendDeviceDebug(URI, word5);
-  }
-  else sendApiNotFound(URI);
-  
-} // handleDevApi()
-
-//====================================================
-void handleHistApi(const char *URI, const char *word4, const char *word5, const char *word6)
-{
-  int8_t  fileType     = 0;
-  char    fileName[20] = "";
-  
-  //DebugTf("word4[%s], word5[%s], word6[%s]\r\n", word4, word5, word6);
-  if (   strcmp(word4, "hours") == 0 )
-  {
-    fileType = HOURS;
-    strCopy(fileName, sizeof(fileName), HOURS_FILE);
-  }
-  else if (strcmp(word4, "days") == 0 )
-  {
-    fileType = DAYS;
-    strCopy(fileName, sizeof(fileName), DAYS_FILE);
-  }
-  else if (strcmp(word4, "months") == 0)
-  {
-    fileType = MONTHS;
-    if (httpServer.method() == HTTP_PUT || httpServer.method() == HTTP_POST)
-    {
-      //------------------------------------------------------------ 
-      // json string: {"recid":"29013023"
-      //               ,"edt1":2601.146,"edt2":"9535.555"
-      //               ,"ert1":378.074,"ert2":208.746
-      //               ,"gdt":3314.404}
-      //------------------------------------------------------------ 
-      char      record[DATA_RECLEN + 1] = "";
-      uint16_t  recSlot;
-
-      String jsonIn  = httpServer.arg(0).c_str();
-      DebugTln(jsonIn);
-      
-      recSlot = buildDataRecordFromJson(record, jsonIn);
-      
-      //--- update MONTHS
-      writeDataToFile(MONTHS_FILE, record, recSlot, MONTHS);
-      //--- send OK response --
-      httpServer.send(200, "application/json", httpServer.arg(0));
-      
-      return;
-    }
-    else 
-    {
-      strCopy(fileName, sizeof(fileName), MONTHS_FILE);
-    }
-  }
-  else 
-  {
-    sendApiNotFound(URI);
-    return;
-  }
-  if (strcmp(word5, "desc") == 0)
-        sendJsonHist(fileType, fileName, actTimestamp, true);
-  else  sendJsonHist(fileType, fileName, actTimestamp, false);
-
-} // handleHistApi()
-
-//====================================================
-void handleSmApi(const char *URI, const char *word4, const char *word5, const char *word6)
-{
-  char    tlgrm[1200] = "";
-  uint8_t p=0;  
-  bool    stopParsingTelegram = false;
-
-  //DebugTf("word4[%s], word5[%s], word6[%s]\r\n", word4, word5, word6);
-  if (strcmp(word4, "info") == 0)
-  {
-    //sendSmInfo();
-    onlyIfPresent = false;
-    copyToFieldsArray(infoArray, infoElements);
-    sendJsonFields(word4);
-  }
-  else if (strcmp(word4, "actual") == 0)
-  {
-    //sendSmActual();
-    onlyIfPresent = true;
-    copyToFieldsArray(actualArray, actualElements);
-    sendJsonFields(word4);
-  }
-  else if (strcmp(word4, "fields") == 0)
-  {
-    fieldsElements = 0;
-    onlyIfPresent = false;
-
-    if (strlen(word5) > 0)
-    {
-       memset(fieldsArray,0,sizeof(fieldsArray));
-       strCopy(fieldsArray[0], 34,"timestamp");
-       strCopy(fieldsArray[1], 34, word5);
-       fieldsElements = 2;
-    }
-    sendJsonFields(word4);
-  }
-  else if (strcmp(word4, "telegram") == 0)
-  {
-    showRaw = true;
-    slimmeMeter.enable(true);
-    swSer1.setTimeout(5000);  // 5 seconds must be enough ..
-    memset(tlgrm, 0, sizeof(tlgrm));
-    int l = 0;
-    // The terminator character is discarded from the serial buffer.
-    l = swSer1.readBytesUntil('/', tlgrm, sizeof(tlgrm));
-    // now read from '/' to '!'
-    // The terminator character is discarded from the serial buffer.
-    l = swSer1.readBytesUntil('!', tlgrm, sizeof(tlgrm));
-    swSer1.setTimeout(1000);  // seems to be the default ..
-    DebugTf("read [%d] bytes\r\n", l);
-    if (l == 0) 
-    {
-      httpServer.send(200, "application/plain", "no telegram received");
-      showRaw = false;
-      return;
-    }
-
-    tlgrm[l++] = '!';
-#if !defined( USE_PRE40_PROTOCOL )
-    // next 6 bytes are "<CRC>\r\n"
-    for (int i=0; ( i<6 && (i<(sizeof(tlgrm)-7)) ); i++)
-    {
-      tlgrm[l++] = (char)swSer1.read();
-    }
-#else
-    tlgrm[l++]    = '\r';
-    tlgrm[l++]    = '\n';
-#endif
-    tlgrm[(l +1)] = '\0';
-    // shift telegram 1 char to the right (make room at pos [0] for '/')
-    for (int i=strlen(tlgrm); i>=0; i--) { tlgrm[i+1] = tlgrm[i]; yield(); }
-    tlgrm[0] = '/'; 
-    showRaw = false;
-    if (Verbose1) Debugf("Telegram (%d chars):\r\n/%s", strlen(tlgrm), tlgrm);
-    httpServer.send(200, "application/plain", tlgrm);
-
-  }
-  else sendApiNotFound(URI);
-  
-} // handleSmApi()
-
-
-
-//=======================================================================
-void sendDeviceInfo() 
-{
-  char compileOptions[200] = "";
-
-#ifdef USE_REQUEST_PIN
-    strConcat(compileOptions, sizeof(compileOptions), "[USE_REQUEST_PIN]");
-#endif
-#if defined( USE_PRE40_PROTOCOL )
-    strConcat(compileOptions, sizeof(compileOptions), "[USE_PRE40_PROTOCOL]");
-#elif defined( USE_BELGIUM_PROTOCOL )
-    strConcat(compileOptions, sizeof(compileOptions), "[USE_BELGIUM_PROTOCOL]");
-#else
-    strConcat(compileOptions, sizeof(compileOptions), "[USE_DUTCH_PROTOCOL]");
-#endif
-#ifdef USE_UPDATE_SERVER
-    strConcat(compileOptions, sizeof(compileOptions), "[USE_UPDATE_SERVER]");
-#endif
-#ifdef USE_MQTT
-    strConcat(compileOptions, sizeof(compileOptions), "[USE_MQTT]");
-#endif
-#ifdef USE_MINDERGAS
-    strConcat(compileOptions, sizeof(compileOptions), "[USE_MINDERGAS]");
-#endif
-#ifdef USE_SYSLOGGER
-    strConcat(compileOptions, sizeof(compileOptions), "[USE_SYSLOGGER]");
-#endif
-#ifdef USE_NTP_TIME
-    strConcat(compileOptions, sizeof(compileOptions), "[USE_NTP_TIME]");
-#endif
-
-  sendStartJsonObj("devinfo");
-
-  sendNestedJsonObj("author", "Willem Aandewiel / Martijn Hendriks (www.aandewiel.nl)");
-  sendNestedJsonObj("fwversion", _FW_VERSION);
-
-  snprintf(cMsg, sizeof(cMsg), "%s %s", __DATE__, __TIME__);
-  sendNestedJsonObj("compiled", cMsg);
-  sendNestedJsonObj("hostname", settingHostname);
-  sendNestedJsonObj("ipaddress", WiFi.localIP().toString().c_str());
-  sendNestedJsonObj("macaddress", WiFi.macAddress().c_str());
-  sendNestedJsonObj("indexfile", settingIndexPage);
-  sendNestedJsonObj("freeheap", ESP.getFreeHeap(), "bytes");
-  sendNestedJsonObj("maxfreeblock", ESP.getMaxFreeBlockSize(), "bytes");
-  sendNestedJsonObj("chipid", String( ESP.getChipId(), HEX ).c_str());
-  sendNestedJsonObj("coreversion", String( ESP.getCoreVersion() ).c_str() );
-  sendNestedJsonObj("sdkversion", String( ESP.getSdkVersion() ).c_str());
-  sendNestedJsonObj("cpufreq", ESP.getCpuFreqMHz(), "MHz");
-  sendNestedJsonObj("sketchsize", formatFloat( (ESP.getSketchSize() / 1024.0), 3), "kB");
-  sendNestedJsonObj("freesketchspace", formatFloat( (ESP.getFreeSketchSpace() / 1024.0), 3), "kB");
-
-  if ((ESP.getFlashChipId() & 0x000000ff) == 0x85) 
-        snprintf(cMsg, sizeof(cMsg), "%08X (PUYA)", ESP.getFlashChipId());
-  else  snprintf(cMsg, sizeof(cMsg), "%08X", ESP.getFlashChipId());
-  sendNestedJsonObj("flashchipid", cMsg);  // flashChipId
-  sendNestedJsonObj("flashchipsize", formatFloat((ESP.getFlashChipSize() / 1024.0 / 1024.0), 3), "MB");
-  sendNestedJsonObj("flashchiprealsize", formatFloat((ESP.getFlashChipRealSize() / 1024.0 / 1024.0), 3), "MB");
-
-  SPIFFS.info(SPIFFSinfo);
-  sendNestedJsonObj("spiffssize", formatFloat( (SPIFFSinfo.totalBytes / (1024.0 * 1024.0)), 0), "MB");
-
-  sendNestedJsonObj("flashchipspeed", formatFloat((ESP.getFlashChipSpeed() / 1000.0 / 1000.0), 0), "MHz");
-
-  FlashMode_t ideMode = ESP.getFlashChipMode();
-  sendNestedJsonObj("flashchipmode", flashMode[ideMode]);
-  sendNestedJsonObj("boardtype",ARDUINO_BOARD );
-  sendNestedJsonObj("compileoptions", compileOptions);
-  sendNestedJsonObj("ssid", WiFi.SSID().c_str());
-#ifdef SHOW_PASSWRDS
-  sendNestedJsonObj("pskkey", WiFi.psk());   
-#endif
-  sendNestedJsonObj("wifirssi", WiFi.RSSI());
-  sendNestedJsonObj("uptime", upTime());
-  sendNestedJsonObj("smhasfaseinfo",    (int)settingSmHasFaseInfo);
-  sendNestedJsonObj("telegraminterval", (int)settingTelegramInterval);
-  sendNestedJsonObj("telegramcount",    (int)telegramCount);
-  sendNestedJsonObj("telegramerrors",   (int)telegramErrors);
-
-#ifdef USE_MQTT
-  snprintf(cMsg, sizeof(cMsg), "%s:%04d", settingMQTTbroker, settingMQTTbrokerPort);
-  sendNestedJsonObj("mqttbroker", cMsg);
-  sendNestedJsonObj("mqttinterval", settingMQTTinterval);
-  if (mqttIsConnected)
-        sendNestedJsonObj("mqttbroker_connected", "yes");
-  else  sendNestedJsonObj("mqttbroker_connected", "no");
-#endif
-#ifdef USE_MINDERGAS
-  snprintf(cMsg, sizeof(cMsg), "%s:%d", timeLastResponse, intStatuscodeMindergas);
-  sendNestedJsonObj("mindergas_response",     txtResponseMindergas);
-  sendNestedJsonObj("mindergas_status",       cMsg);
-#endif
-
-  sendNestedJsonObj("reboots", (int)nrReboots);
-  sendNestedJsonObj("lastreset", lastReset);
-
-  httpServer.sendContent("\r\n]}\r\n");
-
-} // sendDeviceInfo()
-
-
-//=======================================================================
-void sendDeviceTime() 
-{
-
-  sendStartJsonObj("devtime");
-  sendNestedJsonObj("timestamp", actTimestamp); 
-  sendNestedJsonObj("time", buildDateTimeString(actTimestamp, sizeof(actTimestamp)).c_str()); 
-  sendNestedJsonObj("epoch", (int)now());
-
-  sendEndJsonObj();
-
-} // sendDeviceTime()
-
-
-//=======================================================================
-void sendDeviceSettings() 
-{
-  DebugTln("sending device settings ...\r");
-
-  sendStartJsonObj("settings");
-  
-  sendJsonSettingObj("hostname",          settingHostname,        "s", sizeof(settingHostname) -1);
-  sendJsonSettingObj("ed_tariff1",        settingEDT1,            "f", 0, 10,  5);
-  sendJsonSettingObj("ed_tariff2",        settingEDT2,            "f", 0, 10,  5);
-  sendJsonSettingObj("er_tariff1",        settingERT1,            "f", 0, 10,  5);
-  sendJsonSettingObj("er_tariff2",        settingERT2,            "f", 0, 10,  5);
-  sendJsonSettingObj("gd_tariff",         settingGDT,             "f", 0, 10,  5);
-  sendJsonSettingObj("electr_netw_costs", settingENBK,            "f", 0, 100, 2);
-  sendJsonSettingObj("gas_netw_costs",    settingGNBK,            "f", 0, 100, 2);
-  sendJsonSettingObj("sm_has_fase_info",  settingSmHasFaseInfo,   "i", 0, 1);
-  sendJsonSettingObj("tlgrm_interval",    settingTelegramInterval,"i", 2, 60);
-  sendJsonSettingObj("index_page",        settingIndexPage,       "s", sizeof(settingIndexPage) -1);
-  sendJsonSettingObj("mqtt_broker",       settingMQTTbroker,      "s", sizeof(settingMQTTbroker) -1);
-  sendJsonSettingObj("mqtt_broker_port",  settingMQTTbrokerPort,  "i", 1, 9999);
-  sendJsonSettingObj("mqtt_user",         settingMQTTuser,        "s", sizeof(settingMQTTuser) -1);
-  sendJsonSettingObj("mqtt_passwd",       settingMQTTpasswd,      "s", sizeof(settingMQTTpasswd) -1);
-  sendJsonSettingObj("mqtt_toptopic",     settingMQTTtopTopic,    "s", sizeof(settingMQTTtopTopic) -1);
-  sendJsonSettingObj("mqtt_interval",     settingMQTTinterval,    "i", 0, 600);
-#if defined (USE_MINDERGAS )
-  sendJsonSettingObj("mindergastoken",  settingMindergasToken,    "s", sizeof(settingMindergasToken) -1);
-#endif
-
-  sendEndJsonObj();
-
-} // sendDeviceSettings()
-
-
-//=======================================================================
-void sendDeviceDebug(const char *URI, String tail) 
-{
-#ifdef USE_SYSLOGGER
-  String lLine = "";
-  int lineNr = 0;
-  int tailLines = tail.toInt();
-
-  DebugTf("list [%d] debug lines\r\n", tailLines);
-  sysLog.status();
-  sysLog.setDebugLvl(0);
-  httpServer.sendHeader("Access-Control-Allow-Origin", "*");
-  httpServer.setContentLength(CONTENT_LENGTH_UNKNOWN);
-  if (tailLines > 0)
-        sysLog.startReading((tailLines * -1));  
-  else  sysLog.startReading(0, 0);  
-  while( (lLine = sysLog.readNextLine()) && !(lLine == "EOF")) 
-  {
-    lineNr++;
-    snprintf(cMsg, sizeof(cMsg), "%s\r\n", lLine.c_str());
-    httpServer.sendContent(cMsg);
-
-  }
-  sysLog.setDebugLvl(1);
-
-#else
-  sendApiNotFound(URI);
-#endif
-
-} // sendDeviceDebug()
-
-
-//=======================================================================
-struct buildJsonApi {
-    bool  skip = false;
-    
-    template<typename Item>
-    void apply(Item &i) {
-      skip = false;
-      String Name = Item::name;
-      //-- for dsmr30 -----------------------------------------------
-#if defined( USE_PRE40_PROTOCOL )
-      if (Name.indexOf("gas_delivered2") == 0) Name = "gas_delivered";
-#endif
-      if (!isInFieldsArray(Name.c_str(), fieldsElements))
-      {
-        skip = true;
-      }
-      if (!skip)
-      {
-        if (i.present()) 
-        {
-          String Unit = Item::unit();
-        
-          if (Unit.length() > 0)
-          {
-            sendNestedJsonObj(Name.c_str(), typecastValue(i.val()), Unit.c_str());
-          }
-          else 
-          {
-            sendNestedJsonObj(Name.c_str(), typecastValue(i.val()));
-          }
-        }
-        else if (!onlyIfPresent)
-        {
-          sendNestedJsonObj(Name.c_str(), "-");
-        }
-      }
-  }
-
-};  // buildJsonApi()
-
-
-//=======================================================================
-void sendJsonFields(const char *Name) 
-{
-  sendStartJsonObj(Name);
-  DSMRdata.applyEach(buildJsonApi());
-  sendEndJsonObj();
-
-} // sendJsonFields()
-
-
-//=======================================================================
-void sendJsonHist(int8_t fileType, const char *fileName, const char *timeStamp, bool desc) 
-{
-  uint8_t startSlot, nrSlots, recNr  = 0;
-  char    typeApi[10];
-
-  if (DUE(antiWearTimer))
-  {
-    writeDataToFiles();
-    writeRingFiles();
-    writeLastStatus();
-  }
-    
-  switch(fileType) {
-    case HOURS:   startSlot       = timestampToHourSlot(timeStamp, strlen(timeStamp));
-                  nrSlots         = _NO_HOUR_SLOTS_;
-                  strCopy(typeApi, 9, "hours");
-                  break;
-    case DAYS:    startSlot       = timestampToDaySlot(timeStamp, strlen(timeStamp));
-                  nrSlots         = _NO_DAY_SLOTS_;
-                  strCopy(typeApi, 9, "days");
-                  break;
-    case MONTHS:  startSlot       = timestampToMonthSlot(timeStamp, strlen(timeStamp));
-                  nrSlots         = _NO_MONTH_SLOTS_;
-                  strCopy(typeApi, 9, "months");
-                  break;
-  }
-
-  sendStartJsonObj(typeApi);
-
-  if (desc)
-        startSlot += nrSlots +1; // <==== voorbij actuele slot!
-  else  startSlot += nrSlots;    // <==== start met actuele slot!
-
-  DebugTf("sendJsonHist startSlot[%02d]\r\n", (startSlot % nrSlots));
-  
-  for (uint8_t s = 0; s < nrSlots; s++)
-  {
-    if (desc)
-          readOneSlot(fileType, fileName, s, (s +startSlot), true, "hist");
-    else  readOneSlot(fileType, fileName, s, (startSlot -s), true, "hist");
-   
-  }
-  
-  
-  sendEndJsonObj();
-  
-} // sendJsonHist()
-
-
-bool isInFieldsArray(const char* lookUp, int elemts)
-{
-  if (elemts == 0) return true;
-
-  for (int i=0; i<elemts; i++)
-  {
-    //if (Verbose2) DebugTf("[%2d] Looking for [%s] in array[%s]\r\n", i, lookUp, fieldsArray[i]); 
-    if (strcmp(lookUp, fieldsArray[i]) == 0) return true;
-  }
-  return false;
-  
-} // isInFieldsArray()
-
-
-void copyToFieldsArray(const char inArray[][35], int elemts)
-{
-  int i = 0;
-  memset(fieldsArray,0,sizeof(fieldsArray));
-  //if (Verbose2) DebugTln("start copying ....");
-  
-  for ( i=0; i<elemts; i++)
-  {
-    strncpy(fieldsArray[i], inArray[i], 34);
-    //if (Verbose1) DebugTf("[%2d] => inArray[%s] fieldsArray[%s]\r\n", i, inArray[i], fieldsArray[i]); 
-
-  }
-  fieldsElements = i;
-  
-} // copyToFieldsArray()
-
-
-bool listFieldsArray(char inArray[][35])
-{
-  int i = 0;
-
-  for ( i=0; strlen(inArray[i]) == 0; i++)
-  {
-    DebugTf("[%2d] => inArray[%s]\r\n", i, inArray[i]); 
-  }
-  
-} // listFieldsArray()
-
-/***************************************************************************
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
-* copy of this software and associated documentation files (the
-* "Software"), to deal in the Software without restriction, including
-* without limitation the rights to use, copy, modify, merge, publish,
-* distribute, sublicense, and/or sell copies of the Software, and to permit
-* persons to whom the Software is furnished to do so, subject to the
-* following conditions:
-*
-* The above copyright notice and this permission notice shall be included
-* in all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
-* OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* 
-***************************************************************************/