From 661e51671a2180295a51c3850f6be28e4e14706d Mon Sep 17 00:00:00 2001
From: Edward Firmo <edward@costafirmo.com>
Date: Mon, 3 Jul 2023 01:45:36 +0200
Subject: [PATCH] Fixed Fan page rounding

---
 nspanel_eu.HMI                   | Bin 21307134 -> 21307134 bytes
 nspanel_eu_code/boot.txt         |  40 +++++++++++++++++++++
 nspanel_eu_code/cover.txt        |  22 +++++++-----
 nspanel_eu_code/entitypage01.txt |  19 ++++++----
 nspanel_eu_code/light.txt        |  58 +++++++++++++++++--------------
 nspanel_eu_code/notification.txt |  18 ++++++++--
 nspanel_eu_code/weather01.txt    |  19 ++++++----
 nspanel_eu_code/weather02.txt    |  19 ++++++----
 nspanel_eu_code/weather03.txt    |  19 ++++++----
 nspanel_eu_code/weather04.txt    |  19 ++++++----
 10 files changed, 167 insertions(+), 66 deletions(-)

diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI
index 80ed27a03abba0b79c973188dc81a4fda2a1c9a3..931d30a6543bc9b45959dcf2b63d533152b4787f 100644
GIT binary patch
delta 2132
zcmd_pYfw~W7{Kv!mSwpqp{ZCvVTl>(vRD`kE(>ag32ACpM&gzb7&l!+s3?l3$fV5B
zw$LoQSy`qnwUrrAY4<X_*u{vl`^D^PSM2}D&csYkU;5HaXXf`m`=00QnSFP5d$z2I
z?19;Tles_4EN?NxW35J{Vff?2^CIF5PicicH-EAbJbH#LFshiEk%qr<fX9+;&tlP8
zX&8GOY$dI0ExOiYdWF|8Irp8V1ZOjtwI=k={NaPr!)B)0t2_tZ7EIKdS|eHS?(^gW
zYc8ejsx?A6AMD8)%<?0GPcDe-NU&}mvVCJqqH}0tv$Lt$X~KdKSP=?apxGH#z3qSh
z1vGZMo4Va5EC_)Wp|AzI-C>Cx|B)N`Fy>shq>EEBBvZzTOR~f**^(pUWr9qUlVp;d
zEV(jSPLU~+C;4)!OqFSJnoO4&GE+{MS#pM)DQC%SIa><k9GN49GFLouuAC?Hq)3Y8
zd?}GqnJ*VenUqU~R7#aBkcDmD;SSrtiuh^vEZ@F-?~V~$^_R#INHL6+!Pj|dhEZti
zy}mxvFs4|1ss6<oK1XwdH86UrclD?_V-pz{dn&wTrSpmw+G{*zuD@30o?0%XjEUtQ
zZ=Kiiw^4Fhzur-*OXo?cjwsfp#UojzX1UUQ1vTEdQ2qDS2UZn&>r7wA{OZKOhI(&K
zbRf`HJInNychwJWYOnO78jDba#ew$9+C00hWOtDy2e;T6+?K!37IXV-aos_;IQ!pj
zF+8~YBv;?<IsS2b?r7^I-WFKCXvt2qDW<Cyb+`~0;bPR|5?qP~T!zch2*DM&5>2=Y
zOK>%oq8ZoVS}enLSdQz_f)!Ya8{or@xCyOTh1IwjYj6v0#ai5k+i?f(#9dg2yKxWh
z#d_R_`>_EJU?Vo+LHN;zhwv~0cm$8)F>J=;*n%g}jt+F<Nj!z8u@&3!44%bvcpfj{
zMZAQU@d~!%RqViPcpY!xP3**5cpLBFUF^bp=)(Kx#s~NiyYUe|#wYj`pW$<SfiLkD
zzQ!JWgT43`-{E`wfFJP__Tgvzf?x3)e#al^!TzN&UFI@qESeCFRTHYQX~Hz&ng~s#
zCQ8#!(_a&<IYbkq8K4=cIaD)9Ggvc36RR1jIZSi7CQcKtNzfdjIZ~6T8KyZ(bF^l-
zCP_0wbBt!B=2%U#<~YqL&1j8XlcI5GQZ-{V$7@c|q-n-#PSm7poSF<xre>VRrODE`
UHQAaR&3MfOvpuG3qPZvgPjo{XTL1t6

delta 2428
zcmdVZi(gZ97{~G7VX)zd96CU5hJ=-Q0S%Q2I7IW3Vi=mYyv(%Hyg+P;LqgzD9Aad1
zo-U?zvC^_M%;O~jvotCarOZnrrCFMJDV0pZz7IPv`wwcb*ZZ?)=lssj<+U|etkyS!
zq~9vt)JeiA`38GSbum(TxbLWTVe>4r=l2?(Izp(g<}R5cLyr%27t0F+EMCzy5kg3p
zcKh`0m0@XJ#P63=vqV!82J9=3Hpc71Mclua_^rzpi-)<7F5ePX72zFqKIghKEg?kX
zxRK<HG^G`mn2JhF5_o|Iyuk;wN{LBl-S@w|=)wkbQG;0mFVKKD_<&YvFzX_#{v!);
zG17E1#gmB!Py!`V5)C9XCDR~Ep}{nS?x&$NjE2()dVogKC`zT#^dP0t7<!1(X)KMS
zhiN=bpouhzCetG{g{IOpnobs)L66c*nnjP%<Mag0raAN^&82xXpB7LCWztjIvZ7=C
zwR_J-^3N+Czal?*MU1t39$`%NLGU_=_jX?H`It_KT#b7k?<d4!b*{TzhyZoXX@d|3
zb-vO;h-!7N2oz$!I#VYhH0rTMVM6#y?(ZxO7eXrud8lhys(h)xRjZW6T8&0!SE^Mn
z$?I2I1C^;qb2mzIahmn8yrFSnA7#$*+&$iM%w%V0?by;pTT_x8urB*h7pHplOJjs^
zsdH#wA*N~FXIi90^v*ijqo_J33#?#+r(vN|os*ps<v(eRQ^)@sek?(9naSQgk1uni
z`UUBD6n6C%YVc2Oy`5Tr&+Qz!<*}T_V~JDOM;JZF%E5TN>g|`|vFO!#QwYx6I)@6O
zXhdGirCU0;d}x_FMS11}U4_`Go?v-5&vtW9&wMS`GjERb%rkM5I6=!REYUL`G7GUo
z-CjHx!!D(^pW{S`?0+@iDDP~_A0*dKaLiRQ#yBdxWJ7&+ynG=&E6}x|AXupy>qytQ
zx2;*373ej?D(~6tbjiu%96@qrN<oku+i2?{mrb+>DQl<LXQ{`ZJ7a5En|aFaUaR!9
z*el&TU6Tre<@~F~F1c)Zu~t4X*I~fk)>BLEWlM3kkxz6`zv$LAVYBV(<w=INHTelS
zx2_p|(bl>qpl!{n2@dxf1?Q@9Uxd`5ZFi>D=8|ihZ9z(CW82Xk+ji$qUE<!o{RZ|H
z;qkyCutN?khFo|C@?Z(%Lje>5!BSWTMX($kPz)=e1XjYcPzuk%DtI28uo_&j24r{v
zUWAw6WmpTZz&cnDW$-Gz2Cu^#umRqLx8QBq2%F#?co#Oqd+<JNfvxZXl*2ao5VnH?
zJ76d5g5B^DRKUkj301HMK7qaPDSQU|U_X2g)$j#;312}Cd<_Sn77oH8sDp3dTR05g
z!4WtL$KW`84=11=PC^6x06)ShI1N9+8Tc7~fwOQ9eueY!8(e^ka0xEM@9+m)fva#0
z8sSg44u8Q7XoA0?8E&pH)Jvtn@#1JW-W(r}mZRhNa@uk996!!&9DmO3oc0_8CxFv|
z(~)E31ag8n!JJN<5Kbs3j1$g@;B@BP!HMK_;Y4xn<V172a_-{X&AErujdL%jJEsSy
zC#M%Dh7-%_&FRCrj}yn~%jw7I&xz-lI0HBdoJ39%XCTMSN#+dVq;LjHm4^Bu(uL%I
E066JxLI3~&

diff --git a/nspanel_eu_code/boot.txt b/nspanel_eu_code/boot.txt
index a05580a..a9d3274 100644
--- a/nspanel_eu_code/boot.txt
+++ b/nspanel_eu_code/boot.txt
@@ -20,6 +20,26 @@ Page boot
             printh 00
             printh FF FF FF
         
+Variable (int32) counter
+    Attributes
+        ID   : 12
+        Scope: local
+        Value: 0
+    
+Variable (string) aux
+    Attributes
+        ID            : 13
+        Scope         : local
+        Text          : 
+        Max. Text Size: 10
+    
+Variable (string) nspanelevent
+    Attributes
+        ID            : 14
+        Scope         : local
+        Text          : 
+        Max. Text Size: 100
+    
 Text ip_addr
     Attributes
         ID                 : 1
@@ -120,3 +140,23 @@ Dual-state Button a01
         Text             : Reboot
         Max. Text Size   : 6
     
+Timer timer
+    Attributes
+        ID         : 11
+        Scope      : local
+        Period (ms): 65534
+        Enabled    : yes
+    
+    Events
+        Timer Event
+            counter.val++
+            covx counter.val,aux.txt,0,0
+            nspanelevent.txt="{\"page\": \"boot\", \"component\": \"timeout\", \"value\": "+aux.txt+"}"
+            bluep_version.txt="Retry: "+aux.txt
+            printh 92
+            prints "nspanelevent",0
+            printh 00
+            prints nspanelevent.txt,0
+            printh 00
+            printh FF FF FF
+        
diff --git a/nspanel_eu_code/cover.txt b/nspanel_eu_code/cover.txt
index 10246df..5e930e7 100644
--- a/nspanel_eu_code/cover.txt
+++ b/nspanel_eu_code/cover.txt
@@ -13,14 +13,20 @@ Page cover
     Events
         Preinitialize Event
             dim=home.brightness.val
-            coversetting.txt="{\"page\": \"cover\", \"component\": \"currentpage\", \"value\": \"pagechange\", \"entity\": \""+home.entity.txt+"\"}"
-            printh 92
-            prints "nspanelevent",0
-            printh 00
-            prints coversetting.txt,0
-            printh 00
-            printh FF FF FF
-            page_label.txt=home.entity.txt
+            if(home.api.val==0)
+            {
+                page home
+            }else
+            {
+                coversetting.txt="{\"page\": \"cover\", \"component\": \"currentpage\", \"value\": \"pagechange\", \"entity\": \""+home.entity.txt+"\"}"
+                printh 92
+                prints "nspanelevent",0
+                printh 00
+                prints coversetting.txt,0
+                printh 00
+                printh FF FF FF
+                page_label.txt=home.entity.txt
+            }
         
         Touch Press Event
             coversetting.txt="{\"page\": \"cover\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+home.entity.txt+"\"}"
diff --git a/nspanel_eu_code/entitypage01.txt b/nspanel_eu_code/entitypage01.txt
index 0dae56e..864e3f1 100644
--- a/nspanel_eu_code/entitypage01.txt
+++ b/nspanel_eu_code/entitypage01.txt
@@ -12,12 +12,19 @@ Page entitypage01
     
     Events
         Preinitialize Event
-            printh 92
-            prints "nspanelevent",0
-            printh 00
-            prints "{\"page\": \"entitypage01\", \"component\": \"currentpage\", \"value\": \"pagechange\"}",0
-            printh 00
-            printh FF FF FF
+            dim=home.brightness.val
+            if(home.api.val==0)
+            {
+                page home
+            }else
+            {
+                printh 92
+                prints "nspanelevent",0
+                printh 00
+                prints "{\"page\": \"entitypage01\", \"component\": \"currentpage\", \"value\": \"pagechange\"}",0
+                printh 00
+                printh FF FF FF
+            }
         
         Touch Press Event
             printh 92
diff --git a/nspanel_eu_code/light.txt b/nspanel_eu_code/light.txt
index 300a31c..b2c8af9 100644
--- a/nspanel_eu_code/light.txt
+++ b/nspanel_eu_code/light.txt
@@ -13,32 +13,38 @@ Page light
     Events
         Preinitialize Event
             dim=home.brightness.val
-            lightsetting.txt="{\"page\": \"light\", \"component\": \"currentpage\", \"value\": \"pagechange\", \"entity\": \""+home.entity.txt+"\"}"
-            printh 92
-            prints "nspanelevent",0
-            printh 00
-            prints lightsetting.txt,0
-            printh 00
-            printh FF FF FF
-            vis light_b_press,1
-            vis lightslider,1
-            vis light_value,1
-            // #### OFF Button #####
-            vis temp_b_press,0
-            vis color_b_pres,0
-            // #### OFF Value #####
-            vis temp_value,0
-            vis light_value_2,0
-            // #### OFF Slider #####
-            vis tempslider,0
-            vis colorwheel,0
-            // #### Hide color & temp buttons #####
-            vis temp_touch,0
-            vis temp_value_2,0
-            vis temp_button,0
-            vis color_touch,0
-            vis color_button,0
-            page_label.txt=home.entity.txt
+            if(home.api.val==0)
+            {
+                page home
+            }else
+            {
+                lightsetting.txt="{\"page\": \"light\", \"component\": \"currentpage\", \"value\": \"pagechange\", \"entity\": \""+home.entity.txt+"\"}"
+                printh 92
+                prints "nspanelevent",0
+                printh 00
+                prints lightsetting.txt,0
+                printh 00
+                printh FF FF FF
+                vis light_b_press,1
+                vis lightslider,1
+                vis light_value,1
+                // #### OFF Button #####
+                vis temp_b_press,0
+                vis color_b_pres,0
+                // #### OFF Value #####
+                vis temp_value,0
+                vis light_value_2,0
+                // #### OFF Slider #####
+                vis tempslider,0
+                vis colorwheel,0
+                // #### Hide color & temp buttons #####
+                vis temp_touch,0
+                vis temp_value_2,0
+                vis temp_button,0
+                vis color_touch,0
+                vis color_button,0
+                page_label.txt=home.entity.txt
+            }
         
         Touch Press Event
             lightsetting.txt="{\"page\": \"light\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+home.entity.txt+"\"}"
diff --git a/nspanel_eu_code/notification.txt b/nspanel_eu_code/notification.txt
index c3bf257..17ea873 100644
--- a/nspanel_eu_code/notification.txt
+++ b/nspanel_eu_code/notification.txt
@@ -101,6 +101,20 @@ Hotspot accept
         Dragging         : 0
         Send Component ID: disabled
     
+Hotspot clear
+    Attributes
+        ID               : 7
+        Scope            : local
+        Dragging         : 0
+        Send Component ID: disabled
+    
+Hotspot accept_hotspot
+    Attributes
+        ID               : 11
+        Scope            : local
+        Dragging         : 0
+        Send Component ID: disabled
+    
     Events
         Touch Release Event
             lastclick.txt="{\"page\": \"notification\", \"component\": \"accept\", \"value\": \"release\"}"
@@ -111,9 +125,9 @@ Hotspot accept
             printh 00
             printh FF FF FF
         
-Hotspot clear
+Hotspot clear_hotspot
     Attributes
-        ID               : 7
+        ID               : 12
         Scope            : local
         Dragging         : 0
         Send Component ID: disabled
diff --git a/nspanel_eu_code/weather01.txt b/nspanel_eu_code/weather01.txt
index b3c876c..7116f43 100644
--- a/nspanel_eu_code/weather01.txt
+++ b/nspanel_eu_code/weather01.txt
@@ -12,12 +12,19 @@ Page weather01
     
     Events
         Preinitialize Event
-            printh 92
-            prints "nspanelevent",0
-            printh 00
-            prints "{\"page\": \"weather01\", \"component\": \"currentpage\", \"value\": \"pagechange\"}",0
-            printh 00
-            printh FF FF FF
+            dim=home.brightness.val
+            if(home.api.val==0)
+            {
+                page home
+            }else
+            {
+                printh 92
+                prints "nspanelevent",0
+                printh 00
+                prints "{\"page\": \"weather01\", \"component\": \"currentpage\", \"value\": \"pagechange\"}",0
+                printh 00
+                printh FF FF FF
+            }
         
         Touch Press Event
             printh 92
diff --git a/nspanel_eu_code/weather02.txt b/nspanel_eu_code/weather02.txt
index dfe10b4..5f34cca 100644
--- a/nspanel_eu_code/weather02.txt
+++ b/nspanel_eu_code/weather02.txt
@@ -12,12 +12,19 @@ Page weather02
     
     Events
         Preinitialize Event
-            printh 92
-            prints "nspanelevent",0
-            printh 00
-            prints "{\"page\": \"weather02\", \"component\": \"currentpage\", \"value\": \"pagechange\"}",0
-            printh 00
-            printh FF FF FF
+            dim=home.brightness.val
+            if(home.api.val==0)
+            {
+                page home
+            }else
+            {
+                printh 92
+                prints "nspanelevent",0
+                printh 00
+                prints "{\"page\": \"weather02\", \"component\": \"currentpage\", \"value\": \"pagechange\"}",0
+                printh 00
+                printh FF FF FF
+            }
         
         Touch Press Event
             printh 92
diff --git a/nspanel_eu_code/weather03.txt b/nspanel_eu_code/weather03.txt
index c05f616..801cf59 100644
--- a/nspanel_eu_code/weather03.txt
+++ b/nspanel_eu_code/weather03.txt
@@ -12,12 +12,19 @@ Page weather03
     
     Events
         Preinitialize Event
-            printh 92
-            prints "nspanelevent",0
-            printh 00
-            prints "{\"page\": \"weather03\", \"component\": \"currentpage\", \"value\": \"pagechange\"}",0
-            printh 00
-            printh FF FF FF
+            dim=home.brightness.val
+            if(home.api.val==0)
+            {
+                page home
+            }else
+            {
+                printh 92
+                prints "nspanelevent",0
+                printh 00
+                prints "{\"page\": \"weather03\", \"component\": \"currentpage\", \"value\": \"pagechange\"}",0
+                printh 00
+                printh FF FF FF
+            }
         
         Touch Press Event
             printh 92
diff --git a/nspanel_eu_code/weather04.txt b/nspanel_eu_code/weather04.txt
index 1def451..c097ed6 100644
--- a/nspanel_eu_code/weather04.txt
+++ b/nspanel_eu_code/weather04.txt
@@ -12,12 +12,19 @@ Page weather04
     
     Events
         Preinitialize Event
-            printh 92
-            prints "nspanelevent",0
-            printh 00
-            prints "{\"page\": \"weather04\", \"component\": \"currentpage\", \"value\": \"pagechange\"}",0
-            printh 00
-            printh FF FF FF
+            dim=home.brightness.val
+            if(home.api.val==0)
+            {
+                page home
+            }else
+            {
+                printh 92
+                prints "nspanelevent",0
+                printh 00
+                prints "{\"page\": \"weather04\", \"component\": \"currentpage\", \"value\": \"pagechange\"}",0
+                printh 00
+                printh FF FF FF
+            }
         
         Touch Press Event
             printh 92