FSBrowser and Eventmanager

.gitignore

@@ -1,3 +1,15 @@
 .DS_Store
-.DS_Store
-.DS_Store
+.gitattributes
+.gitignore
+.vscode/launch.json
+data/config.json
+build/core
+build/preproc
+build/sketch
+build/libraries
+build/arduino.ar
+build/build.options.json
+build/MQTTDevice.ino.elf
+build/MQTTDevice.ino.map
+build/includes.cache
+build/local.eagle.app.v6.common.ld

.vscode/arduino.json

@@ -0,0 +1,7 @@
+{
+    "sketch": "MQTTDevice.ino",
+    "board": "esp8266:esp8266:d1_mini",
+    "configuration": "xtal=80,vt=flash,exception=disabled,ssl=all,eesz=4M3M,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=921600",
+    "output": "./build",
+    "port": "COM3"
+}

.vscode/c_cpp_properties.json

@@ -0,0 +1,27 @@
+{
+    "configurations": [
+        {
+            "name": "Win32",
+            "includePath": [
+                "${workspaceFolder}\\**",
+                "C:\\Arduino\\libraries\\**",
+                "C:\\Users\\pn010.TEAM\\AppData\\Local\\Arduino15\\packages\\esp8266\\tools\\**",
+                "C:\\Users\\pn010.TEAM\\AppData\\Local\\Arduino15\\packages\\esp8266\\hardware\\esp8266\\2.5.2\\**"
+            ],
+            "browse": {
+                "limitSymbolsToIncludedHeaders": false,
+                "databaseFilename": ""
+            },
+            "defines": [
+                "_DEBUG",
+                "UNICODE"
+            ],
+            "compilerPath": "C:/Program Files (x86)/Arduino/hardware/tools/avr/bin/avr-gcc.exe",
+            "cStandard": "c11",
+            "cppStandard": "c++17",
+            "intelliSenseMode": "msvc-x64",
+            "forcedInclude": []
+        }
+    ],
+    "version": 4
+}

.vscode/settings.json

@@ -0,0 +1,32 @@
+{
+    "telemetry.enableTelemetry": false,
+    "arduino.path": "C:/Program Files (x86)/Arduino",
+    "arduino.commandPath": "arduino_debug.exe",
+    "arduino.logLevel": "info",
+    "arduino.enableUSBDetection": true,
+    "arduino.disableTestingOpen": false,
+    "arduino.skipHeaderProvider": false,
+    "arduino.additionalUrls": [
+        "http://arduino.esp8266.com/stable/package_esp8266com_index.json"
+    ],
+    "arduino.defaultBaudRate": 115200,    
+    "C_Cpp.intelliSenseEngineFallback": "Disabled",
+    "C_Cpp.intelliSenseEngine": "Tag Parser",
+    "C_Cpp.default.intelliSenseMode": "msvc-x64",
+    "editor.formatOnType":true,
+    "esp8266fs.mkspiffs.debugLevel": 0,
+    "esp8266fs.esptool.executable": "C:/Arduino/tools/esptool.exe",
+    "esp8266fs.mkspiffs.executable": "C:/Arduino/tools/mkspiffs.exe",
+    "esp8266fs.spiffsImage": "C:/Arduino/git/MQTTDevice/build/MQTTDevice.spiffs.bin",
+    "esp8266fs.dataFiles": "C:/Arduino/git/MQTTDevice/data",
+    "esp8266fs.preferencesPath": "C:/Users/pn010.TEAM/AppData/Local/Arduino15",
+    "esp8266fs.logLevel": "normal",
+    "esp8266fs.mkspiffs.allFiles": false,
+    "files.associations": {
+        "initializer_list": "cpp",
+        "*.tcc": "cpp",
+        "string": "cpp",
+        "fstream": "cpp"
+    },
+    "terminal.integrated.windowsEnableConpty": false,
+}

0_SETUP.ino

