From 97c1fccdc759205e45a674850c5048ee8dca7777 Mon Sep 17 00:00:00 2001
From: Robert Strouse <rstrouse@truepointsolutions.com>
Date: Mon, 3 Jul 2023 16:10:12 -0700
Subject: [PATCH] Cleanup for v2.0.0 #83 #53

---
 SomfyController.littlefs.bin | Bin 1441792 -> 1441792 bytes
 data/index.js                |  11 ++++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/SomfyController.littlefs.bin b/SomfyController.littlefs.bin
index 783336c9062377062d431ac206fec5a959ff8cb9..7f6fd3aeb95fbd58dbbfb6b30bd8f839d021cd8a 100644
GIT binary patch
delta 949
zcmYk3OK1~O6o!*_^3YD^o;0RyeBM^AF0{E7QL#SKg80N%e9$hm#>`Ain`A<gDp?t^
zMmI_{(gPy3wCYME^})FDg^D18f*ZjK6-uq3P(h)BTJKC$Tzs4F{^y?m&SbOg*=&39
z35Y8j3Uat}igmwe*;24lcHS+RPW4Z*isHwshPxGT_m+#b9hZ4>g5{Fmj+jZWU^>-5
z!4|G~J!rT>z`I54x?N^TY#dv2>DbG$!Z}!0c*v7-+Yp}~W2XzXo6YH}l2iR-Z24<P
zp)_69D?VA&&x50^@yk+b2CD_rss2%RVOaWF3Rd@uU7wBM2<v~k@0l5_5lpB0M_ALz
zgr^j&=@n}a7{%YP$5S5!Gw9>Rxl{dbn0oioE5n@#_)Z0UR!$kGoFi~-96QIsadKvG
zW^yVxBFDv%^ni~Pi@3Q3>iV|9Vr;9C+z1n{N*rjF9D49MSwFu|CIW6~2gw$Zmn@^$
zf1Aw3gKvowi?bvFBh!)#A9N50Uj0ct`nw78!|wcLu~>d`@V<lW!GUq&(l<>KB*L^I
zk2iuBZQn`L9R}BlXt7!>hBpUB2rSY?fGhSrAuSdQ#$_5w(UcNT)3ip@hZP#r(pr*c
zv>tji5{=SB3Js>Z6&_RnJ5Ke4LP{#7_C%u@+NFiVirlcypV)wnl`v<;R+UE5RF25T
zM4Tp)JW4w@?KbX+Yw15Cu2ExsC>jZM;|(uV+i5TyjKuZ#RS<UyR$d!h7r-!P-7dlW
z7=6vK7YElt0}jlC3jHF5rPej2zA+`HB{TmjCzYU_F<umu%@Q<qI4CQBpBPSRJqetw
zhZelI799GnIuKpXGQQAUx{E<0p7lc##|g~V>lic<q1>p`{LtmW#74;Dr<;<5tegL!
zGrHtOvH(1oy)Q}njsUnxUmH}T+zOZQ-cG2}>)T*85p2c{`#WI>KSqh9S004zq{7an
zaiGXe=w8LACZ{F9QyOG+X9D&T!C_7vgCSkWg3mVG9GIEQLoV;m<tuY}PcA>}THc%Z
E4Rv}n#Q*>R

delta 806
zcmXw#T}V@57{_<q+?QwPeU4{yTbLcKs6_H5`$ChBSQHUC3~^DJh93#)#JUMFmLFMx
zVGVlf#telnyct-%5v&G<kra3#B_Xs(VqK`wm4a)%XLARBaL%9K|9Q^)27~@!&>wye
z;%e=9bK9jg+SjhU4hbrKAe&NIYv~%@>UveLXVaQIXxud8RG9g@k}_QxGfpRO&6n$0
zNOPSOKTKyCx{od$u9;RLbRSAWQEo=+^gT=T<;3^9sdipEYb{-(%Fp$NbUSZwb4`pU
z#Ek<f(VbZnqyE$1exyZrMqH%N-O>Fi(UTDusa*dnmKHr3ae>bEoH&;fy%}+V2KF_L
z=-Ghg9oD=8CyQg`m^j%SGsnWQa%>zsCx;_)92|*hUJ?#t?;I&Y$d^Qn4G=H-Jd%tM
zcjV%Djbvd>v!t>B!%oSBoi=dh)CM{_+Pm7S1I;ZMO^|%_93+6BY#`%U1IfckQmSS*
zev^JP##Z>auNER%{}~L11P4q1kYaOdPv_Z|YwW@wGD&b|jd-wRortC+7hdd!1%gj0
z><|rt!JtQak5Pb0GaD&`F@YsLAXu>C2yDRu70@Jb5trxrAtF^!fyXOhFVhO4Ou)ut
zaGNa`f#Se60*`Y8J=fJMO;^>+Em^#y_t+GLI)dRR#EElvBrB>K44aJl#KKdc;5{Ze
zF}jVv1>Z;#Th%}&80jSz{Cozg(C>ru4}IXqM>P^*AAN9$V1C?T!(tiiSiT`ixU&)Z
zZP|RF%AY>GIRpxO+Xz(zza*t%<TsUrmEF)~HFHPz*i^UvOQs-9*e(3~;;uav4m-;I
ipgfBPAv;9W?MxdI-`R(aqrj0lxg3S#WX4ffBJdygh6_>v

diff --git a/data/index.js b/data/index.js
index ad040fd..cc7f00a 100644
--- a/data/index.js
+++ b/data/index.js
@@ -2592,7 +2592,7 @@ class Somfy {
                 obj.groupId = groupId;
                 putJSONSync('/saveGroup', obj, (err, shade) => {
                     if (err) ui.serviceError(err);
-                    else this.updateShadeList();
+                    else this.updateGroupList();
                     console.log(shade);
                 });
             }
@@ -2758,7 +2758,8 @@ class Somfy {
             else {
                 console.log(shade);
                 let div = document.createElement('div');
-                let html = `<div id="divRollingCode" class="instructions" data-shadeid="${shadeId}">`;
+                div.setAttribute('id', 'divRollingCode');
+                let html = `<div class="instructions" data-shadeid="${shadeId}">`;
                 html += '<div style="width:100%;color:red;text-align:center;font-weight:bold;"><span style="background:yellow;padding:10px;display:inline-block;border-radius:5px;background:white;">BEWARE ... WARNING ... DANGER<span></div>';
                 html += '<hr style="width:100%;margin:0px;"></hr>';
                 html += '<p style="font-size:14px;">If this shade is already paired with a motor then changing the rolling code WILL cause it to stop working.  Rolling codes are tied to the remote address and the Somfy motor expects these to be sequential.</p>';
@@ -2769,7 +2770,7 @@ class Somfy {
                 html += '</div>'
                 html += `<div class="button-container">`
                 html += `<button id="btnChangeRollingCode" type="button" style="padding-left:20px;padding-right:20px;display:inline-block;background:orangered;" onclick="somfy.setRollingCode(${shadeId}, parseInt(document.getElementById('fldNewRollingCode').value, 10));">Set Rolling Code</button>`
-                html += `<button id="btnCancel" type="button" style="padding-left:20px;padding-right:20px;display:inline-block;background:lawngreen;color:gray" onclick="document.getElementById('frmSetRollingCode').remove();">Cancel</button>`
+                html += `<button id="btnCancel" type="button" style="padding-left:20px;padding-right:20px;display:inline-block;background:lawngreen;color:gray" onclick="document.getElementById('divRollingCode').remove();">Cancel</button>`
                 html += `</div>`;
                 div.innerHTML = html;
                 document.getElementById('somfyShade').appendChild(div);
@@ -2909,7 +2910,7 @@ class Somfy {
 
         html += '<div class="wizard-step" data-stepid="3">';
         html += '<p style="font-size:14px;">Now that you have chosen a shade to pair.  Open the memory for the shade by pressing the OPEN MEMORY button.  The shade should jog to indicate the memory has been opened.</p>';
-        html += '<p style="font-size:14px;">The motor should jog only once.  If it jogs more than once then you have again closed the memory on the motor. Once the motor has jogged press the NEXT button to proceed.</p>';
+        html += '<p style="font-size:14px;">The motor should jog only once.  If it jogs more than once then you have again closed the memory on the motor. Once the command is sent to the motor you will be asked if the motor successfully jogged.</p><p style="font-size:14px;">If it did then press YES if not press no and click the OPEN MEMORY button again.</p>';
         html += '<hr></hr>';
         html += '<div id="divWizShadeName" style="text-align:center;font-size:22px;"></div>';
         html += '<div class="button-container"><button type="button" id="btnOpenMemory">Open Memory</button></div>';
@@ -2944,7 +2945,7 @@ class Somfy {
                         ui.wizSetNextStep(document.getElementById('divLinkGroup'));
                         prompt.remove();
                     });
-                    prompt.querySelector('.sub-message').innerHTML = `<hr></hr><p>Did the shade jog? If the shade jogged press the YES button if not then press the NO button and try again.</p><p>Once the shade has jogged the shade will be removed from the group and this process will be finished.</p>`;
+                    prompt.querySelector('.sub-message').innerHTML = `<hr></hr><p>Did the shade jog? If the shade jogged press the YES button if not then press the NO button and try again.</p><p>Once the shade has jogged the motor memory will be ready to add the shade to the group.</p>`;
                 }
             });
         });