h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-21 13:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

sync (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-07-23 09:08:03 +00:00
committed by github-actions[bot]
parent eb1234be2d
commit 3ba628584e
8 changed files with 217 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-07-23 08:57:50.363086553 +0000 --- HMI/n2t-out/Program.s.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-23 08:57:51.439093859 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-23 09:07:59.704136032 +0000
@@ -11,9 +11,4 @@ @@ -11,9 +11,4 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -12,8 +12,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- lcd_dev fffb 0002 0000 0020 - lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-07-23 08:57:50.367086580 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-23 08:57:51.439093859 +0000 +++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-23 09:07:59.708136115 +0000
@@ -37,25 +37,6 @@ @@ -37,25 +37,6 @@
vis tCode,0 vis tCode,0
vis bPrev,0 vis bPrev,0
@@ -60,8 +60,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-07-23 08:57:50.367086580 +0000 --- HMI/n2t-out/cardEntities.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-23 08:57:51.439093859 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-23 09:07:59.704136032 +0000
@@ -65,26 +65,6 @@ @@ -65,26 +65,6 @@
vis nNum4,0 vis nNum4,0
vis bPrev,0 vis bPrev,0
@@ -153,8 +153,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-07-23 08:57:50.367086580 +0000 --- HMI/n2t-out/cardGrid.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-23 08:57:51.439093859 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-23 09:07:59.704136032 +0000
@@ -36,15 +36,6 @@ @@ -36,15 +36,6 @@
vis tEntity6,0 vis tEntity6,0
vis bPrev,0 vis bPrev,0
@@ -202,8 +202,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
TouchCap tc0 TouchCap tc0
Attributes Attributes
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-07-23 08:57:50.363086553 +0000 --- HMI/n2t-out/cardMedia.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-23 08:57:51.439093859 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-23 09:07:59.704136032 +0000
@@ -21,21 +21,6 @@ @@ -21,21 +21,6 @@
vis t5,0 vis t5,0
vis bPrev,0 vis bPrev,0
@@ -246,8 +246,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-07-23 08:57:50.367086580 +0000 --- HMI/n2t-out/cardQR.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-23 08:57:51.439093859 +0000 +++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-23 09:07:59.704136032 +0000
@@ -32,25 +32,6 @@ @@ -32,25 +32,6 @@
vis bText2,0 vis bText2,0
tsw m0,0 tsw m0,0
@@ -294,8 +294,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-07-23 08:57:50.367086580 +0000 --- HMI/n2t-out/cardThermo.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-23 08:57:51.439093859 +0000 +++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-23 09:07:59.708136115 +0000
@@ -41,21 +41,6 @@ @@ -41,21 +41,6 @@
vis xTempDest1,0 vis xTempDest1,0
vis bPrev,0 vis bPrev,0
@@ -338,8 +338,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-07-23 08:57:50.363086553 +0000 --- HMI/n2t-out/pageStartup.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-23 08:57:51.439093859 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-23 09:07:59.704136032 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -370,8 +370,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
{ {
Only in HMI/n2t-out: popupFan.txt Only in HMI/n2t-out: popupFan.txt
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-07-23 08:57:50.363086553 +0000 --- HMI/n2t-out/popupLight.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-23 08:57:51.439093859 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-23 09:07:59.704136032 +0000
@@ -50,29 +50,6 @@ @@ -50,29 +50,6 @@
vis t0,0 vis t0,0
vis pColorWheel,0 vis pColorWheel,0
@@ -422,8 +422,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-07-23 08:57:50.363086553 +0000 --- HMI/n2t-out/popupNotify.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-23 08:57:51.439093859 +0000 +++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-23 09:07:59.704136032 +0000
@@ -12,24 +12,12 @@ @@ -12,24 +12,12 @@
Events Events
@@ -469,8 +469,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-07-23 08:57:50.363086553 +0000 --- HMI/n2t-out/popupShutter.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-23 08:57:51.439093859 +0000 +++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-23 09:07:59.704136032 +0000
@@ -40,40 +40,6 @@ @@ -40,40 +40,6 @@
prints sys0,2 prints sys0,2
prints tSend.txt,0 prints tSend.txt,0
@@ -638,8 +638,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-07-23 08:57:50.363086553 +0000 --- HMI/n2t-out/screensaver.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-23 08:57:51.439093859 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-23 09:07:59.704136032 +0000
@@ -406,22 +406,10 @@ @@ -406,22 +406,10 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1

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

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-07-23 08:57:50.363086553 +0000 --- HMI/n2t-out/Program.s.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 08:57:50.911090274 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:07:59.236126361 +0000
@@ -14,6 +14,6 @@ @@ -14,6 +14,6 @@
//color vars //color vars
int defaultFontColor=65535 int defaultFontColor=65535
@@ -10,107 +10,13 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ // 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
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-07-23 08:57:50.367086580 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-23 08:57:50.915090301 +0000
@@ -12,6 +12,21 @@
Events
Preinitialize Event
+ for(sys0=0;sys0<40;sys0++)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
+ if(defaultBcoColor==0)
+ {
+ tCode.bco=6371
+ tCode.pco=40179
+ }
+ if(defaultBcoColor==6371)
+ {
+ tCode.bco=10565
+ tCode.pco=40179
+ }
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -37,25 +52,6 @@
vis tCode,0
vis bPrev,0
vis bNext,0
- cardAlarm.bco=defaultBcoColor
- for(sys0=0;sys0<40;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- }
- if(defaultBcoColor==0)
- {
- tCode.bco=6371
- tCode.pco=40179
- }
- if(defaultBcoColor==6371)
- {
- tCode.bco=10565
- tCode.pco=40179
- }
Variable (string) strCommand
Attributes
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-07-23 08:57:50.367086580 +0000 --- HMI/n2t-out/cardEntities.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 08:57:50.915090301 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:07:59.236126361 +0000
@@ -12,6 +12,22 @@ @@ -65,6 +65,16 @@
Events
Preinitialize Event
+ for(sys0=0;sys0<40;sys0++)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ if(b[sys0].type==53&&defaultBcoColor==0)
+ {
+ b[sys0].pic=10
+ b[sys0].pic2=11
+ }
+ if(b[sys0].type==1&&defaultBcoColor==0)
+ {
+ b[sys0].pic=14
+ b[sys0].pic1=13
+ b[sys0].pic2=15
+ }
+ }
dim=dimValueNormal
//wup=cardEntities
//remove background & activate reparse mode
@@ -65,26 +81,18 @@
vis nNum4,0 vis nNum4,0
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
- cardEntities.bco=defaultBcoColor
- for(sys0=0;sys0<65;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- if(b[sys0].type==53&&defaultBcoColor==0)
- {
- b[sys0].pic=10
- b[sys0].pic2=11
- }
- if(b[sys0].type==1&&defaultBcoColor==0)
- {
- b[sys0].pic=14
- b[sys0].pic1=13
- b[sys0].pic2=15
- }
- }
+ //ui e5 + //ui e5
+ vis btOnOff5,0 + vis btOnOff5,0
+ vis bUp5,0 + vis bUp5,0
@@ -121,12 +27,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ vis bText5,0 + vis bText5,0
+ vis hSlider5,0 + vis hSlider5,0
+ vis nNum5,0 + vis nNum5,0
+ vis bPrev,0 cardEntities.bco=defaultBcoColor
+ vis bNext,0 for(sys0=0;sys0<65;sys0++)
{
Variable (string) strCommand @@ -140,6 +150,18 @@
Attributes
@@ -140,6 +148,18 @@
Text : Text :
Max. Text Size: 80 Max. Text Size: 80
@@ -145,7 +49,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Number nNum1 Number nNum1
Attributes Attributes
Scope : local Scope : local
@@ -176,6 +196,15 @@ @@ -176,6 +198,15 @@
Associated Keyboard : none Associated Keyboard : none
Value : 0 Value : 0
@@ -161,7 +65,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Text tHeading Text tHeading
Attributes Attributes
Scope : local Scope : local
@@ -306,6 +335,26 @@ @@ -306,6 +337,26 @@
Text : Text :
Max. Text Size : 50 Max. Text Size : 50
@@ -188,7 +92,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Picture p0 Picture p0
Attributes Attributes
Scope : local Scope : local
@@ -425,6 +474,34 @@ @@ -425,6 +476,34 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -223,7 +127,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Button bDown1 Button bDown1
Attributes Attributes
Scope : local Scope : local
@@ -882,6 +959,106 @@ @@ -882,6 +961,106 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -330,7 +234,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Dual-state Button btOnOff1 Dual-state Button btOnOff1
Attributes Attributes
Scope : local Scope : local
@@ -990,6 +1167,33 @@ @@ -990,6 +1169,33 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -364,44 +268,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSpecial Hotspot mSpecial
Attributes Attributes
Scope : local Scope : local
@@ -1028,10 +1232,6 @@ @@ -1110,6 +1316,32 @@
//popupLight.tEntity.txt=tEntity3.txt {
page popupLight page popupFan
} }
- if(type3.txt=="fan")
- {
- page popupFan
- }
Hotspot m1
Attributes
@@ -1054,10 +1254,6 @@
//popupLight.tEntity.txt=tEntity2.txt
page popupLight
}
- if(type2.txt=="fan")
- {
- page popupFan
- }
Hotspot m0
Attributes
@@ -1080,10 +1276,6 @@
//popupLight.tEntity.txt=tEntity1.txt
page popupLight
}
- if(type1.txt=="fan")
- {
- page popupFan
- }
Hotspot m3
Attributes
@@ -1106,9 +1298,27 @@
//popupLight.tEntity.txt=tEntity4.txt
page popupLight
}
- if(type4.txt=="fan")
+ +
+Hotspot m4 +Hotspot m4
+ Attributes + Attributes
@@ -420,16 +290,20 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ page popupShutter + page popupShutter
+ } + }
+ if(type5.txt=="light") + if(type5.txt=="light")
{ + {
- page popupFan
+ //popupLight.tEntity.txt=tEntity5.txt + //popupLight.tEntity.txt=tEntity5.txt
+ page popupLight + page popupLight
} + }
+ if(type5.txt=="fan")
+ {
+ page popupFan
+ }
Hotspot mSwipeNext Hotspot mSwipeNext
Attributes
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-07-23 08:57:50.367086580 +0000 --- HMI/n2t-out/cardGrid.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 08:57:50.915090301 +0000 +++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 09:07:59.236126361 +0000
@@ -12,6 +12,11 @@ @@ -12,6 +12,11 @@
Events Events
@@ -470,8 +344,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
TouchCap tc0 TouchCap tc0
Attributes Attributes
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-07-23 08:57:50.363086553 +0000 --- HMI/n2t-out/cardMedia.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-23 08:57:50.915090301 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-23 09:07:59.236126361 +0000
@@ -12,30 +12,26 @@ @@ -12,30 +12,26 @@
Events Events
@@ -514,8 +388,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-07-23 08:57:50.367086580 +0000 --- HMI/n2t-out/cardQR.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-23 08:57:50.911090274 +0000 +++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-23 09:07:59.236126361 +0000
@@ -32,25 +32,6 @@ @@ -32,25 +32,6 @@
vis bText2,0 vis bText2,0
tsw m0,0 tsw m0,0
@@ -543,8 +417,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-07-23 08:57:50.363086553 +0000 --- HMI/n2t-out/pageStartup.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 08:57:50.915090301 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:07:59.236126361 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
@@ -564,8 +438,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-07-23 08:57:50.363086553 +0000 --- HMI/n2t-out/popupShutter.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-23 08:57:50.911090274 +0000 +++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-23 09:07:59.236126361 +0000
@@ -143,7 +143,7 @@ @@ -143,7 +143,7 @@
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none

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

