h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-12 08:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2023-01-23 16:53:40 +00:00
committed by github-actions[bot]
parent a481e70976
commit 9e026d8922
19 changed files with 475 additions and 897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -536,6 +536,23 @@
│ if(tInstruction.txt=="date") │ if(tInstruction.txt=="date")
│ --- HMI/n2t-out/cardMedia.txt │ --- HMI/n2t-out/cardMedia.txt
├── +++ HMI/US/landscape/n2t-out/cardMedia.txt ├── +++ HMI/US/landscape/n2t-out/cardMedia.txt
│ @@ -25,15 +25,15 @@
│ vis bEntity1,0
│ vis bEntity2,0
│ vis bEntity3,0
│ vis bEntity4,0
│ vis bEntity5,0
│ vis bEntity6,0
│ cardMedia.bco=defaultBcoColor
│ - for(sys0=0;sys0<52;sys0++)
│ + for(sys0=0;sys0<34;sys0++)
│ {
│ if(b[sys0].type==98||b[sys0].type==116)
│ {
│ b[sys0].bco=defaultBcoColor
│ b[sys0].pco=defaultFontColor
│ }
│ }
│ @@ -1200,18 +1200,14 @@ │ @@ -1200,18 +1200,14 @@
│ { │ {
│ page cardPower │ page cardPower
@@ -574,14 +591,16 @@
│ b[sys0].pco=defaultFontColor │ b[sys0].pco=defaultFontColor
│ } │ }
│ if(defaultBcoColor==0) │ if(defaultBcoColor==0)
│ @@ -275,109 +275,79 @@ │ @@ -273,111 +273,81 @@
│ Attributes
│ Scope : local
│ Dragging : 0 │ Dragging : 0
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ Send Component ID : disabled │ Send Component ID : disabled
│ Associated Keyboard : none │ Associated Keyboard : none
│ Text : │ Text :
│ Max. Text Size : 20 │ - Max. Text Size : 10
│ │ -
│ -Text tHome2 │ -Text tHome2
│ - Attributes │ - Attributes
│ - Scope : local │ - Scope : local
@@ -600,7 +619,7 @@
│ - Send Component ID : disabled │ - Send Component ID : disabled
│ - Associated Keyboard : none │ - Associated Keyboard : none
│ - Text : │ - Text :
│ - Max. Text Size : 20 │ - Max. Text Size : 10
│ - │ -
│ -Text tHomeO2 │ -Text tHomeO2
│ - Attributes │ - Attributes
@@ -611,7 +630,8 @@
│ - Associated Keyboard : none │ - Associated Keyboard : none
│ - Text : │ - Text :
│ - Max. Text Size : 10 │ - Max. Text Size : 10
│ - │ + Max. Text Size : 20
│
│ Picture p0 │ Picture p0
│ Attributes │ Attributes
│ Scope : local │ Scope : local
@@ -1379,7 +1399,7 @@
│ spstr strCommand.txt,tTmp.txt,"~",2 │ spstr strCommand.txt,tTmp.txt,"~",2
│ covx tTmp.txt,tIcon1.pco,0,0 │ covx tTmp.txt,tIcon1.pco,0,0
│ //statusIcon2 │ //statusIcon2
│ @@ -540,109 +522,109 @@ │ @@ -540,95 +522,91 @@
│ } │ }
│ if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") │ if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
│ { │ {
@@ -1486,7 +1506,10 @@
│ tF4Icon.txt=tF3Icon.txt │ tF4Icon.txt=tF3Icon.txt
│ tF3Icon.txt=tF2Icon.txt │ tF3Icon.txt=tF2Icon.txt
│ tF2Icon.txt=tF1Icon.txt │ tF2Icon.txt=tF1Icon.txt
│ } │ - tF4Icon.pco=tF3Icon.pco
│ - tF3Icon.pco=tF2Icon.pco
│ - tF2Icon.pco=tF1Icon.pco
│ + }
│ + //tMR │ + //tMR
│ + spstr strCommand.txt,tMR.txt,"~",16 │ + spstr strCommand.txt,tMR.txt,"~",16
│ + //statusIcon1 │ + //statusIcon1
@@ -1506,14 +1529,14 @@
│ + if(tTmp.txt!="") │ + if(tTmp.txt!="")
│ + { │ + {
│ + tIcon2.font=3 │ + tIcon2.font=3
│ + } │ }
│ } │ }
│ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") │ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
│ { │ {
│ spstr strCommand.txt,tTmp.txt,"~",1 │ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,tTime.bco,0,0 │ covx tTmp.txt,tTime.bco,0,0
│ if(tTime.bco!=screensaver.bco) │ if(tTime.bco!=screensaver.bco)
│ { │ @@ -636,16 +614,17 @@
│ screensaver.bco=tTime.bco │ screensaver.bco=tTime.bco
│ tAMPM.bco=tTime.bco │ tAMPM.bco=tTime.bco
│ tDate.bco=tTime.bco │ tDate.bco=tTime.bco
@@ -1533,7 +1556,7 @@
│ tF1Icon.bco=tTime.bco │ tF1Icon.bco=tTime.bco
│ tForecast2.bco=tTime.bco │ tForecast2.bco=tTime.bco
│ tForecast2Val.bco=tTime.bco │ tForecast2Val.bco=tTime.bco
│ @@ -658,42 +640,56 @@ │ @@ -661,42 +640,56 @@
│ spstr strCommand.txt,tTmp.txt,"~",2 │ spstr strCommand.txt,tTmp.txt,"~",2
│ covx tTmp.txt,tTime.pco,0,0 │ covx tTmp.txt,tTime.pco,0,0
│ spstr strCommand.txt,tTmp.txt,"~",3 │ spstr strCommand.txt,tTmp.txt,"~",3
@@ -1604,24 +1627,28 @@
│ tForecast3.pco=tForecast2.pco │ tForecast3.pco=tForecast2.pco
│ tForecast2.pco=tForecast1.pco │ tForecast2.pco=tForecast1.pco
│ } │ }
│ @@ -789,20 +785,14 @@ │ @@ -791,24 +784,14 @@
│ {
│ page cardPower │ page cardPower
│ } │ }
│ if(tId.txt=="cardChart") │ if(tId.txt=="cardChart")
│ { │ {
│ page cardChart │ page cardChart
│ } │ }
│ } │ - if(tId.txt=="cardLChart")
│ - {
│ - page cardLChart
│ - }
│ - }
│ - if(tInstruction.txt=="timeout") │ - if(tInstruction.txt=="timeout")
│ - { │ - {
│ - //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
│ - } │ }
│ // end of user code │ // end of user code
│ udelete payloadLength-1 │ udelete payloadLength-1
│ bufferPos=0 │ bufferPos=0
│ } │ }
│ } │ }
│ } │ }
│ }

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

