From f88e02b25cb086a194fa219b98f3044bb3038a31 Mon Sep 17 00:00:00 2001
From: Robert Strouse <rstrouse@truepointsolutions.com>
Date: Sun, 19 Feb 2023 12:46:11 -0800
Subject: [PATCH] Cache clearing and v1.2.1 binaries

---
 ConfigSettings.h              |   2 +-
 SomfyController.ino.esp32.bin | Bin 988496 -> 988496 bytes
 SomfyController.littlefs.bin  | Bin 1441792 -> 1441792 bytes
 data/index.html               |  45 ++++++++++++++++++++++++++--------
 4 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/ConfigSettings.h b/ConfigSettings.h
index ef4df24..2e00321 100644
--- a/ConfigSettings.h
+++ b/ConfigSettings.h
@@ -2,7 +2,7 @@
 #ifndef configsettings_h
 #define configsettings_h
 
-#define FW_VERSION "v1.2.0"
+#define FW_VERSION "v1.2.1"
 enum DeviceStatus {
   DS_OK = 0,
   DS_ERROR = 1,
diff --git a/SomfyController.ino.esp32.bin b/SomfyController.ino.esp32.bin
index e751b94c602238d642c18d49f8526d10f5317fbc..8ece69731548d57d6ed9bd999ac7d0608606bc56 100644
GIT binary patch
delta 151
zcmcbx%I3l<n+Y2f7;pSBk$963(fj6TyyyGG*HW*tr{>M?yWf-0X42)fblLQe4vYbt
zfy#s#4V!<8wEq-g1Y#y2W(HywAZ7((HXvpPVh$kY1Y#~A<_2OOAm#;PzUe<j_{|g-
mi*CE_cXM$=39sRXq~Gca*-2In|Bucxw`E}B{C{nOG&2CxEJCjU

delta 151
zcmcbx%I3l<n+Y2fl)Y|kN;8{mzG9kH#EZv#A!g6iZ|MCj+v4WxpjD#(=k)ZC4vYbt
z6&P;_Ga5Ai6lwn{!U)7nK+FupEI`Z(#B4y!4#XTl%n8I?K+FxqJV49~#C+3#itw8$
nhMY4An9iM`8qisMrzH3;kDe;8j{BFGc%}Bxnz!#Nr0)R$r8YnX

diff --git a/SomfyController.littlefs.bin b/SomfyController.littlefs.bin
index be37d65861e42f78536e41bc37b30a4c10dcf202..96c600e1c039e24704bb4fb81f7cf1201a71891f 100644
GIT binary patch
delta 1956
zcmZ8hdu)?c6sPUit=;aqbZ#Ac@56zeZ0lMdOd(_6K+u3-LD#8l**>>#59!*n)hPy8
z89H$41Q&PW0~jWffR9wv-Ka5k8vpRg@BzNvrXm`MVEjwt<J@+JNt2U&J-^@iopaAQ
z_eP_)Mx(dJc4xAq@0sR=YtCHrX~xme@Nq}^a6D6C*1_Le+MCXJa-OdIW7wp69?eSn
z+A7a@-k7$#rEgfvx{tlRT@p`w3efj@g6LEdzP8HKo>x!yhNN$&=G>(@O=M;=3z<S@
zB}*YoC9{#)$<oNuh2~^E@7rp6tG(_k++MWTGVOo=7Glm6yUrUhBB~w^`;G3N&QMUT
zR$aY`0M}ATQ)hmX(`^JodTVVsj0g8arf8UAWv0}mvlOR_AU98MZCz_b^jq|HQYj7U
zT}HXu5(-9)AfE4Mx#(HL6da8(Md>0M?ofGt@@xJ-EH^{?+#Qifc;)81I(tb0_gn_^
z5<$)cmXwMRG9#K%#B<PdHDs4i%5{{k)YW0=t**;AdK%qyBqP|mqN6j=TAE0A{C+4w
zho32h7wRl^g}e3kF5OkGx`LsK7QLkdH@^(oIkPFoJ>kx7qepT)NToU#%tmF5Q6Vep
z4h1gOL7x-sjzFkIk5F&j|8;A;pB0N;)69~td^Bgy95Hy7^_ub7-&uiB&#^nfc8t6d
z!KoL(g-sk5;<9s)E~frs#b%5(LMCdfSq`dojN#~SusF5d2pZjb0AZSyNVg4RS3w@e
z`$2hS7@jhxT^O;bvOsZ~ZG!YWTZ~fFZ(&Xm0@!QD;zF?D-`7J5Ml6s!5`h%qb-+Sk
z$B8Th66N{};fNXUZh(2BM1?Cs`B;|feUzp(v>UQyscHD|5m<^tt3btg4AvxPziu2J
z6md6bCLApTD`r>1rJ~FOWdNU$gp|3{9oZ7biBxcka5d~PV`v2w;3Psm#y2p#xIqIB
z%BRE>{<X4<>h+K&xDRds$7ke~h}20I+9(+lRgjZdJ5f{zO(u*Dk@%<%W9g|Uh<R5e
zgtebTHpau;hMNLVBgVR5wOJ@(*Z{VZM3FS%-zLR=i2}o+2Fh6!g=;|hJOMo{q39r7
zi=NkD2`(E1o9NpECmH*KaLJJpxcLcc(S!}`SUgJ8+_4Y(%;@N5DX1<7C4mS+szCWt
z(x>*pQnB}W2oVXOTGYnC3AV2YO2F%nLMcWcq7L_sL7_~lCL0xd02av2D-Z-MH;v?g
z7Z1M)_2{{dS@GQ`XqzS$K)zTT2RkTV%T(Gl^(efWak2G7xX+A@CtzH>GXZ<q$Ru^E
z{u?-K#yEgg<W530DBsGUgI*{RTh78RGirap5<zp%0o!*3Nm%&*l3l6s0bq0jY_AmZ
zfYpBC6*>1D?dRxYBspZ|&!oa6#gwZ(Mt3i5CD!(_Y*c~U#O=TjnK91-&e=OW-@zSV
zouZh@$4op+EGy)1nehQXbK)^S^Wvs$v@9D{eu62}vKVg#KSsx@;2)xYCtD=`^zg;Z
z_B}yKxSEH}i7CvgkS<0cpSf5wcNa6pAr~i?^D6xK5HG-Z9XRma8eW-L@VWZkdS^uK
z33at?ad!qg@q9BBC0D;f<K@Y(+caK^>KLtmzsBi|W3&_BOwzR(TE$buQH_6)uKXZN
z-hLzRw;*id85nQm3KreO*NJu?pU3P!5-vH@^6Xet$5OF*2WMh`1HZ$9Uw7~{k=M*y
znR1Fqs71Leky{)N@Oq1>2iM=v-RRg&2S|i%4D%9Z{fW4z(Bvb<Zvz~#=m5{fra@jT
z(=#!-m8%x(%^iBHfiFDH7m2DUzn&?lWris~FBDHc#0`s3_V9Zd`<c8FN#uXg$KB$&
zr}!ER`nGc`{@TYmt~|gOUEEwMv;;O7ZS>l9s4L{diU)%{e<Z-uaPA{?O}5m7V`M#*
u6>sMAMfE6Okvbf6*k00{nlcdM1F^XSF~>kGV<2|PKrC}0mUSrR^!*Elb8;d8

delta 1326
zcmX9-YfKzf6lP~<VV1q;Fu*R*h_J<&EswAR_@I)81)4Ut$(BM4h>!BNU<)f~TWc+w
z(r()y+HFbq7$b!$;fE$TV8~5lV$sC@u+~Ctt=a|w(NZOqkQ)1=M(-Vde3O~)an8MW
z&JBm_!{K`KL@GOY$rcwXUoOq@?X(Td=mi5)sVW=Yv)b~?u4SWPX7Gyvo7XtwUgO&R
z%f^4FKkt;>K)`*JdAp@?$ym%8-ESE^s>QYYmyC+$@JEvC4|t9TJT?JEz%HN)I0WJa
z5(G2>r$C~Biw8Wc_cA#v*b9_3&w|{XXZbe%?;^9isO$mDBl8|h<fSXDQc=H)i;JW2
z`z({kR#_*|sd4a4`eBEnT@{L@uHVk`DfBilnpWVEwMX?a$l_&o_(0Ko`-%#S3k@Hi
zcR+Tcy`!a#<`-BRT{R*1tRIqjoep)1IxWiau@tBQ`ZEPwJlzXJ3Y!tERMr~pf^>c*
z2TFhfUqcCh+JOCvdQHf5u?T$pMls|A*8=ddqJ1w|OZn0cnQLpBs$ovPS_ueTtri~j
zy72I^8rkyDi*ScFJrCJDtqDeK`VApTS(dPR&%6YEXQx0Ve?2^)z!q??*>|_XdoH@)
z1&zEl1ltt#2dik0D9W|4T**yASmeYJ2m(Ev1UJu!LQGMA6beNzz(#6(RxGl760#`i
zBxpQ$0B$n+RD)ECZUrabFbwZ1>?dKD5m}7Z4T}T5{vi|qc`Koemz&V7s6R{TwG*(3
z=5B+^|C)egpqJl=0;>bBo`PmYyCqDPv1<_WX!v#Jpgtd@@qfMoCy?I5638q=o#uk*
zqR;`R^1Nv{s;IX`j*nfFJ9E#8oyF$B!!IsC1<>$ehU9%xeEU}5xT4O=b<DURgI`*O
zXJAr8aS*=<(h_#w6T&wNb~t2rl{aWOn&2$(_O|uxljBj*C&t4Y6pBw5L3PfmmVzE@
zmW;wuA74p99cXVnB$Bb6sqzP>QizH9*z848*u03ynC!=I<>2E$*`HuS>;P!A=Lq|Q
zhQchu`-`yJrY;B%83tbA!zI|rsC@?_tpu4Cdkh%Q3t&)*RpADTR$)99S7EO8mfYL@
zs|d>Q-u5>OJGwe3JRyFda23#$^e<OoI`x%{Nzu1qJbz*{e(R#~5zOG3)!1oQ7iHg5
zHQ2)M)?zxNzt7=1(z`H$8;#g(*MAeb^vD+0KF+jY7o%4P(PwR%`$Je~cl<8oUTQjo
zTgdE0N2~)?Sw-Wsy_myj_Aow0bMK&+rqAP}{H-u1+2M}J$XxC2rq(tx1~HFc=*O*0
zUSpt81L}Nz6x;0Tk}&be03Kwtu@(y{dLHwrF^X;q9YY7<5ccth!+265{W)|x?h5-7
v*}|AcmqX|w?>TYV-Wb8EgwFz=uof{fVkSjQJz^$D%#?_k8Zq6Yrl<OU<jkYf

diff --git a/data/index.html b/data/index.html
index 58f840d..c0d4dff 100644
--- a/data/index.html
+++ b/data/index.html
@@ -3,10 +3,12 @@
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta charset="UTF-8">
-    <link rel="stylesheet" href="main.css" type="text/css" />
-    <link rel="stylesheet" href="icons.css" type="text/css" />
+    <link rel="stylesheet" href="main.css?v=1.2.1" type="text/css" />
+    <link rel="stylesheet" href="icons.css?v=1.2.1" type="text/css" />
     <link rel="icon" type="image/png" href="favicon.png" />
     <script>
+        let appVersion = 'v1.2.1';
+        let reloadApp = false;
         document.oncontextmenu = (event) => { event.preventDefault(); event.stopPropagation(); return false; }
         class General {
             async init() {
@@ -14,6 +16,18 @@
                 this.setTimeZones();
                 this.loadGeneral();
             };
+            reload() {
+                let addMetaTag = (name, content) => {
+                    let meta = document.createElement('meta');
+                    meta.httpEquiv = name;
+                    meta.content = content;
+                    document.getElementsByTagName('head')[0].appendChild(meta);
+                }
+                addMetaTag('pragma', 'no-cache');
+                addMetaTag('expires', '0');
+                addMetaTag('cache-control', 'no-cache');
+                document.location.reload();
+            }
             timeZones = [
                 { city: "Africa/Abidjan", code: "GMT0" },
                 { city: "Africa/Addis_Ababa", code: "EAT-3" },
@@ -129,6 +143,7 @@
                                 break;
                             }
                         }
+                        general.setAppVersion();
                         document.getElementById('spanFwVersion').innerText = settings.fwVersion;
                         document.getElementsByName('hostname')[0].value = settings.hostname;
                         document.getElementsByName('ntptimeserver')[0].value = settings.ntpServer;
@@ -139,7 +154,7 @@
                 });
 
             };
-            setAppVersion() { document.getElementById('spanAppVersion').innerText = 'v1.2.0'; };
+            setAppVersion() { document.getElementById('spanAppVersion').innerText = appVersion; };
             setTimeZones() {
                 let dd = document.getElementById('selTimeZone');
                 dd.length = 0;
@@ -1185,6 +1200,7 @@
             };
             updateApplication() {
                 let div = this.createFileUploader('/updateApplication');
+                reloadApp = true;
                 let inst = div.querySelector('div[id=divInstText]');
                 inst.innerHTML = '<div style="font-size:14px;margin-bottom:20px;">Select a binary file containing the littlefs data for the application then press the Upload File button.</div>';
                 document.getElementById('fsUpdates').appendChild(div);
@@ -1234,7 +1250,7 @@
         };
         var firmware = new Firmware();
 
-        function setAppVersion() { document.getElementById('spanAppVersion').innerText = 'v1.0.8'; }
+        function setAppVersion() { document.getElementById('spanAppVersion').innerText = appVersion; }
         Number.prototype.round = function (dec) { return Number(Math.round(this + 'e' + dec) + 'e-' + dec); };
         Number.prototype.fmt = function (format, empty) {
             if (isNaN(this)) return empty || '';
@@ -1490,12 +1506,17 @@
                     let errs = document.getElementsByClassName('socket-error');
                     for (let i = 0; i < errs.length; i++)
                         errs[i].remove();
-                    (async () => {
-                        await general.init();
-                        await somfy.init();
-                        await mqtt.init();
-                        await wifi.init();
-                    })();
+                    if (reloadApp) {
+                        general.reload();
+                    }
+                    else {
+                        (async () => {
+                            await general.init();
+                            await somfy.init();
+                            await mqtt.init();
+                            await wifi.init();
+                        })();
+                    }
                 };
                 socket.onclose = (evt) => {
                     if (document.getElementsByClassName('socket-wait') === 0)
@@ -1832,6 +1853,10 @@
                         <button id="btnUpdateApplication" type="button" onclick="firmware.updateApplication();">
                             Update Application
                         </button>
+                        <button id="btnUpdateApplication" type="button" onclick="general.reload();">
+                            Refresh Cache
+                        </button>
+
                     </div>
                 </form>
             </fieldset>