h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-15 01:18:19 +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 d4ab833cd5
commit 229bfa4ecc
8 changed files with 217 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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
--- HMI/n2t-out/Program.s.txt 2022-07-23 08:57:50.363086553 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 08:57:50.911090274 +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 09:07:59.236126361 +0000
@@ -14,6 +14,6 @@
//color vars
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)
+ //lcd_dev fffb 0002 0000 0020
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
--- 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 @@
--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:07:59.236126361 +0000
@@ -65,6 +65,16 @@
vis nNum4,0
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
- }
- }
+ //ui e5
+ vis btOnOff5,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 hSlider5,0
+ vis nNum5,0
+ vis bPrev,0
+ vis bNext,0
Variable (string) strCommand
Attributes
@@ -140,6 +148,18 @@
cardEntities.bco=defaultBcoColor
for(sys0=0;sys0<65;sys0++)
{
@@ -140,6 +150,18 @@
Text :
Max. Text Size: 80
@@ -145,7 +49,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Number nNum1
Attributes
Scope : local
@@ -176,6 +196,15 @@
@@ -176,6 +198,15 @@
Associated Keyboard : none
Value : 0
@@ -161,7 +65,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Text tHeading
Attributes
Scope : local
@@ -306,6 +335,26 @@
@@ -306,6 +337,26 @@
Text :
Max. Text Size : 50
@@ -188,7 +92,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Picture p0
Attributes
Scope : local
@@ -425,6 +474,34 @@
@@ -425,6 +476,34 @@
prints tSend.txt,0
prints crcval,2
@@ -223,7 +127,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Button bDown1
Attributes
Scope : local
@@ -882,6 +959,106 @@
@@ -882,6 +961,106 @@
prints tSend.txt,0
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
Attributes
Scope : local
@@ -990,6 +1167,33 @@
@@ -990,6 +1169,33 @@
prints tSend.txt,0
prints crcval,2
@@ -364,44 +268,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSpecial
Attributes
Scope : local
@@ -1028,10 +1232,6 @@
//popupLight.tEntity.txt=tEntity3.txt
page popupLight
@@ -1110,6 +1316,32 @@
{
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
+ Attributes
@@ -420,16 +290,20 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ page popupShutter
+ }
+ if(type5.txt=="light")
{
- page popupFan
+ {
+ //popupLight.tEntity.txt=tEntity5.txt
+ page popupLight
}
+ }
+ if(type5.txt=="fan")
+ {
+ page popupFan
+ }
Hotspot mSwipeNext
Attributes
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/US/portrait/n2t-out/cardGrid.txt 2022-07-23 08:57:50.915090301 +0000
--- HMI/n2t-out/cardGrid.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 09:07:59.236126361 +0000
@@ -12,6 +12,11 @@
Events
@@ -470,8 +344,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
TouchCap tc0
Attributes
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/US/portrait/n2t-out/cardMedia.txt 2022-07-23 08:57:50.915090301 +0000
--- HMI/n2t-out/cardMedia.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-23 09:07:59.236126361 +0000
@@ -12,30 +12,26 @@
Events
@@ -514,8 +388,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
Variable (string) strCommand
Attributes
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/US/portrait/n2t-out/cardQR.txt 2022-07-23 08:57:50.911090274 +0000
--- HMI/n2t-out/cardQR.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-23 09:07:59.236126361 +0000
@@ -32,25 +32,6 @@
vis bText2,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
Attributes
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/US/portrait/n2t-out/pageStartup.txt 2022-07-23 08:57:50.915090301 +0000
--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:07:59.236126361 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
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
crcrest 1,0xffff // reset CRC
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/US/portrait/n2t-out/popupShutter.txt 2022-07-23 08:57:50.911090274 +0000
--- HMI/n2t-out/popupShutter.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-23 09:07:59.236126361 +0000
@@ -143,7 +143,7 @@
Send Component ID : disabled
Associated Keyboard : none