From 35ef3ad84205635bcec9af5d073dfdaa3a740f6a Mon Sep 17 00:00:00 2001 From: lorol Date: Sun, 25 Oct 2020 22:11:22 -0400 Subject: [PATCH] Bugfix - my additions. --- .../ESP_AsyncFSBrowser/data/.exclude.files | 4 ++-- .../ESP_AsyncFSBrowser/data/acefull.js.gz | Bin 118766 -> 118766 bytes .../data/{edit.htm => edit_gz} | Bin 4503 -> 4503 bytes .../ESP_AsyncFSBrowser/data/worker-css.js.gz | Bin 32927 -> 32927 bytes .../ESP_AsyncFSBrowser/data/worker-html.js.gz | Bin 45019 -> 45019 bytes .../data/worker-javascript.js.gz | Bin 112558 -> 112558 bytes .../ESP_AsyncFSBrowser/data/worker-json.js.gz | Bin 6923 -> 6923 bytes examples/SmartSwitch/SmartSwitch.ino | 18 ++++++++---------- examples/SmartSwitch/data/.exclude.files | 2 +- examples/SmartSwitch/data/acefull.js.gz | Bin 118766 -> 118766 bytes .../SmartSwitch/data/{edit.htm => edit_gz} | Bin 4503 -> 4503 bytes examples/SmartSwitch/data/worker-css.js.gz | Bin 32927 -> 32927 bytes examples/SmartSwitch/data/worker-html.js.gz | Bin 45019 -> 45019 bytes .../SmartSwitch/data/worker-javascript.js.gz | Bin 112558 -> 112558 bytes examples/SmartSwitch/data/worker-json.js.gz | Bin 6923 -> 6923 bytes extras/do_ed_fs.bat | 4 ++-- src/SPIFFSEditor.cpp | 2 +- src/edit.htm.gz.h | 2 +- 18 files changed, 15 insertions(+), 17 deletions(-) rename examples/ESP_AsyncFSBrowser/data/{edit.htm => edit_gz} (98%) rename examples/SmartSwitch/data/{edit.htm => edit_gz} (98%) diff --git a/examples/ESP_AsyncFSBrowser/data/.exclude.files b/examples/ESP_AsyncFSBrowser/data/.exclude.files index ba74486..a1c4278 100644 --- a/examples/ESP_AsyncFSBrowser/data/.exclude.files +++ b/examples/ESP_AsyncFSBrowser/data/.exclude.files @@ -1,3 +1,3 @@ -/*.js.gz -/edit.htm +/*.gz +/edit_gz /.exclude.files diff --git a/examples/ESP_AsyncFSBrowser/data/acefull.js.gz b/examples/ESP_AsyncFSBrowser/data/acefull.js.gz index 42cd5e87724f3765698a6aef40c852f786905e42..8ba7fd8a73c8744cd2a2edd3205bd2afcb36833a 100644 GIT binary patch delta 21 dcmaDipZ(o@c6Rx04vwTPQyba0vNJwE4**{82#^2( delta 21 dcmaDipZ(o@c6Rx04i4AfZH??(*%_ao2LNBx2&(`9 diff --git a/examples/ESP_AsyncFSBrowser/data/edit.htm b/examples/ESP_AsyncFSBrowser/data/edit_gz similarity index 98% rename from examples/ESP_AsyncFSBrowser/data/edit.htm rename to examples/ESP_AsyncFSBrowser/data/edit_gz index 6620caab1b5d747bd72794f957a8d78c19ae9827..323f93ec3763003d9a988e6119bb9cabbf93bbb1 100644 GIT binary patch delta 16 XcmbQPJYAVxzMF&NsNS@V>=Oh5Dx?J% delta 16 XcmbQPJYAVxzMF%i^Ho4FEds2Aco? diff --git a/examples/ESP_AsyncFSBrowser/data/worker-html.js.gz b/examples/ESP_AsyncFSBrowser/data/worker-html.js.gz index 19b5d9e4e6d9b7d5ae8a330732372afda5406eee..beef3c194fee47f2481918ca233af25fe0256cc2 100644 GIT binary patch delta 18 acmcb8pXv5}CU*I54vzROQ#Z0-Sq}hC5eOXs delta 18 acmcb8pXv5}CU*I54i4wvZ5!FItOo#2tOz*( diff --git a/examples/ESP_AsyncFSBrowser/data/worker-javascript.js.gz b/examples/ESP_AsyncFSBrowser/data/worker-javascript.js.gz index 5ad84ceaa2ed99fddf81ae1adad50c6aabda632e..02c0e6f39f64f7bb37c543d5000bd63c047f258d 100644 GIT binary patch delta 21 dcmZ4Yo^9QGHg@@L4vxevQyba0vNJB<4gg>J2vq<8 delta 21 dcmZ4Yo^9QGHg@@L4i4AfZH??(*%_B_2LNE{2yp-a diff --git a/examples/ESP_AsyncFSBrowser/data/worker-json.js.gz b/examples/ESP_AsyncFSBrowser/data/worker-json.js.gz index e1de25bd0450183027aa0b0a808cd43483163049..f917582a23fa4abb51e368fb4e3308d38c9cbcaa 100644 GIT binary patch delta 16 XcmeA+>o#MT@8;l0+A?(`JBu^`Dy#&? delta 16 XcmeA+>o#MT@8;le{oS^aokbb|D?kL{ diff --git a/examples/SmartSwitch/SmartSwitch.ino b/examples/SmartSwitch/SmartSwitch.ino index 796bb99..658942f 100644 --- a/examples/SmartSwitch/SmartSwitch.ino +++ b/examples/SmartSwitch/SmartSwitch.ino @@ -204,8 +204,13 @@ void doOut(){ if (ledOut != ledState){ // only if changed digitalWrite(ledPin, ledState); //consolidated here ledOut = ledState; //update - if (ledState == LED_OFF) ws.textAll("led,ledoff"); - else ws.textAll("led,ledon"); + if (ledState == LED_OFF){ + ws.textAll("led,ledoff"); + Serial.println(F("LED-OFF")); + } else { + ws.textAll("led,ledon"); + Serial.println(F("LED-ON")); + } } } @@ -257,7 +262,7 @@ void showTime() ledState = LED_ON; ws.textAll("led,ledon"); } - if ((((t - HYST) > ee.tempe)&&(ledState == LED_ON))||(!heat_enabled)){ // ON->OFF once, also turn off at end of period. + if ((((t - HYST) > ee.tempe)&&(ledState == LED_ON))||(!heat_enabled)){ // ->OFF ledState = LED_OFF; ws.textAll("led,ledoff"); } @@ -290,13 +295,6 @@ void checkPhysicalButton() if (digitalRead(btnPin) == LOW){ if (btnState != LOW){ // btnState is used to avoid sequential toggles ledState = !ledState; - if (ledState == LED_OFF){ - ws.textAll("led,ledoff"); - Serial.println(F("LED-OFF")); - } else { - ws.textAll("led,ledon"); - Serial.println(F("LED-ON")); - } } btnState = LOW; } else { diff --git a/examples/SmartSwitch/data/.exclude.files b/examples/SmartSwitch/data/.exclude.files index 664e3b7..a1c4278 100644 --- a/examples/SmartSwitch/data/.exclude.files +++ b/examples/SmartSwitch/data/.exclude.files @@ -1,3 +1,3 @@ /*.gz -/edit.htm +/edit_gz /.exclude.files diff --git a/examples/SmartSwitch/data/acefull.js.gz b/examples/SmartSwitch/data/acefull.js.gz index 42cd5e87724f3765698a6aef40c852f786905e42..8ba7fd8a73c8744cd2a2edd3205bd2afcb36833a 100644 GIT binary patch delta 21 dcmaDipZ(o@c6Rx04vwTPQyba0vNJwE4**{82#^2( delta 21 dcmaDipZ(o@c6Rx04i4AfZH??(*%_ao2LNBx2&(`9 diff --git a/examples/SmartSwitch/data/edit.htm b/examples/SmartSwitch/data/edit_gz similarity index 98% rename from examples/SmartSwitch/data/edit.htm rename to examples/SmartSwitch/data/edit_gz index 6620caab1b5d747bd72794f957a8d78c19ae9827..323f93ec3763003d9a988e6119bb9cabbf93bbb1 100644 GIT binary patch delta 16 XcmbQPJYAVxzMF&NsNS@V>=Oh5Dx?J% delta 16 XcmbQPJYAVxzMF%i^Ho4FEds2Aco? diff --git a/examples/SmartSwitch/data/worker-html.js.gz b/examples/SmartSwitch/data/worker-html.js.gz index 19b5d9e4e6d9b7d5ae8a330732372afda5406eee..beef3c194fee47f2481918ca233af25fe0256cc2 100644 GIT binary patch delta 18 acmcb8pXv5}CU*I54vzROQ#Z0-Sq}hC5eOXs delta 18 acmcb8pXv5}CU*I54i4wvZ5!FItOo#2tOz*( diff --git a/examples/SmartSwitch/data/worker-javascript.js.gz b/examples/SmartSwitch/data/worker-javascript.js.gz index 5ad84ceaa2ed99fddf81ae1adad50c6aabda632e..02c0e6f39f64f7bb37c543d5000bd63c047f258d 100644 GIT binary patch delta 21 dcmZ4Yo^9QGHg@@L4vxevQyba0vNJB<4gg>J2vq<8 delta 21 dcmZ4Yo^9QGHg@@L4i4AfZH??(*%_B_2LNE{2yp-a diff --git a/examples/SmartSwitch/data/worker-json.js.gz b/examples/SmartSwitch/data/worker-json.js.gz index e1de25bd0450183027aa0b0a808cd43483163049..f917582a23fa4abb51e368fb4e3308d38c9cbcaa 100644 GIT binary patch delta 16 XcmeA+>o#MT@8;l0+A?(`JBu^`Dy#&? delta 16 XcmeA+>o#MT@8;le{oS^aokbb|D?kL{ diff --git a/extras/do_ed_fs.bat b/extras/do_ed_fs.bat index 0396220..c88b646 100644 --- a/extras/do_ed_fs.bat +++ b/extras/do_ed_fs.bat @@ -1,8 +1,8 @@ copy ..\src\edit.htm edit_src.htm call html-minifier-terser --collapse-whitespace --remove-comments --remove-optional-tags --remove-redundant-attributes --remove-script-type-attributes --minify-css true --minify-js true -o edit.htm edit_src.htm "C:\Program Files\7-Zip\7z.exe" a -tgzip -mx9 edit.htm.gz edit.htm -copy edit.htm.gz ..\examples\SmartSwitch\data\edit.htm -copy edit.htm.gz ..\examples\ESP_AsyncFSBrowser\data\edit.htm +copy edit.htm.gz ..\examples\SmartSwitch\data\edit_gz +copy edit.htm.gz ..\examples\ESP_AsyncFSBrowser\data\edit_gz ehg edit.htm.gz PROGMEM copy edit.htm.gz.h ..\src\edit.htm.gz.h pause diff --git a/src/SPIFFSEditor.cpp b/src/SPIFFSEditor.cpp index 05ff4a1..343ed79 100644 --- a/src/SPIFFSEditor.cpp +++ b/src/SPIFFSEditor.cpp @@ -237,7 +237,7 @@ void SPIFFSEditor::handleRequest(AsyncWebServerRequest *request){ request->send(304); } else { #ifdef EDFS - AsyncWebServerResponse *response = request->beginResponse(_fs, F("/edit.htm"), F("text/html"), false); + AsyncWebServerResponse *response = request->beginResponse(_fs, F("/edit_gz"), F("text/html"), false); #else AsyncWebServerResponse *response = request->beginResponse_P(200, F("text/html"), edit_htm_gz, edit_htm_gz_len); #endif diff --git a/src/edit.htm.gz.h b/src/edit.htm.gz.h index 5a00089..c53251d 100644 --- a/src/edit.htm.gz.h +++ b/src/edit.htm.gz.h @@ -2,7 +2,7 @@ //File: edit.htm.gz, Size: 4503 #define edit_htm_gz_len 4503 const uint8_t edit_htm_gz[] PROGMEM = { -0x1F,0x8B,0x08,0x08,0x89,0xFA,0x86,0x5F,0x02,0x00,0x65,0x64,0x69,0x74,0x2E,0x68,0x74,0x6D,0x00,0xB5, +0x1F,0x8B,0x08,0x08,0xC5,0x2E,0x96,0x5F,0x02,0x00,0x65,0x64,0x69,0x74,0x2E,0x68,0x74,0x6D,0x00,0xB5, 0x1A,0x0B,0x5B,0xDB,0x36,0xF0,0xAF,0x18,0x6F,0x63,0xF6,0xE2,0x38,0x0E,0x50,0xD6,0x3A,0x18,0x16,0x1E, 0xEB,0xBB,0x50,0x12,0xDA,0xD1,0x8E,0xED,0x53,0x6C,0x25,0x56,0xB1,0x25,0xCF,0x96,0x09,0x34,0xCD,0x7F, 0xDF,0x49,0xF2,0x93,0x84,0xEE,0xF1,0x6D,0xA5,0x60,0x49,0xA7,0x3B,0xDD,0x9D,0xEE,0x25,0xD9,0x7B,0x1B,