From b541718588b1baf93d94be36d10e0442a52b12c6 Mon Sep 17 00:00:00 2001
From: lorol <lorolouis@gmail.com>
Date: Thu, 12 Mar 2020 13:04:59 -0400
Subject: [PATCH] Bugfix

---
 examples/SmartSwitch/README.md                  |   7 ++++---
 examples/SmartSwitch/SmartSwitch.ino            |  16 +++++++++++-----
 .../SmartSwitch/data/{index2.htm => index.htm}  |  10 ++++++----
 examples/SmartSwitch/data/index.htm.gz          | Bin 3834 -> 0 bytes
 examples/SmartSwitch/data_src/index.htm         |  10 ++++++----
 5 files changed, 27 insertions(+), 16 deletions(-)
 rename examples/SmartSwitch/data/{index2.htm => index.htm} (98%)
 delete mode 100644 examples/SmartSwitch/data/index.htm.gz

diff --git a/examples/SmartSwitch/README.md b/examples/SmartSwitch/README.md
index 1a9c83e..ac61481 100644
--- a/examples/SmartSwitch/README.md
+++ b/examples/SmartSwitch/README.md
@@ -2,12 +2,13 @@
 
 ## SmartSwitch
 * Remote Temperature Control application with schedule (example car block heater or battery charger)
-* Based on the ESP_AsyncFSBrowser example
+* Based on ESP_AsyncFSBrowser example
 * Wide browser compatibility, no extra server-side needed.
 * HTTP server and WebSocket, single port  
 * Standalone, no JS dependencies for the browser from Internet (I hope), ace editor included
 * Added ESPAsyncWiFiManager
 * Real Time (NTP) w/ Time Zones
 * Memorized settings to EEPROM
-* Multiple clients can be connected at same time, they see each other requests
-* Use latest ESP8266 core lib (from github)
+* Multiple clients can be connected at same time, they see each other' requests
+* Default credentials <b>smart:switch</b>
+* Use latest ESP8266 core lib (from Github)
diff --git a/examples/SmartSwitch/SmartSwitch.ino b/examples/SmartSwitch/SmartSwitch.ino
index a1d2c95..11d17e7 100644
--- a/examples/SmartSwitch/SmartSwitch.ino
+++ b/examples/SmartSwitch/SmartSwitch.ino
@@ -14,6 +14,9 @@ Use latest ESP core lib (from github)
 */
 
 #define USE_WFM   // to use ESPAsyncWiFiManager
+//#define DEL_WFM   // delete Wifi credentials stored 
+                  //(use once then comment and flash again), also HTTP /erase-wifi can do the same live
+                  
 #define USE_AUTH  // .setAuthentication for all static
 
 #include <ArduinoOTA.h>
@@ -44,7 +47,7 @@ Use latest ESP core lib (from github)
 #define EECH    104  // fixed eeprom address to keep selected active channel, only for reference here 
 #define EEBEGIN EECH + 1
 #define EEMARK  0x5A
-#define MEMMAX  1   // 0,1,2... last max index (only 2 channels)
+#define MEMMAX  2   // 0,1,2... last max index (only 3 channels)
 #define EEALL   512
 
 #define HYST 0.5 // C +/- hysteresis 
@@ -140,8 +143,9 @@ void showTime()
   Serial.printf("RTC: %02d:%02d\n", tm->tm_hour, tm->tm_min);
 
   if (sched == 0) { // automatic
-      if ((tm->tm_wday > 0)&&(tm->tm_wday < 6)) tmpch = 0; //weekdays 
-      else tmpch = 0; //weekend
+      if ((tm->tm_wday > 0)&&(tm->tm_wday < 6)) tmpch = 0; //Mon - Fri
+      else if (tm->tm_wday == 6) tmpch = 1; //Sat
+      else if (tm->tm_wday == 0) tmpch = 2; //Sun
   } else { // manual
     tmpch = sched - 1; //and stays
   }
