diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 3c21fd22..fefae546 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1302,7 +1302,46 @@ │ tSend.txt="event,buttonPress2,"+entn.txt+","+"OnOff," │ covx btOnOff1.val,tTmp.txt,0,0 │ tSend.txt+=tTmp.txt -│ @@ -401,63 +473,48 @@ +│ @@ -345,38 +417,14 @@ +│ Period (ms): 100 +│ Enabled : no +│ +│ Events +│ Timer Event +│ tmCooldown.en=0 +│ +│ -Timer tmDrawCooldown +│ - Attributes +│ - Scope : local +│ - Period (ms): 500 +│ - Enabled : no +│ - +│ - Events +│ - Timer Event +│ - //draw black background +│ - fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484 +│ - //draw draw colored bar at the position of the current brightness value +│ - fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val +│ - if(hBrightness.val>7) +│ - { +│ - //draw cursor +│ - fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE +│ - //paint corner +│ - xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a" +│ - } +│ - //paint corners +│ - xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a" +│ - xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" +│ - tmDrawCooldown.en=0 +│ - +│ Timer tmSerial +│ Attributes +│ Scope : local +│ Period (ms): 50 +│ Enabled : yes +│ +│ Events +│ @@ -425,48 +473,48 @@ │ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) │ spstr strCommand.txt,tInstruction.txt,"~",0 │ spstr strCommand.txt,tTmp.txt,"~",1 @@ -1339,25 +1378,13 @@ │ + vis t2,1 │ vis hBrightness,1 │ covx tTmp.txt,sys0,0,0 -│ - if(tmCooldown.en==0&&hBrightness.val!=sys0) +│ - hBrightness.val=sys0 +│ - tmDrawCooldown.en=1 +│ - tmDrawCooldown.tim=500 │ + if(tmCooldown.en==0) -│ { -│ hBrightness.val=sys0 -│ - //draw black background -│ - fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484 -│ - //draw draw colored bar at the position of the current brightness value -│ - fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val -│ - if(hBrightness.val>7) -│ - { -│ - //draw cursor -│ - fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE -│ - //paint corner -│ - xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a" -│ - } -│ - //paint corners -│ - xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a" -│ - xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" -│ } +│ + { +│ + hBrightness.val=sys0 +│ + } │ } │ // get ColorTemp value │ spstr strCommand.txt,tTmp.txt,"~",6 @@ -1375,7 +1402,7 @@ │ // switch mode │ click bColor,1 │ click bColor,0 -│ @@ -472,16 +529,16 @@ +│ @@ -481,16 +529,16 @@ │ click bColor,1 │ click bColor,0 │ } @@ -1394,7 +1421,7 @@ │ } │ // mode == 0 is rgb controls currently shown │ if(mode.val==0) -│ @@ -492,36 +549,36 @@ +│ @@ -501,36 +549,36 @@ │ } │ } │ // get Color value diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 451cad84..7b72722c 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -2677,7 +2677,46 @@ │ tSend.txt="event,buttonPress2,"+entn.txt+","+"OnOff," │ covx btOnOff1.val,tTmp.txt,0,0 │ tSend.txt+=tTmp.txt -│ @@ -401,63 +473,48 @@ +│ @@ -345,38 +417,14 @@ +│ Period (ms): 100 +│ Enabled : no +│ +│ Events +│ Timer Event +│ tmCooldown.en=0 +│ +│ -Timer tmDrawCooldown +│ - Attributes +│ - Scope : local +│ - Period (ms): 500 +│ - Enabled : no +│ - +│ - Events +│ - Timer Event +│ - //draw black background +│ - fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484 +│ - //draw draw colored bar at the position of the current brightness value +│ - fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val +│ - if(hBrightness.val>7) +│ - { +│ - //draw cursor +│ - fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE +│ - //paint corner +│ - xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a" +│ - } +│ - //paint corners +│ - xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a" +│ - xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" +│ - tmDrawCooldown.en=0 +│ - +│ Timer tmSerial +│ Attributes +│ Scope : local +│ Period (ms): 50 +│ Enabled : yes +│ +│ Events +│ @@ -425,48 +473,48 @@ │ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) │ spstr strCommand.txt,tInstruction.txt,"~",0 │ spstr strCommand.txt,tTmp.txt,"~",1 @@ -2714,25 +2753,13 @@ │ + vis t2,1 │ vis hBrightness,1 │ covx tTmp.txt,sys0,0,0 -│ - if(tmCooldown.en==0&&hBrightness.val!=sys0) +│ - hBrightness.val=sys0 +│ - tmDrawCooldown.en=1 +│ - tmDrawCooldown.tim=500 │ + if(tmCooldown.en==0) -│ { -│ hBrightness.val=sys0 -│ - //draw black background -│ - fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484 -│ - //draw draw colored bar at the position of the current brightness value -│ - fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val -│ - if(hBrightness.val>7) -│ - { -│ - //draw cursor -│ - fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE -│ - //paint corner -│ - xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a" -│ - } -│ - //paint corners -│ - xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a" -│ - xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" -│ } +│ + { +│ + hBrightness.val=sys0 +│ + } │ } │ // get ColorTemp value │ spstr strCommand.txt,tTmp.txt,"~",6 @@ -2750,7 +2777,7 @@ │ // switch mode │ click bColor,1 │ click bColor,0 -│ @@ -472,16 +529,16 @@ +│ @@ -481,16 +529,16 @@ │ click bColor,1 │ click bColor,0 │ } @@ -2769,7 +2796,7 @@ │ } │ // mode == 0 is rgb controls currently shown │ if(mode.val==0) -│ @@ -492,36 +549,36 @@ +│ @@ -501,36 +549,36 @@ │ } │ } │ // get Color value diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 063af9f8..3091b496 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-04-18 22:17:40.643093312 +0000 ++++ /dev/fd/62 2023-04-19 16:16:22.100652931 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +1 +10,10 @@ @@ -57,13 +57,13 @@ +ributes + Scope : local + Text : -+ Max. Text Size: 80 + Max. Text Size: 40 + +e (string) nent2 +ributes + Scope : local + Text : ++ Max. Text Size: 80 + Max. Text Size: 40 +14 +186,26 @@ +e (string) type6 @@ -1483,9 +1483,6 @@ + Associated Keyboard: none + Text : newtxt + Max. Text Size : 100 -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : newtxt @@ -1541,6 +1538,9 @@ + State : unpressed + Text : startup + Max. Text Size : 10 ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : startup @@ -2067,7 +2067,46 @@ + tSend.txt="event,buttonPress2,"+entn.txt+","+"OnOff," + covx btOnOff1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt -+63 +473,48 @@ ++38 +417,14 @@ ++ Period (ms): 100 ++ Enabled : no ++ ++nts ++ Timer Event ++ tmCooldown.en=0 ++ ++mDrawCooldown ++ributes ++ Scope : local ++ Period (ms): 500 ++ Enabled : no ++ ++nts ++ Timer Event ++ //draw black background ++ fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484 ++ //draw draw colored bar at the position of the current brightness value ++ fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val ++ if(hBrightness.val>7) ++ { ++ //draw cursor ++ fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE ++ //paint corner ++ xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a" ++ } ++ //paint corners ++ xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a" ++ xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" ++ tmDrawCooldown.en=0 ++ ++mSerial ++ributes ++ Scope : local ++ Period (ms): 50 ++ Enabled : yes ++ ++nts ++48 +473,48 @@ + // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) + spstr strCommand.txt,tInstruction.txt,"~",0 + spstr strCommand.txt,tTmp.txt,"~",1 @@ -2104,24 +2143,12 @@ + vis t2,1 + vis hBrightness,1 + covx tTmp.txt,sys0,0,0 -+ if(tmCooldown.en==0&&hBrightness.val!=sys0) ++ hBrightness.val=sys0 ++ tmDrawCooldown.en=1 ++ tmDrawCooldown.tim=500 + if(tmCooldown.en==0) + { + hBrightness.val=sys0 -+ //draw black background -+ fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484 -+ //draw draw colored bar at the position of the current brightness value -+ fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val -+ if(hBrightness.val>7) -+ { -+ //draw cursor -+ fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE -+ //paint corner -+ xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a" -+ } -+ //paint corners -+ xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a" -+ xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" + } + } + // get ColorTemp value diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 9c7fb7b7..28f54c57 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -10,10 +10,6 @@ pageTest 27 Component(s) 68 Line(s) of event code 66 Unique line(s) of event code -popupLight - 22 Component(s) - 406 Line(s) of event code - 214 Unique line(s) of event code popupNotify 19 Component(s) 263 Line(s) of event code @@ -34,6 +30,10 @@ screensaver2 59 Component(s) 354 Line(s) of event code 251 Unique line(s) of event code +popupLight + 23 Component(s) + 406 Line(s) of event code + 207 Unique line(s) of event code cardChart 33 Component(s) 433 Line(s) of event code @@ -89,6 +89,6 @@ cardEntities Total 21 Page(s) - 799 Component(s) + 800 Component(s) 9262 Line(s) of event code - 2348 Unique line(s) of event code + 2343 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index 474796ee..264f1357 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -511,6 +511,31 @@ Timer tmCooldown Timer Event tmCooldown.en=0 +Timer tmDrawCooldown + Attributes + ID : 22 + Scope : local + Period (ms): 500 + Enabled : no + + Events + Timer Event + //draw black background + fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484 + //draw draw colored bar at the position of the current brightness value + fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val + if(hBrightness.val>7) + { + //draw cursor + fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE + //paint corner + xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a" + } + //paint corners + xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a" + xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" + tmDrawCooldown.en=0 + Timer tmSerial Attributes ID : 8 @@ -591,24 +616,9 @@ Timer tmSerial //vis t2,1 vis hBrightness,1 covx tTmp.txt,sys0,0,0 - if(tmCooldown.en==0&&hBrightness.val!=sys0) - { - hBrightness.val=sys0 - //draw black background - fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484 - //draw draw colored bar at the position of the current brightness value - fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val - if(hBrightness.val>7) - { - //draw cursor - fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE - //paint corner - xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a" - } - //paint corners - xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a" - xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" - } + hBrightness.val=sys0 + tmDrawCooldown.en=1 + tmDrawCooldown.tim=500 } // get ColorTemp value spstr strCommand.txt,tTmp.txt,"~",6 diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 520fd095..59e30822 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -349,6 +349,30 @@ Timer tmCooldown Timer Event tmCooldown.en=0 +Timer tmDrawCooldown + Attributes + Scope : local + Period (ms): 500 + Enabled : no + + Events + Timer Event + //draw black background + fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484 + //draw draw colored bar at the position of the current brightness value + fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val + if(hBrightness.val>7) + { + //draw cursor + fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE + //paint corner + xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a" + } + //paint corners + xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a" + xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" + tmDrawCooldown.en=0 + Timer tmSerial Attributes Scope : local @@ -428,24 +452,9 @@ Timer tmSerial //vis t2,1 vis hBrightness,1 covx tTmp.txt,sys0,0,0 - if(tmCooldown.en==0&&hBrightness.val!=sys0) - { - hBrightness.val=sys0 - //draw black background - fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484 - //draw draw colored bar at the position of the current brightness value - fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val - if(hBrightness.val>7) - { - //draw cursor - fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE - //paint corner - xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a" - } - //paint corners - xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a" - xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" - } + hBrightness.val=sys0 + tmDrawCooldown.en=1 + tmDrawCooldown.tim=500 } // get ColorTemp value spstr strCommand.txt,tTmp.txt,"~",6