diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 0568ba07..c0a6a2ae 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-12-20 19:29:52.155490204 +0000 ++++ /dev/fd/62 2022-12-20 21:05:02.743512847 +0000 +le list + +12,8 @@ +t.txt diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index c4950217..30a62c8b 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -42,6 +42,10 @@ pageStartup 19 Component(s) 181 Line(s) of event code 129 Unique line(s) of event code +popupTimer + 42 Component(s) + 512 Line(s) of event code + 255 Unique line(s) of event code pageTest 21 Component(s) 66 Line(s) of event code @@ -62,10 +66,6 @@ cardQR 32 Component(s) 425 Line(s) of event code 244 Unique line(s) of event code -popupTimer - 42 Component(s) - 508 Line(s) of event code - 247 Unique line(s) of event code cardThermo 55 Component(s) 555 Line(s) of event code @@ -82,5 +82,5 @@ cardEntities Total 19 Page(s) 678 Component(s) - 8421 Line(s) of event code - 2126 Unique line(s) of event code + 8425 Line(s) of event code + 2130 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupTimer.txt b/HMI/n2t-out-visual/popupTimer.txt index dface03e..ab5fac6e 100644 --- a/HMI/n2t-out-visual/popupTimer.txt +++ b/HMI/n2t-out-visual/popupTimer.txt @@ -42,6 +42,9 @@ Page popupTimer vis bZ4M,0 vis t0,0 vis fToggleEdit,0 + vis b0,0 + vis b1,0 + vis b2,0 //page open event // event,pageOpenDetail,typeOfPage,tEntityName // craft command @@ -713,9 +716,9 @@ Button bZ1M if(n2.pco==63488) { n2.val=n2.val-1 - if(n1.val<0) + if(n2.val<0) { - n1.val=0 + n2.val=0 } } @@ -756,17 +759,17 @@ Button bZ1P if(n1.pco==63488) { n1.val=n1.val+1 - if(n1.val>60) + if(n1.val>59) { - n1.val=60 + n1.val=59 } } if(n2.pco==63488) { n2.val=n2.val+1 - if(n1.val>60) + if(n2.val>59) { - n1.val=60 + n2.val=59 } } @@ -815,9 +818,9 @@ Button bZ2M if(n2.pco==63488) { n2.val=n2.val-5 - if(n1.val<0) + if(n2.val<0) { - n1.val=0 + n2.val=0 } } @@ -858,17 +861,17 @@ Button bZ2P if(n1.pco==63488) { n1.val=n1.val+5 - if(n1.val>60) + if(n1.val>59) { - n1.val=60 + n1.val=59 } } if(n2.pco==63488) { n2.val=n2.val+5 - if(n1.val>60) + if(n2.val>59) { - n1.val=60 + n2.val=59 } } @@ -917,9 +920,9 @@ Button bZ3M if(n2.pco==63488) { n2.val=n2.val-10 - if(n1.val<0) + if(n2.val<0) { - n1.val=0 + n2.val=0 } } @@ -960,17 +963,17 @@ Button bZ3P if(n1.pco==63488) { n1.val=n1.val+10 - if(n1.val>60) + if(n1.val>59) { - n1.val=60 + n1.val=59 } } if(n2.pco==63488) { n2.val=n2.val+10 - if(n1.val>60) + if(n2.val>59) { - n1.val=60 + n2.val=59 } } @@ -1019,9 +1022,9 @@ Button bZ4M if(n2.pco==63488) { n2.val=n2.val-15 - if(n1.val<0) + if(n2.val<0) { - n1.val=0 + n2.val=0 } } @@ -1062,17 +1065,17 @@ Button bZ4P if(n1.pco==63488) { n1.val=n1.val+15 - if(n1.val>60) + if(n1.val>59) { - n1.val=60 + n1.val=59 } } if(n2.pco==63488) { n2.val=n2.val+15 - if(n1.val>60) + if(n2.val>59) { - n1.val=60 + n2.val=59 } } @@ -1084,9 +1087,9 @@ Button fToggleEdit Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 398 + x coordinate : 386 y coordinate : 108 - Width : 80 + Width : 64 Height : 37 Effect : load Effect Priority : 0 @@ -1274,6 +1277,7 @@ Timer tmSerial spstr strCommand.txt,b2.txt,"~",12 //label b3 spstr strCommand.txt,b3.txt,"~",13 + sleepValue=0 } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out/popupTimer.txt b/HMI/n2t-out/popupTimer.txt index ee5a418b..a1efd2ce 100644 --- a/HMI/n2t-out/popupTimer.txt +++ b/HMI/n2t-out/popupTimer.txt @@ -34,6 +34,9 @@ Page popupTimer vis bZ4M,0 vis t0,0 vis fToggleEdit,0 + vis b0,0 + vis b1,0 + vis b2,0 //page open event // event,pageOpenDetail,typeOfPage,tEntityName // craft command @@ -426,9 +429,9 @@ Button bZ1M if(n2.pco==63488) { n2.val=n2.val-1 - if(n1.val<0) + if(n2.val<0) { - n1.val=0 + n2.val=0 } } @@ -447,17 +450,17 @@ Button bZ1P if(n1.pco==63488) { n1.val=n1.val+1 - if(n1.val>60) + if(n1.val>59) { - n1.val=60 + n1.val=59 } } if(n2.pco==63488) { n2.val=n2.val+1 - if(n1.val>60) + if(n2.val>59) { - n1.val=60 + n2.val=59 } } @@ -484,9 +487,9 @@ Button bZ2M if(n2.pco==63488) { n2.val=n2.val-5 - if(n1.val<0) + if(n2.val<0) { - n1.val=0 + n2.val=0 } } @@ -505,17 +508,17 @@ Button bZ2P if(n1.pco==63488) { n1.val=n1.val+5 - if(n1.val>60) + if(n1.val>59) { - n1.val=60 + n1.val=59 } } if(n2.pco==63488) { n2.val=n2.val+5 - if(n1.val>60) + if(n2.val>59) { - n1.val=60 + n2.val=59 } } @@ -542,9 +545,9 @@ Button bZ3M if(n2.pco==63488) { n2.val=n2.val-10 - if(n1.val<0) + if(n2.val<0) { - n1.val=0 + n2.val=0 } } @@ -563,17 +566,17 @@ Button bZ3P if(n1.pco==63488) { n1.val=n1.val+10 - if(n1.val>60) + if(n1.val>59) { - n1.val=60 + n1.val=59 } } if(n2.pco==63488) { n2.val=n2.val+10 - if(n1.val>60) + if(n2.val>59) { - n1.val=60 + n2.val=59 } } @@ -600,9 +603,9 @@ Button bZ4M if(n2.pco==63488) { n2.val=n2.val-15 - if(n1.val<0) + if(n2.val<0) { - n1.val=0 + n2.val=0 } } @@ -621,17 +624,17 @@ Button bZ4P if(n1.pco==63488) { n1.val=n1.val+15 - if(n1.val>60) + if(n1.val>59) { - n1.val=60 + n1.val=59 } } if(n2.pco==63488) { n2.val=n2.val+15 - if(n1.val>60) + if(n2.val>59) { - n1.val=60 + n2.val=59 } } @@ -810,6 +813,7 @@ Timer tmSerial spstr strCommand.txt,b2.txt,"~",12 //label b3 spstr strCommand.txt,b3.txt,"~",13 + sleepValue=0 } if(tInstruction.txt=="time") {