@@ -372,8 +376,10 @@ void setup(){
 //Wifi 
 #ifdef USE_WFM 
   AsyncWiFiManager wifiManager(&server,&dns);
- //wifiManager.resetSettings();
-  wifiManager.autoConnect("SmartSW");
+ #ifdef DEL_WFM
+  wifiManager.resetSettings();
+ #endif
+  wifiManager.autoConnect(hostName);
 #else
     //WiFi.mode(WIFI_AP_STA); // Core SVN 5179 use STA as default interface in mDNS (#7042)
     //WiFi.softAP(hostName);  // Core SVN 5179 use STA as default interface in mDNS (#7042)
diff --git a/examples/SmartSwitch/data/index2.htm b/examples/SmartSwitch/data/index.htm
similarity index 98%
rename from examples/SmartSwitch/data/index2.htm
rename to examples/SmartSwitch/data/index.htm
index 44c86bf..7c28036 100644
--- a/examples/SmartSwitch/data/index2.htm
+++ b/examples/SmartSwitch/data/index.htm
@@ -251,12 +251,14 @@
         <tr align="center">
             <td colspan=3>
                 <form name="sched">
-                    <label class="container">Auto&nbsp;&nbsp;
+                    <label class="container">Auto&nbsp;
                         <input type="radio" name="radio" onclick="handleClick(this);" value="Z0"><span class="checkmark"></span></label>
-                    <label class="container">Mon-Fri&nbsp;&nbsp;
+                    <label class="container">M-F&nbsp;
                         <input type="radio" name="radio" onclick="handleClick(this);" value="Z1"><span class="checkmark"></span></label>
-                    <label class="container">Sat-Sun
+                    <label class="container">Sat
                         <input type="radio" name="radio" onclick="handleClick(this);" value="Z2"><span class="checkmark"></span></label>
+                    <label class="container">Sun
+                        <input type="radio" name="radio" onclick="handleClick(this);" value="Z3"><span class="checkmark"></span></label>
                 </form>
             </td>
         </tr>
@@ -327,7 +329,7 @@
     <script src="app.min.js"></script>
 
     <script type="text/javascript">
-        const MYCORS = '192.168.0.55';
+        const MYCORS = '192.168.0.12';
         var g1, g2;
         var Analog0 = new Array();
 
diff --git a/examples/SmartSwitch/data/index.htm.gz b/examples/SmartSwitch/data/index.htm.gz
deleted file mode 100644
index 807a1fecf780f80d98171a8fc05cdccaf7a2011a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3834
zcmb2|=HTda&x~VY$jnPgt<cLT$z?bzbF=8R$(On71=18WP0n5Va%mZFwC3#%+s~v*
zwgu)`3YO|9pY-L9+1Hu>;Izf0M<+V>q-d6F7$2Ed^3B!Vz3p_k{hwE_zO}Dkf6?dM
z<MOzjCiWk^3x1r_=J==g+$Cwow9NKD(=PtrSbkK<Q|RWze$9^o3HOf8Q{msV`hk9c
z!QmJI%X2ALEI&`HP?>62`8=&}r;9naR`bo&@P5&kDiwam?%Aq#PbrK%uy4V_IlazB
z{>+yy>RaBMp;q28x#G=3lU`5vO*%75H5{rkj(M7V+a<U!{Jq_u)6NIXCM+nnQN7##
zbl19O?=uZ`6Ff^a7Bx#w>^BrNc3N_9(a|r=ibX6@??2=<ns!u~)eDQ+EwX=b^`9%x
z8}Wyhz4GoH#a)lPxBhH6+S7j_`}y<dt3QgbUVgRt$mAJ03)p`9Wimw=pVTu;lk0iv
z_9Alqbi0@<i}=hxEVJOrG?HET@3nZUu<WdcOD8yZ<JKSco@_GNKJ%>R(Z72fQ%~N%
zy_Z)hE0_Iv3D+c6mYPZNQ;N4wI-T`@q4JCOSwizFJu1=<%`wfYX%U(xkbca;<K#1i
z>R$~k-I*P6(qGQccU2c(7uh)D(xC$ek8WLIGW+ekSx8;7U|P<q!lvfkn(2{3Wigx1
z7DcBm)>su#B5%_Bt8Z5^d+?*(VmzJ)ET&CSownljF6RSpR_Q->+Bn5%*6jO+!p9ZQ
z9^shF(B{Uv`!l!Ga^sbI)^E4tHlA#)Wi9ZNrFag@lAgck=KQ_4;mFLjn>Xo~OuN_P
zthORhLEUi0r@Cer4_B$=373u}rweU<u<njq-^a8lMz{Ltg0w#c&GyqCHFzz!udRAZ
zd-;vk>f*r$`Ad~Pup}8xPGN7Ks8d?e>8Uc;k?+sW#cJ|94(HuqbqsjtEp$gg{D6Gd
zS6AuD(HiL{ih_?*!ewW^t!=Sce@Cx5U6e6TE#~XX6UCuVeJoBDZ9aQh`?SRyjTsXk
z^tI$$)`iZuo-OFEbE3ud^*d){nN6%ac>gd*ce?J8KE7^aZ0bQ9jad6*5tH8EK9%4;
zo6|dI|BkeWV((sNw=x~(jjYZN31c;t@ULEfU5V$BwL`$h=J|Z9%RW3TsJPfLJ;CnK
zM3p}k#aEu*?sYbwJv%5rdXe;vvpro$B6ZtX!+#6kPdvPFrAh4#&HPzU^WNRvJH@s&
zXxpMWuWx4YUMg7oB6yDPL5-)o^lv&Xo{?yIDd+mb+T2_E`UMA#Uq584KKQdqmFq(3
zElqWml`AXNboitV+ygDM{0=z__+N?S_BzG;#A4y+)TJ}l?`Rbg`uexg!K5?8NmcW{
z?l$JN$*=ZWf08J)QBUGM%+|g4`rC%dDjpYRe^Ij(^*;HJ_k8xlkGGq*vzLB2pY>w4
z%-keDp~&{ffBqE6{Eb_yv}lF-8(vwK(wRJe*e@SRS@i7EHp|GJ?V*$N+0tJ+|J;+3
z8Mn!T^Q6zbP@iX-@7BCz2;TbsOJmN?`1Ga^eF}!0DOZ0kuI$Z-dgPOzt{uG6<of)x
z?X2P9TV-C{;+Rr@-J^QHa>LqI|J7L!FY9JSJDoVnxV0<vOUAKx;jjLkp1A*^!KS^2
zxi?=1WUiZLZ*}urn%~|>A<n&OrNS+Rx1Ci>D~r3EbTfBY#QLwX@DH84|Cf4bdwKb>
zuUoY8WfvapIpupbwrslW+0*M@dhah<SvBj!>U3Z6AoJ(P=4GDKtv;MKYx=pHKLc__
zm5!eLkz$&<{OZKyo72P=94p{_x2F4J%Mp!^jRFoQSHuZc+fRPeo1%1y`}2F5TSpU=
zPMMTWT{mO-i(BH;SPXgJ9lOV)p6Ijgig)z66&AZbT(Ipkj`)>)zWRC4$w|eVHre!)
zUuF4|5mqkpn0s1@-J>t6UYGv&tL!|usd%#Lf5Y$1e|PSGqcz|7ahXrkeerug{N(Z~
z+gNK48y0ZCKDCvNr^j|}d!NeZDFr&letXLE9<u)Z{5{n4z0`^V<A;iTil-<2D17tO
zUv5#NWYv|@)^*~k8zyULdT-vMtny6AWnppCJ}<uMOIUt;Pi|SdQz7unmq{B$SSo|;
za}v(Qs7Zv)Tc6}<Ik$J$(?yPkZ(iNpa^!V!OQu%zGVdQ(=CDqd-YQ$!mMMJmLTvQL
zjP@>@yeG}6{eJJO{JaWMEL|pU51aTv^UlSTi6^Hgyq|C{dz(e$oH-L5qE@_p^0P?w
z{AXz~SJujwBSymKU2hAjq|0~YFN{gn^!2&0s5E6qcgtqic45adu@ASWHq5tq?j*+2
zBgto<;<$V2;yl^Kb#pi9pPsSVbKB+_^CJv7{Z23Gu~3xld#;e0AFnyP^8Ct%x%}>K
z-vW+oEq(ENf|t6(dfyhgob-xION-*nnPcYlemb}M-4&+)eKD8!O<#X?t=DRu^rs6l
zmwwcjC@|XSR<O0H{o9W8;zd)_TMu;Q&vQMHsWtII<4><7KjHu33kzn<{91bSy?Wiz
z?>BnHmb9~|s{DG?zIy$>y^hIOUd`wK^KY~9{^#@OZOi#t-ETSTTmQw94R+t^nv%`l
zGNw3*y{J9+QCZ^SRNgO2+)PSGru$s#VB3|;A;3MWCFddgoCMFV;<umF4o|&wgJbI?
zjfk=at6j|Ztm2~e(o_5rBz={(8LFn`d`z4c-#7nDRjYR3^w+G<IDMDtPk*g?G3wa-
zP$Rib3bUJ^|FGa$|Nh~_Vl5R<j{Iu*y05MOR&XAZ;PZSTyI8}U>8xd-cmEx}#stHU
z2lq)yO*{Tkxy#h#kY`8G8CHc`JC4lyHvQg*NVO-&E4*&y-JjH^yyVf_8#6CPCbd{C
z|F_bbb01&u;kc7Lbph>p<w`1yb016STqsxnx;*m0$=rnw>m$B?U8VcTamgmvlUA~a
z4fxa9%ge56|BX=Xk-pnH#YXwup*`~9rm`taH80v&CKXP2rM~!1*Rc)XZ=HOgb0l5Q
zzAgFLs>|Q3G)i91nJIpJ#Y81LYuPISYZjVY+-*(};XRxf;VZBqEZ9a@@MC)UPOG&^
zKU2--Kbf}CJ4ZmQDPcpd0MDxCgd3mFYc(y<V)?bVHu=Hi96x6*`S}VAasU7Cs25><
z-kkp1^6`f+`#=0koNGKS$j0Q5f40WAYX3L?za16hZ2IuK=XgfW_vJHY`d*%I7`Wrd
zBEc;E@ZW}>%Zl3cF20<2bi<mEYuy6HCxTu~bNoKXCr{$btkm6G1s3ORZ@qUa@IdhD
z-2wr5|F0afIg@cH%3fS@+liWK8>TS$?GDU)H}P&>;!Xw68+pE+e_S_MPBh-yyZ(J|
zSY1S^tnk+#2Olp_jGlk6uO?QwuJbudMpcvQy|N3s4SBLZMJyi9zf<>dXOmuCbI!#b
z($$XTUN^qJ{o^_{u4xA6BaJkF$IrL#GcWl&!DEf|_2^Z<y&pKLM>2%Dze({H)!ex~
zMDXF9kBhp#98jzh(&_rQ+$w9W5?^fgPQ`s&_T0|M@@qK|ylL6$>X&U&Mtd{1C<rHJ
z=qlDuS*kdVB~jCIZptK%BRg)oKGbwNazb^&oWzDh0>U3WN={2RMrI0au&hYv+i*+#
zSyGn;=Yk40v08<$aG_f@EZtu`IeNoa*GxPXvTbkj2U*pwy0a%2o>b=Y^m!ig>a@{G
z0XL_jqk>@_uYMRVX;}E@<8rwto9`<8vUcVvYqPj1ne?N$GcQwU)#qtkYnA?ct-Q5F
z@Tt=?w)U%42G@<Rg)MaAuluFAqpdD!a{NKbi7ChWv(BtvksMl8aeUfjAw5H>@Z--m
zZO{77w)=bJ9EE<VgP!MPe{_`I%<$Fu<j^W|yiz1Ua{_0~v9H~{-KI@>u^az9*%4dP
zv+5HwchjElXZc?B&M{s3>h}!KCF{d?WrXJCWhDMpd08w}sFe1$>9Oo$mF~w@8ydOG
zg4ol(#(%IiY1?xBd*3SIC%P&gwVAJPpT4UtrhR=&Yl5k*5cekiqR+nByhR00Q-hWi
z9oc5Lyk5ju=k`>;mv=(8PP_U4#Pm1HzZ?#g{pTp1a5Qv_XJKG-7jO7`g$#qMFTPdI
z{V}J-w`%JYy};#-R}yE<D`<MJmzDIytM<r)-dDb@@~l$Mo?O$nZ7AKgFX7j7Gv!y$
zEjhp5)_MF&eBFwx=Xs~Cov%OZ!mLM*!aqE3zq{<Rt=scw`j_YPSA0$LPQNhk{qOTK
zQ+lr+yXv+!@B>e1{$cz4r+Z`;oRC&pswM2c+xW$uxM%nFo_lk2;f%<rwjU|=NAet)
zo?TLq5o;Dm`k*;wOJGBl{~~$u=MPsEP7F($s>%DVMkmzpj^55|Y**hhpSomq;zX;?
zr+DU9B@5^JZT_5ois`D)zOI$4n)dzvbvR7*NcUo9CnGgQ?<^*v-#^{slkb{XOb8Ll
z_0&GJ(V|5{{c}{(H@D>a)qkc1{*<5jboK4;doR{M3T%+{JuyY?cVS-s`tQ@v)hya}
zR&Rm$uV3BE=5s~<d%nEj)C3oc?o?Cp4YSiY)fs22U3kk=Ec=SvQoh24^Rn)u*v|a{
zGkh2R>oVR~*QOz}H*wRK3%Q?D>b|)h)mJ;=_H#X_$One*hmUzBraJ7j*;Z@*fA#wH
z`*p0Xa<-lB@OS<amb$9^bMd_?3<~f4^Q!}<t#fW-ekXs~Ozz8bwHLQv=PSrbJ$m4J
zP-beD{GOP-=JR>H%C*0zeAwc}8uc$&^J-lTLsen4>9W;#UQH6%w6R)2KR-ge`m(l&
zv1ah)>~rfc-#_(n)rVkZ*DpU^H@(`mO_WdLW&O+}7CW<V9?12(zV6$)My1EP%kAS=
zYy397F1&kwt9s=v+oC-izgF76Z?jOhEYDrPb++)0^N!|`x9>e)U45;03w!m&ZI!PN
zl<l1D^nL2lE%EaYIo~M>nK&z+LAuQT@4xQz_Kga^r~R2Gs2FIT*m-o#x9vY=BEC!v
zXiA*Oza_xqeRN0Ls>AHJ9OraQQEfV~TRZh%YM23kzu@}Ql2%s|Z%$6<?Y?<dx~-L+
zHBE1~*_KU#ku#^-d2exSG4fz2i+R5-+;z>Iz>RsHCNBAV8o%t&e0t@^g6qWwCKjqE
zwp}wc&?w%$;y=%ZB_AUDe+n7;>V37_x3Bfv8o!mh_Gw@4D72nosd72)>|w#ES*w)p
zMx|<nGZhytO8#(nmu%F1qsV7`dsb(jo3KsC-r)Uyn}xG{!*aJhH-F)E|8Z_$+zi_j
t2_@$F()Z`A*mH5+y%}d*9xCrWz3%7x>IaVh`B(m9RnonwwcLw=0Ra6oe!Bnw

diff --git a/examples/SmartSwitch/data_src/index.htm b/examples/SmartSwitch/data_src/index.htm
index 44c86bf..7c28036 100644
--- a/examples/SmartSwitch/data_src/index.htm
+++ b/examples/SmartSwitch/data_src/index.htm
@@ -251,12 +251,14 @@
         <tr align="center">
             <td colspan=3>
                 <form name="sched">
-                    <label class="container">Auto&nbsp;&nbsp;
+                    <label class="container">Auto&nbsp;
                         <input type="radio" name="radio" onclick="handleClick(this);" value="Z0"><span class="checkmark"></span></label>
-                    <label class="container">Mon-Fri&nbsp;&nbsp;
+                    <label class="container">M-F&nbsp;
                         <input type="radio" name="radio" onclick="handleClick(this);" value="Z1"><span class="checkmark"></span></label>
-                    <label class="container">Sat-Sun
+                    <label class="container">Sat
                         <input type="radio" name="radio" onclick="handleClick(this);" value="Z2"><span class="checkmark"></span></label>
+                    <label class="container">Sun
+                        <input type="radio" name="radio" onclick="handleClick(this);" value="Z3"><span class="checkmark"></span></label>
                 </form>
             </td>
         </tr>
@@ -327,7 +329,7 @@
     <script src="app.min.js"></script>
 
     <script type="text/javascript">
-        const MYCORS = '192.168.0.55';
+        const MYCORS = '192.168.0.12';
         var g1, g2;
         var Analog0 = new Array();