@@ -1,164 +1,38 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-07-23 08:57:50.931090410 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-07-23 09:07:59.252126692 +0000
+--- HMI/n2t-out/Program.s.txt 2022-07-23 08:57:50.363086553 +0000 +--- HMI/n2t-out/Program.s.txt 2022-07-23 09:07:58.768116691 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 08:57:50.911090274 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:07:59.236126361 +0000
+@@ -14,6 +14,6 @@ +@@ -14,6 +14,6 @@
+ //color vars + //color vars
+ int defaultFontColor=65535 + int defaultFontColor=65535
+ int defaultBcoColor=6371 + int defaultBcoColor=6371
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt +--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:07:58.768116691 +0000
+--- HMI/n2t-out/cardAlarm.txt 2022-07-23 08:57:50.367086580 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:07:59.236126361 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-23 08:57:50.915090301 +0000 +@@ -65,6 +65,16 @@
+@@ -12,6 +12,21 @@
+
+ Events
+ Preinitialize Event
++ for(sys0=0;sys0<40;sys0++)
++ {
++ b[sys0].bco=defaultBcoColor
++ b[sys0].pco=defaultFontColor
++ }
++ if(defaultBcoColor==0)
++ {
++ tCode.bco=6371
++ tCode.pco=40179
++ }
++ if(defaultBcoColor==6371)
++ {
++ tCode.bco=10565
++ tCode.pco=40179
++ }
+ dim=dimValueNormal
+ vis p0,0
+ vis tSend,0
+@@ -37,25 +52,6 @@
+ vis tCode,0
+ vis bPrev,0 + vis bPrev,0
+ vis bNext,0 + vis bNext,0
+- cardAlarm.bco=defaultBcoColor + cardEntities.bco=defaultBcoColor
+- for(sys0=0;sys0<40;sys0++) + for(sys0=0;sys0<65;sys0++)
+- { + {
+- if(b[sys0].type==98||b[sys0].type==116) +@@ -140,6 +150,18 @@
+- { +@@ -176,6 +198,15 @@
+- b[sys0].bco=defaultBcoColor +@@ -306,6 +337,26 @@
+- b[sys0].pco=defaultFontColor +@@ -425,6 +476,34 @@
+- } +@@ -882,6 +961,106 @@
+- }
+- if(defaultBcoColor==0)
+- {
+- tCode.bco=6371
+- tCode.pco=40179
+- }
+- if(defaultBcoColor==6371)
+- {
+- tCode.bco=10565
+- tCode.pco=40179
+- }
+
+ Variable (string) strCommand
+ Attributes
+--- HMI/n2t-out/cardEntities.txt 2022-07-23 08:57:50.367086580 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 08:57:50.915090301 +0000
+@@ -12,6 +12,22 @@
+
+ Events
+ Preinitialize Event
++ for(sys0=0;sys0<40;sys0++)
++ {
++ b[sys0].bco=defaultBcoColor
++ b[sys0].pco=defaultFontColor
++ if(b[sys0].type==53&&defaultBcoColor==0)
++ {
++ b[sys0].pic=10
++ b[sys0].pic2=11
++ }
++ if(b[sys0].type==1&&defaultBcoColor==0)
++ {
++ b[sys0].pic=14
++ b[sys0].pic1=13
++ b[sys0].pic2=15
++ }
++ }
+ dim=dimValueNormal
+ //wup=cardEntities
+ //remove background & activate reparse mode
+@@ -65,26 +81,18 @@
+ vis bPrev,0
+ vis bNext,0
+- cardEntities.bco=defaultBcoColor
+- for(sys0=0;sys0<65;sys0++)
+- {
+- if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54)
+- {
+- b[sys0].bco=defaultBcoColor
+- b[sys0].pco=defaultFontColor
+- }
+- if(b[sys0].type==53&&defaultBcoColor==0)
+- {
+- b[sys0].pic=10
+- b[sys0].pic2=11
+- }
+- if(b[sys0].type==1&&defaultBcoColor==0)
+- {
+- b[sys0].pic=14
+- b[sys0].pic1=13
+- b[sys0].pic2=15
+- }
+- }
++ vis bPrev,0
++ vis bNext,0
+ Variable (string) strCommand
+ Attributes
+@@ -140,6 +148,18 @@
+@@ -176,6 +196,15 @@
+@@ -306,6 +335,26 @@
+@@ -425,6 +474,34 @@
+@@ -882,6 +959,106 @@
++ Text : ++ Text :
++ Max. Text Size : 20 ++ Max. Text Size : 20
+@@ -990,6 +1167,33 @@ +@@ -990,6 +1169,33 @@
+@@ -1028,10 +1232,6 @@ +@@ -1110,6 +1316,32 @@
+ //popupLight.tEntity.txt=tEntity3.txt
+ page popupLight
+ }
+- if(type3.txt=="fan")
+- {
+- page popupFan
+- }
+
+ Hotspot m1
+ Attributes
+@@ -1054,10 +1254,6 @@
+ //popupLight.tEntity.txt=tEntity2.txt
+- if(type2.txt=="fan")
+- {
+- page popupFan
+- }
+ Hotspot m0
+ Attributes
+@@ -1080,10 +1276,6 @@
+ //popupLight.tEntity.txt=tEntity1.txt
+ page popupLight
+ }
+- if(type1.txt=="fan")
+- {
+- page popupFan
+- }
+
+ Hotspot m3
+ Attributes
+@@ -1106,9 +1298,27 @@
+ //popupLight.tEntity.txt=tEntity4.txt
+ page popupLight
+ }
+- if(type4.txt=="fan")
++
+ { + {
+- page popupFan + page popupFan
+ } ++
++ if(type5.txt=="fan")
++ {
++ page popupFan
++ }
+ +
+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
+--- HMI/n2t-out/cardGrid.txt 2022-07-23 08:57:50.367086580 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-07-23 09:07:58.768116691 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 08:57:50.915090301 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 09:07:59.236126361 +0000
+@@ -12,6 +12,11 @@ +@@ -12,6 +12,11 @@
+ +
+ Events + Events
@@ -196,9 +70,10 @@
+- } +- }
+ +
+ TouchCap tc0 + TouchCap tc0
+ Attributes
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-07-23 08:57:50.363086553 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-07-23 09:07:58.768116691 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-23 08:57:50.915090301 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-23 09:07:59.236126361 +0000
+@@ -12,30 +12,26 @@ +@@ -12,30 +12,26 @@
+ Events + Events
+ Preinitialize Event + Preinitialize Event
@@ -240,8 +115,8 @@
+ Variable (string) strCommand + Variable (string) strCommand
+ Attributes + Attributes
+diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt +diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
+--- HMI/n2t-out/cardQR.txt 2022-07-23 08:57:50.367086580 +0000 +--- HMI/n2t-out/cardQR.txt 2022-07-23 09:07:58.768116691 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-23 08:57:50.911090274 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-23 09:07:59.236126361 +0000
+@@ -32,25 +32,6 @@ +@@ -32,25 +32,6 @@
+ vis bText2,0 + vis bText2,0
+ tsw m0,0 + tsw m0,0
@@ -267,11 +142,11 @@
+- } +- }
+ +
+ Variable (string) strCommand + Variable (string) strCommand
+--- HMI/n2t-out/pageStartup.txt 2022-07-23 08:57:50.363086553 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:07:58.768116691 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 08:57:50.915090301 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:07:59.236126361 +0000
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-07-23 08:57:50.363086553 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-07-23 09:07:58.768116691 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-23 08:57:50.911090274 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-23 09:07:59.236126361 +0000
+@@ -143,7 +143,7 @@ +@@ -143,7 +143,7 @@
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard : none + Associated Keyboard : none

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

