From 72f9af1175fb9c78aeedee881f81f022cf449a89 Mon Sep 17 00:00:00 2001 From: Johannes Braun Date: Sat, 12 Mar 2022 19:49:58 +0100 Subject: [PATCH] fix bug on light page #2 --- HMI/n2t-out/pageStartup.txt | 2 +- HMI/n2t-out/popupLight.txt | 12 +++++++----- HMI/nspanel.HMI | Bin 11134137 -> 11134137 bytes HMI/nspanel.tft | Bin 8122732 -> 8122732 bytes .../nspanel-lovelance-ui.py | 6 +++++- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 4fadae18..93f16602 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -165,7 +165,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 3 + Text : 4 Max. Text Size : 10 Picture p0 diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index b95dbaf7..90f3b7d1 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -68,7 +68,7 @@ Variable (int32) mode Attributes ID : 23 Scope: local - Value: 0 + Value: 1 Variable (int32) mode_bright Attributes @@ -384,9 +384,10 @@ Button bColor Events Touch Press Event - if(mode.val==0) + if(mode.val==1) { - mode.val=1 + mode.val=0 + //enable color wheel vis pColorWheel,1 vis t0,1 //disable brightness @@ -399,7 +400,8 @@ Button bColor vis hTempSlider,0 }else { - mode.val=0 + mode.val=1 + //disable color wheel vis pColorWheel,0 vis t0,0 if(mode_bright.val==1) @@ -529,7 +531,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,",",1 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 - if(mode.val==0) + if(mode.val==1) { // get Brightness value spstr strCommand.txt,tTmp.txt,",",2 diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index 4f0cd070af4e3ae31e2376be0821f4b0f8c712c7..134c6a7d9039fec5bed63518e7d52b81f7101a86 100644 GIT binary patch delta 1371 zcmd_oOKenC90u@nhM5*KMzC}54A_r4SX5AHJ4h7^r6N@7a}XWSR;>d}c{uG9ihu$I zWcZ2-SgG||UszvlT#%G%Z&+YJS1KBD)rBrd1QO!HD8_{`@f(VoxOV4Fe#tri@BYup zJ@*{_d?0jGY-Y%oTHD$)#m0i>tEB0fV+XD2Ic;O(Y`_fvZu^2e%&dy`wE5?0s&~u} zNn@-e{*~4Bj%7xf`7~+1IgvD9AIpUn^>zlz&p77WX=8onld*bU^^uLn{Cb&d!X?TI z+Z@{(I@vcI__E{Tp2NQtrEGcOrNV+ni~ZG9h`$(2neO>&{46<~8^0$ITz$5(X}1k` z*|3#>jFX^*q{z47;vX;kU%xv)F@I&gBp><6sp}2?vZbZQZ?1RNCB6Q@PS^Ws$W8nD zfghJfswe1Z*S1V=&8^B*Y)WTqYZKn_Ln*hkDykqJudK|prB`G#@s+u3ZbN+YnoK6^ zEr__^1rjl@d&qG^f0v^E#3RnhV*k{D6D}cKB1*)FNyKF0Dx#DCF@-22t|sEdRN@+< zoR~&jOI$}>PfRCf5H}Dv5;qYui3*~Us3H=?EaGNjHc?I7LflHsA#NjTh`Gc(qL!FX z)DgE63y3?2g~TGFp16}(Of(R85qA^!5cd-I5%&{GVhQm8v6Og_cxVJEXHw|GiNoth z{K>OZbv98|RJeu4oN6_u_~Pv~X0*+iD=v-C=8U=g()j0gWA=Id?UA|O==a+kf3!OF zVS`P0r#m$9I#bc9|M|g}1+4YbF}KFwA9XuIepzkgy!Dm`w;%KyCMM*$x5rVNlw~jy=;&U*(guRCfO`o zfUN)l)gPla+QZd-J2pxc`D^8tUv2!yCOhnu# zB055akdEF|t)^n~?1uqGgci^nwf8%_7Riu*jbXbGL(>;HYOOs+F`B?eA^Pjx>YOxP zKg#oJbsiR-hlCTHp@9}Is?Njp(@(43BkX^BkJ;1gWu9&Jey$|8sv+N$7lEq3x6gMs z+pkDpgH8X^YlRw|Y)p-mQEF$eSG81!N4(#=s6$_T4E`2RcOUq|4~}&J<{%Jr5rlaN z#(e0o03is)LM*~!EI}B;u@uX&91)0w9tK2V1)>pyl~{#Xti~F|As%ayfJCgrdThW( zY(f%}u^A~y#TIPEHf+ZZq+us^VK>sTNA+|!YQnYJoZ{CtYCyCxQ5q(+latt9B7`f` z<%q6QA!bhHePu$-n92uDLNwSqP2O>~v5%FCIu>K>O_6$A^D{+JZPi9!-Q-uOjaf>t zlPyzI)uN`%%247hS>r}zAQOAB4_U}Y4))^!a*>C86yP8VQG`P{j3X$XS;rPQds4qAI}YVTTY|Hh5PFKIl%c>@v>SCZa%1ecyb z^sb3V;C#s!{r=TOwf9KGpd%JN2I7b(fkcd$NFtdO%%qY=IvHe=MK(F)Vj&M1EBO>q zND;-9P)Zr)R8UD3)zo047CUv+q>7tt+dg-H|0Tc!qVi-3b zMi^y`aVD5#ifLw;WsZ3kSY(N1R#;_?bvE#_$rjt}u*)9%9B{}H$DDAAk2B7>;F2r+ z1m1&oS#qjxufh^?%fYZ)7GA652*0?5&uDPi95&sf`mBf|wObJZwMG#c>ffj^g})SG b)=N?-;t|?w?Tz*}9P!*eJjMEdK0f~e+*5*& delta 336 zcmWN=M@|A^0D#eq6bp*I;aIR2M8Jv-ETe+hd&k}t3;dRii!UJ_z|0La(ZrR>T*MQ& zCNbdx%1d7C=T{d?d_p1#9eNBHNhXC<(lC)u24*tJBAXm?$s?Zv3Mrx(3nj>uQbsuy zSgE9nYHFyZj(QqsqzN0%*lEFm6Bn(t(M|`Qbm69(9(w7c9}ivz7-WcH6h;_j3?F{R z2{6GVQ%p0%EOX4Wz#>a5v%)HCth2!;TLjr=hh6sA=YT_wIOc>?&N%0SOF~?6%?-DN zzan;7YE?f!geB^eBbrYZ!BWYgy}QMQ$>^{-ZMtXmO%YbrqlmEDq=-EAFCfyjZ$)Go bUhXAxH0~FPcZv6j4_e&+7