h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-15 09:26:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

sync (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-12-31 14:51:00 +00:00
committed by github-actions[bot]
parent b7a207407f
commit e2501f79ad
11 changed files with 202 additions and 998 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1034,362 +1034,6 @@
│ //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/cardGrid.txt
├── +++ HMI/US/portrait/n2t-out/cardGrid.txt
│ @@ -631,14 +631,18 @@
│ {
│ page popupLight
│ }
│ if(tTmp.txt=="fan")
│ {
│ page popupFan
│ }
│ + if(tTmp.txt=="input_sel")
│ + {
│ + page popupInSel
│ + }
│
│ Timer tmSerial
│ Attributes
│ Scope : local
│ Period (ms): 50
│ Enabled : yes
│ --- HMI/n2t-out/cardQR.txt
├── +++ HMI/US/portrait/n2t-out/cardQR.txt
│ @@ -70,27 +70,27 @@
│ Text :
│ Max. Text Size: 80
│
│ Variable (string) nent1
│ Attributes
│ Scope : local
│ Text :
│ - Max. Text Size: 50
│ + Max. Text Size: 80
│
│ Variable (string) nent2
│ Attributes
│ Scope : local
│ Text :
│ - Max. Text Size: 50
│ + Max. Text Size: 80
│
│ Variable (string) strCommand
│ Attributes
│ Scope : local
│ Text :
│ - Max. Text Size: 400
│ + Max. Text Size: 275
│
│ Variable (string) tId
│ Attributes
│ Scope : local
│ Text :
│ Max. Text Size: 20
│ --- HMI/n2t-out/cardThermo.txt
├── +++ HMI/US/portrait/n2t-out/cardThermo.txt
│ @@ -829,208 +829,214 @@
│ ucopy strCommand.txt,4,payloadLength-5,0
│ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
│ spstr strCommand.txt,tInstruction.txt,"~",0
│ if(tInstruction.txt=="entityUpd")
│ {
│ //heading
│ spstr strCommand.txt,tHeading.txt,"~",1
│ - // navigation icon left
│ - spstr strCommand.txt,tTmp.txt,"~",2 //type
│ - if(tTmp.txt=="delete"||tTmp.txt=="")
│ + // navigation icons
│ + spstr strCommand.txt,tId.txt,"~",2
│ + spstr tId.txt,tTmp.txt,"|",0
│ + if(tTmp.txt=="0")
│ {
│ vis bPrev,0
│ - }else
│ + tsw mSwipePrev,0
│ + tsw mSwipeUp,0
│ + }
│ + if(tTmp.txt=="1")
│ + {
│ + vis bPrev,1
│ + tsw mSwipePrev,1
│ + tsw mSwipeUp,0
│ + bPrev.txt=""
│ + }
│ + if(tTmp.txt=="2")
│ {
│ - // get internal name
│ - spstr strCommand.txt,nent1.txt,"~",3
│ - // change icon
│ - spstr strCommand.txt,bPrev.txt,"~",4
│ - // change icon color
│ - spstr strCommand.txt,tTmp.txt,"~",5
│ - covx tTmp.txt,sys0,0,0
│ - bPrev.pco=sys0
│ vis bPrev,1
│ + tsw mSwipePrev,0
│ + tsw mSwipeUp,1
│ + bPrev.txt=""
│ }
│ - // navigation icon right
│ - spstr strCommand.txt,tTmp.txt,"~",8 //type
│ - if(tTmp.txt=="delete"||tTmp.txt=="")
│ + spstr tId.txt,tTmp.txt,"|",1
│ + if(tTmp.txt=="0")
│ {
│ vis bNext,0
│ - }else
│ + tsw mSwipeNext,0
│ + }
│ + if(tTmp.txt=="1")
│ + {
│ + vis bNext,1
│ + tsw mSwipeNext,1
│ + bNext.txt=""
│ + }
│ + if(tTmp.txt=="2")
│ {
│ - // get internal name
│ - spstr strCommand.txt,nent2.txt,"~",9
│ - // change icon
│ - spstr strCommand.txt,bNext.txt,"~",10
│ - // change icon color
│ - spstr strCommand.txt,tTmp.txt,"~",11
│ - covx tTmp.txt,sys0,0,0
│ - bNext.pco=sys0
│ vis bNext,1
│ + bNext.txt=""
│ }
│ //entity name
│ - spstr strCommand.txt,entn.txt,"~",14
│ + spstr strCommand.txt,entn.txt,"~",3
│ //currentTemp
│ - spstr strCommand.txt,tCurTemp.txt,"~",15
│ + spstr strCommand.txt,tCurTemp.txt,"~",4
│ //dstTemp
│ - spstr strCommand.txt,tTmp.txt,"~",16
│ + spstr strCommand.txt,tTmp.txt,"~",5
│ covx tTmp.txt,xTempDest1.val,0,0
│ xTempDest.val=xTempDest1.val
│ //status
│ - spstr strCommand.txt,tStatus.txt,"~",17
│ + spstr strCommand.txt,tStatus.txt,"~",6
│ //minTemp
│ - spstr strCommand.txt,tTmp.txt,"~",18
│ + spstr strCommand.txt,tTmp.txt,"~",7
│ covx tTmp.txt,xTempMin1.val,0,0
│ //maxTemp
│ - spstr strCommand.txt,tTmp.txt,"~",19
│ + spstr strCommand.txt,tTmp.txt,"~",8
│ covx tTmp.txt,xTempMax1.val,0,0
│ //tempStep
│ - spstr strCommand.txt,tTmp.txt,"~",20
│ + spstr strCommand.txt,tTmp.txt,"~",9
│ covx tTmp.txt,xTempStep1.val,0,0
│ // disable all buttons
│ vis bt0,0
│ vis bt1,0
│ vis bt2,0
│ vis bt3,0
│ vis bt4,0
│ vis bt5,0
│ vis bt6,0
│ vis bt7,0
│ //bt0
│ - spstr strCommand.txt,bt0.txt,"~",21
│ + spstr strCommand.txt,bt0.txt,"~",10
│ if(bt0.txt!="")
│ {
│ // set text color on active state
│ - spstr strCommand.txt,tTmp.txt,"~",22
│ + spstr strCommand.txt,tTmp.txt,"~",11
│ covx tTmp.txt,bt0.pco2,0,0
│ // set state
│ - spstr strCommand.txt,tTmp.txt,"~",23
│ + spstr strCommand.txt,tTmp.txt,"~",12
│ covx tTmp.txt,bt0.val,0,0
│ // save action
│ - spstr strCommand.txt,va0.txt,"~",24
│ + spstr strCommand.txt,va0.txt,"~",13
│ //enable
│ vis bt0,1
│ }
│ //bt1
│ - spstr strCommand.txt,bt1.txt,"~",25
│ + spstr strCommand.txt,bt1.txt,"~",14
│ if(bt1.txt!="")
│ {
│ // set text color on active state
│ - spstr strCommand.txt,tTmp.txt,"~",26
│ + spstr strCommand.txt,tTmp.txt,"~",15
│ covx tTmp.txt,bt1.pco2,0,0
│ // set state
│ - spstr strCommand.txt,tTmp.txt,"~",27
│ + spstr strCommand.txt,tTmp.txt,"~",16
│ covx tTmp.txt,bt1.val,0,0
│ // save action
│ - spstr strCommand.txt,va1.txt,"~",28
│ + spstr strCommand.txt,va1.txt,"~",17
│ //enable
│ vis bt1,1
│ }
│ //bt2
│ - spstr strCommand.txt,bt2.txt,"~",29
│ + spstr strCommand.txt,bt2.txt,"~",18
│ if(bt2.txt!="")
│ {
│ // set text color on active state
│ - spstr strCommand.txt,tTmp.txt,"~",30
│ + spstr strCommand.txt,tTmp.txt,"~",19
│ covx tTmp.txt,bt2.pco2,0,0
│ // set state
│ - spstr strCommand.txt,tTmp.txt,"~",31
│ + spstr strCommand.txt,tTmp.txt,"~",20
│ covx tTmp.txt,bt2.val,0,0
│ // save action
│ - spstr strCommand.txt,va2.txt,"~",32
│ + spstr strCommand.txt,va2.txt,"~",21
│ //enable
│ vis bt2,1
│ }
│ //bt3
│ - spstr strCommand.txt,bt3.txt,"~",33
│ + spstr strCommand.txt,bt3.txt,"~",22
│ if(bt3.txt!="")
│ {
│ // set text color on active state
│ - spstr strCommand.txt,tTmp.txt,"~",34
│ + spstr strCommand.txt,tTmp.txt,"~",23
│ covx tTmp.txt,bt3.pco2,0,0
│ // set state
│ - spstr strCommand.txt,tTmp.txt,"~",35
│ + spstr strCommand.txt,tTmp.txt,"~",24
│ covx tTmp.txt,bt3.val,0,0
│ // save action
│ - spstr strCommand.txt,va3.txt,"~",36
│ + spstr strCommand.txt,va3.txt,"~",25
│ //enable
│ vis bt3,1
│ }
│ //bt4
│ - spstr strCommand.txt,bt4.txt,"~",37
│ + spstr strCommand.txt,bt4.txt,"~",26
│ if(bt4.txt!="")
│ {
│ // set text color on active state
│ - spstr strCommand.txt,tTmp.txt,"~",38
│ + spstr strCommand.txt,tTmp.txt,"~",27
│ covx tTmp.txt,bt4.pco2,0,0
│ // set state
│ - spstr strCommand.txt,tTmp.txt,"~",39
│ + spstr strCommand.txt,tTmp.txt,"~",28
│ covx tTmp.txt,bt4.val,0,0
│ // save action
│ - spstr strCommand.txt,va4.txt,"~",40
│ + spstr strCommand.txt,va4.txt,"~",29
│ //enable
│ vis bt4,1
│ }
│ //bt5
│ - spstr strCommand.txt,bt5.txt,"~",41
│ + spstr strCommand.txt,bt5.txt,"~",30
│ if(bt5.txt!="")
│ {
│ // set text color on active state
│ - spstr strCommand.txt,tTmp.txt,"~",42
│ + spstr strCommand.txt,tTmp.txt,"~",31
│ covx tTmp.txt,bt5.pco2,0,0
│ // set state
│ - spstr strCommand.txt,tTmp.txt,"~",43
│ + spstr strCommand.txt,tTmp.txt,"~",32
│ covx tTmp.txt,bt5.val,0,0
│ // save action
│ - spstr strCommand.txt,va5.txt,"~",44
│ + spstr strCommand.txt,va5.txt,"~",33
│ //enable
│ vis bt5,1
│ }
│ //bt6
│ - spstr strCommand.txt,bt6.txt,"~",45
│ + spstr strCommand.txt,bt6.txt,"~",34
│ if(bt6.txt!="")
│ {
│ // set text color on active state
│ - spstr strCommand.txt,tTmp.txt,"~",46
│ + spstr strCommand.txt,tTmp.txt,"~",35
│ covx tTmp.txt,bt6.pco2,0,0
│ // set state
│ - spstr strCommand.txt,tTmp.txt,"~",47
│ + spstr strCommand.txt,tTmp.txt,"~",36
│ covx tTmp.txt,bt6.val,0,0
│ // save action
│ - spstr strCommand.txt,va6.txt,"~",48
│ + spstr strCommand.txt,va6.txt,"~",37
│ //enable
│ vis bt6,1
│ }
│ //bt7
│ - spstr strCommand.txt,bt7.txt,"~",49
│ + spstr strCommand.txt,bt7.txt,"~",38
│ if(bt7.txt!="")
│ {
│ // set text color on active state
│ - spstr strCommand.txt,tTmp.txt,"~",50
│ + spstr strCommand.txt,tTmp.txt,"~",39
│ covx tTmp.txt,bt7.pco2,0,0
│ // set state
│ - spstr strCommand.txt,tTmp.txt,"~",51
│ + spstr strCommand.txt,tTmp.txt,"~",40
│ covx tTmp.txt,bt7.val,0,0
│ // save action
│ - spstr strCommand.txt,va7.txt,"~",52
│ + spstr strCommand.txt,va7.txt,"~",41
│ //enable
│ vis bt7,1
│ }
│ //Text tCurTempLbl
│ - spstr strCommand.txt,tCurTempLbl.txt,"~",53
│ + spstr strCommand.txt,tCurTempLbl.txt,"~",42
│ //Text tStateLbl
│ - spstr strCommand.txt,tStateLbl.txt,"~",54
│ + spstr strCommand.txt,tStateLbl.txt,"~",43
│ //Text tALbl
│ - //spstr strCommand.txt,tALbl.txt,"~",55
│ + //spstr strCommand.txt,tALbl.txt,"~",44
│ //Text tCF
│ - spstr strCommand.txt,tCF.txt,"~",56
│ + spstr strCommand.txt,tCF.txt,"~",45
│ tCF1.txt=tCF.txt
│ tCF2.txt=tCF.txt
│ //Second Temperature
│ - spstr strCommand.txt,tTmp.txt,"~",57
│ + spstr strCommand.txt,tTmp.txt,"~",46
│ if(tTmp.txt!="")
│ {
│ covx tTmp.txt,xTempDest2.val,0,0
│ vis btUp,0
│ vis xTempDest,0
│ vis btDown,0
│ vis tCF,0
│ @@ -1040,16 +1046,16 @@
│ vis tCF1,1
│ vis bUp2,1
│ vis xTempDest2,1
│ vis bDown2,1
│ vis tCF2,1
│ }
│ //Show btDetail
│ - spstr strCommand.txt,tTmp.txt,"~",58
│ - if(tTmp.txt!="1")
│ + spstr strCommand.txt,tTmp.txt,"~",47
│ + if(tTmp.txt=="1")
│ {
│ vis btDetail,1
│ }else
│ {
│ vis btDetail,0
│ }
│ }
│ --- HMI/n2t-out/pageStartup.txt │ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/portrait/n2t-out/pageStartup.txt ├── +++ HMI/US/portrait/n2t-out/pageStartup.txt
│ @@ -118,15 +118,15 @@ │ @@ -118,15 +118,15 @@
@@ -1483,56 +1127,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
│ @@ -361,15 +342,15 @@
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ Text :
│ - Max. Text Size : 120
│ + Max. Text Size : 80
│
│ Text tTime
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ @@ -508,35 +489,14 @@
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ }
│ - if(tInstruction.txt=="statusUpdate")
│ - {
│ - //statusIcon1
│ - spstr strCommand.txt,tIcon1.txt,"~",1
│ - spstr strCommand.txt,tTmp.txt,"~",2
│ - covx tTmp.txt,tIcon1.pco,0,0
│ - //statusIcon2
│ - spstr strCommand.txt,tIcon2.txt,"~",3
│ - spstr strCommand.txt,tTmp.txt,"~",4
│ - covx tTmp.txt,tIcon2.pco,0,0
│ - spstr strCommand.txt,tTmp.txt,"~",5
│ - if(tTmp.txt!="")
│ - {
│ - tIcon1.font=3
│ - }
│ - spstr strCommand.txt,tTmp.txt,"~",6
│ - if(tTmp.txt!="")
│ - {
│ - tIcon2.font=3
│ - }
│ - }
│ if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
│ {
│ vis tMainIcon,1
│ vis tMainIconAlt,0
│ vis tMainText,1
│ vis tMainTextAlt,0
│ vis tMRIcon,0

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

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2022-12-31 14:38:21.065618305 +0000 +++ /dev/fd/62 2022-12-31 14:50:55.481929954 +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/cardEntities.txt +I/n2t-out/cardEntities.txt
@@ -40,13 +40,13 @@
+ributes +ributes
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 80
+ Max. Text Size: 40 + Max. Text Size: 40
+ +
+e (string) nent2 +e (string) nent2
+ributes +ributes
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 80
+ Max. Text Size: 40 + Max. Text Size: 40
+14 +176,26 @@ +14 +176,26 @@
+e (string) type6 +e (string) type6
@@ -452,362 +452,6 @@
+ covx tTmp.txt,sys0,0,0 + covx tTmp.txt,sys0,0,0
+ hSlider6.maxval=sys0 + hSlider6.maxval=sys0
+ } + }
+I/n2t-out/cardGrid.txt
++ HMI/US/portrait/n2t-out/cardGrid.txt
+14 +631,18 @@
+ {
+ page popupLight
+ }
+ if(tTmp.txt=="fan")
+ {
+ page popupFan
+ }
+ if(tTmp.txt=="input_sel")
+ {
+ page popupInSel
+ }
+
+mSerial
+ributes
+ Scope : local
+ Period (ms): 50
+ Enabled : yes
+I/n2t-out/cardQR.txt
++ HMI/US/portrait/n2t-out/cardQR.txt
+7 +70,27 @@
+ Text :
+ Max. Text Size: 80
+
+e (string) nent1
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 50
+ Max. Text Size: 80
+
+e (string) nent2
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 50
+ Max. Text Size: 80
+
+e (string) strCommand
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 400
+ Max. Text Size: 275
+
+e (string) tId
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 20
+I/n2t-out/cardThermo.txt
++ HMI/US/portrait/n2t-out/cardThermo.txt
+208 +829,214 @@
+ ucopy strCommand.txt,4,payloadLength-5,0
+ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
+ spstr strCommand.txt,tInstruction.txt,"~",0
+ if(tInstruction.txt=="entityUpd")
+ {
+ //heading
+ spstr strCommand.txt,tHeading.txt,"~",1
+ // navigation icon left
+ spstr strCommand.txt,tTmp.txt,"~",2 //type
+ if(tTmp.txt=="delete"||tTmp.txt=="")
+ // navigation icons
+ spstr strCommand.txt,tId.txt,"~",2
+ spstr tId.txt,tTmp.txt,"|",0
+ if(tTmp.txt=="0")
+ {
+ vis bPrev,0
+ }else
+ tsw mSwipePrev,0
+ tsw mSwipeUp,0
+ }
+ if(tTmp.txt=="1")
+ {
+ vis bPrev,1
+ tsw mSwipePrev,1
+ tsw mSwipeUp,0
+ bPrev.txt=""
+ }
+ if(tTmp.txt=="2")
+ {
+ // get internal name
+ spstr strCommand.txt,nent1.txt,"~",3
+ // change icon
+ spstr strCommand.txt,bPrev.txt,"~",4
+ // change icon color
+ spstr strCommand.txt,tTmp.txt,"~",5
+ covx tTmp.txt,sys0,0,0
+ bPrev.pco=sys0
+ vis bPrev,1
+ tsw mSwipePrev,0
+ tsw mSwipeUp,1
+ bPrev.txt=""
+ }
+ // navigation icon right
+ spstr strCommand.txt,tTmp.txt,"~",8 //type
+ if(tTmp.txt=="delete"||tTmp.txt=="")
+ spstr tId.txt,tTmp.txt,"|",1
+ if(tTmp.txt=="0")
+ {
+ vis bNext,0
+ }else
+ tsw mSwipeNext,0
+ }
+ if(tTmp.txt=="1")
+ {
+ vis bNext,1
+ tsw mSwipeNext,1
+ bNext.txt=""
+ }
+ if(tTmp.txt=="2")
+ {
+ // get internal name
+ spstr strCommand.txt,nent2.txt,"~",9
+ // change icon
+ spstr strCommand.txt,bNext.txt,"~",10
+ // change icon color
+ spstr strCommand.txt,tTmp.txt,"~",11
+ covx tTmp.txt,sys0,0,0
+ bNext.pco=sys0
+ vis bNext,1
+ bNext.txt=""
+ }
+ //entity name
+ spstr strCommand.txt,entn.txt,"~",14
+ spstr strCommand.txt,entn.txt,"~",3
+ //currentTemp
+ spstr strCommand.txt,tCurTemp.txt,"~",15
+ spstr strCommand.txt,tCurTemp.txt,"~",4
+ //dstTemp
+ spstr strCommand.txt,tTmp.txt,"~",16
+ spstr strCommand.txt,tTmp.txt,"~",5
+ covx tTmp.txt,xTempDest1.val,0,0
+ xTempDest.val=xTempDest1.val
+ //status
+ spstr strCommand.txt,tStatus.txt,"~",17
+ spstr strCommand.txt,tStatus.txt,"~",6
+ //minTemp
+ spstr strCommand.txt,tTmp.txt,"~",18
+ spstr strCommand.txt,tTmp.txt,"~",7
+ covx tTmp.txt,xTempMin1.val,0,0
+ //maxTemp
+ spstr strCommand.txt,tTmp.txt,"~",19
+ spstr strCommand.txt,tTmp.txt,"~",8
+ covx tTmp.txt,xTempMax1.val,0,0
+ //tempStep
+ spstr strCommand.txt,tTmp.txt,"~",20
+ spstr strCommand.txt,tTmp.txt,"~",9
+ covx tTmp.txt,xTempStep1.val,0,0
+ // disable all buttons
+ vis bt0,0
+ vis bt1,0
+ vis bt2,0
+ vis bt3,0
+ vis bt4,0
+ vis bt5,0
+ vis bt6,0
+ vis bt7,0
+ //bt0
+ spstr strCommand.txt,bt0.txt,"~",21
+ spstr strCommand.txt,bt0.txt,"~",10
+ if(bt0.txt!="")
+ {
+ // set text color on active state
+ spstr strCommand.txt,tTmp.txt,"~",22
+ spstr strCommand.txt,tTmp.txt,"~",11
+ covx tTmp.txt,bt0.pco2,0,0
+ // set state
+ spstr strCommand.txt,tTmp.txt,"~",23
+ spstr strCommand.txt,tTmp.txt,"~",12
+ covx tTmp.txt,bt0.val,0,0
+ // save action
+ spstr strCommand.txt,va0.txt,"~",24
+ spstr strCommand.txt,va0.txt,"~",13
+ //enable
+ vis bt0,1
+ }
+ //bt1
+ spstr strCommand.txt,bt1.txt,"~",25
+ spstr strCommand.txt,bt1.txt,"~",14
+ if(bt1.txt!="")
+ {
+ // set text color on active state
+ spstr strCommand.txt,tTmp.txt,"~",26
+ spstr strCommand.txt,tTmp.txt,"~",15
+ covx tTmp.txt,bt1.pco2,0,0
+ // set state
+ spstr strCommand.txt,tTmp.txt,"~",27
+ spstr strCommand.txt,tTmp.txt,"~",16
+ covx tTmp.txt,bt1.val,0,0
+ // save action
+ spstr strCommand.txt,va1.txt,"~",28
+ spstr strCommand.txt,va1.txt,"~",17
+ //enable
+ vis bt1,1
+ }
+ //bt2
+ spstr strCommand.txt,bt2.txt,"~",29
+ spstr strCommand.txt,bt2.txt,"~",18
+ if(bt2.txt!="")
+ {
+ // set text color on active state
+ spstr strCommand.txt,tTmp.txt,"~",30
+ spstr strCommand.txt,tTmp.txt,"~",19
+ covx tTmp.txt,bt2.pco2,0,0
+ // set state
+ spstr strCommand.txt,tTmp.txt,"~",31
+ spstr strCommand.txt,tTmp.txt,"~",20
+ covx tTmp.txt,bt2.val,0,0
+ // save action
+ spstr strCommand.txt,va2.txt,"~",32
+ spstr strCommand.txt,va2.txt,"~",21
+ //enable
+ vis bt2,1
+ }
+ //bt3
+ spstr strCommand.txt,bt3.txt,"~",33
+ spstr strCommand.txt,bt3.txt,"~",22
+ if(bt3.txt!="")
+ {
+ // set text color on active state
+ spstr strCommand.txt,tTmp.txt,"~",34
+ spstr strCommand.txt,tTmp.txt,"~",23
+ covx tTmp.txt,bt3.pco2,0,0
+ // set state
+ spstr strCommand.txt,tTmp.txt,"~",35
+ spstr strCommand.txt,tTmp.txt,"~",24
+ covx tTmp.txt,bt3.val,0,0
+ // save action
+ spstr strCommand.txt,va3.txt,"~",36
+ spstr strCommand.txt,va3.txt,"~",25
+ //enable
+ vis bt3,1
+ }
+ //bt4
+ spstr strCommand.txt,bt4.txt,"~",37
+ spstr strCommand.txt,bt4.txt,"~",26
+ if(bt4.txt!="")
+ {
+ // set text color on active state
+ spstr strCommand.txt,tTmp.txt,"~",38
+ spstr strCommand.txt,tTmp.txt,"~",27
+ covx tTmp.txt,bt4.pco2,0,0
+ // set state
+ spstr strCommand.txt,tTmp.txt,"~",39
+ spstr strCommand.txt,tTmp.txt,"~",28
+ covx tTmp.txt,bt4.val,0,0
+ // save action
+ spstr strCommand.txt,va4.txt,"~",40
+ spstr strCommand.txt,va4.txt,"~",29
+ //enable
+ vis bt4,1
+ }
+ //bt5
+ spstr strCommand.txt,bt5.txt,"~",41
+ spstr strCommand.txt,bt5.txt,"~",30
+ if(bt5.txt!="")
+ {
+ // set text color on active state
+ spstr strCommand.txt,tTmp.txt,"~",42
+ spstr strCommand.txt,tTmp.txt,"~",31
+ covx tTmp.txt,bt5.pco2,0,0
+ // set state
+ spstr strCommand.txt,tTmp.txt,"~",43
+ spstr strCommand.txt,tTmp.txt,"~",32
+ covx tTmp.txt,bt5.val,0,0
+ // save action
+ spstr strCommand.txt,va5.txt,"~",44
+ spstr strCommand.txt,va5.txt,"~",33
+ //enable
+ vis bt5,1
+ }
+ //bt6
+ spstr strCommand.txt,bt6.txt,"~",45
+ spstr strCommand.txt,bt6.txt,"~",34
+ if(bt6.txt!="")
+ {
+ // set text color on active state
+ spstr strCommand.txt,tTmp.txt,"~",46
+ spstr strCommand.txt,tTmp.txt,"~",35
+ covx tTmp.txt,bt6.pco2,0,0
+ // set state
+ spstr strCommand.txt,tTmp.txt,"~",47
+ spstr strCommand.txt,tTmp.txt,"~",36
+ covx tTmp.txt,bt6.val,0,0
+ // save action
+ spstr strCommand.txt,va6.txt,"~",48
+ spstr strCommand.txt,va6.txt,"~",37
+ //enable
+ vis bt6,1
+ }
+ //bt7
+ spstr strCommand.txt,bt7.txt,"~",49
+ spstr strCommand.txt,bt7.txt,"~",38
+ if(bt7.txt!="")
+ {
+ // set text color on active state
+ spstr strCommand.txt,tTmp.txt,"~",50
+ spstr strCommand.txt,tTmp.txt,"~",39
+ covx tTmp.txt,bt7.pco2,0,0
+ // set state
+ spstr strCommand.txt,tTmp.txt,"~",51
+ spstr strCommand.txt,tTmp.txt,"~",40
+ covx tTmp.txt,bt7.val,0,0
+ // save action
+ spstr strCommand.txt,va7.txt,"~",52
+ spstr strCommand.txt,va7.txt,"~",41
+ //enable
+ vis bt7,1
+ }
+ //Text tCurTempLbl
+ spstr strCommand.txt,tCurTempLbl.txt,"~",53
+ spstr strCommand.txt,tCurTempLbl.txt,"~",42
+ //Text tStateLbl
+ spstr strCommand.txt,tStateLbl.txt,"~",54
+ spstr strCommand.txt,tStateLbl.txt,"~",43
+ //Text tALbl
+ //spstr strCommand.txt,tALbl.txt,"~",55
+ //spstr strCommand.txt,tALbl.txt,"~",44
+ //Text tCF
+ spstr strCommand.txt,tCF.txt,"~",56
+ spstr strCommand.txt,tCF.txt,"~",45
+ tCF1.txt=tCF.txt
+ tCF2.txt=tCF.txt
+ //Second Temperature
+ spstr strCommand.txt,tTmp.txt,"~",57
+ spstr strCommand.txt,tTmp.txt,"~",46
+ if(tTmp.txt!="")
+ {
+ covx tTmp.txt,xTempDest2.val,0,0
+ vis btUp,0
+ vis xTempDest,0
+ vis btDown,0
+ vis tCF,0
+,16 +1046,16 @@
+ vis tCF1,1
+ vis bUp2,1
+ vis xTempDest2,1
+ vis bDown2,1
+ vis tCF2,1
+ }
+ //Show btDetail
+ spstr strCommand.txt,tTmp.txt,"~",58
+ if(tTmp.txt!="1")
+ spstr strCommand.txt,tTmp.txt,"~",47
+ if(tTmp.txt=="1")
+ {
+ vis btDetail,1
+ }else
+ {
+ vis btDetail,0
+ }
+ }
+I/n2t-out/pageStartup.txt +I/n2t-out/pageStartup.txt
++ HMI/US/portrait/n2t-out/pageStartup.txt ++ HMI/US/portrait/n2t-out/pageStartup.txt
+I/n2t-out/screensaver.txt +I/n2t-out/screensaver.txt
@@ -867,56 +511,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 +342,15 @@
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 120
+ Max. Text Size : 80
+
+ime
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+35 +489,14 @@
+ }
+ if(tInstruction.txt=="timeout")
+ {
+ //set timeout to global var
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,sleepTimeout,0,0
+ }
+ if(tInstruction.txt=="statusUpdate")
+ {
+ //statusIcon1
+ spstr strCommand.txt,tIcon1.txt,"~",1
+ spstr strCommand.txt,tTmp.txt,"~",2
+ covx tTmp.txt,tIcon1.pco,0,0
+ //statusIcon2
+ spstr strCommand.txt,tIcon2.txt,"~",3
+ spstr strCommand.txt,tTmp.txt,"~",4
+ covx tTmp.txt,tIcon2.pco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",5
+ if(tTmp.txt!="")
+ {
+ tIcon1.font=3
+ }
+ spstr strCommand.txt,tTmp.txt,"~",6
+ if(tTmp.txt!="")
+ {
+ tIcon2.font=3
+ }
+ }
+ if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
+ {
+ vis tMainIcon,1
+ vis tMainIconAlt,0
+ vis tMainText,1
+ vis tMainTextAlt,0
+ vis tMRIcon,0

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

@@ -1082,10 +1082,6 @@ Timer tmLP
{ {
page popupFan page popupFan
} }
if(tTmp.txt=="input_sel")
{
page popupInSel
}
Timer tmSerial Timer tmSerial
Attributes Attributes

6
HMI/US/portrait/n2t-out-visual/cardQR.txt
View File

@@ -86,21 +86,21 @@ Variable (string) nent1
ID : 33 ID : 33
Scope : local Scope : local
Text : Text :
Max. Text Size: 80 Max. Text Size: 50
Variable (string) nent2 Variable (string) nent2
Attributes Attributes
ID : 32 ID : 32
Scope : local Scope : local
Text : Text :
Max. Text Size: 80 Max. Text Size: 50
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
ID : 6 ID : 6
Scope : local Scope : local
Text : Text :
Max. Text Size: 275 Max. Text Size: 400
Variable (string) tId Variable (string) tId
Attributes Attributes

146
HMI/US/portrait/n2t-out-visual/cardThermo.txt
View File

@@ -1557,64 +1557,58 @@ Timer tmSerial
{ {
//heading //heading
spstr strCommand.txt,tHeading.txt,"~",1 spstr strCommand.txt,tHeading.txt,"~",1
// navigation icons // navigation icon left
spstr strCommand.txt,tId.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2 //type
spstr tId.txt,tTmp.txt,"|",0 if(tTmp.txt=="delete"||tTmp.txt=="")
if(tTmp.txt=="0")
{ {
vis bPrev,0 vis bPrev,0
tsw mSwipePrev,0 }else
tsw mSwipeUp,0
}
if(tTmp.txt=="1")
{ {
// get internal name
spstr strCommand.txt,nent1.txt,"~",3
// change icon
spstr strCommand.txt,bPrev.txt,"~",4
// change icon color
spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,sys0,0,0
bPrev.pco=sys0
vis bPrev,1 vis bPrev,1
tsw mSwipePrev,1
tsw mSwipeUp,0
bPrev.txt=""
} }
if(tTmp.txt=="2") // navigation icon right
{ spstr strCommand.txt,tTmp.txt,"~",8 //type
vis bPrev,1 if(tTmp.txt=="delete"||tTmp.txt=="")
tsw mSwipePrev,0
tsw mSwipeUp,1
bPrev.txt=""
}
spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0")
{ {
vis bNext,0 vis bNext,0
tsw mSwipeNext,0 }else
}
if(tTmp.txt=="1")
{ {
// get internal name
spstr strCommand.txt,nent2.txt,"~",9
// change icon
spstr strCommand.txt,bNext.txt,"~",10
// change icon color
spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,sys0,0,0
bNext.pco=sys0
vis bNext,1 vis bNext,1
tsw mSwipeNext,1
bNext.txt=""
}
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt=""
} }
//entity name //entity name
spstr strCommand.txt,entn.txt,"~",3 spstr strCommand.txt,entn.txt,"~",14
//currentTemp //currentTemp
spstr strCommand.txt,tCurTemp.txt,"~",4 spstr strCommand.txt,tCurTemp.txt,"~",15
//dstTemp //dstTemp
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,xTempDest1.val,0,0 covx tTmp.txt,xTempDest1.val,0,0
xTempDest.val=xTempDest1.val xTempDest.val=xTempDest1.val
//status //status
spstr strCommand.txt,tStatus.txt,"~",6 spstr strCommand.txt,tStatus.txt,"~",17
//minTemp //minTemp
spstr strCommand.txt,tTmp.txt,"~",7 spstr strCommand.txt,tTmp.txt,"~",18
covx tTmp.txt,xTempMin1.val,0,0 covx tTmp.txt,xTempMin1.val,0,0
//maxTemp //maxTemp
spstr strCommand.txt,tTmp.txt,"~",8 spstr strCommand.txt,tTmp.txt,"~",19
covx tTmp.txt,xTempMax1.val,0,0 covx tTmp.txt,xTempMax1.val,0,0
//tempStep //tempStep
spstr strCommand.txt,tTmp.txt,"~",9 spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,xTempStep1.val,0,0 covx tTmp.txt,xTempStep1.val,0,0
// disable all buttons // disable all buttons
vis bt0,0 vis bt0,0
@@ -1626,137 +1620,137 @@ Timer tmSerial
vis bt6,0 vis bt6,0
vis bt7,0 vis bt7,0
//bt0 //bt0
spstr strCommand.txt,bt0.txt,"~",10 spstr strCommand.txt,bt0.txt,"~",21
if(bt0.txt!="") if(bt0.txt!="")
{ {
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,"~",11 spstr strCommand.txt,tTmp.txt,"~",22
covx tTmp.txt,bt0.pco2,0,0 covx tTmp.txt,bt0.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,"~",12 spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,bt0.val,0,0 covx tTmp.txt,bt0.val,0,0
// save action // save action
spstr strCommand.txt,va0.txt,"~",13 spstr strCommand.txt,va0.txt,"~",24
//enable //enable
vis bt0,1 vis bt0,1
} }
//bt1 //bt1
spstr strCommand.txt,bt1.txt,"~",14 spstr strCommand.txt,bt1.txt,"~",25
if(bt1.txt!="") if(bt1.txt!="")
{ {
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,"~",15 spstr strCommand.txt,tTmp.txt,"~",26
covx tTmp.txt,bt1.pco2,0,0 covx tTmp.txt,bt1.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,"~",16 spstr strCommand.txt,tTmp.txt,"~",27
covx tTmp.txt,bt1.val,0,0 covx tTmp.txt,bt1.val,0,0
// save action // save action
spstr strCommand.txt,va1.txt,"~",17 spstr strCommand.txt,va1.txt,"~",28
//enable //enable
vis bt1,1 vis bt1,1
} }
//bt2 //bt2
spstr strCommand.txt,bt2.txt,"~",18 spstr strCommand.txt,bt2.txt,"~",29
if(bt2.txt!="") if(bt2.txt!="")
{ {
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",30
covx tTmp.txt,bt2.pco2,0,0 covx tTmp.txt,bt2.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,"~",20 spstr strCommand.txt,tTmp.txt,"~",31
covx tTmp.txt,bt2.val,0,0 covx tTmp.txt,bt2.val,0,0
// save action // save action
spstr strCommand.txt,va2.txt,"~",21 spstr strCommand.txt,va2.txt,"~",32
//enable //enable
vis bt2,1 vis bt2,1
} }
//bt3 //bt3
spstr strCommand.txt,bt3.txt,"~",22 spstr strCommand.txt,bt3.txt,"~",33
if(bt3.txt!="") if(bt3.txt!="")
{ {
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,"~",23 spstr strCommand.txt,tTmp.txt,"~",34
covx tTmp.txt,bt3.pco2,0,0 covx tTmp.txt,bt3.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,"~",24 spstr strCommand.txt,tTmp.txt,"~",35
covx tTmp.txt,bt3.val,0,0 covx tTmp.txt,bt3.val,0,0
// save action // save action
spstr strCommand.txt,va3.txt,"~",25 spstr strCommand.txt,va3.txt,"~",36
//enable //enable
vis bt3,1 vis bt3,1
} }
//bt4 //bt4
spstr strCommand.txt,bt4.txt,"~",26 spstr strCommand.txt,bt4.txt,"~",37
if(bt4.txt!="") if(bt4.txt!="")
{ {
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,"~",27 spstr strCommand.txt,tTmp.txt,"~",38
covx tTmp.txt,bt4.pco2,0,0 covx tTmp.txt,bt4.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,"~",28 spstr strCommand.txt,tTmp.txt,"~",39
covx tTmp.txt,bt4.val,0,0 covx tTmp.txt,bt4.val,0,0
// save action // save action
spstr strCommand.txt,va4.txt,"~",29 spstr strCommand.txt,va4.txt,"~",40
//enable //enable
vis bt4,1 vis bt4,1
} }
//bt5 //bt5
spstr strCommand.txt,bt5.txt,"~",30 spstr strCommand.txt,bt5.txt,"~",41
if(bt5.txt!="") if(bt5.txt!="")
{ {
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,"~",31 spstr strCommand.txt,tTmp.txt,"~",42
covx tTmp.txt,bt5.pco2,0,0 covx tTmp.txt,bt5.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,"~",32 spstr strCommand.txt,tTmp.txt,"~",43
covx tTmp.txt,bt5.val,0,0 covx tTmp.txt,bt5.val,0,0
// save action // save action
spstr strCommand.txt,va5.txt,"~",33 spstr strCommand.txt,va5.txt,"~",44
//enable //enable
vis bt5,1 vis bt5,1
} }
//bt6 //bt6
spstr strCommand.txt,bt6.txt,"~",34 spstr strCommand.txt,bt6.txt,"~",45
if(bt6.txt!="") if(bt6.txt!="")
{ {
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,"~",35 spstr strCommand.txt,tTmp.txt,"~",46
covx tTmp.txt,bt6.pco2,0,0 covx tTmp.txt,bt6.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,"~",36 spstr strCommand.txt,tTmp.txt,"~",47
covx tTmp.txt,bt6.val,0,0 covx tTmp.txt,bt6.val,0,0
// save action // save action
spstr strCommand.txt,va6.txt,"~",37 spstr strCommand.txt,va6.txt,"~",48
//enable //enable
vis bt6,1 vis bt6,1
} }
//bt7 //bt7
spstr strCommand.txt,bt7.txt,"~",38 spstr strCommand.txt,bt7.txt,"~",49
if(bt7.txt!="") if(bt7.txt!="")
{ {
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,"~",39 spstr strCommand.txt,tTmp.txt,"~",50
covx tTmp.txt,bt7.pco2,0,0 covx tTmp.txt,bt7.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,"~",40 spstr strCommand.txt,tTmp.txt,"~",51
covx tTmp.txt,bt7.val,0,0 covx tTmp.txt,bt7.val,0,0
// save action // save action
spstr strCommand.txt,va7.txt,"~",41 spstr strCommand.txt,va7.txt,"~",52
//enable //enable
vis bt7,1 vis bt7,1
} }
//Text tCurTempLbl //Text tCurTempLbl
spstr strCommand.txt,tCurTempLbl.txt,"~",42 spstr strCommand.txt,tCurTempLbl.txt,"~",53
//Text tStateLbl //Text tStateLbl
spstr strCommand.txt,tStateLbl.txt,"~",43 spstr strCommand.txt,tStateLbl.txt,"~",54
//Text tALbl //Text tALbl
//spstr strCommand.txt,tALbl.txt,"~",44 //spstr strCommand.txt,tALbl.txt,"~",55
//Text tCF //Text tCF
spstr strCommand.txt,tCF.txt,"~",45 spstr strCommand.txt,tCF.txt,"~",56
tCF1.txt=tCF.txt tCF1.txt=tCF.txt
tCF2.txt=tCF.txt tCF2.txt=tCF.txt
//Second Temperature //Second Temperature
spstr strCommand.txt,tTmp.txt,"~",46 spstr strCommand.txt,tTmp.txt,"~",57
if(tTmp.txt!="") if(tTmp.txt!="")
{ {
covx tTmp.txt,xTempDest2.val,0,0 covx tTmp.txt,xTempDest2.val,0,0
@@ -1774,8 +1768,8 @@ Timer tmSerial
vis tCF2,1 vis tCF2,1
} }
//Show btDetail //Show btDetail
spstr strCommand.txt,tTmp.txt,"~",47 spstr strCommand.txt,tTmp.txt,"~",58
if(tTmp.txt=="1") if(tTmp.txt!="1")
{ {
vis btDetail,1 vis btDetail,1
}else }else

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

@@ -36,8 +36,8 @@ cardPower
289 Unique line(s) of event code 289 Unique line(s) of event code
screensaver screensaver
45 Component(s) 45 Component(s)
410 Line(s) of event code 429 Line(s) of event code
298 Unique line(s) of event code 301 Unique line(s) of event code
popupShutter popupShutter
25 Component(s) 25 Component(s)
398 Line(s) of event code 398 Line(s) of event code
@@ -46,6 +46,10 @@ popupThermo
44 Component(s) 44 Component(s)
519 Line(s) of event code 519 Line(s) of event code
274 Unique line(s) of event code 274 Unique line(s) of event code
cardGrid
44 Component(s)
511 Line(s) of event code
289 Unique line(s) of event code
cardChart cardChart
33 Component(s) 33 Component(s)
425 Line(s) of event code 425 Line(s) of event code
@@ -58,14 +62,10 @@ cardAlarm
42 Component(s) 42 Component(s)
415 Line(s) of event code 415 Line(s) of event code
253 Unique line(s) of event code 253 Unique line(s) of event code
cardGrid
44 Component(s)
515 Line(s) of event code
290 Unique line(s) of event code
cardThermo cardThermo
57 Component(s) 57 Component(s)
541 Line(s) of event code 528 Line(s) of event code
316 Unique line(s) of event code 313 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
@@ -82,5 +82,5 @@ cardEntities
Total Total
19 Page(s) 19 Page(s)
709 Component(s) 709 Component(s)
8631 Line(s) of event code 8633 Line(s) of event code
2261 Unique line(s) of event code 2247 Unique line(s) of event code

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

@@ -863,7 +863,7 @@ Text tNotifyText
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 80 Max. Text Size : 120
Word wrap : enabled Word wrap : enabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -1065,6 +1065,27 @@ Timer tmSerial
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=="statusUpdate")
{
//statusIcon1
spstr strCommand.txt,tIcon1.txt,"~",1
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,tIcon1.pco,0,0
//statusIcon2
spstr strCommand.txt,tIcon2.txt,"~",3
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,tIcon2.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt!="")
{
tIcon1.font=3
}
spstr strCommand.txt,tTmp.txt,"~",6
if(tTmp.txt!="")
{
tIcon2.font=3
}
}
if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
{ {
vis tMainIcon,1 vis tMainIcon,1

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

@@ -635,10 +635,6 @@ Timer tmLP
{ {
page popupFan page popupFan
} }
if(tTmp.txt=="input_sel")
{
page popupInSel
}
Timer tmSerial Timer tmSerial
Attributes Attributes

6
HMI/US/portrait/n2t-out/cardQR.txt
View File

@@ -74,19 +74,19 @@ Variable (string) nent1
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 80 Max. Text Size: 50
Variable (string) nent2 Variable (string) nent2
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 80 Max. Text Size: 50
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 275 Max. Text Size: 400
Variable (string) tId Variable (string) tId
Attributes Attributes

146
HMI/US/portrait/n2t-out/cardThermo.txt
View File

@@ -833,64 +833,58 @@ Timer tmSerial
{ {
//heading //heading
spstr strCommand.txt,tHeading.txt,"~",1 spstr strCommand.txt,tHeading.txt,"~",1
// navigation icons // navigation icon left
spstr strCommand.txt,tId.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2 //type
spstr tId.txt,tTmp.txt,"|",0 if(tTmp.txt=="delete"||tTmp.txt=="")
if(tTmp.txt=="0")
{ {
vis bPrev,0 vis bPrev,0
tsw mSwipePrev,0 }else
tsw mSwipeUp,0
}
if(tTmp.txt=="1")
{ {
// get internal name
spstr strCommand.txt,nent1.txt,"~",3
// change icon
spstr strCommand.txt,bPrev.txt,"~",4
// change icon color
spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,sys0,0,0
bPrev.pco=sys0
vis bPrev,1 vis bPrev,1
tsw mSwipePrev,1
tsw mSwipeUp,0
bPrev.txt=""
} }
if(tTmp.txt=="2") // navigation icon right
{ spstr strCommand.txt,tTmp.txt,"~",8 //type
vis bPrev,1 if(tTmp.txt=="delete"||tTmp.txt=="")
tsw mSwipePrev,0
tsw mSwipeUp,1
bPrev.txt=""
}
spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0")
{ {
vis bNext,0 vis bNext,0
tsw mSwipeNext,0 }else
}
if(tTmp.txt=="1")
{ {
// get internal name
spstr strCommand.txt,nent2.txt,"~",9
// change icon
spstr strCommand.txt,bNext.txt,"~",10
// change icon color
spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,sys0,0,0
bNext.pco=sys0
vis bNext,1 vis bNext,1
tsw mSwipeNext,1
bNext.txt=""
}
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt=""
} }
//entity name //entity name
spstr strCommand.txt,entn.txt,"~",3 spstr strCommand.txt,entn.txt,"~",14
//currentTemp //currentTemp
spstr strCommand.txt,tCurTemp.txt,"~",4 spstr strCommand.txt,tCurTemp.txt,"~",15
//dstTemp //dstTemp
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,xTempDest1.val,0,0 covx tTmp.txt,xTempDest1.val,0,0
xTempDest.val=xTempDest1.val xTempDest.val=xTempDest1.val
//status //status
spstr strCommand.txt,tStatus.txt,"~",6 spstr strCommand.txt,tStatus.txt,"~",17
//minTemp //minTemp
spstr strCommand.txt,tTmp.txt,"~",7 spstr strCommand.txt,tTmp.txt,"~",18
covx tTmp.txt,xTempMin1.val,0,0 covx tTmp.txt,xTempMin1.val,0,0
//maxTemp //maxTemp
spstr strCommand.txt,tTmp.txt,"~",8 spstr strCommand.txt,tTmp.txt,"~",19
covx tTmp.txt,xTempMax1.val,0,0 covx tTmp.txt,xTempMax1.val,0,0
//tempStep //tempStep
spstr strCommand.txt,tTmp.txt,"~",9 spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,xTempStep1.val,0,0 covx tTmp.txt,xTempStep1.val,0,0
// disable all buttons // disable all buttons
vis bt0,0 vis bt0,0
@@ -902,137 +896,137 @@ Timer tmSerial
vis bt6,0 vis bt6,0
vis bt7,0 vis bt7,0
//bt0 //bt0
spstr strCommand.txt,bt0.txt,"~",10 spstr strCommand.txt,bt0.txt,"~",21
if(bt0.txt!="") if(bt0.txt!="")
{ {
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,"~",11 spstr strCommand.txt,tTmp.txt,"~",22
covx tTmp.txt,bt0.pco2,0,0 covx tTmp.txt,bt0.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,"~",12 spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,bt0.val,0,0 covx tTmp.txt,bt0.val,0,0
// save action // save action
spstr strCommand.txt,va0.txt,"~",13 spstr strCommand.txt,va0.txt,"~",24
//enable //enable
vis bt0,1 vis bt0,1
} }
//bt1 //bt1
spstr strCommand.txt,bt1.txt,"~",14 spstr strCommand.txt,bt1.txt,"~",25
if(bt1.txt!="") if(bt1.txt!="")
{ {
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,"~",15 spstr strCommand.txt,tTmp.txt,"~",26
covx tTmp.txt,bt1.pco2,0,0 covx tTmp.txt,bt1.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,"~",16 spstr strCommand.txt,tTmp.txt,"~",27
covx tTmp.txt,bt1.val,0,0 covx tTmp.txt,bt1.val,0,0
// save action // save action
spstr strCommand.txt,va1.txt,"~",17 spstr strCommand.txt,va1.txt,"~",28
//enable //enable
vis bt1,1 vis bt1,1
} }
//bt2 //bt2
spstr strCommand.txt,bt2.txt,"~",18 spstr strCommand.txt,bt2.txt,"~",29
if(bt2.txt!="") if(bt2.txt!="")
{ {
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",30
covx tTmp.txt,bt2.pco2,0,0 covx tTmp.txt,bt2.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,"~",20 spstr strCommand.txt,tTmp.txt,"~",31
covx tTmp.txt,bt2.val,0,0 covx tTmp.txt,bt2.val,0,0
// save action // save action
spstr strCommand.txt,va2.txt,"~",21 spstr strCommand.txt,va2.txt,"~",32
//enable //enable
vis bt2,1 vis bt2,1
} }
//bt3 //bt3
spstr strCommand.txt,bt3.txt,"~",22 spstr strCommand.txt,bt3.txt,"~",33
if(bt3.txt!="") if(bt3.txt!="")
{ {
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,"~",23 spstr strCommand.txt,tTmp.txt,"~",34
covx tTmp.txt,bt3.pco2,0,0 covx tTmp.txt,bt3.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,"~",24 spstr strCommand.txt,tTmp.txt,"~",35
covx tTmp.txt,bt3.val,0,0 covx tTmp.txt,bt3.val,0,0
// save action // save action
spstr strCommand.txt,va3.txt,"~",25 spstr strCommand.txt,va3.txt,"~",36
//enable //enable
vis bt3,1 vis bt3,1
} }
//bt4 //bt4
spstr strCommand.txt,bt4.txt,"~",26 spstr strCommand.txt,bt4.txt,"~",37
if(bt4.txt!="") if(bt4.txt!="")
{ {
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,"~",27 spstr strCommand.txt,tTmp.txt,"~",38
covx tTmp.txt,bt4.pco2,0,0 covx tTmp.txt,bt4.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,"~",28 spstr strCommand.txt,tTmp.txt,"~",39
covx tTmp.txt,bt4.val,0,0 covx tTmp.txt,bt4.val,0,0
// save action // save action
spstr strCommand.txt,va4.txt,"~",29 spstr strCommand.txt,va4.txt,"~",40
//enable //enable
vis bt4,1 vis bt4,1
} }
//bt5 //bt5
spstr strCommand.txt,bt5.txt,"~",30 spstr strCommand.txt,bt5.txt,"~",41
if(bt5.txt!="") if(bt5.txt!="")
{ {
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,"~",31 spstr strCommand.txt,tTmp.txt,"~",42
covx tTmp.txt,bt5.pco2,0,0 covx tTmp.txt,bt5.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,"~",32 spstr strCommand.txt,tTmp.txt,"~",43
covx tTmp.txt,bt5.val,0,0 covx tTmp.txt,bt5.val,0,0
// save action // save action
spstr strCommand.txt,va5.txt,"~",33 spstr strCommand.txt,va5.txt,"~",44
//enable //enable
vis bt5,1 vis bt5,1
} }
//bt6 //bt6
spstr strCommand.txt,bt6.txt,"~",34 spstr strCommand.txt,bt6.txt,"~",45
if(bt6.txt!="") if(bt6.txt!="")
{ {
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,"~",35 spstr strCommand.txt,tTmp.txt,"~",46
covx tTmp.txt,bt6.pco2,0,0 covx tTmp.txt,bt6.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,"~",36 spstr strCommand.txt,tTmp.txt,"~",47
covx tTmp.txt,bt6.val,0,0 covx tTmp.txt,bt6.val,0,0
// save action // save action
spstr strCommand.txt,va6.txt,"~",37 spstr strCommand.txt,va6.txt,"~",48
//enable //enable
vis bt6,1 vis bt6,1
} }
//bt7 //bt7
spstr strCommand.txt,bt7.txt,"~",38 spstr strCommand.txt,bt7.txt,"~",49
if(bt7.txt!="") if(bt7.txt!="")
{ {
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,"~",39 spstr strCommand.txt,tTmp.txt,"~",50
covx tTmp.txt,bt7.pco2,0,0 covx tTmp.txt,bt7.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,"~",40 spstr strCommand.txt,tTmp.txt,"~",51
covx tTmp.txt,bt7.val,0,0 covx tTmp.txt,bt7.val,0,0
// save action // save action
spstr strCommand.txt,va7.txt,"~",41 spstr strCommand.txt,va7.txt,"~",52
//enable //enable
vis bt7,1 vis bt7,1
} }
//Text tCurTempLbl //Text tCurTempLbl
spstr strCommand.txt,tCurTempLbl.txt,"~",42 spstr strCommand.txt,tCurTempLbl.txt,"~",53
//Text tStateLbl //Text tStateLbl
spstr strCommand.txt,tStateLbl.txt,"~",43 spstr strCommand.txt,tStateLbl.txt,"~",54
//Text tALbl //Text tALbl
//spstr strCommand.txt,tALbl.txt,"~",44 //spstr strCommand.txt,tALbl.txt,"~",55
//Text tCF //Text tCF
spstr strCommand.txt,tCF.txt,"~",45 spstr strCommand.txt,tCF.txt,"~",56
tCF1.txt=tCF.txt tCF1.txt=tCF.txt
tCF2.txt=tCF.txt tCF2.txt=tCF.txt
//Second Temperature //Second Temperature
spstr strCommand.txt,tTmp.txt,"~",46 spstr strCommand.txt,tTmp.txt,"~",57
if(tTmp.txt!="") if(tTmp.txt!="")
{ {
covx tTmp.txt,xTempDest2.val,0,0 covx tTmp.txt,xTempDest2.val,0,0
@@ -1050,8 +1044,8 @@ Timer tmSerial
vis tCF2,1 vis tCF2,1
} }
//Show btDetail //Show btDetail
spstr strCommand.txt,tTmp.txt,"~",47 spstr strCommand.txt,tTmp.txt,"~",58
if(tTmp.txt=="1") if(tTmp.txt!="1")
{ {
vis btDetail,1 vis btDetail,1
}else }else

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

@@ -346,7 +346,7 @@ Text tNotifyText
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text :
Max. Text Size : 80 Max. Text Size : 120
Text tTime Text tTime
Attributes Attributes
@@ -493,6 +493,27 @@ Timer tmSerial
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=="statusUpdate")
{
//statusIcon1
spstr strCommand.txt,tIcon1.txt,"~",1
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,tIcon1.pco,0,0
//statusIcon2
spstr strCommand.txt,tIcon2.txt,"~",3
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,tIcon2.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt!="")
{
tIcon1.font=3
}
spstr strCommand.txt,tTmp.txt,"~",6
if(tTmp.txt!="")
{
tIcon2.font=3
}
}
if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
{ {
vis tMainIcon,1 vis tMainIcon,1