@@ -20,21 +20,6 @@ Page cardAlarm
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(defaultBcoColor==0)
{
tCode.bco=6371
tCode.pco=40179
}
if(defaultBcoColor==6371)
{
tCode.bco=10565
tCode.pco=40179
}
dim=dimValueNormal dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
@@ -60,6 +45,25 @@ Page cardAlarm
vis tCode,0 vis tCode,0
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
cardAlarm.bco=defaultBcoColor
for(sys0=0;sys0<40;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
}
if(defaultBcoColor==0)
{
tCode.bco=6371
tCode.pco=40179
}
if(defaultBcoColor==6371)
{
tCode.bco=10565
tCode.pco=40179
}
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes

58
HMI/US/portrait/n2t-out-visual/cardEntities.txt
View File

@@ -20,22 +20,6 @@ Page cardEntities
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
if(b[sys0].type==1&&defaultBcoColor==0)
{
b[sys0].pic=14
b[sys0].pic1=13
b[sys0].pic2=15
}
}
dim=dimValueNormal dim=dimValueNormal
//wup=cardEntities //wup=cardEntities
//remove background & activate reparse mode //remove background & activate reparse mode
@@ -99,8 +83,26 @@ Page cardEntities
vis bText5,0 vis bText5,0
vis hSlider5,0 vis hSlider5,0
vis nNum5,0 vis nNum5,0
vis bPrev,0 cardEntities.bco=defaultBcoColor
vis bNext,0 for(sys0=0;sys0<65;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
if(b[sys0].type==1&&defaultBcoColor==0)
{
b[sys0].pic=14
b[sys0].pic1=13
b[sys0].pic2=15
}
}
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -2333,6 +2335,10 @@ Hotspot m2
//popupLight.tEntity.txt=tEntity3.txt //popupLight.tEntity.txt=tEntity3.txt
page popupLight page popupLight
} }
if(type3.txt=="fan")
{
page popupFan
}
Hotspot m1 Hotspot m1
Attributes Attributes
@@ -2364,6 +2370,10 @@ Hotspot m1
//popupLight.tEntity.txt=tEntity2.txt //popupLight.tEntity.txt=tEntity2.txt
page popupLight page popupLight
} }
if(type2.txt=="fan")
{
page popupFan
}
Hotspot m0 Hotspot m0
Attributes Attributes
@@ -2395,6 +2405,10 @@ Hotspot m0
//popupLight.tEntity.txt=tEntity1.txt //popupLight.tEntity.txt=tEntity1.txt
page popupLight page popupLight
} }
if(type1.txt=="fan")
{
page popupFan
}
Hotspot m3 Hotspot m3
Attributes Attributes
@@ -2426,6 +2440,10 @@ Hotspot m3
//popupLight.tEntity.txt=tEntity4.txt //popupLight.tEntity.txt=tEntity4.txt
page popupLight page popupLight
} }
if(type4.txt=="fan")
{
page popupFan
}
Hotspot m4 Hotspot m4
Attributes Attributes
@@ -2457,6 +2475,10 @@ Hotspot m4
//popupLight.tEntity.txt=tEntity5.txt //popupLight.tEntity.txt=tEntity5.txt
page popupLight page popupLight
} }
if(type5.txt=="fan")
{
page popupFan
}
Hotspot mSwipeNext Hotspot mSwipeNext
Attributes Attributes

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

