Merge branch 'dev' into main

Author: rvdbreemen

.gitignore

@@ -1,3 +1,6 @@
 
+.vscode/arduino.json
 node_modules/*
-package-lock.json
+package-lock.json
+
+*.bin

.vscode/settings.json

@@ -23,6 +23,10 @@
         "initializer_list": "cpp",
         "sstream": "cpp",
         "iosfwd": "cpp",
-        "xlocbuf": "cpp"
+        "xlocbuf": "cpp",
+        "random": "cpp",
+        "chrono": "cpp",
+        "system_error": "cpp",
+        "cstddef": "cpp"
     }
 }

FSexplorer.ino

@@ -58,11 +58,36 @@ const char Helper[] = R"(
 )";
 const char Header[] = "HTTP/1.1 303 OK\r\nLocation:FSexplorer.html\r\nCache-Control: no-cache\r\n";
 
+
+
 //=====================================================================================
-void setupFSexplorer()    // Funktionsaufruf "LittleFS();" muss im Setup eingebunden werden
-{    
+void startWebserver(){
+  if (!LittleFS.exists("/index.html")) {
+    httpServer.serveStatic("/",           LittleFS, "/FSexplorer.html");
+    httpServer.serveStatic("/index",      LittleFS, "/FSexplorer.html");
+    httpServer.serveStatic("/index.html", LittleFS, "/FSexplorer.html");
+  } else{
+    httpServer.serveStatic("/",           LittleFS, "/index.html");
+    httpServer.serveStatic("/index",      LittleFS, "/index.html");
+    httpServer.serveStatic("/index.html", LittleFS, "/index.html");
+  } 
+  httpServer.serveStatic("/FSexplorer.png",   LittleFS, "/FSexplorer.png");
+  httpServer.serveStatic("/index.css", LittleFS, "/index.css");
+  httpServer.serveStatic("/index.js",  LittleFS, "/index.js");
+  //otgw pic functions
+  httpServer.on("/pic", upgradepic);
+  // all other api calls are catched in FSexplorer onNotFounD!
+  httpServer.on("/api", HTTP_ANY, processAPI);  //was only HTTP_GET (20210110)
+
+  httpServer.begin();
+  // Set up first message as the IP address
+  OTGWSerial.println("\nHTTP Server started\r");  
+  sprintf(cMsg, "%03d.%03d.%d.%d", WiFi.localIP()[0], WiFi.localIP()[1], WiFi.localIP()[2], WiFi.localIP()[3]);
+  OTGWSerial.printf("\nAssigned IP=%s\r\n", cMsg);
+}
+//=====================================================================================
+void setupFSexplorer(){    
   LittleFS.begin();
-  
   if (LittleFS.exists("/FSexplorer.html")) 
   {
     httpServer.serveStatic("/FSexplorer.html", LittleFS, "/FSexplorer.html");
@@ -72,12 +97,12 @@ void setupFSexplorer()    // Funktionsaufruf "LittleFS();" muss im Setup eingebu
   {
     httpServer.send(200, "text/html", Helper); //Upload the FSexplorer.html
   }
-  httpServer.on("/api/listfiles", APIlistFiles);
+  httpServer.on("/api/firmwarefilelist", apifirmwarefilelist); 
+  httpServer.on("/api/listfiles", apilistfiles);
   httpServer.on("/LittleFSformat", formatLittleFS);
   httpServer.on("/upload", HTTP_POST, []() {}, handleFileUpload);
   httpServer.on("/ReBoot", reBootESP);
-  httpServer.on("/update", updateFirmware);
-  httpServer.on("/upgradepic", upgradePIC);
+ 
   httpServer.onNotFound([]() 
   {
     if (Verbose) DebugTf("in 'onNotFound()'!! [%s] => \r\n", String(httpServer.uri()).c_str());
@@ -104,9 +129,48 @@ void setupFSexplorer()    // Funktionsaufruf "LittleFS();" muss im Setup eingebu
 
 } // setupFSexplorer()
 
+//=====================================================================================
+void apifirmwarefilelist() {
+  char *s, buffer[400];
+  String version, fwversion;
+  Dir dir;
+  File f;
+      
+  s = buffer;
+  s += sprintf(buffer, "[");
+  dir = LittleFS.openDir("/");
+  while (dir.next()) {
+    if (dir.fileName().endsWith(".hex")) {
+      version="";fwversion="";
+      String verfile = "/" + dir.fileName();
+      verfile.replace(".hex", ".ver");
+      f = LittleFS.open(verfile, "r");
+      if (f) {
+        version = f.readStringUntil('\n');
+        version.trim();
+        f.close();
+      } 
+      fwversion = GetVersion("/"+dir.fileName()); // only check if gateway firmware
+      DebugTf("GetVersion(%s) returned %s\n", dir.fileName().c_str(), fwversion.c_str());  
+      if (fwversion.length() && strcmp(fwversion.c_str(),version.c_str())) { // versions do not match
+        version=fwversion; // assign hex file version to version
+        if (f = LittleFS.open(verfile, "w")) { // write to .ver file
+          DebugTf("writing %s to %s\n",version.c_str(),verfile.c_str());
+          f.print(version + "\n");
+          f.close();
+        } 
+      }
+      s += snprintf( s, sizeof(buffer), "{\"name\":\"%s\",\"version\":\"%s\",\"size\":%d},", CSTR(dir.fileName()), CSTR(version), dir.fileSize());
+    }
+  }
+  s += sprintf(--s, "]\n");
+  DebugTf("filelist response: [%s]\r\n", buffer);
+  httpServer.send(200, "application/json", buffer);
+}
+
 
 //=====================================================================================
-void APIlistFiles()             // Senden aller Daten an den Client
+void apilistfiles()             // Senden aller Daten an den Client
 {   
   FSInfo LittleFSinfo;
 
@@ -118,7 +182,7 @@ void APIlistFiles()             // Senden aller Daten an den Client
 
   _fileMeta dirMap[MAX_FILES_IN_LIST+1];
   int fileNr = 0;
-  
+    
   Dir dir = LittleFS.openDir("/");         // List files on LittleFS
   while (dir.next() && (fileNr < MAX_FILES_IN_LIST))  
   {
@@ -160,18 +224,17 @@ void APIlistFiles()             // Senden aller Daten an den Client
   for (int f=0; f < fileNr; f++)  
   {
     DebugTf("[%3d] >> [%s]\r\n", f, dirMap[f].Name);
-    if (temp != "[") temp += ",";
-    temp += R"({"name":")" + String(dirMap[f].Name) + R"(","size":")" + formatBytes(dirMap[f].Size) + R"("})";
+    temp += R"({"name":")" + String(dirMap[f].Name) + R"(","size":")" + formatBytes(dirMap[f].Size) + R"("},)";
   }
 
   LittleFS.info(LittleFSinfo);
-  temp += R"(,{"usedBytes":")" + formatBytes(LittleFSinfo.usedBytes * 1.05) + R"(",)" +       // Berechnet den verwendeten Speicherplatz + 5% Sicherheitsaufschlag
+  temp += R"({"usedBytes":")" + formatBytes(LittleFSinfo.usedBytes * 1.05) + R"(",)" +       // Berechnet den verwendeten Speicherplatz + 5% Sicherheitsaufschlag
           R"("totalBytes":")" + formatBytes(LittleFSinfo.totalBytes) + R"(","freeBytes":")" + // Zeigt die Größe des Speichers
           (LittleFSinfo.totalBytes - (LittleFSinfo.usedBytes * 1.05)) + R"("}])";               // Berechnet den freien Speicherplatz + 5% Sicherheitsaufschlag
 
   httpServer.send(200, "application/json", temp);
 
-} // APIlistFiles()
+} // apilistfiles()
 
 
 //=====================================================================================
@@ -269,28 +332,11 @@ bool freeSpace(uint16_t const& printsize)
 
 } // freeSpace()
 
-//=====================================================================================
-void upgradePIC()
-{
-  DebugTln(F("Redirect to upgrade PIC .."));
-  doRedirect("Upgrade OTGW PIC ", 120, "/FSexplorer", false);
-  upgradenow();
-} // upgradePIC()
-
-
-//=====================================================================================
-void updateFirmware()
-{
-  DebugTln(F("Redirect to updateIndex .."));
-  doRedirect("wait ... ", 1, "/updateIndex", false);
-} // updateFirmware()
-
-
 //=====================================================================================
 void reBootESP()
 {
   DebugTln(F("Redirect and ReBoot .."));
-  doRedirect("Reboot OTGW firmware ..", 60, "/", true);   
+  doRedirect("Reboot OTGW firmware ..", 120, "/", true);   
 } // reBootESP()
 
 //=====================================================================================

MQTTstuff.ino

@@ -1,7 +1,7 @@
 /* 
 ***************************************************************************  
 **  Program  : MQTTstuff
-**  Version  : v0.7.5
+**  Version  : v0.7.6
 **
 **  Copyright (c) 2021 Robert van den Breemen
 **      Modified version from (c) 2020 Willem Aandewiel

OTGW-Core.h

@@ -1,7 +1,7 @@
 /*
 ***************************************************************************  
 **  Program  : Header file: OTGW-Core.h 
-**  Version  : v0.7.5
+**  Version  : v0.7.6
 **
 **  Copyright (c) 2021 Robert van den Breemen
 **  Borrowed from OpenTherm library from: 
@@ -25,7 +25,7 @@ TelnetStreamClass OTGWstream(OTGW_SERIAL_PORT);
 
 typedef struct {
 	uint16_t 	Status = 0; 				// flag8 / flag8  Master and Slave Status flags. 
-	float 		Tset = 0.0; 					// f8.8  Control setpoint  ie CH  water temperature setpoint (°C)
+	float 		TSet = 0.0; 					// f8.8  Control setpoint  ie CH  water temperature setpoint (°C)
 	uint16_t	MConfigMMemberIDcode = 0; 	// flag8 / u8  Master Configuration Flags /  Master MemberID Code 
 	uint16_t	SConfigSMemberIDcode = 0; // flag8 / u8  Slave Configuration Flags /  Slave MemberID Code 
 	uint16_t 	Command = 0; // u8 / u8  Remote Command 
@@ -401,6 +401,8 @@ enum OpenThermMessageID {
 
 #define OT_MSGID_MAX 133
 
+time_t msglastupdated[255] = {0}; //all msg, even if they are unknown
+
 enum OpenThermStatus {
 	OT_NOT_INITIALIZED,
 	OT_READY,

OTGW-Core.ino

@@ -1,7 +1,7 @@
 /* 
 ***************************************************************************  
 **  Program  : OTGW-Core.ino
-**  Version  : v0.7.5
+**  Version  : v0.7.6
 **
 **  Copyright (c) 2021 Robert van den Breemen
 **  Borrowed from OpenTherm library from: 
@@ -22,6 +22,12 @@
 #define PIN_I2C_SDA 4   //D2
 #define PIN_I2C_SCL 5   //D1
 
+//used by update firmware functions
+const char *hexheaders[] = {
+  "Last-Modified",
+  "X-Version"
+};
+
 //Macro to Feed the Watchdog
 #define FEEDWATCHDOGNOW   Wire.beginTransmission(EXT_WD_I2C_ADDRESS);   Wire.write(0xA5);   Wire.endTransmission();
 
@@ -215,6 +221,7 @@ String initWatchDog() {
   // Code here is based on ESPEasy code, modified to work in the project.
 
   // configure hardware pins according to eeprom settings.
+  DebugTln("Setup Watchdog");
   DebugTln(F("INIT : I2C"));
   Wire.begin(PIN_I2C_SDA, PIN_I2C_SCL);  //configure the I2C bus
   //=============================================
@@ -835,13 +842,16 @@ void processOTGW(const char * buf, int len)
     Debugf("[%-30s]\t", messageIDToString(static_cast<OpenThermMessageID>(OTdata.id)));
     DebugFlush();
 
+    //keep track of update
+    msglastupdated[OTdata.id] = now();
+
     //next step interpret the OT protocol
     if (static_cast<OpenThermMessageType>(OTdata.type) == OT_READ_ACK || static_cast<OpenThermMessageType>(OTdata.type) == OT_WRITE_DATA) {
 
       //#define OTprint(data, value, text, format) ({ data= value; Debugf("[%37s]", text); Debugf("= [format]", data)})
       //interpret values f8.8
       switch (static_cast<OpenThermMessageID>(OTdata.id)) {   
-        case TSet:                          OTdataObject.Tset = print_f88(); break;         
+        case TSet:                          OTdataObject.TSet = print_f88(); break;         
         case CoolingControl:                OTdataObject.CoolingControl = print_f88(); break;
         case TsetCH2:                       OTdataObject.TsetCH2 = print_f88();  break;
         case TrOverride:                    OTdataObject.TrOverride = print_f88();  break;        
@@ -1029,7 +1039,7 @@ void handleOTGW()
 String getOTGWValue(int msgid)
 {
   switch (static_cast<OpenThermMessageID>(msgid)) { 
-    case TSet:                              return String(OTdataObject.Tset); break;         
+    case TSet:                              return String(OTdataObject.TSet); break;         
     case CoolingControl:                    return String(OTdataObject.CoolingControl); break;
     case TsetCH2:                           return String(OTdataObject.TsetCH2);  break;
     case TrOverride:                        return String(OTdataObject.TrOverride);  break;        
@@ -1127,10 +1137,10 @@ void startOTGWstream()
   OTGWstream.begin();
 }
 
-void upgradenow() {
+void upgradepicnow(const char *filename) {
   if (OTGWSerial.busy()) return; // if already in programming mode, never call it twice
   DebugTln("Start PIC upgrade now.");
-  fwupgradestart(FIRMWARE);  
+  fwupgradestart(filename);  
   while (OTGWSerial.busy()){
     feedWatchDog();
     //blink the led during flash...
@@ -1161,6 +1171,8 @@ void fwupgradedone(OTGWError result, short errors = 0, short retries = 0) {
   }
 }
 
+
+// Schelte's firmware integration
 void fwupgradestart(const char *hexfile) {
   OTGWError result;
 
@@ -1173,6 +1185,76 @@ void fwupgradestart(const char *hexfile) {
   }
 }
 
+String checkforupdatepic(String filename){
+  WiFiClient client;
+  HTTPClient http;
+  String latest = "";
+  int code;
+
+  http.begin(client, "http://otgw.tclcode.com/download/" + filename);
+  http.collectHeaders(hexheaders, 2);
+  code = http.sendRequest("HEAD");
+  if (code == HTTP_CODE_OK) {
+    for (int i = 0; i< http.headers(); i++) {
+      DebugTf("%s: %s\n", hexheaders[i], http.header(i).c_str());
+    }
+    latest = http.header(1);
+    DebugTf("Update %s -> %s\n", filename.c_str(), latest.c_str());
+    http.end();
+  }
+  return latest; 
+}
+
+void refreshpic(String filename, String version) {
+  WiFiClient client;
+  HTTPClient http;
+  String latest;
+  int code;
+
+  if (latest=checkforupdatepic(filename) != "") {
+    if (latest != version) {
+      DebugTf("Update %s: %s -> %s\n", filename.c_str(), version.c_str(), latest.c_str());
+      http.begin(client, "http://otgw.tclcode.com/download/" + filename);
+      code = http.GET();
+      if (code == HTTP_CODE_OK) {
+        File f = LittleFS.open("/" + filename, "w");
+        if (f) {
+          http.writeToStream(&f);
+          f.close();
+          String verfile = "/" + filename;
+          verfile.replace(".hex", ".ver");
+          f = LittleFS.open(verfile, "w");
+          if (f) {
+            f.print(latest + "\n");
+            f.close();
+            DebugTf("Update successful\n");
+          }
+        }
+      }
+    }
+  }
+  http.end();
+}
+
+void upgradepic() {
+  String action = httpServer.arg("action");
+  String filename = httpServer.arg("name");
+  String version = httpServer.arg("version");
+  DebugTf("Action: %s %s %s\r\n", action.c_str(), filename.c_str(), version.c_str());
+  if (action == "upgrade") {
+    upgradepicnow(String("/" + filename).c_str());
+  } else if (action == "refresh") {
+    refreshpic(filename, version);
+  } else if (action == "delete") {
+    String path = "/" + filename;
+    LittleFS.remove(path);
+    path.replace(".hex", ".ver");
+    LittleFS.remove(path);
+  }
+  httpServer.sendHeader("Location", "index.html#tabPICflash", true);
+  httpServer.send(303, "text/html", "<a href='index.html#tabPICflash'>Return</a>");
+}
+
 /***************************************************************************
 *
 * Permission is hereby granted, free of charge, to any person obtaining a