@@ -15,25 +15,6 @@
│ + // fix touch offset (Removed for US version) │ + // fix touch offset (Removed for US version)
│ + //lcd_dev fffb 0002 0000 0020 │ + //lcd_dev fffb 0002 0000 0020
│ page pageStartup │ page pageStartup
│ --- HMI/n2t-out/cardAlarm.txt
├── +++ HMI/US/portrait/n2t-out/cardAlarm.txt
│ @@ -34,15 +34,15 @@
│ vis b9,0
│ vis b10,0
│ vis b11,0
│ vis tCode,0
│ vis bPrev,0
│ vis bNext,0
│ cardAlarm.bco=defaultBcoColor
│ - for(sys0=0;sys0<44;sys0++)
│ + for(sys0=0;sys0<40;sys0++)
│ {
│ if(b[sys0].type==98||b[sys0].type==116)
│ {
│ b[sys0].bco=defaultBcoColor
│ //b[sys0].pco=defaultFontColor
│ }
│ }
│ --- HMI/n2t-out/cardEntities.txt │ --- HMI/n2t-out/cardEntities.txt
├── +++ HMI/US/portrait/n2t-out/cardEntities.txt ├── +++ HMI/US/portrait/n2t-out/cardEntities.txt
│ @@ -61,16 +61,36 @@ │ @@ -61,16 +61,36 @@
@@ -1066,277 +1047,25 @@
│ //command format pageType,specialPageName │ //command format pageType,specialPageName
│ //write name of speical page to tId │ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1 │ spstr strCommand.txt,tId.txt,"~",1
│ --- HMI/n2t-out/cardPower.txt │ --- HMI/n2t-out/cardMedia.txt
├── +++ HMI/US/portrait/n2t-out/cardPower.txt ├── +++ HMI/US/portrait/n2t-out/cardMedia.txt
│ @@ -35,15 +35,15 @@ │ @@ -25,15 +25,15 @@
│ vis t0Icon,0 │ vis bEntity1,0
│ vis t1Icon,0 │ vis bEntity2,0
│ vis t2Icon,0 │ vis bEntity3,0
│ vis t3Icon,0 │ vis bEntity4,0
│ vis t4Icon,0 │ vis bEntity5,0
│ vis t5Icon,0 │ vis bEntity6,0
│ cardPower.bco=defaultBcoColor │ cardMedia.bco=defaultBcoColor
│ - for(sys0=0;sys0<48;sys0++) │ - for(sys0=0;sys0<52;sys0++)
│ + for(sys0=0;sys0<43;sys0++) │ + for(sys0=0;sys0<34;sys0++)
│ { │ {
│ if(b[sys0].type==98||b[sys0].type==116) │ if(b[sys0].type==98||b[sys0].type==116)
│ { │ {
│ b[sys0].bco=defaultBcoColor │ b[sys0].bco=defaultBcoColor
│ b[sys0].pco=defaultFontColor │ b[sys0].pco=defaultFontColor
│ } │ }
│ if(defaultBcoColor==0)
│ @@ -283,15 +283,15 @@
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ Text :
│ - Max. Text Size : 10
│ + Max. Text Size : 20
│
│ Text tHomeO
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ @@ -303,81 +303,81 @@
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ Text :
│ - Max. Text Size : 10
│ + Max. Text Size : 20
│
│ Picture p0
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│
│ Slider h0
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ - Position : 600
│ - Upper range limit : 1200
│ + Position : 50
│ + Upper range limit : 100
│ Lower range limit : 0
│
│ Slider h1
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ - Position : 600
│ - Upper range limit : 1200
│ + Position : 50
│ + Upper range limit : 100
│ Lower range limit : 0
│
│ Slider h2
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ - Position : 600
│ - Upper range limit : 1200
│ + Position : 50
│ + Upper range limit : 100
│ Lower range limit : 0
│
│ Slider h3
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ - Position : 600
│ - Upper range limit : 1200
│ + Position : 50
│ + Upper range limit : 100
│ Lower range limit : 0
│
│ Slider h4
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ - Position : 600
│ - Upper range limit : 1200
│ + Position : 50
│ + Upper range limit : 100
│ Lower range limit : 0
│
│ Slider h5
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ - Position : 600
│ - Upper range limit : 1200
│ + Position : 50
│ + Upper range limit : 100
│ Lower range limit : 0
│
│ Button bNext
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ @@ -463,92 +463,74 @@
│ Attributes
│ Scope : local
│ Period (ms): 100
│ Enabled : yes
│
│ Events
│ Timer Event
│ - if(t0Speed.val!=0)
│ + sys0=h0.val+t0Speed.val
│ + if(sys0>h0.maxval)
│ {
│ - sys0=h0.val+t0Speed.val
│ - if(sys0>h0.maxval)
│ - {
│ - h0.val=h0.minval
│ - }
│ - if(sys0<h0.minval)
│ - {
│ - h0.val=h0.maxval
│ - }
│ - h0.val+=t0Speed.val
│ + h0.val=h0.minval
│ } │ }
│ - if(t1Speed.val!=0)
│ + if(sys0<h0.minval)
│ {
│ - sys0=h1.val+t1Speed.val
│ - if(sys0>h1.maxval)
│ - {
│ - h1.val=h1.minval
│ - }
│ - if(sys0<h1.minval)
│ - {
│ - h1.val=h1.maxval
│ - }
│ - h1.val+=t1Speed.val
│ + h0.val=h0.maxval
│ }
│ - if(t2Speed.val!=0)
│ + h0.val+=t0Speed.val
│ + sys0=h1.val+t1Speed.val
│ + if(sys0>h1.maxval)
│ {
│ - sys0=h2.val+t2Speed.val
│ - if(sys0>h2.maxval)
│ - {
│ - h2.val=h2.minval
│ - }
│ - if(sys0<h2.minval)
│ - {
│ - h2.val=h2.maxval
│ - }
│ - h2.val+=t2Speed.val
│ + h1.val=h1.minval
│ }
│ - if(t3Speed.val!=0)
│ + if(sys0<h1.minval)
│ {
│ - sys0=h3.val+t3Speed.val
│ - if(sys0>h3.maxval)
│ - {
│ - h3.val=h3.minval
│ - }
│ - if(sys0<h3.minval)
│ - {
│ - h3.val=h3.maxval
│ - }
│ - h3.val+=t3Speed.val
│ + h1.val=h1.maxval
│ }
│ - if(t4Speed.val!=0)
│ + h1.val+=t1Speed.val
│ + sys0=h2.val+t2Speed.val
│ + if(sys0>h2.maxval)
│ {
│ - sys0=h4.val+t4Speed.val
│ - if(sys0>h4.maxval)
│ - {
│ - h4.val=h4.minval
│ - }
│ - if(sys0<h4.minval)
│ - {
│ - h4.val=h4.maxval
│ - }
│ - h4.val+=t4Speed.val
│ + h2.val=h2.minval
│ }
│ - if(t5Speed.val!=0)
│ + if(sys0<h2.minval)
│ {
│ - sys0=h5.val+t5Speed.val
│ - if(sys0>h5.maxval)
│ - {
│ - h5.val=h5.minval
│ - }
│ - if(sys0<h5.minval)
│ - {
│ - h5.val=h5.maxval
│ - }
│ - h5.val+=t5Speed.val
│ + h2.val=h2.maxval
│ + }
│ + h2.val+=t2Speed.val
│ + sys0=h3.val+t3Speed.val
│ + if(sys0>h3.maxval)
│ + {
│ + h3.val=h3.minval
│ + }
│ + if(sys0<h3.minval)
│ + {
│ + h3.val=h3.maxval
│ + }
│ + h3.val+=t3Speed.val
│ + sys0=h4.val+t4Speed.val
│ + if(sys0>h4.maxval)
│ + {
│ + h4.val=h4.minval
│ + }
│ + if(sys0<h4.minval)
│ + {
│ + h4.val=h4.maxval
│ + }
│ + h4.val+=t4Speed.val
│ + sys0=h5.val+t5Speed.val
│ + if(sys0>h5.maxval)
│ + {
│ + h5.val=h5.minval
│ + }
│ + if(sys0<h5.minval)
│ + {
│ + h5.val=h5.maxval
│ }
│ + h5.val+=t5Speed.val
│
│ Timer tmSerial
│ Attributes
│ Scope : local
│ Period (ms): 50
│ Enabled : yes
│ --- HMI/n2t-out/cardQR.txt │ --- HMI/n2t-out/cardQR.txt
├── +++ HMI/US/portrait/n2t-out/cardQR.txt ├── +++ HMI/US/portrait/n2t-out/cardQR.txt
│ @@ -602,19 +602,19 @@ │ @@ -602,19 +602,19 @@
@@ -1363,7 +1092,60 @@
│ } │ }
│ --- HMI/n2t-out/pageStartup.txt │ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/portrait/n2t-out/pageStartup.txt ├── +++ HMI/US/portrait/n2t-out/pageStartup.txt
│ @@ -35,20 +35,14 @@ │ @@ -8,47 +8,56 @@
│ Swide up page ID : disabled
│ Swide down page ID : disabled
│ Swide left page ID : disabled
│ Swide right page ID : disabled
│
│ Events
│ Preinitialize Event
│ + dim=dimValueNormal
│ vis p0,0
│ - recmod=1
│ - bauds=115200
│ vis tSend,0
│ vis tInstruction,0
│ vis tTmp,0
│ vis tId,0
│ - vis bSendStartup,0
│ - vis frame_ptr,0
│ - vis spinner_w,0
│ - vis frapic_w,0
│ - vis usual_cnt,0
│ - vis tMsg2,0
│ - vis tMsg3,0
│ - vis tVersion,0
│ - dim=100
│ + vis t5,0
│ + vis tShuffle,0
│ + vis bPrev,0
│ + vis bNext,0
│ + vis bEntity1,0
│ + vis bEntity2,0
│ + vis bEntity3,0
│ + vis bEntity4,0
│ + vis bEntity5,0
│ + vis bEntity6,0
│ + cardMedia.bco=defaultBcoColor
│ + for(sys0=0;sys0<52;sys0++)
│ + {
│ + if(b[sys0].type==98||b[sys0].type==116)
│ + {
│ + b[sys0].bco=defaultBcoColor
│ + b[sys0].pco=defaultFontColor
│ + }
│ + }
│ + if(defaultBcoColor==0)
│ + {
│ + hVolume.pic=14
│ + hVolume.pic1=13
│ + hVolume.pic2=15
│ + }
│
│ Postinitialize Event
│ //send messages by clicking button
│ click bSendStartup,1
│ │
│ Variable (string) strCommand │ Variable (string) strCommand
│ Attributes │ Attributes
@@ -1384,7 +1166,7 @@
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ Send Component ID : disabled │ Send Component ID : disabled
│ Associated Keyboard : none │ Associated Keyboard : none
│ @@ -124,15 +118,15 @@ │ @@ -124,15 +133,15 @@
│ Text tMsg3 │ Text tMsg3
│ Attributes │ Attributes
│ Scope : local │ Scope : local
@@ -1401,24 +1183,7 @@
│ Scope : local │ Scope : local
│ Dragging : 0 │ Dragging : 0
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ @@ -145,15 +139,15 @@ │ @@ -179,15 +188,15 @@
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ Text :
│ - Max. Text Size : 30
│ + Max. Text Size : 10
│
│ Text tVersion
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ @@ -179,15 +173,15 @@
│ Max. Text Size : 10 │ Max. Text Size : 10
│ │
│ Events │ Events
@@ -1437,7 +1202,7 @@
│ //send cmd │ //send cmd
│ --- HMI/n2t-out/screensaver.txt │ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/portrait/n2t-out/screensaver.txt ├── +++ HMI/US/portrait/n2t-out/screensaver.txt
│ @@ -29,28 +29,19 @@ │ @@ -29,22 +29,19 @@
│ } │ }
│ tDate.txt=pageIcons.vaDate.txt │ tDate.txt=pageIcons.vaDate.txt
│ dim=dimValue │ dim=dimValue
@@ -1453,21 +1218,15 @@
│ Scope : local │ Scope : local
│ Text : │ Text :
│ - Max. Text Size: 400 │ - Max. Text Size: 400
│ -
│ -Variable (string) strTmp
│ - Attributes
│ - Scope : local
│ - Text :
│ - Max. Text Size: 2
│ + Max. Text Size: 200 │ + Max. Text Size: 200
│ │
│ Variable (string) tId │ Variable (string) strTmp
│ Attributes │ Attributes
│ Scope : local │ Scope : local
│ Text : │ Text :
│ Max. Text Size: 25 │ Max. Text Size: 2
│ │
│ @@ -103,35 +94,14 @@ │ @@ -103,35 +100,14 @@
│ Value: 0 │ Value: 0
│ │
│ Variable (int32) ycR │ Variable (int32) ycR
@@ -1503,38 +1262,3 @@
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ Send Component ID : disabled │ Send Component ID : disabled
│ Associated Keyboard : none │ Associated Keyboard : none
│ @@ -494,15 +464,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
│ @@ -788,14 +757,18 @@
│ {
│ 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
│ }

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

