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

untested fix for #768 (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2023-02-13 21:33:10 +00:00
committed by github-actions[bot]
parent 75fb6f8e5d
commit 209a2525ee
12 changed files with 3928 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,409 @@
--- HMI/n2t-out
+++ HMI/US/landscape/n2t-out
│ --- HMI/n2t-out/Program.s.txt
├── +++ HMI/US/landscape/n2t-out/Program.s.txt
│ @@ -11,9 +11,9 @@
│ // dim value
│ int dimValue=40
│ int dimValueNormal=100
│ //color vars
│ int defaultFontColor=65535
│ int defaultBcoColor=6371
│ // fix touch offset
│ - lcd_dev fffb 0002 0000 0020
│ + //lcd_dev fffb 0002 0000 0020
│ page pageStartup
│ --- HMI/n2t-out/cardAlarm.txt
├── +++ HMI/US/landscape/n2t-out/cardAlarm.txt
│ @@ -902,18 +902,14 @@
│ {
│ page pageStartup
│ }
│ if(tId.txt=="screensaver")
│ {
│ page screensaver
│ }
│ - if(tId.txt=="screensaver2")
│ - {
│ - page screensaver2
│ - }
│ if(tId.txt=="cardEntities")
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ --- HMI/n2t-out/cardChart.txt
├── +++ HMI/US/landscape/n2t-out/cardChart.txt
│ @@ -635,18 +635,14 @@
│ {
│ page pageStartup
│ }
│ if(tId.txt=="screensaver")
│ {
│ page screensaver
│ }
│ - if(tId.txt=="screensaver2")
│ - {
│ - page screensaver2
│ - }
│ if(tId.txt=="cardEntities")
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ --- HMI/n2t-out/cardEntities.txt
├── +++ HMI/US/landscape/n2t-out/cardEntities.txt
│ @@ -1885,18 +1885,14 @@
│ {
│ page pageStartup
│ }
│ if(tId.txt=="screensaver")
│ {
│ page screensaver
│ }
│ - if(tId.txt=="screensaver2")
│ - {
│ - page screensaver2
│ - }
│ if(tId.txt=="cardEntities")
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ --- HMI/n2t-out/cardGrid.txt
├── +++ HMI/US/landscape/n2t-out/cardGrid.txt
│ @@ -870,18 +870,14 @@
│ {
│ page pageStartup
│ }
│ if(tId.txt=="screensaver")
│ {
│ page screensaver
│ }
│ - if(tId.txt=="screensaver2")
│ - {
│ - page screensaver2
│ - }
│ if(tId.txt=="cardEntities")
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ --- HMI/n2t-out/cardLChart.txt
├── +++ HMI/US/landscape/n2t-out/cardLChart.txt
│ @@ -616,18 +616,14 @@
│ {
│ page pageStartup
│ }
│ if(tId.txt=="screensaver")
│ {
│ page screensaver
│ }
│ - if(tId.txt=="screensaver2")
│ - {
│ - page screensaver2
│ - }
│ if(tId.txt=="cardEntities")
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ --- HMI/n2t-out/cardMedia.txt
├── +++ HMI/US/landscape/n2t-out/cardMedia.txt
│ @@ -1154,18 +1154,14 @@
│ {
│ page pageStartup
│ }
│ if(tId.txt=="screensaver")
│ {
│ page screensaver
│ }
│ - if(tId.txt=="screensaver2")
│ - {
│ - page screensaver2
│ - }
│ if(tId.txt=="cardEntities")
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ --- HMI/n2t-out/cardQR.txt
├── +++ HMI/US/landscape/n2t-out/cardQR.txt
│ @@ -669,18 +669,14 @@
│ {
│ page pageStartup
│ }
│ if(tId.txt=="screensaver")
│ {
│ page screensaver
│ }
│ - if(tId.txt=="screensaver2")
│ - {
│ - page screensaver2
│ - }
│ if(tId.txt=="cardEntities")
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ --- HMI/n2t-out/cardThermo.txt
├── +++ HMI/US/landscape/n2t-out/cardThermo.txt
│ @@ -1071,18 +1071,14 @@
│ {
│ page pageStartup
│ }
│ if(tId.txt=="screensaver")
│ {
│ page screensaver
│ }
│ - if(tId.txt=="screensaver2")
│ - {
│ - page screensaver2
│ - }
│ if(tId.txt=="cardEntities")
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/landscape/n2t-out/pageStartup.txt
│ @@ -179,15 +179,15 @@
│ Max. Text Size : 10
│
│ Events
│ Touch Press Event
│ recmod=1
│ bauds=115200
│ // startup event
│ - tSend.txt="event,startup,"+tVersion.txt+",eu"
│ + tSend.txt="event,startup,"+tVersion.txt+",us-l"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ crcputh 55 bb
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ @@ -320,18 +320,14 @@
│ {
│ page pageStartup
│ }
│ if(tId.txt=="screensaver")
│ {
│ page screensaver
│ }
│ - if(tId.txt=="screensaver2")
│ - {
│ - page screensaver2
│ - }
│ if(tId.txt=="cardEntities")
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/landscape/n2t-out/screensaver.txt
│ @@ -29,17 +29,14 @@
│ }
│ tDate.txt=pageIcons.vaDate.txt
│ dim=dimValue
│ vis tSend,0
│ //page open event
│ // clear weather elements, to keep example content in HMI
│
│ - Postinitialize Event
│ - click m0,1
│ -
│ Variable (string) strCommand
│ Attributes
│ Scope : local
│ Text :
│ Max. Text Size: 600
│
│ Variable (string) strTmp
│ @@ -103,35 +100,14 @@
│ Value: 0
│
│ Variable (int32) ycR
│ Attributes
│ Scope: local
│ Value: 0
│
│ -Text m0
│ - Attributes
│ - Scope : local
│ - Dragging : 0
│ - Disable release event after dragging: 0
│ - Send Component ID : disabled
│ - Associated Keyboard : none
│ - Text :
│ - Max. Text Size : 10
│ -
│ - Events
│ - Touch Press Event
│ - tTmp.txt="change model conf to us-l/p "
│ - strlen tTmp.txt,sys1
│ - sya1=sys1*11+m0.h-48/2
│ - for(sys0=0;sys0<sys1;sys0++)
│ - {
│ - substr tTmp.txt,strTmp.txt,sys0,1
│ - xstr m0.x-5,sys0*-11+m0.y+sya1,23,20,6,WHITE,RED,2,1,3,strTmp.txt
│ - }
│ -
│ Text t10
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ @@ -590,42 +566,39 @@
│ //tMainTextAlt2
│ spstr strCommand.txt,tMainTextAlt2.txt,"~",36
│ //tMainIconAlt2
│ spstr strCommand.txt,tMainIconAlt2.txt,"~",33
│ //tMainIconAlt2 Color
│ spstr strCommand.txt,tTmp.txt,"~",34
│ covx tTmp.txt,tMainIconAlt2.pco,0,0
│ - if(tMainTextAlt2.txt!="")
│ + if(tMainTextAlt2.txt!=""&&p0.w!=320)
│ {
│ //value for tMRIcon, activate alternative layout
│ vis tMainIcon,0
│ vis tMainText,0
│ vis tMainTextAlt,1
│ vis tMainIconAlt,1
│ vis tMainTextAlt2,1
│ vis tMainIconAlt2,1
│ - if(p0.w!=320)
│ - {
│ - vis tForecast1,0
│ - vis tF1Icon,0
│ - vis tForecast1Val,0
│ - //move forecast values to the right
│ - tForecast4.txt=tForecast3.txt
│ - tForecast3.txt=tForecast2.txt
│ - tForecast2.txt=tForecast1.txt
│ - tForecast4Val.txt=tForecast3Val.txt
│ - tForecast3Val.txt=tForecast2Val.txt
│ - tForecast2Val.txt=tForecast1Val.txt
│ - tF4Icon.txt=tF3Icon.txt
│ - tF3Icon.txt=tF2Icon.txt
│ - tF2Icon.txt=tF1Icon.txt
│ - tF4Icon.pco=tF3Icon.pco
│ - tF3Icon.pco=tF2Icon.pco
│ - tF2Icon.pco=tF1Icon.pco
│ - }
│ + vis tForecast1,0
│ + vis tF1Icon,0
│ + vis tForecast1Val,0
│ + //move forecast values to the right
│ + tForecast4.txt=tForecast3.txt
│ + tForecast3.txt=tForecast2.txt
│ + tForecast2.txt=tForecast1.txt
│ + tForecast4Val.txt=tForecast3Val.txt
│ + tForecast3Val.txt=tForecast2Val.txt
│ + tForecast2Val.txt=tForecast1Val.txt
│ + tF4Icon.txt=tF3Icon.txt
│ + tF3Icon.txt=tF2Icon.txt
│ + tF2Icon.txt=tF1Icon.txt
│ + tF4Icon.pco=tF3Icon.pco
│ + tF3Icon.pco=tF2Icon.pco
│ + tF2Icon.pco=tF1Icon.pco
│ }else
│ {
│ vis tMainIcon,1
│ vis tMainIconAlt,0
│ vis tMainText,1
│ vis tMainTextAlt,0
│ vis tMainTextAlt2,0
│ --- HMI/n2t-out/screensaver2.txt
├── +++ HMI/US/landscape/n2t-out/screensaver2.txt
│ @@ -29,17 +29,14 @@
│ }
│ tDate.txt=pageIcons.vaDate.txt
│ dim=dimValue
│ vis tSend,0
│ //page open event
│ // clear weather elements, to keep example content in HMI
│
│ - Postinitialize Event
│ - click m0,1
│ -
│ Variable (string) strCommand
│ Attributes
│ Scope : local
│ Text :
│ Max. Text Size: 1979
│
│ Variable (string) strTmp
│ @@ -393,35 +390,14 @@
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ Text :
│ Max. Text Size : 4
│
│ -Text m0
│ - Attributes
│ - Scope : local
│ - Dragging : 0
│ - Disable release event after dragging: 0
│ - Send Component ID : disabled
│ - Associated Keyboard : none
│ - Text :
│ - Max. Text Size : 10
│ -
│ - Events
│ - Touch Press Event
│ - tTmp.txt="change model conf to us-l/p "
│ - strlen tTmp.txt,sys1
│ - sya1=sys1*11+m0.h-48/2
│ - for(sys0=0;sys0<sys1;sys0++)
│ - {
│ - substr tTmp.txt,strTmp.txt,sys0,1
│ - xstr m0.x-5,sys0*-11+m0.y+sya1,23,20,6,WHITE,RED,2,1,3,strTmp.txt
│ - }
│ -
│ Text tAMPM
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ @@ -614,15 +590,14 @@
│ if(tTmp.txt!="")
│ {
│ covx tTmp.txt,defaultFontColor,0,0
│ }
│ }
│ if(tInstruction.txt=="time")
│ {
│ - click m0,1
│ //get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ spstr pageIcons.vaTime.txt,tTime.txt,"?",0
│ spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
│ if(tAMPM.txt=="")
│ {
│ vis tAMPM,0

432
HMI/US/landscape/n2t-out-visual/cardPower.txt
View File

@@ -47,7 +47,7 @@ Page cardPower
vis t4Icon,0
vis t5Icon,0
cardPower.bco=defaultBcoColor
for(sys0=0;sys0<48;sys0++)
for(sys0=0;sys0<54;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
@@ -58,8 +58,8 @@ Page cardPower
{
if(b[sys0].type==1)
{
b[sys0].pic=19
b[sys0].pic1=19
b[sys0].pic=21
b[sys0].pic1=21
b[sys0].pic2=15
}
}
@@ -84,7 +84,7 @@ Variable (string) strCommand
ID : 5
Scope : local
Text :
Max. Text Size: 275
Max. Text Size: 1000
Variable (int32) t0Speed
Attributes
@@ -158,7 +158,7 @@ Text t0Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 34
x coordinate : 33
y coordinate : 80
Width : 60
Height : 60
@@ -182,6 +182,36 @@ Text t0Icon
Horizontal Spacing : 0
Vertical Spacing : 0
Text t0o
Attributes
ID : 48
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 96
y coordinate : 73
Width : 115
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t0u
Attributes
ID : 30
@@ -190,9 +220,9 @@ Text t0u
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 98
y coordinate : 132
Width : 108
x coordinate : 96
y coordinate : 118
Width : 115
Height : 30
Effect : load
Effect Priority : 0
@@ -220,7 +250,7 @@ Text t1
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 214
x coordinate : 213
y coordinate : 70
Width : 60
Height : 230
@@ -252,7 +282,7 @@ Text t1Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 34
x coordinate : 33
y coordinate : 156
Width : 60
Height : 60
@@ -276,6 +306,36 @@ Text t1Icon
Horizontal Spacing : 0
Vertical Spacing : 0
Text t1o
Attributes
ID : 50
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 96
y coordinate : 149
Width : 115
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t1u
Attributes
ID : 31
@@ -284,9 +344,9 @@ Text t1u
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 98
y coordinate : 209
Width : 108
x coordinate : 96
y coordinate : 194
Width : 115
Height : 30
Effect : load
Effect Priority : 0
@@ -314,7 +374,7 @@ Text t2Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 34
x coordinate : 33
y coordinate : 232
Width : 60
Height : 60
@@ -338,6 +398,36 @@ Text t2Icon
Horizontal Spacing : 0
Vertical Spacing : 0
Text t2o
Attributes
ID : 51
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 96
y coordinate : 226
Width : 115
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t2u
Attributes
ID : 32
@@ -346,9 +436,9 @@ Text t2u
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 98
y coordinate : 285
Width : 108
x coordinate : 96
y coordinate : 271
Width : 115
Height : 30
Effect : load
Effect Priority : 0
@@ -376,7 +466,7 @@ Text t3Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 394
x coordinate : 393
y coordinate : 80
Width : 60
Height : 60
@@ -400,6 +490,36 @@ Text t3Icon
Horizontal Spacing : 0
Vertical Spacing : 0
Text t3o
Attributes
ID : 53
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 276
y coordinate : 73
Width : 115
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t3u
Attributes
ID : 35
@@ -408,9 +528,9 @@ Text t3u
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 278
y coordinate : 132
Width : 108
x coordinate : 276
y coordinate : 118
Width : 115
Height : 30
Effect : load
Effect Priority : 0
@@ -438,7 +558,7 @@ Text t4Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 394
x coordinate : 393
y coordinate : 156
Width : 60
Height : 60
@@ -462,6 +582,36 @@ Text t4Icon
Horizontal Spacing : 0
Vertical Spacing : 0
Text t4o
Attributes
ID : 49
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 276
y coordinate : 149
Width : 115
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t4u
Attributes
ID : 34
@@ -470,9 +620,9 @@ Text t4u
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 278
y coordinate : 209
Width : 108
x coordinate : 276
y coordinate : 194
Width : 115
Height : 30
Effect : load
Effect Priority : 0
@@ -500,7 +650,7 @@ Text t5Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 394
x coordinate : 393
y coordinate : 232
Width : 60
Height : 60
@@ -524,6 +674,36 @@ Text t5Icon
Horizontal Spacing : 0
Vertical Spacing : 0
Text t5o
Attributes
ID : 52
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 276
y coordinate : 226
Width : 115
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t5u
Attributes
ID : 33
@@ -532,9 +712,9 @@ Text t5u
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 278
y coordinate : 285
Width : 108
x coordinate : 276
y coordinate : 271
Width : 115
Height : 30
Effect : load
Effect Priority : 0
@@ -562,7 +742,7 @@ Text tHeading
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 82
x coordinate : 81
y coordinate : 26
Width : 320
Height : 30
@@ -572,7 +752,7 @@ Text tHeading
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 2
Font ID : 1
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
@@ -592,7 +772,7 @@ Text tHome
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 216
x coordinate : 215
y coordinate : 214
Width : 56
Height : 54
@@ -622,7 +802,7 @@ Text tHome2
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 216
x coordinate : 215
y coordinate : 271
Width : 56
Height : 28
@@ -652,7 +832,7 @@ Text tHomeO
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 216
x coordinate : 215
y coordinate : 73
Width : 56
Height : 54
@@ -682,7 +862,7 @@ Text tHomeO2
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 216
x coordinate : 215
y coordinate : 130
Width : 56
Height : 28
@@ -729,10 +909,10 @@ Slider h0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 94
y coordinate : 88
x coordinate : 93
y coordinate : 105
Width : 120
Height : 44
Height : 12
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -740,8 +920,8 @@ Slider h0
Fill : image
Cursor width : auto
Cursor height : 255
Back. Picture ID : 18
Slided Back. Picture ID : 18
Back. Picture ID : 20
Slided Back. Picture ID : 20
Position : 600
Upper range limit : 1200
Lower range limit : 0
@@ -754,10 +934,10 @@ Slider h1
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 94
y coordinate : 165
x coordinate : 93
y coordinate : 181
Width : 120
Height : 44
Height : 12
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -765,8 +945,8 @@ Slider h1
Fill : image
Cursor width : auto
Cursor height : 255
Back. Picture ID : 18
Slided Back. Picture ID : 18
Back. Picture ID : 20
Slided Back. Picture ID : 20
Position : 600
Upper range limit : 1200
Lower range limit : 0
@@ -779,10 +959,10 @@ Slider h2
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 94
y coordinate : 241
x coordinate : 93
y coordinate : 258
Width : 120
Height : 44
Height : 12
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -790,8 +970,8 @@ Slider h2
Fill : image
Cursor width : auto
Cursor height : 255
Back. Picture ID : 18
Slided Back. Picture ID : 18
Back. Picture ID : 20
Slided Back. Picture ID : 20
Position : 600
Upper range limit : 1200
Lower range limit : 0
@@ -804,10 +984,10 @@ Slider h3
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 274
y coordinate : 88
x coordinate : 273
y coordinate : 105
Width : 120
Height : 44
Height : 12
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -815,8 +995,8 @@ Slider h3
Fill : image
Cursor width : auto
Cursor height : 255
Back. Picture ID : 18
Slided Back. Picture ID : 18
Back. Picture ID : 20
Slided Back. Picture ID : 20
Position : 600
Upper range limit : 1200
Lower range limit : 0
@@ -829,10 +1009,10 @@ Slider h4
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 274
y coordinate : 165
x coordinate : 273
y coordinate : 181
Width : 120
Height : 44
Height : 12
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -840,8 +1020,8 @@ Slider h4
Fill : image
Cursor width : auto
Cursor height : 255
Back. Picture ID : 18
Slided Back. Picture ID : 18
Back. Picture ID : 20
Slided Back. Picture ID : 20
Position : 600
Upper range limit : 1200
Lower range limit : 0
@@ -854,10 +1034,10 @@ Slider h5
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 274
y coordinate : 241
x coordinate : 273
y coordinate : 258
Width : 120
Height : 44
Height : 12
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -865,8 +1045,8 @@ Slider h5
Fill : image
Cursor width : auto
Cursor height : 255
Back. Picture ID : 18
Slided Back. Picture ID : 18
Back. Picture ID : 20
Slided Back. Picture ID : 20
Position : 600
Upper range limit : 1200
Lower range limit : 0
@@ -879,7 +1059,7 @@ Button bNext
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 407
x coordinate : 406
y coordinate : 16
Width : 50
Height : 50
@@ -926,7 +1106,7 @@ Button bPrev
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 25
x coordinate : 24
y coordinate : 16
Width : 50
Height : 50
@@ -973,9 +1153,9 @@ Hotspot mSwipeNext
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 471
x coordinate : 472
y coordinate : 5
Width : 9
Width : 8
Height : 310
Effect : load
Effect Priority : 0
@@ -995,7 +1175,7 @@ Hotspot mSwipePrev
Opacity : 127
x coordinate : 0
y coordinate : 5
Width : 9
Width : 8
Height : 310
Effect : load
Effect Priority : 0
@@ -1013,7 +1193,7 @@ Hotspot mSwipeUp
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 12
x coordinate : 27
y coordinate : 0
Width : 426
Height : 9
@@ -1046,6 +1226,7 @@ Timer tm0
h0.val=h0.maxval
}
h0.val+=t0Speed.val
ref t0u
}
if(t1Speed.val!=0)
{
@@ -1059,6 +1240,7 @@ Timer tm0
h1.val=h1.maxval
}
h1.val+=t1Speed.val
ref t1u
}
if(t2Speed.val!=0)
{
@@ -1072,6 +1254,7 @@ Timer tm0
h2.val=h2.maxval
}
h2.val+=t2Speed.val
ref t2u
}
if(t3Speed.val!=0)
{
@@ -1085,6 +1268,7 @@ Timer tm0
h3.val=h3.maxval
}
h3.val+=t3Speed.val
ref t3u
}
if(t4Speed.val!=0)
{
@@ -1098,6 +1282,7 @@ Timer tm0
h4.val=h4.maxval
}
h4.val+=t4Speed.val
ref t4u
}
if(t5Speed.val!=0)
{
@@ -1111,6 +1296,7 @@ Timer tm0
h5.val=h5.maxval
}
h5.val+=t5Speed.val
ref t5u
}
Timer tmSerial
@@ -1167,7 +1353,6 @@ Timer tmSerial
spstr strCommand.txt,tInstruction.txt,"~",0
if(tInstruction.txt=="entityUpd")
{
// command format: entityUpd,heading,navigation,colorHome,iconHome[,iconColor,icon,speed,valueUp,valueDown]x6
spstr strCommand.txt,tHeading.txt,"~",1
// navigation icon left
spstr strCommand.txt,tTmp.txt,"~",2 //type
@@ -1204,30 +1389,31 @@ Timer tmSerial
vis bNext,1
}
// icon color home
spstr strCommand.txt,tTmp.txt,"~",14
spstr strCommand.txt,tTmp.txt,"~",17
covx tTmp.txt,t1.pco,0,0
// icon home
spstr strCommand.txt,t1.txt,"~",15
spstr strCommand.txt,t1.txt,"~",16
// speed 16 ignored
// text home
spstr strCommand.txt,tHome.txt,"~",17
spstr strCommand.txt,tHome.txt,"~",19
spstr tHome.txt,tHome2.txt," ",1
spstr tHome.txt,tHome.txt," ",0
// icon color 18 ignored
// icon 19 ignored
// speed 20 ignored
// text home
spstr strCommand.txt,tHomeO.txt,"~",21
spstr strCommand.txt,tHomeO.txt,"~",26
spstr tHomeO.txt,tHomeO2.txt," ",1
spstr tHomeO.txt,tHomeO.txt," ",0
// iconColor
spstr strCommand.txt,tTmp.txt,"~",22
spstr strCommand.txt,tTmp.txt,"~",31
covx tTmp.txt,t0Icon.pco,0,0
// icon
spstr strCommand.txt,t0Icon.txt,"~",23
spstr strCommand.txt,t0Icon.txt,"~",30
// speed
spstr strCommand.txt,tTmp.txt,"~",24
spstr strCommand.txt,tTmp.txt,"~",34
covx tTmp.txt,t0Speed.val,0,0
if(p0.h==320)
{
t0Speed.val=t0Speed.val*-1
}
if(t0Speed.val>120)
{
t0Speed.val=120
@@ -1237,7 +1423,9 @@ Timer tmSerial
t0Speed.val=-120
}
// lower text
spstr strCommand.txt,t0u.txt,"~",25
spstr strCommand.txt,t0u.txt,"~",33
// upper text
spstr strCommand.txt,t0o.txt,"~",32
if(t0Icon.txt!="")
{
vis t0Icon,1
@@ -1250,13 +1438,17 @@ Timer tmSerial
vis h0,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",26
spstr strCommand.txt,tTmp.txt,"~",38
covx tTmp.txt,t1Icon.pco,0,0
// icon
spstr strCommand.txt,t1Icon.txt,"~",27
spstr strCommand.txt,t1Icon.txt,"~",37
// speed
spstr strCommand.txt,tTmp.txt,"~",28
spstr strCommand.txt,tTmp.txt,"~",41
covx tTmp.txt,t1Speed.val,0,0
if(p0.h==320)
{
t1Speed.val=t1Speed.val*-1
}
if(t1Speed.val>120)
{
t1Speed.val=120
@@ -1266,7 +1458,9 @@ Timer tmSerial
t1Speed.val=-120
}
// lower text
spstr strCommand.txt,t1u.txt,"~",29
spstr strCommand.txt,t1u.txt,"~",40
// upper text
spstr strCommand.txt,t1o.txt,"~",39
if(t1Icon.txt!="")
{
vis t1Icon,1
@@ -1279,13 +1473,17 @@ Timer tmSerial
vis h1,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",30
spstr strCommand.txt,tTmp.txt,"~",45
covx tTmp.txt,t2Icon.pco,0,0
// icon
spstr strCommand.txt,t2Icon.txt,"~",31
spstr strCommand.txt,t2Icon.txt,"~",44
// speed
spstr strCommand.txt,tTmp.txt,"~",32
spstr strCommand.txt,tTmp.txt,"~",48
covx tTmp.txt,t2Speed.val,0,0
if(p0.h==320)
{
t2Speed.val=t2Speed.val*-1
}
if(t2Speed.val>120)
{
t2Speed.val=120
@@ -1295,7 +1493,9 @@ Timer tmSerial
t2Speed.val=-120
}
// lower text
spstr strCommand.txt,t2u.txt,"~",33
spstr strCommand.txt,t2u.txt,"~",47
// upper text
spstr strCommand.txt,t2o.txt,"~",46
if(t2Icon.txt!="")
{
vis t2Icon,1
@@ -1308,13 +1508,17 @@ Timer tmSerial
vis h2,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",34
spstr strCommand.txt,tTmp.txt,"~",52
covx tTmp.txt,t3Icon.pco,0,0
// icon
spstr strCommand.txt,t3Icon.txt,"~",35
spstr strCommand.txt,t3Icon.txt,"~",51
// speed
spstr strCommand.txt,tTmp.txt,"~",36
spstr strCommand.txt,tTmp.txt,"~",55
covx tTmp.txt,t3Speed.val,0,0
if(p0.h==320)
{
t3Speed.val=t3Speed.val*-1
}
if(t3Speed.val>120)
{
t3Speed.val=120
@@ -1324,7 +1528,9 @@ Timer tmSerial
t3Speed.val=-120
}
// lower text
spstr strCommand.txt,t3u.txt,"~",37
spstr strCommand.txt,t3u.txt,"~",54
// upper text
spstr strCommand.txt,t3o.txt,"~",53
if(t3Icon.txt!="")
{
vis t3Icon,1
@@ -1337,13 +1543,17 @@ Timer tmSerial
vis h3,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",38
spstr strCommand.txt,tTmp.txt,"~",59
covx tTmp.txt,t4Icon.pco,0,0
// icon
spstr strCommand.txt,t4Icon.txt,"~",39
spstr strCommand.txt,t4Icon.txt,"~",58
// speed
spstr strCommand.txt,tTmp.txt,"~",40
spstr strCommand.txt,tTmp.txt,"~",62
covx tTmp.txt,t4Speed.val,0,0
if(p0.h==320)
{
t4Speed.val=t4Speed.val*-1
}
if(t4Speed.val>120)
{
t4Speed.val=120
@@ -1353,7 +1563,9 @@ Timer tmSerial
t4Speed.val=-120
}
// lower text
spstr strCommand.txt,t4u.txt,"~",41
spstr strCommand.txt,t4u.txt,"~",61
// upper text
spstr strCommand.txt,t4o.txt,"~",60
if(t4Icon.txt!="")
{
vis t4Icon,1
@@ -1366,13 +1578,17 @@ Timer tmSerial
vis h4,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",42
spstr strCommand.txt,tTmp.txt,"~",66
covx tTmp.txt,t5Icon.pco,0,0
// icon
spstr strCommand.txt,t5Icon.txt,"~",43
spstr strCommand.txt,t5Icon.txt,"~",65
// speed
spstr strCommand.txt,tTmp.txt,"~",44
spstr strCommand.txt,tTmp.txt,"~",69
covx tTmp.txt,t5Speed.val,0,0
if(p0.h==320)
{
t5Speed.val=t5Speed.val*-1
}
if(t5Speed.val>120)
{
t5Speed.val=120
@@ -1382,7 +1598,9 @@ Timer tmSerial
t5Speed.val=-120
}
// lower text
spstr strCommand.txt,t5u.txt,"~",45
spstr strCommand.txt,t5u.txt,"~",68
// upper text
spstr strCommand.txt,t5o.txt,"~",67
if(t5Icon.txt!="")
{
vis t5Icon,1
@@ -1417,6 +1635,10 @@ Timer tmSerial
{
page screensaver
}
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities")
{
page cardEntities
@@ -1463,10 +1685,6 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
if(tInstruction.txt=="time")
{

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

@@ -18,6 +18,10 @@ cardLChart
33 Component(s)
394 Line(s) of event code
262 Unique line(s) of event code
pageStartup
20 Component(s)
185 Line(s) of event code
131 Unique line(s) of event code
cardChart
33 Component(s)
429 Line(s) of event code
@@ -42,10 +46,10 @@ cardQR
34 Component(s)
402 Line(s) of event code
234 Unique line(s) of event code
pageStartup
20 Component(s)
185 Line(s) of event code
131 Unique line(s) of event code
cardPower
54 Component(s)
523 Line(s) of event code
345 Unique line(s) of event code
screensaver
46 Component(s)
418 Line(s) of event code
@@ -78,10 +82,6 @@ cardAlarm
43 Component(s)
492 Line(s) of event code
269 Unique line(s) of event code
cardPower
48 Component(s)
487 Line(s) of event code
326 Unique line(s) of event code
screensaver2
58 Component(s)
344 Line(s) of event code
@@ -89,6 +89,6 @@ screensaver2
Total
21 Page(s)
794 Component(s)
9143 Line(s) of event code
2307 Unique line(s) of event code
800 Component(s)
9179 Line(s) of event code
2329 Unique line(s) of event code

178
HMI/US/landscape/n2t-out/cardPower.txt
View File

@@ -39,7 +39,7 @@ Page cardPower
vis t4Icon,0
vis t5Icon,0
cardPower.bco=defaultBcoColor
for(sys0=0;sys0<48;sys0++)
for(sys0=0;sys0<54;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
@@ -50,8 +50,8 @@ Page cardPower
{
if(b[sys0].type==1)
{
b[sys0].pic=19
b[sys0].pic1=19
b[sys0].pic=21
b[sys0].pic1=21
b[sys0].pic2=15
}
}
@@ -73,7 +73,7 @@ Variable (string) strCommand
Attributes
Scope : local
Text :
Max. Text Size: 275
Max. Text Size: 1000
Variable (int32) t0Speed
Attributes
@@ -139,6 +139,16 @@ Text t0Icon
Text : 
Max. Text Size : 5
Text t0o
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text t0u
Attributes
Scope : local
@@ -169,6 +179,16 @@ Text t1Icon
Text : 
Max. Text Size : 5
Text t1o
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text t1u
Attributes
Scope : local
@@ -189,6 +209,16 @@ Text t2Icon
Text : î °
Max. Text Size : 5
Text t2o
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text t2u
Attributes
Scope : local
@@ -209,6 +239,16 @@ Text t3Icon
Text : î °
Max. Text Size : 5
Text t3o
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text t3u
Attributes
Scope : local
@@ -229,6 +269,16 @@ Text t4Icon
Text : î´½
Max. Text Size : 5
Text t4o
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text t4u
Attributes
Scope : local
@@ -249,6 +299,16 @@ Text t5Icon
Text : 
Max. Text Size : 5
Text t5o
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text t5u
Attributes
Scope : local
@@ -479,6 +539,7 @@ Timer tm0
h0.val=h0.maxval
}
h0.val+=t0Speed.val
ref t0u
}
if(t1Speed.val!=0)
{
@@ -492,6 +553,7 @@ Timer tm0
h1.val=h1.maxval
}
h1.val+=t1Speed.val
ref t1u
}
if(t2Speed.val!=0)
{
@@ -505,6 +567,7 @@ Timer tm0
h2.val=h2.maxval
}
h2.val+=t2Speed.val
ref t2u
}
if(t3Speed.val!=0)
{
@@ -518,6 +581,7 @@ Timer tm0
h3.val=h3.maxval
}
h3.val+=t3Speed.val
ref t3u
}
if(t4Speed.val!=0)
{
@@ -531,6 +595,7 @@ Timer tm0
h4.val=h4.maxval
}
h4.val+=t4Speed.val
ref t4u
}
if(t5Speed.val!=0)
{
@@ -544,6 +609,7 @@ Timer tm0
h5.val=h5.maxval
}
h5.val+=t5Speed.val
ref t5u
}
Timer tmSerial
@@ -599,7 +665,6 @@ Timer tmSerial
spstr strCommand.txt,tInstruction.txt,"~",0
if(tInstruction.txt=="entityUpd")
{
// command format: entityUpd,heading,navigation,colorHome,iconHome[,iconColor,icon,speed,valueUp,valueDown]x6
spstr strCommand.txt,tHeading.txt,"~",1
// navigation icon left
spstr strCommand.txt,tTmp.txt,"~",2 //type
@@ -636,30 +701,31 @@ Timer tmSerial
vis bNext,1
}
// icon color home
spstr strCommand.txt,tTmp.txt,"~",14
spstr strCommand.txt,tTmp.txt,"~",17
covx tTmp.txt,t1.pco,0,0
// icon home
spstr strCommand.txt,t1.txt,"~",15
spstr strCommand.txt,t1.txt,"~",16
// speed 16 ignored
// text home
spstr strCommand.txt,tHome.txt,"~",17
spstr strCommand.txt,tHome.txt,"~",19
spstr tHome.txt,tHome2.txt," ",1
spstr tHome.txt,tHome.txt," ",0
// icon color 18 ignored
// icon 19 ignored
// speed 20 ignored
// text home
spstr strCommand.txt,tHomeO.txt,"~",21
spstr strCommand.txt,tHomeO.txt,"~",26
spstr tHomeO.txt,tHomeO2.txt," ",1
spstr tHomeO.txt,tHomeO.txt," ",0
// iconColor
spstr strCommand.txt,tTmp.txt,"~",22
spstr strCommand.txt,tTmp.txt,"~",31
covx tTmp.txt,t0Icon.pco,0,0
// icon
spstr strCommand.txt,t0Icon.txt,"~",23
spstr strCommand.txt,t0Icon.txt,"~",30
// speed
spstr strCommand.txt,tTmp.txt,"~",24
spstr strCommand.txt,tTmp.txt,"~",34
covx tTmp.txt,t0Speed.val,0,0
if(p0.h==320)
{
t0Speed.val=t0Speed.val*-1
}
if(t0Speed.val>120)
{
t0Speed.val=120
@@ -669,7 +735,9 @@ Timer tmSerial
t0Speed.val=-120
}
// lower text
spstr strCommand.txt,t0u.txt,"~",25
spstr strCommand.txt,t0u.txt,"~",33
// upper text
spstr strCommand.txt,t0o.txt,"~",32
if(t0Icon.txt!="")
{
vis t0Icon,1
@@ -682,13 +750,17 @@ Timer tmSerial
vis h0,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",26
spstr strCommand.txt,tTmp.txt,"~",38
covx tTmp.txt,t1Icon.pco,0,0
// icon
spstr strCommand.txt,t1Icon.txt,"~",27
spstr strCommand.txt,t1Icon.txt,"~",37
// speed
spstr strCommand.txt,tTmp.txt,"~",28
spstr strCommand.txt,tTmp.txt,"~",41
covx tTmp.txt,t1Speed.val,0,0
if(p0.h==320)
{
t1Speed.val=t1Speed.val*-1
}
if(t1Speed.val>120)
{
t1Speed.val=120
@@ -698,7 +770,9 @@ Timer tmSerial
t1Speed.val=-120
}
// lower text
spstr strCommand.txt,t1u.txt,"~",29
spstr strCommand.txt,t1u.txt,"~",40
// upper text
spstr strCommand.txt,t1o.txt,"~",39
if(t1Icon.txt!="")
{
vis t1Icon,1
@@ -711,13 +785,17 @@ Timer tmSerial
vis h1,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",30
spstr strCommand.txt,tTmp.txt,"~",45
covx tTmp.txt,t2Icon.pco,0,0
// icon
spstr strCommand.txt,t2Icon.txt,"~",31
spstr strCommand.txt,t2Icon.txt,"~",44
// speed
spstr strCommand.txt,tTmp.txt,"~",32
spstr strCommand.txt,tTmp.txt,"~",48
covx tTmp.txt,t2Speed.val,0,0
if(p0.h==320)
{
t2Speed.val=t2Speed.val*-1
}
if(t2Speed.val>120)
{
t2Speed.val=120
@@ -727,7 +805,9 @@ Timer tmSerial
t2Speed.val=-120
}
// lower text
spstr strCommand.txt,t2u.txt,"~",33
spstr strCommand.txt,t2u.txt,"~",47
// upper text
spstr strCommand.txt,t2o.txt,"~",46
if(t2Icon.txt!="")
{
vis t2Icon,1
@@ -740,13 +820,17 @@ Timer tmSerial
vis h2,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",34
spstr strCommand.txt,tTmp.txt,"~",52
covx tTmp.txt,t3Icon.pco,0,0
// icon
spstr strCommand.txt,t3Icon.txt,"~",35
spstr strCommand.txt,t3Icon.txt,"~",51
// speed
spstr strCommand.txt,tTmp.txt,"~",36
spstr strCommand.txt,tTmp.txt,"~",55
covx tTmp.txt,t3Speed.val,0,0
if(p0.h==320)
{
t3Speed.val=t3Speed.val*-1
}
if(t3Speed.val>120)
{
t3Speed.val=120
@@ -756,7 +840,9 @@ Timer tmSerial
t3Speed.val=-120
}
// lower text
spstr strCommand.txt,t3u.txt,"~",37
spstr strCommand.txt,t3u.txt,"~",54
// upper text
spstr strCommand.txt,t3o.txt,"~",53
if(t3Icon.txt!="")
{
vis t3Icon,1
@@ -769,13 +855,17 @@ Timer tmSerial
vis h3,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",38
spstr strCommand.txt,tTmp.txt,"~",59
covx tTmp.txt,t4Icon.pco,0,0
// icon
spstr strCommand.txt,t4Icon.txt,"~",39
spstr strCommand.txt,t4Icon.txt,"~",58
// speed
spstr strCommand.txt,tTmp.txt,"~",40
spstr strCommand.txt,tTmp.txt,"~",62
covx tTmp.txt,t4Speed.val,0,0
if(p0.h==320)
{
t4Speed.val=t4Speed.val*-1
}
if(t4Speed.val>120)
{
t4Speed.val=120
@@ -785,7 +875,9 @@ Timer tmSerial
t4Speed.val=-120
}
// lower text
spstr strCommand.txt,t4u.txt,"~",41
spstr strCommand.txt,t4u.txt,"~",61
// upper text
spstr strCommand.txt,t4o.txt,"~",60
if(t4Icon.txt!="")
{
vis t4Icon,1
@@ -798,13 +890,17 @@ Timer tmSerial
vis h4,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",42
spstr strCommand.txt,tTmp.txt,"~",66
covx tTmp.txt,t5Icon.pco,0,0
// icon
spstr strCommand.txt,t5Icon.txt,"~",43
spstr strCommand.txt,t5Icon.txt,"~",65
// speed
spstr strCommand.txt,tTmp.txt,"~",44
spstr strCommand.txt,tTmp.txt,"~",69
covx tTmp.txt,t5Speed.val,0,0
if(p0.h==320)
{
t5Speed.val=t5Speed.val*-1
}
if(t5Speed.val>120)
{
t5Speed.val=120
@@ -814,7 +910,9 @@ Timer tmSerial
t5Speed.val=-120
}
// lower text
spstr strCommand.txt,t5u.txt,"~",45
spstr strCommand.txt,t5u.txt,"~",68
// upper text
spstr strCommand.txt,t5o.txt,"~",67
if(t5Icon.txt!="")
{
vis t5Icon,1
@@ -849,6 +947,10 @@ Timer tmSerial
{
page screensaver
}
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities")
{
page cardEntities
@@ -895,10 +997,6 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
if(tInstruction.txt=="time")
{

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@@ -1266,6 +1266,10 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",34
covx tTmp.txt,t0Speed.val,0,0
if(p0.h==320)
{
t0Speed.val=t0Speed.val*-1
}
if(t0Speed.val>120)
{
t0Speed.val=120
@@ -1297,6 +1301,10 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",41
covx tTmp.txt,t1Speed.val,0,0
if(p0.h==320)
{
t1Speed.val=t1Speed.val*-1
}
if(t1Speed.val>120)
{
t1Speed.val=120
@@ -1328,6 +1336,10 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",48
covx tTmp.txt,t2Speed.val,0,0
if(p0.h==320)
{
t2Speed.val=t2Speed.val*-1
}
if(t2Speed.val>120)
{
t2Speed.val=120
@@ -1359,6 +1371,10 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",55
covx tTmp.txt,t3Speed.val,0,0
if(p0.h==320)
{
t3Speed.val=t3Speed.val*-1
}
if(t3Speed.val>120)
{
t3Speed.val=120
@@ -1390,6 +1406,10 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",62
covx tTmp.txt,t4Speed.val,0,0
if(p0.h==320)
{
t4Speed.val=t4Speed.val*-1
}
if(t4Speed.val>120)
{
t4Speed.val=120
@@ -1421,6 +1441,10 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",69
covx tTmp.txt,t5Speed.val,0,0
if(p0.h==320)
{
t5Speed.val=t5Speed.val*-1
}
if(t5Speed.val>120)
{
t5Speed.val=120
@@ -1467,6 +1491,10 @@ Timer tmSerial
{
page screensaver
}
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities")
{
page cardEntities

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

@@ -58,6 +58,10 @@ cardQR
34 Component(s)
402 Line(s) of event code
234 Unique line(s) of event code
cardPower
54 Component(s)
517 Line(s) of event code
339 Unique line(s) of event code
cardThermo
57 Component(s)
532 Line(s) of event code
@@ -66,10 +70,6 @@ popupTimer
42 Component(s)
512 Line(s) of event code
255 Unique line(s) of event code
cardPower
54 Component(s)
489 Line(s) of event code
330 Unique line(s) of event code
screensaver
46 Component(s)
421 Line(s) of event code
@@ -90,5 +90,5 @@ cardEntities
Total
21 Page(s)
811 Component(s)
9554 Line(s) of event code
2447 Unique line(s) of event code
9582 Line(s) of event code
2454 Unique line(s) of event code

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

@@ -692,6 +692,10 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",34
covx tTmp.txt,t0Speed.val,0,0
if(p0.h==320)
{
t0Speed.val=t0Speed.val*-1
}
if(t0Speed.val>120)
{
t0Speed.val=120
@@ -723,6 +727,10 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",41
covx tTmp.txt,t1Speed.val,0,0
if(p0.h==320)
{
t1Speed.val=t1Speed.val*-1
}
if(t1Speed.val>120)
{
t1Speed.val=120
@@ -754,6 +762,10 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",48
covx tTmp.txt,t2Speed.val,0,0
if(p0.h==320)
{
t2Speed.val=t2Speed.val*-1
}
if(t2Speed.val>120)
{
t2Speed.val=120
@@ -785,6 +797,10 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",55
covx tTmp.txt,t3Speed.val,0,0
if(p0.h==320)
{
t3Speed.val=t3Speed.val*-1
}
if(t3Speed.val>120)
{
t3Speed.val=120
@@ -816,6 +832,10 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",62
covx tTmp.txt,t4Speed.val,0,0
if(p0.h==320)
{
t4Speed.val=t4Speed.val*-1
}
if(t4Speed.val>120)
{
t4Speed.val=120
@@ -847,6 +867,10 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",69
covx tTmp.txt,t5Speed.val,0,0
if(p0.h==320)
{
t5Speed.val=t5Speed.val*-1
}
if(t5Speed.val>120)
{
t5Speed.val=120
@@ -893,6 +917,10 @@ Timer tmSerial
{
page screensaver
}
if(tId.txt=="screensaver2")
{
page screensaver2
}
if(tId.txt=="cardEntities")
{
page cardEntities

24
HMI/n2t-out-visual/cardPower.txt
View File

@@ -1410,6 +1410,10 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",34
covx tTmp.txt,t0Speed.val,0,0
if(p0.h==320)
{
t0Speed.val=t0Speed.val*-1
}
if(t0Speed.val>120)
{
t0Speed.val=120
@@ -1441,6 +1445,10 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",41
covx tTmp.txt,t1Speed.val,0,0
if(p0.h==320)
{
t1Speed.val=t1Speed.val*-1
}
if(t1Speed.val>120)
{
t1Speed.val=120
@@ -1472,6 +1480,10 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",48
covx tTmp.txt,t2Speed.val,0,0
if(p0.h==320)
{
t2Speed.val=t2Speed.val*-1
}
if(t2Speed.val>120)
{
t2Speed.val=120
@@ -1503,6 +1515,10 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",55
covx tTmp.txt,t3Speed.val,0,0
if(p0.h==320)
{
t3Speed.val=t3Speed.val*-1
}
if(t3Speed.val>120)
{
t3Speed.val=120
@@ -1534,6 +1550,10 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",62
covx tTmp.txt,t4Speed.val,0,0
if(p0.h==320)
{
t4Speed.val=t4Speed.val*-1
}
if(t4Speed.val>120)
{
t4Speed.val=120
@@ -1565,6 +1585,10 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",69
covx tTmp.txt,t5Speed.val,0,0
if(p0.h==320)
{
t5Speed.val=t5Speed.val*-1
}
if(t5Speed.val>120)
{
t5Speed.val=120

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

@@ -50,10 +50,6 @@ cardThermo
57 Component(s)
536 Line(s) of event code
317 Unique line(s) of event code
cardPower
54 Component(s)
499 Line(s) of event code
338 Unique line(s) of event code
popupInSel
34 Component(s)
617 Line(s) of event code
@@ -74,6 +70,10 @@ screensaver2
59 Component(s)
354 Line(s) of event code
251 Unique line(s) of event code
cardPower
54 Component(s)
523 Line(s) of event code
345 Unique line(s) of event code
popupTimer
42 Component(s)
512 Line(s) of event code
@@ -90,5 +90,5 @@ cardEntities
Total
21 Page(s)
802 Component(s)
9214 Line(s) of event code
2333 Unique line(s) of event code
9238 Line(s) of event code
2340 Unique line(s) of event code

24
HMI/n2t-out/cardPower.txt
View File

@@ -722,6 +722,10 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",34
covx tTmp.txt,t0Speed.val,0,0
if(p0.h==320)
{
t0Speed.val=t0Speed.val*-1
}
if(t0Speed.val>120)
{
t0Speed.val=120
@@ -753,6 +757,10 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",41
covx tTmp.txt,t1Speed.val,0,0
if(p0.h==320)
{
t1Speed.val=t1Speed.val*-1
}
if(t1Speed.val>120)
{
t1Speed.val=120
@@ -784,6 +792,10 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",48
covx tTmp.txt,t2Speed.val,0,0
if(p0.h==320)
{
t2Speed.val=t2Speed.val*-1
}
if(t2Speed.val>120)
{
t2Speed.val=120
@@ -815,6 +827,10 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",55
covx tTmp.txt,t3Speed.val,0,0
if(p0.h==320)
{
t3Speed.val=t3Speed.val*-1
}
if(t3Speed.val>120)
{
t3Speed.val=120
@@ -846,6 +862,10 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",62
covx tTmp.txt,t4Speed.val,0,0
if(p0.h==320)
{
t4Speed.val=t4Speed.val*-1
}
if(t4Speed.val>120)
{
t4Speed.val=120
@@ -877,6 +897,10 @@ Timer tmSerial
// speed
spstr strCommand.txt,tTmp.txt,"~",69
covx tTmp.txt,t5Speed.val,0,0
if(p0.h==320)
{
t5Speed.val=t5Speed.val*-1
}
if(t5Speed.val>120)
{
t5Speed.val=120