From 2180f3ae01ea909ee1749da70d36ddb5aaeb28fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Z=C3=A1le=C5=A1=C3=A1k?= Date: Mon, 26 Apr 2021 23:16:02 +0200 Subject: [PATCH] move js app to SPIFFS --- ESPtermostat.ino | 23 +++++++-------------- {jsapp => data}/favicon.ico | 0 {jsapp => data}/font/BebasNeue-Regular.ttf | Bin {jsapp => data}/img/arrow_down.svg | 0 {jsapp => data}/img/arrow_down_offset.svg | 0 {jsapp => data}/img/arrow_up.svg | 0 {jsapp => data}/img/arrow_up_offset.svg | 0 {jsapp => data}/img/logo.svg | 0 {jsapp => data}/img/netopi.svg | 0 {jsapp => data}/img/topi.svg | 0 {jsapp => data}/index.html | 0 {jsapp => data}/script.js | 4 ++-- {jsapp => data}/style.css | 0 13 files changed, 10 insertions(+), 17 deletions(-) rename {jsapp => data}/favicon.ico (100%) rename {jsapp => data}/font/BebasNeue-Regular.ttf (100%) rename {jsapp => data}/img/arrow_down.svg (100%) rename {jsapp => data}/img/arrow_down_offset.svg (100%) rename {jsapp => data}/img/arrow_up.svg (100%) rename {jsapp => data}/img/arrow_up_offset.svg (100%) rename {jsapp => data}/img/logo.svg (100%) rename {jsapp => data}/img/netopi.svg (100%) rename {jsapp => data}/img/topi.svg (100%) rename {jsapp => data}/index.html (100%) rename {jsapp => data}/script.js (93%) rename {jsapp => data}/style.css (100%) diff --git a/ESPtermostat.ino b/ESPtermostat.ino index 80add7d..ce20a08 100644 --- a/ESPtermostat.ino +++ b/ESPtermostat.ino @@ -56,7 +56,7 @@ void setup() { // MD5(admin) = 21232f297a57a5a743894a0e4a801fc3 // ArduinoOTA.setPasswordHash("21232f297a57a5a743894a0e4a801fc3"); ArduinoOTA.begin(); - + SPIFFS.begin(); //========== Pin setup ========== pinMode(RELAY_PIN, OUTPUT); @@ -103,7 +103,7 @@ void setup() { offset -= request->getParam("decreaseoffset")->value().toFloat(); repply = String(offset); }else{ - repply = "no known parameter"; + repply = "unknown parameter"; } }else{ if (request->hasParam("relay")) { @@ -111,14 +111,11 @@ void setup() { digitalWrite(RELAY_PIN, state); repply = "success"; }else{ - repply = "no known parameter"; + repply = "unknown parameter"; } } - AsyncWebServerResponse *response = request->beginResponse(200, "text/plain; charset=utf-8", repply); - response->addHeader("Access-Control-Allow-Origin", "*"); - request->send(response); - //request->send(200, "text/plain; charset=utf-8", repply); + request->send(200, "text/plain; charset=utf-8", repply); }); server.on("/get", HTTP_GET, [](AsyncWebServerRequest *request){ //nutno vyřešit dotazy na více parametrů najednou @@ -133,18 +130,14 @@ void setup() { }else if(THERMOSTAT && request->hasParam("offset")) { repply = offset; }else{ - repply = "no known parameter"; + repply = "unknown parameter"; } - AsyncWebServerResponse *response = request->beginResponse(200, "text/plain; charset=utf-8", repply); - response->addHeader("Access-Control-Allow-Origin", "*"); - request->send(response); - //request->send(200, "text/plain; charset=utf-8", repply); - }); - server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){ - request->send(200, "text/plain; charset=utf-8", "ESP termostat, tady se bude posílat aplikace z flash paměti"); + request->send(200, "text/plain; charset=utf-8", repply); }); + server.serveStatic("/", SPIFFS, "/").setDefaultFile("index.html"); + server.onNotFound(notFound); server.begin(); diff --git a/jsapp/favicon.ico b/data/favicon.ico similarity index 100% rename from jsapp/favicon.ico rename to data/favicon.ico diff --git a/jsapp/font/BebasNeue-Regular.ttf b/data/font/BebasNeue-Regular.ttf similarity index 100% rename from jsapp/font/BebasNeue-Regular.ttf rename to data/font/BebasNeue-Regular.ttf diff --git a/jsapp/img/arrow_down.svg b/data/img/arrow_down.svg similarity index 100% rename from jsapp/img/arrow_down.svg rename to data/img/arrow_down.svg diff --git a/jsapp/img/arrow_down_offset.svg b/data/img/arrow_down_offset.svg similarity index 100% rename from jsapp/img/arrow_down_offset.svg rename to data/img/arrow_down_offset.svg diff --git a/jsapp/img/arrow_up.svg b/data/img/arrow_up.svg similarity index 100% rename from jsapp/img/arrow_up.svg rename to data/img/arrow_up.svg diff --git a/jsapp/img/arrow_up_offset.svg b/data/img/arrow_up_offset.svg similarity index 100% rename from jsapp/img/arrow_up_offset.svg rename to data/img/arrow_up_offset.svg diff --git a/jsapp/img/logo.svg b/data/img/logo.svg similarity index 100% rename from jsapp/img/logo.svg rename to data/img/logo.svg diff --git a/jsapp/img/netopi.svg b/data/img/netopi.svg similarity index 100% rename from jsapp/img/netopi.svg rename to data/img/netopi.svg diff --git a/jsapp/img/topi.svg b/data/img/topi.svg similarity index 100% rename from jsapp/img/topi.svg rename to data/img/topi.svg diff --git a/jsapp/index.html b/data/index.html similarity index 100% rename from jsapp/index.html rename to data/index.html diff --git a/jsapp/script.js b/data/script.js similarity index 93% rename from jsapp/script.js rename to data/script.js index 3e68d4e..27f7df3 100644 --- a/jsapp/script.js +++ b/data/script.js @@ -27,7 +27,7 @@ function set(co, jak) { } } }; - xhttp.open("GET", "http://10.22.128.209/set?" + co + "=" + jak, true); + xhttp.open("GET", "/set?" + co + "=" + jak, true); xhttp.send(); } @@ -48,7 +48,7 @@ function get(x, y) { } } }; - xhttp.open("GET", "http://10.22.128.209/get?" + x, true); + xhttp.open("GET", "/get?" + x, true); xhttp.send(); } get("temp", "temp"); diff --git a/jsapp/style.css b/data/style.css similarity index 100% rename from jsapp/style.css rename to data/style.css