@@ -1,95 +1,193 @@
-void setup() {
+void setup()
+{
   Serial.begin(115200);
-
-  // Sensoren Starten
-  DS18B20.begin();
-
-  // Dateisystem laden
+  while (!Serial)
+  {
+    yield(); // wait for serial port to connect. Needed for native USB port only
+  }
+  // Set device name
+  snprintf(mqtt_clientid, 25, "ESP8266-%08X", mqtt_chip_key);
+
+  // Event Queues
+  gEM.addListener(EventManager::kEventUser0, listenerSystem);
+  gEM.addListener(EventManager::kEventUser1, listenerSensors);
+  gEM.addListener(EventManager::kEventUser2, listenerActors);
+  gEM.addListener(EventManager::kEventUser3, listenerInduction);
+
+  Serial.println("");
+  Serial.println("*** SYSINFO: Start setup MQTTDevice");
+  // Load filesystem
   ESP.wdtFeed();
-  if (!SPIFFS.begin())  {
+  if (!SPIFFS.begin())
+  {
     Serial.println("SPIFFS Mount failed");
   }
-
-  // Einstellungen laden
-  ESP.wdtFeed();
-  loadConfig();
+  else if (SPIFFS.exists("/config.json")) // Load configuration
+  {
+    loadConfig();
+  }
+  else
+    Serial.println("*** SYSINFO: Config file not found. Use defaults ...");
 
   // WiFi Manager
   ESP.wdtFeed();
-  WiFiManagerParameter cstm_mqtthost("host", "cbpi ip", mqtthost, 16);
+  wifiManager.setDebugOutput(false);
+  wifiManager.setMinimumSignalQuality(10);
+  wifiManager.setConfigPortalTimeout(300);
+  wifiManager.setAPCallback(configModeCallback);
+  WiFiManagerParameter cstm_mqtthost("host", "MQTT broker IP", mqtthost, 16);
   wifiManager.setSaveConfigCallback(saveConfigCallback);
   wifiManager.addParameter(&cstm_mqtthost);
-  wifiManager.autoConnect("MQTTDevice");
+  wifiManager.autoConnect(mqtt_clientid);
   strcpy(mqtthost, cstm_mqtthost.getValue());
+  WiFi.setSleepMode(WIFI_NONE_SLEEP);
+  WiFi.mode(WIFI_STA);
+  WiFi.setAutoConnect(true);
+  WiFi.setAutoReconnect(true);
 
-  // Änderungen speichern
-  ESP.wdtFeed();
-  saveConfig();
+  // Start Webserver
+  setupServer();
+
+  // set pins as used
+  pins_used[ONE_WIRE_BUS] = true;
+  if (useDisplay)
+  {
+    pins_used[SDA] = true;
+    pins_used[SDL] = true;
+  }
+
+  // Start sensors
+  DS18B20.begin();
+
+  // Telnet
+  if (startTEL)
+    cbpiEventSystem(EM_TELSET); // Telnet
+
+  // Load mDNS
+  if (startMDNS)
+    cbpiEventSystem(EM_MDNSET);
 
-  // ArduinoOTA aktivieren
-  setupOTA();
-
-  // MQTT starten
-  client.setServer(mqtthost, 1883);
-  client.setCallback(mqttcallback);
+  // Init Arduino Over The Air
+  if (startOTA)
+    setupOTA();
 
-  // Webserver starten
+  // Display Start Screen
+  dispStartScreen();
+
+  // // Save configuration
+  // ESP.wdtFeed();
+  // saveConfig();
+
+  // Start MQTT
   ESP.wdtFeed();
-  setupServer();
-}
+  cbpiEventSystem(EM_MQTTCON); // MQTT connect
+  cbpiEventSystem(EM_MQTTSUB); // MQTT subscribe
 
-void setupServer() {
+  ESP.wdtFeed();
+  cbpiEventSystem(EM_WLAN); // Check WLAN
+  cbpiEventSystem(EM_MQTT); // Check MQTT
+  cbpiEventSystem(EM_NTP);  // NTP handle
+  cbpiEventSystem(EM_MDNS); // MDNS handle
+
+  while (gEM.getNumEventsInQueue()) // Eventmanager process all queued events
+  {
+    gEM.processEvent();
+  }
+}
 
+void setupServer()
+{
   server.on("/", handleRoot);
-
   server.on("/setupActor", handleSetActor);       // Einstellen der Aktoren
   server.on("/setupSensor", handleSetSensor);     // Einstellen der Sensoren
-
   server.on("/reqSensors", handleRequestSensors); // Liste der Sensoren ausgeben
   server.on("/reqActors", handleRequestActors);   // Liste der Aktoren ausgeben
   server.on("/reqInduction", handleRequestInduction);
-
   server.on("/reqSearchSensorAdresses", handleRequestSensorAddresses);
   server.on("/reqPins", handlereqPins);
+  server.on("/reqSensor", handleRequestSensor); // Infos der Sensoren für WebConfig
+  server.on("/reqActor", handleRequestActor);   // Infos der Aktoren für WebConfig
+  server.on("/reqIndu", handleRequestIndu);     // Infos der Indu für WebConfig
+  server.on("/setSensor", handleSetSensor);     // Sensor ändern
+  server.on("/setActor", handleSetActor);       // Aktor ändern
+  server.on("/setIndu", handleSetIndu);         // Indu ändern
+  server.on("/delSensor", handleDelSensor);     // Sensor löschen
+  server.on("/delActor", handleDelActor);       // Aktor löschen
+  server.on("/reboot", rebootDevice);           // reboots the whole Device
+  server.on("/OTA", OTA);
+  //server.on("/reconmqtt", reconMQTT);           // Reconnect MQTT
+  server.on("/simulation", startSIM); // Simulation
+  server.on("/reqDisplay", handleRequestDisplay);
+  server.on("/reqDisp", handleRequestDisp); // Infos Display für WebConfig
+  server.on("/setDisp", handleSetDisp);     // Display ändern
+  server.on("/reqMiscSet", handleRequestMiscSet);
+  server.on("/reqMisc", handleRequestMisc); // Misc Infos für WebConfig
+  server.on("/setMisc", handleSetMisc);     // Misc ändern
+
+  // FSBrowser initialisieren
+  server.on("/list", HTTP_GET, handleFileList); // list directory
+  server.on("/edit", HTTP_GET, []() {           // load editor
+    if (!handleFileRead("/edit.htm"))
+    {
+      server.send(404, "text/plain", "FileNotFound");
+    }
+  });
+  server.on("/edit", HTTP_PUT, handleFileCreate);    // create file
+  server.on("/edit", HTTP_DELETE, handleFileDelete); // delete file
+  server.on("/edit", HTTP_POST, []() {
+    server.send(200, "text/plain", "");
+  },
+            handleFileUpload);
 
-  server.on("/reqSensor", handleRequestSensor);   // Infos der Sensoren für WebConfig
-  server.on("/reqActor", handleRequestActor);     // Infos der Aktoren für WebConfig
-  server.on("/reqIndu", handleRequestIndu);       // Infos der Indu für WebConfig
-
-  server.on("/setSensor", handleSetSensor);       // Sensor Ändern
-  server.on("/setActor", handleSetActor);         // Aktor ändern
-  server.on("/setIndu", handleSetIndu);           // Indu ändenr
-
-  server.on("/delSensor", handleDelSensor);       // Sensor löschen
-  server.on("/delActor", handleDelActor);         // Aktor löschen
-
-  server.onNotFound(handleWebRequests);           // Sonstiges
+  server.onNotFound(handleWebRequests); // Sonstiges
 
+  httpUpdate.setup(&server); // ESP8266HTTPUpdateServer.cpp https://github.com/esp8266/Arduino/pull/3732/files
   server.begin();
 }
 
-
-void setupOTA() {
-  Serial.print("Configuring OTA device...");
-  TelnetServer.begin();   //Necesary to make Arduino Software autodetect OTA device
+void setupOTA()
+{
+  ArduinoOTA.setHostname(mqtt_clientid);
   ArduinoOTA.onStart([]() {
-    Serial.println("OTA starting...");
+    String type;
+    if (ArduinoOTA.getCommand() == U_FLASH)
+    {
+      type = "sketch";
+      DBG_PRINTLN("OTA starting - updateing sketch");
+    }
+    else
+    { // U_SPIFFS
+      type = "filesystem";
+      DBG_PRINTLN("OTA starting - updateing SPIFFS");
+      //SPIFFS.end();
+    }
+    if (useDisplay)
+      showDispOTA(0, 100);
   });
   ArduinoOTA.onEnd([]() {
-    Serial.println("OTA update finished!");
-    Serial.println("Rebooting...");
+    DBG_PRINTLN("OTA update finished!");
   });
   ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) {
-    Serial.printf("OTA in progress: %u%%\r\n", (progress / (total / 100)));
+    if (useDisplay)
+      showDispOTA(progress, total);
+    DBG_PRINT("OTA in progress: ");
+    DBG_PRINTLN((progress / (total / 100)));
   });
   ArduinoOTA.onError([](ota_error_t error) {
-    Serial.printf("Error[%u]: ", error);
-    if (error == OTA_AUTH_ERROR) Serial.println("Auth Failed");
-    else if (error == OTA_BEGIN_ERROR) Serial.println("Begin Failed");
-    else if (error == OTA_CONNECT_ERROR) Serial.println("Connect Failed");
-    else if (error == OTA_RECEIVE_ERROR) Serial.println("Receive Failed");
-    else if (error == OTA_END_ERROR) Serial.println("End Failed");
+    if (useDisplay)
+      showDispOTAEr(String(error));
+    DBG_PRINT("Error: ");
+    DBG_PRINTLN(error);
+    if (error == OTA_AUTH_ERROR)
+      DBG_PRINTLN("Auth Failed");
+    else if (error == OTA_BEGIN_ERROR)
+      DBG_PRINTLN("Begin Failed");
+    else if (error == OTA_CONNECT_ERROR)
+      DBG_PRINTLN("Connect Failed");
+    else if (error == OTA_RECEIVE_ERROR)
+      DBG_PRINTLN("Receive Failed");
+    else if (error == OTA_END_ERROR)
+      DBG_PRINTLN("End Failed");
   });
   ArduinoOTA.begin();
-  Serial.println("OTA OK");
 }