@@ -26,10 +26,6 @@ cardQR
32 Component(s) 32 Component(s)
384 Line(s) of event code 384 Line(s) of event code
223 Unique line(s) of event code 223 Unique line(s) of event code
cardAlarm
40 Component(s)
417 Line(s) of event code
252 Unique line(s) of event code
popupFan popupFan
20 Component(s) 20 Component(s)
234 Line(s) of event code 234 Line(s) of event code
@@ -50,10 +46,14 @@ cardGrid
42 Component(s) 42 Component(s)
454 Line(s) of event code 454 Line(s) of event code
267 Unique line(s) of event code 267 Unique line(s) of event code
cardAlarm
40 Component(s)
421 Line(s) of event code
254 Unique line(s) of event code
cardEntities cardEntities
77 Component(s) 77 Component(s)
1245 Line(s) of event code 1267 Line(s) of event code
533 Unique line(s) of event code 541 Unique line(s) of event code
cardThermo cardThermo
53 Component(s) 53 Component(s)
580 Line(s) of event code 580 Line(s) of event code
@@ -62,5 +62,5 @@ cardThermo
Total Total
14 Page(s) 14 Page(s)
444 Component(s) 444 Component(s)
5223 Line(s) of event code 5249 Line(s) of event code
1351 Unique line(s) of event code 1361 Unique line(s) of event code

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