@@ -1,25 +1,6 @@
+++ /dev/fd/62 2023-01-22 12:29:59.836182943 +0000 +++ /dev/fd/62 2023-01-23 16:53:32.157856011 +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
+I/n2t-out/cardAlarm.txt
++ HMI/US/portrait/n2t-out/cardAlarm.txt
+5 +34,15 @@
+ vis b9,0
+ vis b10,0
+ vis b11,0
+ vis tCode,0
+ vis bPrev,0
+ vis bNext,0
+ cardAlarm.bco=defaultBcoColor
+ for(sys0=0;sys0<44;sys0++)
+ for(sys0=0;sys0<40;sys0++)
+ {
+ if(b[sys0].type==98||b[sys0].type==116)
+ {
+ b[sys0].bco=defaultBcoColor
+ //b[sys0].pco=defaultFontColor
+ }
+ }
+I/n2t-out/cardEntities.txt +I/n2t-out/cardEntities.txt
++ HMI/US/portrait/n2t-out/cardEntities.txt ++ HMI/US/portrait/n2t-out/cardEntities.txt
+6 +61,36 @@ +6 +61,36 @@
@@ -485,277 +466,25 @@
+ covx tTmp.txt,sys0,0,0 + covx tTmp.txt,sys0,0,0
+ hSlider6.maxval=sys0 + hSlider6.maxval=sys0
+ } + }
+I/n2t-out/cardPower.txt +I/n2t-out/cardMedia.txt
++ HMI/US/portrait/n2t-out/cardPower.txt ++ HMI/US/portrait/n2t-out/cardMedia.txt
+5 +35,15 @@ +5 +25,15 @@
+ vis t0Icon,0 + vis bEntity1,0
+ vis t1Icon,0 + vis bEntity2,0
+ vis t2Icon,0 + vis bEntity3,0
+ vis t3Icon,0 + vis bEntity4,0
+ vis t4Icon,0 + vis bEntity5,0
+ vis t5Icon,0 + vis bEntity6,0
+ cardPower.bco=defaultBcoColor + cardMedia.bco=defaultBcoColor
+ for(sys0=0;sys0<48;sys0++) + for(sys0=0;sys0<52;sys0++)
+ for(sys0=0;sys0<43;sys0++) + for(sys0=0;sys0<34;sys0++)
+ { + {
+ if(b[sys0].type==98||b[sys0].type==116) + if(b[sys0].type==98||b[sys0].type==116)
+ { + {
+ b[sys0].bco=defaultBcoColor + b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor + b[sys0].pco=defaultFontColor
+ } + }
+ if(defaultBcoColor==0)
+15 +283,15 @@
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 10
+ Max. Text Size : 20
+
+omeO
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+81 +303,81 @@
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 10
+ Max. Text Size : 20
+
+ p0
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+
+h0
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Position : 600
+ Upper range limit : 1200
+ Position : 50
+ Upper range limit : 100
+ Lower range limit : 0
+
+h1
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Position : 600
+ Upper range limit : 1200
+ Position : 50
+ Upper range limit : 100
+ Lower range limit : 0
+
+h2
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Position : 600
+ Upper range limit : 1200
+ Position : 50
+ Upper range limit : 100
+ Lower range limit : 0
+
+h3
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Position : 600
+ Upper range limit : 1200
+ Position : 50
+ Upper range limit : 100
+ Lower range limit : 0
+
+h4
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Position : 600
+ Upper range limit : 1200
+ Position : 50
+ Upper range limit : 100
+ Lower range limit : 0
+
+h5
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Position : 600
+ Upper range limit : 1200
+ Position : 50
+ Upper range limit : 100
+ Lower range limit : 0
+
+bNext
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+92 +463,74 @@
+ributes
+ Scope : local
+ Period (ms): 100
+ Enabled : yes
+
+nts
+ Timer Event
+ if(t0Speed.val!=0)
+ sys0=h0.val+t0Speed.val
+ if(sys0>h0.maxval)
+ {
+ sys0=h0.val+t0Speed.val
+ if(sys0>h0.maxval)
+ {
+ h0.val=h0.minval
+ }
+ if(sys0<h0.minval)
+ {
+ h0.val=h0.maxval
+ }
+ h0.val+=t0Speed.val
+ h0.val=h0.minval
+ } + }
+ if(t1Speed.val!=0)
+ if(sys0<h0.minval)
+ {
+ sys0=h1.val+t1Speed.val
+ if(sys0>h1.maxval)
+ {
+ h1.val=h1.minval
+ }
+ if(sys0<h1.minval)
+ {
+ h1.val=h1.maxval
+ }
+ h1.val+=t1Speed.val
+ h0.val=h0.maxval
+ }
+ if(t2Speed.val!=0)
+ h0.val+=t0Speed.val
+ sys0=h1.val+t1Speed.val
+ if(sys0>h1.maxval)
+ {
+ sys0=h2.val+t2Speed.val
+ if(sys0>h2.maxval)
+ {
+ h2.val=h2.minval
+ }
+ if(sys0<h2.minval)
+ {
+ h2.val=h2.maxval
+ }
+ h2.val+=t2Speed.val
+ h1.val=h1.minval
+ }
+ if(t3Speed.val!=0)
+ if(sys0<h1.minval)
+ {
+ sys0=h3.val+t3Speed.val
+ if(sys0>h3.maxval)
+ {
+ h3.val=h3.minval
+ }
+ if(sys0<h3.minval)
+ {
+ h3.val=h3.maxval
+ }
+ h3.val+=t3Speed.val
+ h1.val=h1.maxval
+ }
+ if(t4Speed.val!=0)
+ h1.val+=t1Speed.val
+ sys0=h2.val+t2Speed.val
+ if(sys0>h2.maxval)
+ {
+ sys0=h4.val+t4Speed.val
+ if(sys0>h4.maxval)
+ {
+ h4.val=h4.minval
+ }
+ if(sys0<h4.minval)
+ {
+ h4.val=h4.maxval
+ }
+ h4.val+=t4Speed.val
+ h2.val=h2.minval
+ }
+ if(t5Speed.val!=0)
+ if(sys0<h2.minval)
+ {
+ sys0=h5.val+t5Speed.val
+ if(sys0>h5.maxval)
+ {
+ h5.val=h5.minval
+ }
+ if(sys0<h5.minval)
+ {
+ h5.val=h5.maxval
+ }
+ h5.val+=t5Speed.val
+ h2.val=h2.maxval
+ }
+ h2.val+=t2Speed.val
+ sys0=h3.val+t3Speed.val
+ if(sys0>h3.maxval)
+ {
+ h3.val=h3.minval
+ }
+ if(sys0<h3.minval)
+ {
+ h3.val=h3.maxval
+ }
+ h3.val+=t3Speed.val
+ sys0=h4.val+t4Speed.val
+ if(sys0>h4.maxval)
+ {
+ h4.val=h4.minval
+ }
+ if(sys0<h4.minval)
+ {
+ h4.val=h4.maxval
+ }
+ h4.val+=t4Speed.val
+ sys0=h5.val+t5Speed.val
+ if(sys0>h5.maxval)
+ {
+ h5.val=h5.minval
+ }
+ if(sys0<h5.minval)
+ {
+ h5.val=h5.maxval
+ }
+ h5.val+=t5Speed.val
+
+mSerial
+ributes
+ Scope : local
+ Period (ms): 50
+ Enabled : yes
+I/n2t-out/cardQR.txt +I/n2t-out/cardQR.txt
++ HMI/US/portrait/n2t-out/cardQR.txt ++ HMI/US/portrait/n2t-out/cardQR.txt
+19 +602,19 @@ +19 +602,19 @@
@@ -782,7 +511,60 @@
+ } + }
+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 +35,14 @@ + +8,56 @@
+ Swide up page ID : disabled
+ Swide down page ID : disabled
+ Swide left page ID : disabled
+ Swide right page ID : disabled
+
+nts
+ Preinitialize Event
+ dim=dimValueNormal
+ vis p0,0
+ recmod=1
+ bauds=115200
+ vis tSend,0
+ vis tInstruction,0
+ vis tTmp,0
+ vis tId,0
+ vis bSendStartup,0
+ vis frame_ptr,0
+ vis spinner_w,0
+ vis frapic_w,0
+ vis usual_cnt,0
+ vis tMsg2,0
+ vis tMsg3,0
+ vis tVersion,0
+ dim=100
+ vis t5,0
+ vis tShuffle,0
+ vis bPrev,0
+ vis bNext,0
+ vis bEntity1,0
+ vis bEntity2,0
+ vis bEntity3,0
+ vis bEntity4,0
+ vis bEntity5,0
+ vis bEntity6,0
+ cardMedia.bco=defaultBcoColor
+ for(sys0=0;sys0<52;sys0++)
+ {
+ if(b[sys0].type==98||b[sys0].type==116)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
+ }
+ if(defaultBcoColor==0)
+ {
+ hVolume.pic=14
+ hVolume.pic1=13
+ hVolume.pic2=15
+ }
+
+ Postinitialize Event
+ //send messages by clicking button
+ click bSendStartup,1
+ +
+e (string) strCommand +e (string) strCommand
+ributes +ributes
@@ -803,26 +585,11 @@
+ Disable release event after dragging: 0 + Disable release event after dragging: 0
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard : none + Associated Keyboard : none
+15 +139,15 @@ +15 +133,15 @@
+ributes +15 +188,15 @@
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 30
+ Max. Text Size : 10
+
+ersion
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+I/n2t-out/screensaver.txt +I/n2t-out/screensaver.txt
++ HMI/US/portrait/n2t-out/screensaver.txt ++ HMI/US/portrait/n2t-out/screensaver.txt
+8 +29,19 @@ +2 +29,19 @@
+ } + }
+ tDate.txt=pageIcons.vaDate.txt + tDate.txt=pageIcons.vaDate.txt
+ dim=dimValue + dim=dimValue
@@ -838,21 +605,15 @@
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 400 + Max. Text Size: 400
+ Max. Text Size: 200
+ +
+e (string) strTmp +e (string) strTmp
+ributes +ributes
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 2 + Max. Text Size: 2
+ Max. Text Size: 200
+ +
+e (string) tId +35 +100,14 @@
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 25
+
+35 +94,14 @@
+ Value: 0 + Value: 0
+ +
+e (int32) ycR +e (int32) ycR
@@ -888,38 +649,3 @@
+ Disable release event after dragging: 0 + Disable release event after dragging: 0
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard : none + Associated Keyboard : none
+15 +464,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
+14 +757,18 @@
+ {
+ 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
+ }

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

