From 479792e3355b5ed9045b9e2c4b5ee27a6397b0e2 Mon Sep 17 00:00:00 2001
From: Lukas Bachschwell <lukas@lbsfilm.at>
Date: Fri, 1 Dec 2017 17:11:16 +0100
Subject: [PATCH] ESP8266 Compatibility, finally

---
 examples/gui/gui.ino | 17 ++++++++++++++---
 src/ESPUI.cpp        |  7 +++----
 src/ESPUI.h          | 26 +++++++++++++++++++-------
 3 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/examples/gui/gui.ino b/examples/gui/gui.ino
index 277704b..968723a 100644
--- a/examples/gui/gui.ino
+++ b/examples/gui/gui.ino
@@ -1,7 +1,12 @@
 #include <ESPUI.h>
-#include <WiFi.h>
 
-const char *ssid = "ESP32";
+#if defined(ESP32)
+  #include <WiFi.h>
+#else
+  #include <ESP8266WiFi.h>
+#endif
+
+const char *ssid = "ESPUI";
 const char *password = "";
 
 long oldTime = 0;
@@ -10,7 +15,13 @@ bool switchi = false;
 void setup(void) {
   Serial.begin(115200);
   WiFi.mode(WIFI_AP);
-  WiFi.setHostname(ssid);
+  
+  #if defined(ESP32)
+    WiFi.setHostname(ssid);
+  #else
+    WiFi.hostname(ssid);
+  #endif
+
   WiFi.softAP(ssid);
   // WiFi.softAP(ssid, password);
   Serial.println("");
diff --git a/src/ESPUI.cpp b/src/ESPUI.cpp
index ce2054f..221c393 100644
--- a/src/ESPUI.cpp
+++ b/src/ESPUI.cpp
@@ -29,7 +29,7 @@ void deleteFile(fs::FS &fs, const char * path){
     }
 }
 
-void writeFile(fs::FS &fs, const char * path, const char * message){
+void writeFile(fs::FS &fs, const char * path, const char * data){
     Serial.printf("Writing file: %s\n", path);
 
     File file = fs.open(path, FILE_WRITE);
@@ -37,7 +37,7 @@ void writeFile(fs::FS &fs, const char * path, const char * message){
         Serial.println("Failed to open file for writing");
         return;
     }
-    if(file.print(message)){
+    if(file.print(FPSTR(data))){
         Serial.println("File written");
     } else {
         Serial.println("Write failed");
@@ -67,14 +67,13 @@ deleteFile(SPIFFS, "/js/slider.js");
 Serial.println('Cleanup done');
 
 // Now write
-
 writeFile(SPIFFS, "/index.htm", HTML_INDEX);
 
 writeFile(SPIFFS, "/css/style.css", CSS_STYLE);
 writeFile(SPIFFS, "/css/normalize.css", CSS_NORMALIZE);
 
-writeFile(SPIFFS, "/js/controls.js", JS_CONTROLS);
 writeFile(SPIFFS, "/js/zepto.js", JS_ZEPTO);
+writeFile(SPIFFS, "/js/controls.js", JS_CONTROLS);
 writeFile(SPIFFS, "/js/slider.js", JS_SLIDER);
 
 Serial.println("Done Initializing filesystem :-)");
diff --git a/src/ESPUI.h b/src/ESPUI.h
index 22b1b10..062e44d 100644
--- a/src/ESPUI.h
+++ b/src/ESPUI.h
@@ -1,23 +1,35 @@
 #ifndef ESPUI_h
 #define ESPUI_h
 
-#define HARDWARE "esp32"
-
 #define debug true
 
-// ifdef 8266
-//#include "Hash.h"
-
 #include "Arduino.h"
 #include "ArduinoJson.h"
 #include "FS.h"
-#include "SPIFFS.h"
-#include "WiFi.h"
 #include "stdlib_noniso.h"
 
+#if defined(ESP32)
+
+#include "SPIFFS.h"
+#include "WiFi.h"
 #include <AsyncTCP.h>
 #include <ESPAsyncWebServer.h>
 
+#else
+
+#include <ESP8266WiFi.h>
+#include <ESP8266mDNS.h>
+#include <ArduinoOTA.h>
+#include <FS.h>
+#include <Hash.h>
+#include <ESPAsyncTCP.h>
+#include <ESPAsyncWebServer.h>
+#include <SPIFFSEditor.h>
+
+#define FILE_WRITE "w"
+
+#endif
+
 typedef struct Control {
   unsigned int type;
   unsigned int id; // just mirroring the id here for practical reasons