@@ -12,21 +12,6 @@ Page cardAlarm
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(defaultBcoColor==0)
{
tCode.bco=6371
tCode.pco=40179
}
if(defaultBcoColor==6371)
{
tCode.bco=10565
tCode.pco=40179
}
dim=dimValueNormal dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
@@ -52,6 +37,25 @@ Page cardAlarm
vis tCode,0 vis tCode,0
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
cardAlarm.bco=defaultBcoColor
for(sys0=0;sys0<40;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
}
if(defaultBcoColor==0)
{
tCode.bco=6371
tCode.pco=40179
}
if(defaultBcoColor==6371)
{
tCode.bco=10565
tCode.pco=40179
}
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes

58
HMI/US/portrait/n2t-out/cardEntities.txt
View File

@@ -12,22 +12,6 @@ Page cardEntities
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
if(b[sys0].type==1&&defaultBcoColor==0)
{
b[sys0].pic=14
b[sys0].pic1=13
b[sys0].pic2=15
}
}
dim=dimValueNormal dim=dimValueNormal
//wup=cardEntities //wup=cardEntities
//remove background & activate reparse mode //remove background & activate reparse mode
@@ -91,8 +75,26 @@ Page cardEntities
vis bText5,0 vis bText5,0
vis hSlider5,0 vis hSlider5,0
vis nNum5,0 vis nNum5,0
vis bPrev,0 cardEntities.bco=defaultBcoColor
vis bNext,0 for(sys0=0;sys0<65;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
if(b[sys0].type==1&&defaultBcoColor==0)
{
b[sys0].pic=14
b[sys0].pic1=13
b[sys0].pic2=15
}
}
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -1232,6 +1234,10 @@ Hotspot m2
//popupLight.tEntity.txt=tEntity3.txt //popupLight.tEntity.txt=tEntity3.txt
page popupLight page popupLight
} }
if(type3.txt=="fan")
{
page popupFan
}
Hotspot m1 Hotspot m1
Attributes Attributes
@@ -1254,6 +1260,10 @@ Hotspot m1
//popupLight.tEntity.txt=tEntity2.txt //popupLight.tEntity.txt=tEntity2.txt
page popupLight page popupLight
} }
if(type2.txt=="fan")
{
page popupFan
}
Hotspot m0 Hotspot m0
Attributes Attributes
@@ -1276,6 +1286,10 @@ Hotspot m0
//popupLight.tEntity.txt=tEntity1.txt //popupLight.tEntity.txt=tEntity1.txt
page popupLight page popupLight
} }
if(type1.txt=="fan")
{
page popupFan
}
Hotspot m3 Hotspot m3
Attributes Attributes
@@ -1298,6 +1312,10 @@ Hotspot m3
//popupLight.tEntity.txt=tEntity4.txt //popupLight.tEntity.txt=tEntity4.txt
page popupLight page popupLight
} }
if(type4.txt=="fan")
{
page popupFan
}
Hotspot m4 Hotspot m4
Attributes Attributes
@@ -1320,6 +1338,10 @@ Hotspot m4
//popupLight.tEntity.txt=tEntity5.txt //popupLight.tEntity.txt=tEntity5.txt
page popupLight page popupLight
} }
if(type5.txt=="fan")
{
page popupFan
}
Hotspot mSwipeNext Hotspot mSwipeNext
Attributes Attributes