Update according to Base v1.0.5

Author: J6B

Main.h

@@ -1,6 +1,8 @@
 #ifndef Main_h
 #define Main_h
 
+#include <arduino.h>
+
 #include "data\status.html.gz.h"
 #include "data\config.html.gz.h"
 #include "data\fw.html.gz.h"
@@ -19,18 +21,16 @@
 //include Application header file
 #include "WirelessTeleInfo.h"
 
-#define APPLICATION_NAME "DomoChip Wireless TeleInfo"
-#define APPLICATION_CLASS WebTeleInfo
-#define APPLICATION_VAR webTeleInfo
+#define APPLICATION1_NAME "WTeleInfo"
+#define APPLICATION1_DESC "DomoChip Wireless TeleInfo"
+#define APPLICATION1_CLASS WebTeleInfo
 
 #define VERSION_NUMBER "3.1.1"
 
-#define MODEL "WTeleInfo"
-
 #define DEFAULT_AP_SSID "WirelessTeleInfo"
 #define DEFAULT_AP_PSK "PasswordTeleInfo"
 
-//Enable developper mode (fwdev webpage and SPIFFS is used)
+//Enable developper mode (SPIFFS editor)
 #define DEVELOPPER_MODE 0
 
 //Pin RX used to receive TéléInformation signal @ 1200bauds

WirelessTeleInfo.h

@@ -7,16 +7,16 @@
 
 #include "Main.h"
 #include "src\Utils.h"
+#include "src\Base.h"
 
+#include <ESP8266HTTPClient.h>
 #include "LibTeleInfo.h"
 
 const char appDataPredefPassword[] PROGMEM = "ewcXoCt4HHjZUvY1";
 
-//Structure of Application Data 1
-class AppData1 {
-
-  public:
+class WebTeleInfo : public Application {
 
+  private:
     typedef struct {
       bool enabled = false;
       bool tls = false;
@@ -26,25 +26,6 @@ class AppData1 {
     } Jeedom;
     Jeedom jeedom;
 
-    void SetDefaultValues() {
-
-      jeedom.enabled = false;
-      jeedom.tls = true;
-      jeedom.hostname[0] = 0;
-      jeedom.apiKey[0] = 0;
-      memset(jeedom.fingerPrint, 0, 20);
-    }
-
-    String GetJSON();
-    bool SetFromParameters(AsyncWebServerRequest* request, AppData1 &tempAppData);
-};
-
-
-class WebTeleInfo {
-
-  private:
-    AppData1* _appData1;
-
     //for returning Status
     String _request;
     int _requestResult;
@@ -56,13 +37,17 @@ class WebTeleInfo {
     String GetLabel(const String &labelName);
     String GetAllLabel();
 
-    String GetStatus();
 
+    void SetConfigDefaultValues();
+    void ParseConfigJSON(JsonObject &root);
+    bool ParseConfigWebRequest(AsyncWebServerRequest *request);
+    String GenerateConfigJSON(bool forSaveFile);
+    String GenerateStatusJSON();
+    bool AppInit(bool reInit);
+    void AppInitWebServer(AsyncWebServer &server, bool &shouldReboot, bool &pauseApplication);
+    void AppRun();
   public:
-    WebTeleInfo();
-    void Init(AppData1 &appData1);
-    void InitWebServer(AsyncWebServer &server);
-    void Run();
+    WebTeleInfo(char appId, String appName);
 };
 
 #endif