Merge pull request yubox-node-org#1 from DmytroKorniienko/master

Manual merge from anton-zolotarev:master
tweidelt · Sep 20, 2020 · 3cf93d7 · 3cf93d7
2 parents 737a356 + fa232d5
commit 3cf93d7
Show file tree

Hide file tree

Showing 23 changed files with 400 additions and 889 deletions.
diff --git a/examples/ESP_AsyncFSBrowser/data/ace.ico.gz → ...ESP_AsyncFSBrowser/data/extras/ace.ico.gz b/examples/ESP_AsyncFSBrowser/data/ace.ico.gz → ...ESP_AsyncFSBrowser/data/extras/ace.ico.gz
diff --git a/...les/ESP_AsyncFSBrowser/data/acefull.js.gz → ..._AsyncFSBrowser/data/extras/acefull.js.gz b/...les/ESP_AsyncFSBrowser/data/acefull.js.gz → ..._AsyncFSBrowser/data/extras/acefull.js.gz
diff --git a/examples/ESP_AsyncFSBrowser/data/extras/edit.htm.gz b/examples/ESP_AsyncFSBrowser/data/extras/edit.htm.gz
diff --git a/examples/ESP_AsyncFSBrowser/data/extras/mode-json.js.gz b/examples/ESP_AsyncFSBrowser/data/extras/mode-json.js.gz
diff --git a/.../ESP_AsyncFSBrowser/data/worker-css.js.gz → ...yncFSBrowser/data/extras/worker-css.js.gz b/.../ESP_AsyncFSBrowser/data/worker-css.js.gz → ...yncFSBrowser/data/extras/worker-css.js.gz
diff --git a/...ESP_AsyncFSBrowser/data/worker-html.js.gz → ...ncFSBrowser/data/extras/worker-html.js.gz b/...ESP_AsyncFSBrowser/data/worker-html.js.gz → ...ncFSBrowser/data/extras/worker-html.js.gz
diff --git a/...yncFSBrowser/data/worker-javascript.js.gz → ...owser/data/extras/worker-javascript.js.gz b/...yncFSBrowser/data/worker-javascript.js.gz → ...owser/data/extras/worker-javascript.js.gz
diff --git a/examples/ESP_AsyncFSBrowser/data/extras/worker-json.js.gz b/examples/ESP_AsyncFSBrowser/data/extras/worker-json.js.gz
diff --git a/examples/SmartSwitch/data/ace.ico.gz → examples/SmartSwitch/data/extras/ace.ico.gz b/examples/SmartSwitch/data/ace.ico.gz → examples/SmartSwitch/data/extras/ace.ico.gz
diff --git a/examples/SmartSwitch/data/acefull.js.gz → ...les/SmartSwitch/data/extras/acefull.js.gz b/examples/SmartSwitch/data/acefull.js.gz → ...les/SmartSwitch/data/extras/acefull.js.gz
diff --git a/examples/SmartSwitch/data/extras/edit.htm.gz b/examples/SmartSwitch/data/extras/edit.htm.gz
diff --git a/examples/SmartSwitch/data/extras/mode-json.js.gz b/examples/SmartSwitch/data/extras/mode-json.js.gz
diff --git a/examples/SmartSwitch/data/worker-css.js.gz → .../SmartSwitch/data/extras/worker-css.js.gz b/examples/SmartSwitch/data/worker-css.js.gz → .../SmartSwitch/data/extras/worker-css.js.gz
diff --git a/examples/SmartSwitch/data/worker-html.js.gz → ...SmartSwitch/data/extras/worker-html.js.gz b/examples/SmartSwitch/data/worker-html.js.gz → ...SmartSwitch/data/extras/worker-html.js.gz
diff --git a/.../SmartSwitch/data/worker-javascript.js.gz → ...witch/data/extras/worker-javascript.js.gz b/.../SmartSwitch/data/worker-javascript.js.gz → ...witch/data/extras/worker-javascript.js.gz
diff --git a/examples/SmartSwitch/data/extras/worker-json.js.gz b/examples/SmartSwitch/data/extras/worker-json.js.gz
diff --git a/extras/do2.bat b/extras/do2.bat
@@ -0,0 +1,5 @@
+copy ..\src\edit.htm edit.htm
+"C:\Program Files\7-Zip\7z.exe" a -tgzip -mx9 edit.htm.gz edit.htm
+ehg edit.htm.gz PROGMEM
+copy edit.htm.gz.h ..\src\edit.htm.gz.h
+pause