@@ -46,7 +46,7 @@ Page cardAlarm
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
cardAlarm.bco=defaultBcoColor cardAlarm.bco=defaultBcoColor
for(sys0=0;sys0<40;sys0++) for(sys0=0;sys0<44;sys0++)
{ {
if(b[sys0].type==98||b[sys0].type==116) if(b[sys0].type==98||b[sys0].type==116)
{ {

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

@@ -47,7 +47,7 @@ Page cardPower
vis t4Icon,0 vis t4Icon,0
vis t5Icon,0 vis t5Icon,0
cardPower.bco=defaultBcoColor cardPower.bco=defaultBcoColor
for(sys0=0;sys0<43;sys0++) for(sys0=0;sys0<48;sys0++)
{ {
if(b[sys0].type==98||b[sys0].type==116) if(b[sys0].type==98||b[sys0].type==116)
{ {
@@ -609,7 +609,7 @@ Text tHome
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 20 Max. Text Size : 10
Word wrap : enabled Word wrap : enabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -639,7 +639,7 @@ Text tHome2
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 20 Max. Text Size : 10
Word wrap : enabled Word wrap : enabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -669,7 +669,7 @@ Text tHomeO
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 20 Max. Text Size : 10
Word wrap : enabled Word wrap : enabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -699,7 +699,7 @@ Text tHomeO2
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 20 Max. Text Size : 10
Word wrap : enabled Word wrap : enabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -742,8 +742,8 @@ Slider h0
Cursor height : 255 Cursor height : 255
Back. Picture ID : 18 Back. Picture ID : 18
Slided Back. Picture ID : 18 Slided Back. Picture ID : 18
Position : 50 Position : 600
Upper range limit : 100 Upper range limit : 1200
Lower range limit : 0 Lower range limit : 0
Slider h1 Slider h1
@@ -767,8 +767,8 @@ Slider h1
Cursor height : 255 Cursor height : 255
Back. Picture ID : 18 Back. Picture ID : 18
Slided Back. Picture ID : 18 Slided Back. Picture ID : 18
Position : 50 Position : 600
Upper range limit : 100 Upper range limit : 1200
Lower range limit : 0 Lower range limit : 0
Slider h2 Slider h2
@@ -792,8 +792,8 @@ Slider h2
Cursor height : 255 Cursor height : 255
Back. Picture ID : 18 Back. Picture ID : 18
Slided Back. Picture ID : 18 Slided Back. Picture ID : 18
Position : 50 Position : 600
Upper range limit : 100 Upper range limit : 1200
Lower range limit : 0 Lower range limit : 0
Slider h3 Slider h3
@@ -817,8 +817,8 @@ Slider h3
Cursor height : 255 Cursor height : 255
Back. Picture ID : 18 Back. Picture ID : 18
Slided Back. Picture ID : 18 Slided Back. Picture ID : 18
Position : 50 Position : 600
Upper range limit : 100 Upper range limit : 1200
Lower range limit : 0 Lower range limit : 0
Slider h4 Slider h4
@@ -842,8 +842,8 @@ Slider h4
Cursor height : 255 Cursor height : 255
Back. Picture ID : 18 Back. Picture ID : 18
Slided Back. Picture ID : 18 Slided Back. Picture ID : 18
Position : 50 Position : 600
Upper range limit : 100 Upper range limit : 1200
Lower range limit : 0 Lower range limit : 0
Slider h5 Slider h5
@@ -867,8 +867,8 @@ Slider h5
Cursor height : 255 Cursor height : 255
Back. Picture ID : 18 Back. Picture ID : 18
Slided Back. Picture ID : 18 Slided Back. Picture ID : 18
Position : 50 Position : 600
Upper range limit : 100 Upper range limit : 1200
Lower range limit : 0 Lower range limit : 0
Button bNext Button bNext
@@ -1034,66 +1034,84 @@ Timer tm0
Events Events
Timer Event Timer Event
sys0=h0.val+t0Speed.val if(t0Speed.val!=0)
if(sys0>h0.maxval)
{ {
h0.val=h0.minval sys0=h0.val+t0Speed.val
if(sys0>h0.maxval)
{
h0.val=h0.minval
}
if(sys0<h0.minval)
{
h0.val=h0.maxval
}
h0.val+=t0Speed.val
} }
if(sys0<h0.minval) if(t1Speed.val!=0)
{ {
h0.val=h0.maxval sys0=h1.val+t1Speed.val
if(sys0>h1.maxval)
{
h1.val=h1.minval
}
if(sys0<h1.minval)
{
h1.val=h1.maxval
}
h1.val+=t1Speed.val
} }
h0.val+=t0Speed.val if(t2Speed.val!=0)
sys0=h1.val+t1Speed.val
if(sys0>h1.maxval)
{ {
h1.val=h1.minval sys0=h2.val+t2Speed.val
if(sys0>h2.maxval)
{
h2.val=h2.minval
}
if(sys0<h2.minval)
{
h2.val=h2.maxval
}
h2.val+=t2Speed.val
} }
if(sys0<h1.minval) if(t3Speed.val!=0)
{ {
h1.val=h1.maxval sys0=h3.val+t3Speed.val
if(sys0>h3.maxval)
{
h3.val=h3.minval
}
if(sys0<h3.minval)
{
h3.val=h3.maxval
}
h3.val+=t3Speed.val
} }
h1.val+=t1Speed.val if(t4Speed.val!=0)
sys0=h2.val+t2Speed.val
if(sys0>h2.maxval)
{ {
h2.val=h2.minval sys0=h4.val+t4Speed.val
if(sys0>h4.maxval)
{
h4.val=h4.minval
}
if(sys0<h4.minval)
{
h4.val=h4.maxval
}
h4.val+=t4Speed.val
} }
if(sys0<h2.minval) if(t5Speed.val!=0)
{ {
h2.val=h2.maxval sys0=h5.val+t5Speed.val
if(sys0>h5.maxval)
{
h5.val=h5.minval
}
if(sys0<h5.minval)
{
h5.val=h5.maxval
}
h5.val+=t5Speed.val
} }
h2.val+=t2Speed.val
sys0=h3.val+t3Speed.val
if(sys0>h3.maxval)
{
h3.val=h3.minval
}
if(sys0<h3.minval)
{
h3.val=h3.maxval
}
h3.val+=t3Speed.val
sys0=h4.val+t4Speed.val
if(sys0>h4.maxval)
{
h4.val=h4.minval
}
if(sys0<h4.minval)
{
h4.val=h4.maxval
}
h4.val+=t4Speed.val
sys0=h5.val+t5Speed.val
if(sys0>h5.maxval)
{
h5.val=h5.minval
}
if(sys0<h5.minval)
{
h5.val=h5.maxval
}
h5.val+=t5Speed.val
Timer tmSerial Timer tmSerial
Attributes Attributes

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

@@ -28,8 +28,8 @@ cardQR
234 Unique line(s) of event code 234 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
185 Line(s) of event code 200 Line(s) of event code
131 Unique line(s) of event code 142 Unique line(s) of event code
cardGrid cardGrid
44 Component(s) 44 Component(s)
515 Line(s) of event code 515 Line(s) of event code
@@ -46,10 +46,10 @@ cardThermo
57 Component(s) 57 Component(s)
532 Line(s) of event code 532 Line(s) of event code
315 Unique line(s) of event code 315 Unique line(s) of event code
cardPower screensaver
48 Component(s) 46 Component(s)
465 Line(s) of event code 417 Line(s) of event code
318 Unique line(s) of event code 300 Unique line(s) of event code
cardChart cardChart
33 Component(s) 33 Component(s)
429 Line(s) of event code 429 Line(s) of event code
@@ -70,14 +70,14 @@ cardAlarm
43 Component(s) 43 Component(s)
492 Line(s) of event code 492 Line(s) of event code
269 Unique line(s) of event code 269 Unique line(s) of event code
screensaver
45 Component(s)
413 Line(s) of event code
296 Unique line(s) of event code
popupInSel popupInSel
34 Component(s) 34 Component(s)
617 Line(s) of event code 617 Line(s) of event code
295 Unique line(s) of event code 295 Unique line(s) of event code
cardPower
48 Component(s)
483 Line(s) of event code
324 Unique line(s) of event code
cardEntities cardEntities
91 Component(s) 91 Component(s)
1622 Line(s) of event code 1622 Line(s) of event code
@@ -85,6 +85,6 @@ cardEntities
Total Total
20 Page(s) 20 Page(s)
746 Component(s) 747 Component(s)
9192 Line(s) of event code 9229 Line(s) of event code
2379 Unique line(s) of event code 2382 Unique line(s) of event code

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

@@ -20,22 +20,37 @@ Page pageStartup
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
recmod=1
bauds=115200
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
vis tId,0 vis tId,0
vis bSendStartup,0 vis t5,0
vis frame_ptr,0 vis tShuffle,0
vis spinner_w,0 vis bPrev,0
vis frapic_w,0 vis bNext,0
vis usual_cnt,0 vis bEntity1,0
vis tMsg2,0 vis bEntity2,0
vis tMsg3,0 vis bEntity3,0
vis tVersion,0 vis bEntity4,0
dim=100 vis bEntity5,0
vis bEntity6,0
cardMedia.bco=defaultBcoColor
for(sys0=0;sys0<52;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
}
if(defaultBcoColor==0)
{
hVolume.pic=14
hVolume.pic1=13
hVolume.pic2=15
}
Postinitialize Event Postinitialize Event
//send messages by clicking button //send messages by clicking button
@@ -373,7 +388,7 @@ Text tTmp
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 10 Max. Text Size : 30
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0

11
HMI/US/portrait/n2t-out-visual/screensaver.txt
View File

@@ -48,6 +48,13 @@ Variable (string) strCommand
Text : Text :
Max. Text Size: 200 Max. Text Size: 200
Variable (string) strTmp
Attributes
ID : 45
Scope : local
Text :
Max. Text Size: 2
Variable (string) tId Variable (string) tId
Attributes Attributes
ID : 16 ID : 16
@@ -1040,6 +1047,7 @@ Timer tmSerial
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
click m0,1
//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
spstr pageIcons.vaTime.txt,tTime.txt,"?",0 spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -1163,6 +1171,9 @@ Timer tmSerial
tF4Icon.txt=tF3Icon.txt tF4Icon.txt=tF3Icon.txt
tF3Icon.txt=tF2Icon.txt tF3Icon.txt=tF2Icon.txt
tF2Icon.txt=tF1Icon.txt tF2Icon.txt=tF1Icon.txt
tF4Icon.pco=tF3Icon.pco
tF3Icon.pco=tF2Icon.pco
tF2Icon.pco=tF1Icon.pco
} }
} }
if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")

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

@@ -38,7 +38,7 @@ Page cardAlarm
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
cardAlarm.bco=defaultBcoColor cardAlarm.bco=defaultBcoColor
for(sys0=0;sys0<40;sys0++) for(sys0=0;sys0<44;sys0++)
{ {
if(b[sys0].type==98||b[sys0].type==116) if(b[sys0].type==98||b[sys0].type==116)
{ {

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

@@ -39,7 +39,7 @@ Page cardPower
vis t4Icon,0 vis t4Icon,0
vis t5Icon,0 vis t5Icon,0
cardPower.bco=defaultBcoColor cardPower.bco=defaultBcoColor
for(sys0=0;sys0<43;sys0++) for(sys0=0;sys0<48;sys0++)
{ {
if(b[sys0].type==98||b[sys0].type==116) if(b[sys0].type==98||b[sys0].type==116)
{ {
@@ -277,7 +277,7 @@ Text tHome
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text :
Max. Text Size : 20 Max. Text Size : 10
Text tHome2 Text tHome2
Attributes Attributes
@@ -287,7 +287,7 @@ Text tHome2
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text :
Max. Text Size : 20 Max. Text Size : 10
Text tHomeO Text tHomeO
Attributes Attributes
@@ -297,7 +297,7 @@ Text tHomeO
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text :
Max. Text Size : 20 Max. Text Size : 10
Text tHomeO2 Text tHomeO2
Attributes Attributes
@@ -307,7 +307,7 @@ Text tHomeO2
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text :
Max. Text Size : 20 Max. Text Size : 10
Picture p0 Picture p0
Attributes Attributes
@@ -322,8 +322,8 @@ Slider h0
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Position : 50 Position : 600
Upper range limit : 100 Upper range limit : 1200
Lower range limit : 0 Lower range limit : 0
Slider h1 Slider h1
@@ -332,8 +332,8 @@ Slider h1
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Position : 50 Position : 600
Upper range limit : 100 Upper range limit : 1200
Lower range limit : 0 Lower range limit : 0
Slider h2 Slider h2
@@ -342,8 +342,8 @@ Slider h2
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Position : 50 Position : 600
Upper range limit : 100 Upper range limit : 1200
Lower range limit : 0 Lower range limit : 0
Slider h3 Slider h3
@@ -352,8 +352,8 @@ Slider h3
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Position : 50 Position : 600
Upper range limit : 100 Upper range limit : 1200
Lower range limit : 0 Lower range limit : 0
Slider h4 Slider h4
@@ -362,8 +362,8 @@ Slider h4
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Position : 50 Position : 600
Upper range limit : 100 Upper range limit : 1200
Lower range limit : 0 Lower range limit : 0
Slider h5 Slider h5
@@ -372,8 +372,8 @@ Slider h5
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Position : 50 Position : 600
Upper range limit : 100 Upper range limit : 1200
Lower range limit : 0 Lower range limit : 0
Button bNext Button bNext
@@ -467,66 +467,84 @@ Timer tm0
Events Events
Timer Event Timer Event
sys0=h0.val+t0Speed.val if(t0Speed.val!=0)
if(sys0>h0.maxval)
{ {
h0.val=h0.minval sys0=h0.val+t0Speed.val
if(sys0>h0.maxval)
{
h0.val=h0.minval
}
if(sys0<h0.minval)
{
h0.val=h0.maxval
}
h0.val+=t0Speed.val
} }
if(sys0<h0.minval) if(t1Speed.val!=0)
{ {
h0.val=h0.maxval sys0=h1.val+t1Speed.val
if(sys0>h1.maxval)
{
h1.val=h1.minval
}
if(sys0<h1.minval)
{
h1.val=h1.maxval
}
h1.val+=t1Speed.val
} }
h0.val+=t0Speed.val if(t2Speed.val!=0)
sys0=h1.val+t1Speed.val
if(sys0>h1.maxval)
{ {
h1.val=h1.minval sys0=h2.val+t2Speed.val
if(sys0>h2.maxval)
{
h2.val=h2.minval
}
if(sys0<h2.minval)
{
h2.val=h2.maxval
}
h2.val+=t2Speed.val
} }
if(sys0<h1.minval) if(t3Speed.val!=0)
{ {
h1.val=h1.maxval sys0=h3.val+t3Speed.val
if(sys0>h3.maxval)
{
h3.val=h3.minval
}
if(sys0<h3.minval)
{
h3.val=h3.maxval
}
h3.val+=t3Speed.val
} }
h1.val+=t1Speed.val if(t4Speed.val!=0)
sys0=h2.val+t2Speed.val
if(sys0>h2.maxval)
{ {
h2.val=h2.minval sys0=h4.val+t4Speed.val
if(sys0>h4.maxval)
{
h4.val=h4.minval
}
if(sys0<h4.minval)
{
h4.val=h4.maxval
}
h4.val+=t4Speed.val
} }
if(sys0<h2.minval) if(t5Speed.val!=0)
{ {
h2.val=h2.maxval sys0=h5.val+t5Speed.val
if(sys0>h5.maxval)
{
h5.val=h5.minval
}
if(sys0<h5.minval)
{
h5.val=h5.maxval
}
h5.val+=t5Speed.val
} }
h2.val+=t2Speed.val
sys0=h3.val+t3Speed.val
if(sys0>h3.maxval)
{
h3.val=h3.minval
}
if(sys0<h3.minval)
{
h3.val=h3.maxval
}
h3.val+=t3Speed.val
sys0=h4.val+t4Speed.val
if(sys0>h4.maxval)
{
h4.val=h4.minval
}
if(sys0<h4.minval)
{
h4.val=h4.maxval
}
h4.val+=t4Speed.val
sys0=h5.val+t5Speed.val
if(sys0>h5.maxval)
{
h5.val=h5.minval
}
if(sys0<h5.minval)
{
h5.val=h5.maxval
}
h5.val+=t5Speed.val
Timer tmSerial Timer tmSerial
Attributes Attributes

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

@@ -12,22 +12,37 @@ Page pageStartup
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
recmod=1
bauds=115200
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
vis tId,0 vis tId,0
vis bSendStartup,0 vis t5,0
vis frame_ptr,0 vis tShuffle,0
vis spinner_w,0 vis bPrev,0
vis frapic_w,0 vis bNext,0
vis usual_cnt,0 vis bEntity1,0
vis tMsg2,0 vis bEntity2,0
vis tMsg3,0 vis bEntity3,0
vis tVersion,0 vis bEntity4,0
dim=100 vis bEntity5,0
vis bEntity6,0
cardMedia.bco=defaultBcoColor
for(sys0=0;sys0<52;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
}
if(defaultBcoColor==0)
{
hVolume.pic=14
hVolume.pic1=13
hVolume.pic2=15
}
Postinitialize Event Postinitialize Event
//send messages by clicking button //send messages by clicking button
@@ -143,7 +158,7 @@ Text tTmp
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text :
Max. Text Size : 10 Max. Text Size : 30
Text tVersion Text tVersion
Attributes Attributes

10
HMI/US/portrait/n2t-out/screensaver.txt
View File

@@ -39,6 +39,12 @@ Variable (string) strCommand
Text : Text :
Max. Text Size: 200 Max. Text Size: 200
Variable (string) strTmp
Attributes
Scope : local
Text :
Max. Text Size: 2
Variable (string) tId Variable (string) tId
Attributes Attributes
Scope : local Scope : local
@@ -468,6 +474,7 @@ Timer tmSerial
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
click m0,1
//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
spstr pageIcons.vaTime.txt,tTime.txt,"?",0 spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -591,6 +598,9 @@ Timer tmSerial
tF4Icon.txt=tF3Icon.txt tF4Icon.txt=tF3Icon.txt
tF3Icon.txt=tF2Icon.txt tF3Icon.txt=tF2Icon.txt
tF2Icon.txt=tF1Icon.txt tF2Icon.txt=tF1Icon.txt
tF4Icon.pco=tF3Icon.pco
tF3Icon.pco=tF2Icon.pco
tF2Icon.pco=tF1Icon.pco
} }
} }
if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")

2
HMI/n2t-out-visual/cardMedia.txt
View File

@@ -37,7 +37,7 @@ Page cardMedia
vis bEntity5,0 vis bEntity5,0
vis bEntity6,0 vis bEntity6,0
cardMedia.bco=defaultBcoColor cardMedia.bco=defaultBcoColor
for(sys0=0;sys0<34;sys0++) for(sys0=0;sys0<52;sys0++)
{ {
if(b[sys0].type==98||b[sys0].type==116) if(b[sys0].type==98||b[sys0].type==116)
{ {

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

@@ -609,7 +609,7 @@ Text tHome
Vertical Alignment : bottom Vertical Alignment : bottom
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 20 Max. Text Size : 10
Word wrap : enabled Word wrap : enabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -669,7 +669,7 @@ Text tHomeO
Vertical Alignment : bottom Vertical Alignment : bottom
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 20 Max. Text Size : 10
Word wrap : enabled Word wrap : enabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0

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

@@ -30,6 +30,10 @@ pageTest
26 Component(s) 26 Component(s)
68 Line(s) of event code 68 Line(s) of event code
66 Unique line(s) of event code 66 Unique line(s) of event code
cardMedia
59 Component(s)
641 Line(s) of event code
318 Unique line(s) of event code
popupFan popupFan
27 Component(s) 27 Component(s)
351 Line(s) of event code 351 Line(s) of event code
@@ -42,10 +46,10 @@ cardAlarm
43 Component(s) 43 Component(s)
492 Line(s) of event code 492 Line(s) of event code
269 Unique line(s) of event code 269 Unique line(s) of event code
cardPower screensaver
48 Component(s) 47 Component(s)
483 Line(s) of event code 426 Line(s) of event code
324 Unique line(s) of event code 307 Unique line(s) of event code
popupInSel popupInSel
34 Component(s) 34 Component(s)
617 Line(s) of event code 617 Line(s) of event code
@@ -58,14 +62,10 @@ popupShutter
25 Component(s) 25 Component(s)
398 Line(s) of event code 398 Line(s) of event code
218 Unique line(s) of event code 218 Unique line(s) of event code
screensaver cardPower
47 Component(s) 48 Component(s)
419 Line(s) of event code 483 Line(s) of event code
302 Unique line(s) of event code 324 Unique line(s) of event code
cardMedia
59 Component(s)
641 Line(s) of event code
318 Unique line(s) of event code
popupTimer popupTimer
42 Component(s) 42 Component(s)
512 Line(s) of event code 512 Line(s) of event code
@@ -86,5 +86,5 @@ cardEntities
Total Total
20 Page(s) 20 Page(s)
737 Component(s) 737 Component(s)
8811 Line(s) of event code 8818 Line(s) of event code
2267 Unique line(s) of event code 2271 Unique line(s) of event code

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

@@ -1215,6 +1215,9 @@ Timer tmSerial
tF4Icon.txt=tF3Icon.txt tF4Icon.txt=tF3Icon.txt
tF3Icon.txt=tF2Icon.txt tF3Icon.txt=tF2Icon.txt
tF2Icon.txt=tF1Icon.txt tF2Icon.txt=tF1Icon.txt
tF4Icon.pco=tF3Icon.pco
tF3Icon.pco=tF2Icon.pco
tF2Icon.pco=tF1Icon.pco
} }
} }
if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
@@ -1385,6 +1388,10 @@ Timer tmSerial
{ {
page cardChart page cardChart
} }
if(tId.txt=="cardLChart")
{
page cardLChart
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

2
HMI/n2t-out/cardMedia.txt
View File

@@ -29,7 +29,7 @@ Page cardMedia
vis bEntity5,0 vis bEntity5,0
vis bEntity6,0 vis bEntity6,0
cardMedia.bco=defaultBcoColor cardMedia.bco=defaultBcoColor
for(sys0=0;sys0<34;sys0++) for(sys0=0;sys0<52;sys0++)
{ {
if(b[sys0].type==98||b[sys0].type==116) if(b[sys0].type==98||b[sys0].type==116)
{ {

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

@@ -277,7 +277,7 @@ Text tHome
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text :
Max. Text Size : 20 Max. Text Size : 10
Text tHome2 Text tHome2
Attributes Attributes
@@ -297,7 +297,7 @@ Text tHomeO
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text :
Max. Text Size : 20 Max. Text Size : 10
Text tHomeO2 Text tHomeO2
Attributes Attributes

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

@@ -622,6 +622,9 @@ Timer tmSerial
tF4Icon.txt=tF3Icon.txt tF4Icon.txt=tF3Icon.txt
tF3Icon.txt=tF2Icon.txt tF3Icon.txt=tF2Icon.txt
tF2Icon.txt=tF1Icon.txt tF2Icon.txt=tF1Icon.txt
tF4Icon.pco=tF3Icon.pco
tF3Icon.pco=tF2Icon.pco
tF2Icon.pco=tF1Icon.pco
} }
} }
if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
@@ -792,6 +795,10 @@ Timer tmSerial
{ {
page cardChart page cardChart
} }
if(tId.txt=="cardLChart")
{
page cardLChart
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {