h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-20 14:37:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes #933 (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2023-08-20 13:07:23 +00:00
committed by github-actions[bot]
parent e580333560
commit 652dd0b157
20 changed files with 238 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
HMI/US/landscape/diff-eu-version.txt
View File

@@ -54,28 +54,6 @@
│ spstr strCommand.txt,tTmp.txt,"~",1 │ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0 │ covx tTmp.txt,sleepTimeout,0,0
│ } │ }
│ --- HMI/n2t-out/popupNotify.txt
├── +++ HMI/US/landscape/n2t-out/popupNotify.txt
│ @@ -295,19 +295,14 @@
│ covx tTmp.txt,sys0,0,0
│ tText.pco=sys0
│ //preserve old sleepTimeout
│ vaOldSleepT.val=sleepTimeout
│ // sleep timeout
│ spstr strCommand.txt,tTmp.txt,"~",10
│ covx tTmp.txt,sys0,0,0
│ - if(sys0==0)
│ - {
│ - //0 is buggy, a years is permanent enough
│ - sys0=31536000
│ - }
│ sleepTimeout=sys0
│ //font size
│ spstr strCommand.txt,tTmp.txt,"~",11
│ covx tTmp.txt,sys0,0,0
│ tTextAlt.font=sys0
│ tText.font=sys0
│ //icon
│ --- HMI/n2t-out/screensaver.txt │ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/landscape/n2t-out/screensaver.txt ├── +++ HMI/US/landscape/n2t-out/screensaver.txt
│ @@ -28,17 +28,14 @@ │ @@ -28,17 +28,14 @@

10
HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
View File

@@ -10,10 +10,6 @@ pageIcons
7 Component(s) 7 Component(s)
0 Line(s) of event code 0 Line(s) of event code
0 Unique line(s) of event code 0 Unique line(s) of event code
popupNotify
19 Component(s)
267 Line(s) of event code
172 Unique line(s) of event code
popupTimer popupTimer
42 Component(s) 42 Component(s)
516 Line(s) of event code 516 Line(s) of event code
@@ -30,6 +26,10 @@ popupInSel
34 Component(s) 34 Component(s)
621 Line(s) of event code 621 Line(s) of event code
297 Unique line(s) of event code 297 Unique line(s) of event code
popupNotify
19 Component(s)
267 Line(s) of event code
172 Unique line(s) of event code
pageTest pageTest
26 Component(s) 26 Component(s)
68 Line(s) of event code 68 Line(s) of event code
@@ -99,4 +99,4 @@ Total
23 Page(s) 23 Page(s)
875 Component(s) 875 Component(s)
10379 Line(s) of event code 10379 Line(s) of event code
2406 Unique line(s) of event code 2407 Unique line(s) of event code

2
HMI/US/landscape/n2t-out-visual/popupNotify.txt
View File

@@ -581,7 +581,7 @@ Timer tmSerial
covx tTmp.txt,defaultFontColor,0,0 covx tTmp.txt,defaultFontColor,0,0
} }
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout2")
{ {
//set timeout to global var //set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1

2
HMI/US/landscape/n2t-out/popupNotify.txt
View File

@@ -352,7 +352,7 @@ Timer tmSerial
covx tTmp.txt,defaultFontColor,0,0 covx tTmp.txt,defaultFontColor,0,0
} }
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout2")
{ {
//set timeout to global var //set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1

266
HMI/US/portrait/diff-eu-version.txt
View File

@@ -1136,94 +1136,14 @@
│ Send Component ID : disabled │ Send Component ID : disabled
│ Associated Keyboard: none │ Associated Keyboard: none
│ Text : │ Text :
│ @@ -555,34 +578,34 @@ │ @@ -631,14 +654,58 @@
│ State : unpressed
│ Text : 
│ Max. Text Size : 10
│
│ Events
│ Touch Press Event
│ tmLP.en=1
│ - tTmp.txt=type7.txt
│ - pageIcons.tTmp1.txt=tEntity7.txt
│ - pageIcons.tTmp2.txt=entn7.txt
│ - pageIcons.tTmp3.txt=bEntity7.txt
│ - if(type7.txt=="shutter")
│ + tTmp.txt=type2.txt
│ + pageIcons.tTmp1.txt=tEntity2.txt
│ + pageIcons.tTmp2.txt=entn2.txt
│ + pageIcons.tTmp3.txt=bEntity2.txt
│ + if(type2.txt=="shutter")
│ {
│ page popupShutter
│ }
│ - if(type7.txt=="input_sel")
│ + if(type2.txt=="input_sel")
│ {
│ page popupInSel
│ }
│ - if(type7.txt=="timer")
│ + if(type2.txt=="timer")
│ {
│ page popupTimer
│ }
│
│ Touch Release Event
│ tmLP.en=0
│ - tSend.txt="event,buttonPress2,"+entn7.txt+",button"
│ + tSend.txt="event,buttonPress2,"+entn2.txt+",button"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ crcputh 55 bb
│ crcputs sys0,2
│ crcputs tSend.txt,0 │ crcputs tSend.txt,0
│ //send cmd │ //send cmd
│ @@ -599,34 +622,78 @@ │ printh 55 bb
│ State : unpressed │ prints sys0,2
│ Text :  │ prints tSend.txt,0
│ Max. Text Size : 10 │ prints crcval,2
│ │
│ Events
│ Touch Press Event
│ tmLP.en=1
│ - tTmp.txt=type8.txt
│ - pageIcons.tTmp1.txt=tEntity8.txt
│ - pageIcons.tTmp2.txt=entn8.txt
│ - pageIcons.tTmp3.txt=bEntity8.txt
│ - if(type8.txt=="shutter")
│ + tTmp.txt=type6.txt
│ + pageIcons.tTmp1.txt=tEntity6.txt
│ + pageIcons.tTmp2.txt=entn6.txt
│ + pageIcons.tTmp3.txt=bEntity6.txt
│ + if(type6.txt=="shutter")
│ + {
│ + page popupShutter
│ + }
│ + if(type6.txt=="input_sel")
│ + {
│ + page popupInSel
│ + }
│ + if(type6.txt=="timer")
│ + {
│ + page popupTimer
│ + }
│ +
│ + Touch Release Event
│ + tmLP.en=0
│ + tSend.txt="event,buttonPress2,"+entn6.txt+",button"
│ + //send calc crc
│ + btlen tSend.txt,sys0
│ + crcrest 1,0xffff // reset CRC
│ + crcputh 55 bb
│ + crcputs sys0,2
│ + crcputs tSend.txt,0
│ + //send cmd
│ + printh 55 bb
│ + prints sys0,2
│ + prints tSend.txt,0
│ + prints crcval,2
│ +
│ +Button bEntity9 │ +Button bEntity9
│ + Attributes │ + Attributes
│ + Scope : local │ + Scope : local
@@ -1236,36 +1156,45 @@
│ + Events │ + Events
│ + Touch Press Event │ + Touch Press Event
│ + tmLP.en=1 │ + tmLP.en=1
│ + tTmp.txt=type6.txt │ + tTmp.txt=type9.txt
│ + pageIcons.tTmp1.txt=tEntity6.txt │ + pageIcons.tTmp1.txt=tEntity9.txt
│ + pageIcons.tTmp2.txt=entn6.txt │ + pageIcons.tTmp2.txt=entn9.txt
│ + pageIcons.tTmp3.txt=bEntity6.txt │ + pageIcons.tTmp3.txt=bEntity9.txt
│ + if(type6.txt=="shutter") │ + if(type9.txt=="shutter")
│ { │ + {
│ page popupShutter │ + page popupShutter
│ } │ + }
│ - if(type8.txt=="input_sel") │ + if(type9.txt=="input_sel")
│ + if(type6.txt=="input_sel") │ + {
│ { │ + page popupInSel
│ page popupInSel │ + }
│ } │ + if(type9.txt=="timer")
│ - if(type8.txt=="timer") │ + {
│ + if(type6.txt=="timer") │ + page popupTimer
│ { │ + }
│ page popupTimer │ +
│ } │ + Touch Release Event
│ │ + tmLP.en=0
│ Touch Release Event │ + tSend.txt="event,buttonPress2,"+entn9.txt+",button"
│ tmLP.en=0 │ + //send calc crc
│ - tSend.txt="event,buttonPress2,"+entn8.txt+",button" │ + btlen tSend.txt,sys0
│ + tSend.txt="event,buttonPress2,"+entn6.txt+",button" │ + crcrest 1,0xffff // reset CRC
│ //send calc crc │ + crcputh 55 bb
│ btlen tSend.txt,sys0 │ + crcputs sys0,2
│ crcrest 1,0xffff // reset CRC │ + crcputs tSend.txt,0
│ crcputh 55 bb │ + //send cmd
│ crcputs sys0,2 │ + printh 55 bb
│ crcputs tSend.txt,0 │ + prints sys0,2
│ //send cmd │ + prints tSend.txt,0
│ + prints crcval,2
│ +
│ Button bNext
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID: disabled
│ State : unpressed
│ Text : 
│ @@ -1005,14 +1072,35 @@ │ @@ -1005,14 +1072,35 @@
│ spstr strCommand.txt,tTmp.txt,"~",59 │ spstr strCommand.txt,tTmp.txt,"~",59
│ covx tTmp.txt,sys0,0,0 │ covx tTmp.txt,sys0,0,0
@@ -1629,25 +1558,23 @@
│ Scope : local │ Scope : local
│ Period (ms): 50 │ Period (ms): 50
│ Enabled : yes │ Enabled : yes
│ @@ -960,18 +936,14 @@ │ @@ -962,15 +938,15 @@
│ {
│ page cardPower
│ } │ }
│ if(tId.txt=="cardChart") │ if(tId.txt=="cardChart")
│ { │ {
│ page cardChart │ page cardChart
│ } │ }
│ - if(tId.txt=="cardLChart") │ if(tId.txt=="cardLChart")
│ - { │ {
│ - page cardLChart │ - page cardLChart
│ - } │ + page cardChart
│ }
│ } │ }
│ if(tInstruction.txt=="time") │ if(tInstruction.txt=="time")
│ { │ {
│ // get set time to global variable │ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 │ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ } │ }
│ if(tInstruction.txt=="date")
│ --- HMI/n2t-out/pageStartup.txt │ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/portrait/n2t-out/pageStartup.txt ├── +++ HMI/US/portrait/n2t-out/pageStartup.txt
│ @@ -34,20 +34,14 @@ │ @@ -34,20 +34,14 @@
@@ -1705,27 +1632,23 @@
│ crcputs sys0,2 │ crcputs sys0,2
│ crcputs tSend.txt,0 │ crcputs tSend.txt,0
│ //send cmd │ //send cmd
│ @@ -275,20 +269,14 @@ │ @@ -282,15 +276,15 @@
│ } │ // get feature flag popup
│ // get font color │ spstr strCommand.txt,tTmp.txt,"~",5
│ spstr strCommand.txt,tTmp.txt,"~",4
│ if(tTmp.txt!="") │ if(tTmp.txt!="")
│ { │ {
│ covx tTmp.txt,defaultFontColor,0,0 │ covx tTmp.txt,featNewSliders,0,0
│ } │ }
│ - // get feature flag popup
│ - spstr strCommand.txt,tTmp.txt,"~",5
│ - if(tTmp.txt!="")
│ - {
│ - covx tTmp.txt,featNewSliders,0,0
│ - }
│ } │ }
│ if(tInstruction.txt=="timeout") │ - if(tInstruction.txt=="timeout")
│ + if(tInstruction.txt=="timeout2")
│ { │ {
│ //set timeout to global var │ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1 │ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0 │ covx tTmp.txt,sleepTimeout,0,0
│ } │ }
│ if(tInstruction.txt=="pageType")
│ {
│ --- HMI/n2t-out/popupLight.txt │ --- HMI/n2t-out/popupLight.txt
├── +++ HMI/US/portrait/n2t-out/popupLight.txt ├── +++ HMI/US/portrait/n2t-out/popupLight.txt
│ @@ -48,33 +48,33 @@ │ @@ -48,33 +48,33 @@
@@ -1766,45 +1689,25 @@
│ Variable (string) entn │ Variable (string) entn
│ Attributes │ Attributes
│ Scope : local │ Scope : local
│ @@ -631,15 +631,15 @@
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ if(tId.txt=="cardGrid2")
│ {
│ - page cardGrid2
│ + page cardGrid
│ }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ --- HMI/n2t-out/popupNotify.txt │ --- HMI/n2t-out/popupNotify.txt
├── +++ HMI/US/portrait/n2t-out/popupNotify.txt ├── +++ HMI/US/portrait/n2t-out/popupNotify.txt
│ @@ -295,19 +295,14 @@ │ @@ -348,15 +348,15 @@
│ covx tTmp.txt,sys0,0,0 │ // get font color
│ tText.pco=sys0 │ spstr strCommand.txt,tTmp.txt,"~",4
│ //preserve old sleepTimeout │ if(tTmp.txt!="")
│ vaOldSleepT.val=sleepTimeout │ {
│ // sleep timeout │ covx tTmp.txt,defaultFontColor,0,0
│ spstr strCommand.txt,tTmp.txt,"~",10 │ }
│ covx tTmp.txt,sys0,0,0 │ }
│ - if(sys0==0) │ - if(tInstruction.txt=="timeout2")
│ - { │ + if(tInstruction.txt=="timeout")
│ - //0 is buggy, a years is permanent enough │ {
│ - sys0=31536000 │ //set timeout to global var
│ - } │ spstr strCommand.txt,tTmp.txt,"~",1
│ sleepTimeout=sys0 │ covx tTmp.txt,sleepTimeout,0,0
│ //font size │ }
│ spstr strCommand.txt,tTmp.txt,"~",11 │ if(tInstruction.txt=="exitPopup")
│ covx tTmp.txt,sys0,0,0 │ {
│ tTextAlt.font=sys0
│ tText.font=sys0
│ //icon
│ --- HMI/n2t-out/screensaver.txt │ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/portrait/n2t-out/screensaver.txt ├── +++ HMI/US/portrait/n2t-out/screensaver.txt
│ @@ -28,17 +28,14 @@ │ @@ -28,17 +28,14 @@
@@ -1952,22 +1855,3 @@
│ if(tAMPM.txt=="") │ if(tAMPM.txt=="")
│ { │ {
│ vis tAMPM,0 │ vis tAMPM,0
│ @@ -824,18 +800,14 @@
│ {
│ page cardPower
│ }
│ if(tId.txt=="cardChart")
│ {
│ page cardChart
│ }
│ - if(tId.txt=="cardLChart")
│ - {
│ - page cardLChart
│ - }
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ }

218
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-08-20 12:42:27.830750069 +0000 +++ /dev/fd/62 2023-08-20 13:07:13.304519211 +0000
+I/n2t-out/Program.s.txt +I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt
+1 +12,11 @@ +1 +12,11 @@
@@ -59,13 +59,13 @@
+ributes +ributes
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 80
+ Max. Text Size: 38 + Max. Text Size: 38
+ +
+e (string) nent2 +e (string) nent2
+ributes +ributes
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 80
+ Max. Text Size: 38 + Max. Text Size: 38
+14 +185,26 @@ +14 +185,26 @@
+e (string) type6 +e (string) type6
@@ -600,13 +600,6 @@
+ covx tTmp.txt,sys0,0,0 + covx tTmp.txt,sys0,0,0
+ hSlider6.maxval=sys0 + hSlider6.maxval=sys0
+ } + }
+ }
+ if(tInstruction.txt=="pageType")
+ {
+ sleepValue=0
+ //command format pageType,specialPageName
+ //write name of speical page to tId
+ spstr strCommand.txt,tId.txt,"~",1
+I/n2t-out/cardGrid2.txt +I/n2t-out/cardGrid2.txt
++ HMI/US/portrait/n2t-out/cardGrid2.txt ++ HMI/US/portrait/n2t-out/cardGrid2.txt
+6 +25,28 @@ +6 +25,28 @@
@@ -705,87 +698,7 @@
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard: none + Associated Keyboard: none
+ Text : + Text :
+34 +578,34 @@ +14 +654,58 @@
+ State : unpressed
+ Text : 
+ Max. Text Size : 10
+
+nts
+ Touch Press Event
+ tmLP.en=1
+ tTmp.txt=type7.txt
+ pageIcons.tTmp1.txt=tEntity7.txt
+ pageIcons.tTmp2.txt=entn7.txt
+ pageIcons.tTmp3.txt=bEntity7.txt
+ if(type7.txt=="shutter")
+ tTmp.txt=type2.txt
+ pageIcons.tTmp1.txt=tEntity2.txt
+ pageIcons.tTmp2.txt=entn2.txt
+ pageIcons.tTmp3.txt=bEntity2.txt
+ if(type2.txt=="shutter")
+ {
+ page popupShutter
+ }
+ if(type7.txt=="input_sel")
+ if(type2.txt=="input_sel")
+ {
+ page popupInSel
+ }
+ if(type7.txt=="timer")
+ if(type2.txt=="timer")
+ {
+ page popupTimer
+ }
+
+ Touch Release Event
+ tmLP.en=0
+ tSend.txt="event,buttonPress2,"+entn7.txt+",button"
+ tSend.txt="event,buttonPress2,"+entn2.txt+",button"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+34 +622,78 @@
+ State : unpressed
+ Text : 
+ Max. Text Size : 10
+
+nts
+ Touch Press Event
+ tmLP.en=1
+ tTmp.txt=type8.txt
+ pageIcons.tTmp1.txt=tEntity8.txt
+ pageIcons.tTmp2.txt=entn8.txt
+ pageIcons.tTmp3.txt=bEntity8.txt
+ if(type8.txt=="shutter")
+ tTmp.txt=type6.txt
+ pageIcons.tTmp1.txt=tEntity6.txt
+ pageIcons.tTmp2.txt=entn6.txt
+ pageIcons.tTmp3.txt=bEntity6.txt
+ if(type6.txt=="shutter")
+ {
+ page popupShutter
+ }
+ if(type6.txt=="input_sel")
+ {
+ page popupInSel
+ }
+ if(type6.txt=="timer")
+ {
+ page popupTimer
+ }
+
+ Touch Release Event
+ tmLP.en=0
+ tSend.txt="event,buttonPress2,"+entn6.txt+",button"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0 + crcputs tSend.txt,0
+ //send cmd + //send cmd
+ printh 55 bb + printh 55 bb
@@ -805,29 +718,26 @@
+nts +nts
+ Touch Press Event + Touch Press Event
+ tmLP.en=1 + tmLP.en=1
+ tTmp.txt=type6.txt + tTmp.txt=type9.txt
+ pageIcons.tTmp1.txt=tEntity6.txt + pageIcons.tTmp1.txt=tEntity9.txt
+ pageIcons.tTmp2.txt=entn6.txt + pageIcons.tTmp2.txt=entn9.txt
+ pageIcons.tTmp3.txt=bEntity6.txt + pageIcons.tTmp3.txt=bEntity9.txt
+ if(type6.txt=="shutter") + if(type9.txt=="shutter")
+ { + {
+ page popupShutter + page popupShutter
+ } + }
+ if(type8.txt=="input_sel") + if(type9.txt=="input_sel")
+ if(type6.txt=="input_sel")
+ { + {
+ page popupInSel + page popupInSel
+ } + }
+ if(type8.txt=="timer") + if(type9.txt=="timer")
+ if(type6.txt=="timer")
+ { + {
+ page popupTimer + page popupTimer
+ } + }
+ +
+ Touch Release Event + Touch Release Event
+ tmLP.en=0 + tmLP.en=0
+ tSend.txt="event,buttonPress2,"+entn8.txt+",button" + tSend.txt="event,buttonPress2,"+entn9.txt+",button"
+ tSend.txt="event,buttonPress2,"+entn6.txt+",button"
+ //send calc crc + //send calc crc
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
@@ -835,6 +745,18 @@
+ crcputs sys0,2 + crcputs sys0,2
+ crcputs tSend.txt,0 + crcputs tSend.txt,0
+ //send cmd + //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+
+bNext
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID: disabled
+ State : unpressed
+ Text : 
+,14 +1072,35 @@ +,14 +1072,35 @@
+ spstr strCommand.txt,tTmp.txt,"~",59 + spstr strCommand.txt,tTmp.txt,"~",59
+ covx tTmp.txt,sys0,0,0 + covx tTmp.txt,sys0,0,0
@@ -864,6 +786,13 @@
+ spstr strCommand.txt,tEntity9.txt,"~",66 + spstr strCommand.txt,tEntity9.txt,"~",66
+ vis tEntity9,1 + vis tEntity9,1
+ } + }
+ }
+ if(tInstruction.txt=="pageType")
+ {
+ sleepValue=0
+ //command format pageType,specialPageName
+ //write name of speical page to tId
+ spstr strCommand.txt,tId.txt,"~",1
+I/n2t-out/cardPower.txt +I/n2t-out/cardPower.txt
++ HMI/US/portrait/n2t-out/cardPower.txt ++ HMI/US/portrait/n2t-out/cardPower.txt
+6 +45,16 @@ +6 +45,16 @@
@@ -1191,9 +1120,7 @@
+ Scope : local + Scope : local
+ Period (ms): 50 + Period (ms): 50
+ Enabled : yes + Enabled : yes
+18 +936,14 @@ +15 +938,15 @@
+ {
+ page cardPower
+ } + }
+ if(tId.txt=="cardChart") + if(tId.txt=="cardChart")
+ { + {
@@ -1202,6 +1129,7 @@
+ if(tId.txt=="cardLChart") + if(tId.txt=="cardLChart")
+ { + {
+ page cardLChart + page cardLChart
+ page cardChart
+ } + }
+ } + }
+ if(tInstruction.txt=="time") + if(tInstruction.txt=="time")
@@ -1209,7 +1137,6 @@
+ // get set time to global variable + // get set time to global variable
+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ } + }
+ if(tInstruction.txt=="date")
+I/n2t-out/pageStartup.txt +I/n2t-out/pageStartup.txt
++ HMI/US/portrait/n2t-out/pageStartup.txt ++ HMI/US/portrait/n2t-out/pageStartup.txt
+0 +34,14 @@ +0 +34,14 @@
@@ -1247,14 +1174,7 @@
+ Send Component ID : disabled + Send Component ID : disabled
+15 +158,15 @@ +15 +158,15 @@
+ Max. Text Size : 10 + Max. Text Size : 10
+20 +269,14 @@ +15 +276,15 @@
+ }
+ // get font color
+ spstr strCommand.txt,tTmp.txt,"~",4
+ if(tTmp.txt!="")
+ {
+ covx tTmp.txt,defaultFontColor,0,0
+ }
+ // get feature flag popup + // get feature flag popup
+ spstr strCommand.txt,tTmp.txt,"~",5 + spstr strCommand.txt,tTmp.txt,"~",5
+ if(tTmp.txt!="") + if(tTmp.txt!="")
@@ -1263,11 +1183,14 @@
+ } + }
+ } + }
+ if(tInstruction.txt=="timeout") + if(tInstruction.txt=="timeout")
+ if(tInstruction.txt=="timeout2")
+ { + {
+ //set timeout to global var + //set timeout to global var
+ spstr strCommand.txt,tTmp.txt,"~",1 + spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,sleepTimeout,0,0 + covx tTmp.txt,sleepTimeout,0,0
+ } + }
+ if(tInstruction.txt=="pageType")
+ {
+I/n2t-out/popupLight.txt +I/n2t-out/popupLight.txt
++ HMI/US/portrait/n2t-out/popupLight.txt ++ HMI/US/portrait/n2t-out/popupLight.txt
+3 +48,33 @@ +3 +48,33 @@
@@ -1308,45 +1231,25 @@
+e (string) entn +e (string) entn
+ributes +ributes
+ Scope : local + Scope : local
+15 +631,15 @@
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
+ }
+ if(tId.txt=="cardGrid2")
+ {
+ page cardGrid2
+ page cardGrid
+ }
+ if(tId.txt=="popupLight")
+ {
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
+ }
+ if(tId.txt=="popupShutter")
+I/n2t-out/popupNotify.txt +I/n2t-out/popupNotify.txt
++ HMI/US/portrait/n2t-out/popupNotify.txt ++ HMI/US/portrait/n2t-out/popupNotify.txt
+19 +295,14 @@ +15 +348,15 @@
+ covx tTmp.txt,sys0,0,0 + // get font color
+ tText.pco=sys0 + spstr strCommand.txt,tTmp.txt,"~",4
+ //preserve old sleepTimeout + if(tTmp.txt!="")
+ vaOldSleepT.val=sleepTimeout
+ // sleep timeout
+ spstr strCommand.txt,tTmp.txt,"~",10
+ covx tTmp.txt,sys0,0,0
+ if(sys0==0)
+ { + {
+ //0 is buggy, a years is permanent enough + covx tTmp.txt,defaultFontColor,0,0
+ sys0=31536000
+ } + }
+ sleepTimeout=sys0 + }
+ //font size + if(tInstruction.txt=="timeout2")
+ spstr strCommand.txt,tTmp.txt,"~",11 + if(tInstruction.txt=="timeout")
+ covx tTmp.txt,sys0,0,0 + {
+ tTextAlt.font=sys0 + //set timeout to global var
+ tText.font=sys0 + spstr strCommand.txt,tTmp.txt,"~",1
+ //icon + covx tTmp.txt,sleepTimeout,0,0
+ }
+ if(tInstruction.txt=="exitPopup")
+ {
+I/n2t-out/screensaver.txt +I/n2t-out/screensaver.txt
++ HMI/US/portrait/n2t-out/screensaver.txt ++ HMI/US/portrait/n2t-out/screensaver.txt
+7 +28,14 @@ +7 +28,14 @@
@@ -1494,22 +1397,3 @@
+ if(tAMPM.txt=="") + if(tAMPM.txt=="")
+ { + {
+ vis tAMPM,0 + vis tAMPM,0
+18 +800,14 @@
+ {
+ page cardPower
+ }
+ if(tId.txt=="cardChart")
+ {
+ page cardChart
+ }
+ if(tId.txt=="cardLChart")
+ {
+ page cardLChart
+ }
+ }
+ if(tInstruction.txt=="timeout")
+ {
+ //set timeout to global var
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,sleepTimeout,0,0
+ }

48
HMI/US/portrait/n2t-out-visual/cardGrid2.txt
View File

@@ -1036,26 +1036,26 @@ Button bEntity7
Events Events
Touch Press Event Touch Press Event
tmLP.en=1 tmLP.en=1
tTmp.txt=type2.txt tTmp.txt=type7.txt
pageIcons.tTmp1.txt=tEntity2.txt pageIcons.tTmp1.txt=tEntity7.txt
pageIcons.tTmp2.txt=entn2.txt pageIcons.tTmp2.txt=entn7.txt
pageIcons.tTmp3.txt=bEntity2.txt pageIcons.tTmp3.txt=bEntity7.txt
if(type2.txt=="shutter") if(type7.txt=="shutter")
{ {
page popupShutter page popupShutter
} }
if(type2.txt=="input_sel") if(type7.txt=="input_sel")
{ {
page popupInSel page popupInSel
} }
if(type2.txt=="timer") if(type7.txt=="timer")
{ {
page popupTimer page popupTimer
} }
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0
tSend.txt="event,buttonPress2,"+entn2.txt+",button" tSend.txt="event,buttonPress2,"+entn7.txt+",button"
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
@@ -1102,26 +1102,26 @@ Button bEntity8
Events Events
Touch Press Event Touch Press Event
tmLP.en=1 tmLP.en=1
tTmp.txt=type6.txt tTmp.txt=type8.txt
pageIcons.tTmp1.txt=tEntity6.txt pageIcons.tTmp1.txt=tEntity8.txt
pageIcons.tTmp2.txt=entn6.txt pageIcons.tTmp2.txt=entn8.txt
pageIcons.tTmp3.txt=bEntity6.txt pageIcons.tTmp3.txt=bEntity8.txt
if(type6.txt=="shutter") if(type8.txt=="shutter")
{ {
page popupShutter page popupShutter
} }
if(type6.txt=="input_sel") if(type8.txt=="input_sel")
{ {
page popupInSel page popupInSel
} }
if(type6.txt=="timer") if(type8.txt=="timer")
{ {
page popupTimer page popupTimer
} }
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0
tSend.txt="event,buttonPress2,"+entn6.txt+",button" tSend.txt="event,buttonPress2,"+entn8.txt+",button"
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
@@ -1168,26 +1168,26 @@ Button bEntity9
Events Events
Touch Press Event Touch Press Event
tmLP.en=1 tmLP.en=1
tTmp.txt=type6.txt tTmp.txt=type9.txt
pageIcons.tTmp1.txt=tEntity6.txt pageIcons.tTmp1.txt=tEntity9.txt
pageIcons.tTmp2.txt=entn6.txt pageIcons.tTmp2.txt=entn9.txt
pageIcons.tTmp3.txt=bEntity6.txt pageIcons.tTmp3.txt=bEntity9.txt
if(type6.txt=="shutter") if(type9.txt=="shutter")
{ {
page popupShutter page popupShutter
} }
if(type6.txt=="input_sel") if(type9.txt=="input_sel")
{ {
page popupInSel page popupInSel
} }
if(type6.txt=="timer") if(type9.txt=="timer")
{ {
page popupTimer page popupTimer
} }
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0
tSend.txt="event,buttonPress2,"+entn6.txt+",button" tSend.txt="event,buttonPress2,"+entn9.txt+",button"
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

4
HMI/US/portrait/n2t-out-visual/cardPower.txt
View File

@@ -1514,6 +1514,10 @@ Timer tmSerial
{ {
page cardChart page cardChart
} }
if(tId.txt=="cardLChart")
{
page cardChart
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

38
HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
View File

@@ -22,10 +22,10 @@ popupTimer
42 Component(s) 42 Component(s)
516 Line(s) of event code 516 Line(s) of event code
257 Unique line(s) of event code 257 Unique line(s) of event code
pageStartup popupLight
19 Component(s) 28 Component(s)
193 Line(s) of event code 412 Line(s) of event code
135 Unique line(s) of event code 227 Unique line(s) of event code
popupFan popupFan
27 Component(s) 27 Component(s)
355 Line(s) of event code 355 Line(s) of event code
@@ -46,10 +46,10 @@ cardLChart
33 Component(s) 33 Component(s)
402 Line(s) of event code 402 Line(s) of event code
266 Unique line(s) of event code 266 Unique line(s) of event code
popupLight pageStartup
28 Component(s) 19 Component(s)
412 Line(s) of event code 198 Line(s) of event code
226 Unique line(s) of event code 137 Unique line(s) of event code
popupShutter popupShutter
25 Component(s) 25 Component(s)
402 Line(s) of event code 402 Line(s) of event code
@@ -69,19 +69,11 @@ popupInSel
cardGrid2 cardGrid2
56 Component(s) 56 Component(s)
663 Line(s) of event code 663 Line(s) of event code
335 Unique line(s) of event code 359 Unique line(s) of event code
cardAlarm cardAlarm
43 Component(s) 43 Component(s)
500 Line(s) of event code 500 Line(s) of event code
273 Unique line(s) of event code 273 Unique line(s) of event code
cardPower
54 Component(s)
521 Line(s) of event code
341 Unique line(s) of event code
screensaver2
58 Component(s)
348 Line(s) of event code
245 Unique line(s) of event code
cardThermo cardThermo
57 Component(s) 57 Component(s)
540 Line(s) of event code 540 Line(s) of event code
@@ -90,6 +82,14 @@ screensaver
46 Component(s) 46 Component(s)
429 Line(s) of event code 429 Line(s) of event code
306 Unique line(s) of event code 306 Unique line(s) of event code
cardPower
54 Component(s)
525 Line(s) of event code
342 Unique line(s) of event code
screensaver2
58 Component(s)
352 Line(s) of event code
247 Unique line(s) of event code
cardEntities cardEntities
91 Component(s) 91 Component(s)
1666 Line(s) of event code 1666 Line(s) of event code
@@ -98,5 +98,5 @@ cardEntities
Total Total
23 Page(s) 23 Page(s)
890 Component(s) 890 Component(s)
10823 Line(s) of event code 10836 Line(s) of event code
2527 Unique line(s) of event code 2553 Unique line(s) of event code

8
HMI/US/portrait/n2t-out-visual/pageStartup.txt
View File

@@ -568,8 +568,14 @@ Timer tmSerial
{ {
covx tTmp.txt,defaultFontColor,0,0 covx tTmp.txt,defaultFontColor,0,0
} }
// get feature flag popup
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt!="")
{
covx tTmp.txt,featNewSliders,0,0
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout2")
{ {
//set timeout to global var //set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1

2
HMI/US/portrait/n2t-out-visual/popupLight.txt
View File

@@ -984,7 +984,7 @@ Timer tmSerial
} }
if(tId.txt=="cardGrid2") if(tId.txt=="cardGrid2")
{ {
page cardGrid page cardGrid2
} }
if(tId.txt=="popupLight") if(tId.txt=="popupLight")
{ {

4
HMI/US/portrait/n2t-out-visual/screensaver2.txt
View File

@@ -1617,6 +1617,10 @@ Timer tmSerial
{ {
page cardChart page cardChart
} }
if(tId.txt=="cardLChart")
{
page cardLChart
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

48
HMI/US/portrait/n2t-out/cardGrid2.txt
View File

@@ -582,26 +582,26 @@ Button bEntity7
Events Events
Touch Press Event Touch Press Event
tmLP.en=1 tmLP.en=1
tTmp.txt=type2.txt tTmp.txt=type7.txt
pageIcons.tTmp1.txt=tEntity2.txt pageIcons.tTmp1.txt=tEntity7.txt
pageIcons.tTmp2.txt=entn2.txt pageIcons.tTmp2.txt=entn7.txt
pageIcons.tTmp3.txt=bEntity2.txt pageIcons.tTmp3.txt=bEntity7.txt
if(type2.txt=="shutter") if(type7.txt=="shutter")
{ {
page popupShutter page popupShutter
} }
if(type2.txt=="input_sel") if(type7.txt=="input_sel")
{ {
page popupInSel page popupInSel
} }
if(type2.txt=="timer") if(type7.txt=="timer")
{ {
page popupTimer page popupTimer
} }
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0
tSend.txt="event,buttonPress2,"+entn2.txt+",button" tSend.txt="event,buttonPress2,"+entn7.txt+",button"
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
@@ -626,26 +626,26 @@ Button bEntity8
Events Events
Touch Press Event Touch Press Event
tmLP.en=1 tmLP.en=1
tTmp.txt=type6.txt tTmp.txt=type8.txt
pageIcons.tTmp1.txt=tEntity6.txt pageIcons.tTmp1.txt=tEntity8.txt
pageIcons.tTmp2.txt=entn6.txt pageIcons.tTmp2.txt=entn8.txt
pageIcons.tTmp3.txt=bEntity6.txt pageIcons.tTmp3.txt=bEntity8.txt
if(type6.txt=="shutter") if(type8.txt=="shutter")
{ {
page popupShutter page popupShutter
} }
if(type6.txt=="input_sel") if(type8.txt=="input_sel")
{ {
page popupInSel page popupInSel
} }
if(type6.txt=="timer") if(type8.txt=="timer")
{ {
page popupTimer page popupTimer
} }
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0
tSend.txt="event,buttonPress2,"+entn6.txt+",button" tSend.txt="event,buttonPress2,"+entn8.txt+",button"
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
@@ -670,26 +670,26 @@ Button bEntity9
Events Events
Touch Press Event Touch Press Event
tmLP.en=1 tmLP.en=1
tTmp.txt=type6.txt tTmp.txt=type9.txt
pageIcons.tTmp1.txt=tEntity6.txt pageIcons.tTmp1.txt=tEntity9.txt
pageIcons.tTmp2.txt=entn6.txt pageIcons.tTmp2.txt=entn9.txt
pageIcons.tTmp3.txt=bEntity6.txt pageIcons.tTmp3.txt=bEntity9.txt
if(type6.txt=="shutter") if(type9.txt=="shutter")
{ {
page popupShutter page popupShutter
} }
if(type6.txt=="input_sel") if(type9.txt=="input_sel")
{ {
page popupInSel page popupInSel
} }
if(type6.txt=="timer") if(type9.txt=="timer")
{ {
page popupTimer page popupTimer
} }
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0
tSend.txt="event,buttonPress2,"+entn6.txt+",button" tSend.txt="event,buttonPress2,"+entn9.txt+",button"
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

4
HMI/US/portrait/n2t-out/cardPower.txt
View File

@@ -940,6 +940,10 @@ Timer tmSerial
{ {
page cardChart page cardChart
} }
if(tId.txt=="cardLChart")
{
page cardChart
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

8
HMI/US/portrait/n2t-out/pageStartup.txt
View File

@@ -273,8 +273,14 @@ Timer tmSerial
{ {
covx tTmp.txt,defaultFontColor,0,0 covx tTmp.txt,defaultFontColor,0,0
} }
// get feature flag popup
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt!="")
{
covx tTmp.txt,featNewSliders,0,0
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout2")
{ {
//set timeout to global var //set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1

2
HMI/US/portrait/n2t-out/popupLight.txt
View File

@@ -635,7 +635,7 @@ Timer tmSerial
} }
if(tId.txt=="cardGrid2") if(tId.txt=="cardGrid2")
{ {
page cardGrid page cardGrid2
} }
if(tId.txt=="popupLight") if(tId.txt=="popupLight")
{ {

4
HMI/US/portrait/n2t-out/screensaver2.txt
View File

@@ -804,6 +804,10 @@ Timer tmSerial
{ {
page cardChart page cardChart
} }
if(tId.txt=="cardLChart")
{
page cardLChart
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

8
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -28,8 +28,8 @@ popupLightNew
209 Unique line(s) of event code 209 Unique line(s) of event code
popupNotify popupNotify
19 Component(s) 19 Component(s)
271 Line(s) of event code 267 Line(s) of event code
174 Unique line(s) of event code 172 Unique line(s) of event code
cardGrid cardGrid
44 Component(s) 44 Component(s)
529 Line(s) of event code 529 Line(s) of event code
@@ -98,5 +98,5 @@ cardEntities
Total Total
23 Page(s) 23 Page(s)
878 Component(s) 878 Component(s)
10408 Line(s) of event code 10404 Line(s) of event code
2418 Unique line(s) of event code 2417 Unique line(s) of event code

7
HMI/n2t-out-visual/popupNotify.txt
View File

@@ -528,11 +528,6 @@ Timer tmSerial
// sleep timeout // sleep timeout
spstr strCommand.txt,tTmp.txt,"~",10 spstr strCommand.txt,tTmp.txt,"~",10
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
if(sys0==0)
{
//0 is buggy, a years is permanent enough
sys0=31536000
}
sleepTimeout=sys0 sleepTimeout=sys0
//font size //font size
spstr strCommand.txt,tTmp.txt,"~",11 spstr strCommand.txt,tTmp.txt,"~",11
@@ -586,7 +581,7 @@ Timer tmSerial
covx tTmp.txt,defaultFontColor,0,0 covx tTmp.txt,defaultFontColor,0,0
} }
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout2")
{ {
//set timeout to global var //set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1

7
HMI/n2t-out/popupNotify.txt
View File

@@ -299,11 +299,6 @@ Timer tmSerial
// sleep timeout // sleep timeout
spstr strCommand.txt,tTmp.txt,"~",10 spstr strCommand.txt,tTmp.txt,"~",10
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
if(sys0==0)
{
//0 is buggy, a years is permanent enough
sys0=31536000
}
sleepTimeout=sys0 sleepTimeout=sys0
//font size //font size
spstr strCommand.txt,tTmp.txt,"~",11 spstr strCommand.txt,tTmp.txt,"~",11
@@ -357,7 +352,7 @@ Timer tmSerial
covx tTmp.txt,defaultFontColor,0,0 covx tTmp.txt,defaultFontColor,0,0
} }
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout2")
{ {
//set timeout to global var //set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1