diff --git a/HMI/n2t-out/nspanel_Stats.txt b/HMI/n2t-out/nspanel_Stats.txt index a71dc1e9..7d962b9f 100644 --- a/HMI/n2t-out/nspanel_Stats.txt +++ b/HMI/n2t-out/nspanel_Stats.txt @@ -14,10 +14,14 @@ cardMedia 22 Component(s) 210 Line(s) of event code 116 Unique line(s) of event code -popupNotify - 16 Component(s) - 167 Line(s) of event code +pageStartup + 19 Component(s) + 146 Line(s) of event code 111 Unique line(s) of event code +popupNotify + 17 Component(s) + 172 Line(s) of event code + 114 Unique line(s) of event code pageSwipeTest 18 Component(s) 62 Line(s) of event code @@ -30,10 +34,6 @@ pageTest 14 Component(s) 14 Line(s) of event code 14 Unique line(s) of event code -pageStartup - 19 Component(s) - 146 Line(s) of event code - 111 Unique line(s) of event code screensaver 25 Component(s) 173 Line(s) of event code @@ -61,6 +61,6 @@ popupLight Total 14 Page(s) - 342 Component(s) - 3170 Line(s) of event code - 787 Unique line(s) of event code + 343 Component(s) + 3175 Line(s) of event code + 790 Unique line(s) of event code diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 4adf97a2..4893217f 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 8 + Text : 9 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index 4547a757..f7dd7612 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -40,6 +40,12 @@ Variable (string) entn Text : Max. Text Size: 30 +Variable (int32) vaOldSleepT + Attributes + ID : 16 + Scope: local + Value: 0 + Text tSend Attributes ID : 3 @@ -271,6 +277,7 @@ Button b0 Events Touch Press Event + sleepTimeout=vaOldSleepT.val //page open event // event,pageOpen,cardEntities,pageNumber // craft command @@ -323,6 +330,7 @@ Button b2 Events Touch Press Event + sleepTimeout=vaOldSleepT.val //craft command tSend.txt="event,buttonPress,D,D,"+entn.txt+",1,notifyAction,yes" //send calc crc @@ -371,6 +379,7 @@ Button b1 Events Touch Press Event + sleepTimeout=vaOldSleepT.val //craft command tSend.txt="event,buttonPress,D,D,"+entn.txt+",1,notifyAction,no" //send calc crc @@ -493,6 +502,8 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"|",9 covx tTmp.txt,sys0,0,0 tText.pco=sys0 + //preserve old sleepTimeout + vaOldSleepT.val=sleepTimeout // sleep timeout spstr strCommand.txt,tTmp.txt,"|",9 covx tTmp.txt,sys0,0,0 @@ -523,6 +534,7 @@ Timer tmSerial } if(tInstruction.txt=="pageType") { + sleepTimeout=vaOldSleepT.val //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,",",1