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

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

Browse Source
This commit is contained in:
joBr99
2022-07-07 21:52:24 +00:00
committed by github-actions[bot]
parent 6068795098
commit 790cad09ab
20 changed files with 493 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

159
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
--- HMI/n2t-out/Program.s.txt 2022-07-07 19:52:18.435299522 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-07 19:52:19.367317435 +0000
--- HMI/n2t-out/Program.s.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-07 21:52:21.071078168 +0000
@@ -11,9 +11,4 @@
// dim value
int dimValue=40
@@ -12,16 +12,19 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-07-07 19:52:18.435299522 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-07 19:52:19.367317435 +0000
@@ -12,21 +12,6 @@
--- HMI/n2t-out/cardAlarm.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-07 21:52:21.071078168 +0000
@@ -12,24 +12,6 @@
Events
Preinitialize Event
- for(sys0=0;sys0<40;sys0++)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- if(b[sys0].type==98||b[sys0].type==116)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- }
- if(defaultBcoColor==0)
- {
@@ -36,7 +39,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -138,7 +123,7 @@
@@ -141,7 +123,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
@@ -45,7 +48,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
Max. Text Size : 10
Text tIcon
@@ -755,18 +740,6 @@
@@ -758,18 +740,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
@@ -65,16 +68,19 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-07-07 19:52:18.435299522 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-07 19:52:19.367317435 +0000
@@ -12,22 +12,6 @@
--- HMI/n2t-out/cardEntities.txt 2022-07-07 21:52:20.175064730 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-07 21:52:21.071078168 +0000
@@ -12,25 +12,6 @@
Events
Preinitialize Event
- for(sys0=0;sys0<40;sys0++)
- for(sys0=0;sys0<65;sys0++)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- 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
@@ -90,7 +96,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
dim=dimValueNormal
//wup=cardEntities
//remove background & activate reparse mode
@@ -1024,10 +1008,6 @@
@@ -1027,10 +1008,6 @@
//popupLight.tEntity.txt=tEntity3.txt
page popupLight
}
@@ -101,7 +107,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
Hotspot m1
Attributes
@@ -1050,10 +1030,6 @@
@@ -1053,10 +1030,6 @@
//popupLight.tEntity.txt=tEntity2.txt
page popupLight
}
@@ -112,7 +118,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
Hotspot m0
Attributes
@@ -1076,10 +1052,6 @@
@@ -1079,10 +1052,6 @@
//popupLight.tEntity.txt=tEntity1.txt
page popupLight
}
@@ -123,7 +129,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
Hotspot m3
Attributes
@@ -1102,10 +1074,6 @@
@@ -1105,10 +1074,6 @@
//popupLight.tEntity.txt=tEntity4.txt
page popupLight
}
@@ -134,7 +140,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
Hotspot mSwipeNext
Attributes
@@ -1961,18 +1929,6 @@
@@ -1964,18 +1929,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
@@ -154,21 +160,24 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-07-07 19:52:18.435299522 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-07 19:52:19.367317435 +0000
@@ -12,11 +12,6 @@
--- HMI/n2t-out/cardGrid.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-07 21:52:21.071078168 +0000
@@ -12,14 +12,6 @@
Events
Preinitialize Event
- for(sys0=0;sys0<40;sys0++)
- for(sys0=0;sys0<42;sys0++)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- if(b[sys0].type==98||b[sys0].type==116)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- }
dim=dimValueNormal
//remove background & activate reparse mode
vis p0,0
@@ -855,18 +850,6 @@
@@ -858,18 +850,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
@@ -187,7 +196,7 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
}
if(tInstruction.txt=="timeout")
{
@@ -928,10 +911,6 @@
@@ -931,10 +911,6 @@
{
page popupLight
}
@@ -199,16 +208,19 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
TouchCap tc0
Attributes
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-07-07 19:52:18.435299522 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-07 19:52:19.367317435 +0000
@@ -12,17 +12,6 @@
--- HMI/n2t-out/cardMedia.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-07 21:52:21.071078168 +0000
@@ -12,20 +12,6 @@
Events
Preinitialize Event
- for(sys0=0;sys0<40;sys0++)
- for(sys0=0;sys0<34;sys0++)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- if(b[sys0].type==98||b[sys0].type==116)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- }
- if(defaultBcoColor==0)
- {
@@ -219,7 +231,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -677,18 +666,6 @@
@@ -680,18 +666,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
@@ -239,16 +251,19 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-07-07 19:52:18.435299522 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-07 19:52:19.367317435 +0000
@@ -12,21 +12,6 @@
--- HMI/n2t-out/cardQR.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-07 21:52:21.071078168 +0000
@@ -12,24 +12,6 @@
Events
Preinitialize Event
- for(sys0=0;sys0<40;sys0++)
- for(sys0=0;sys0<32;sys0++)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- if(b[sys0].type==98||b[sys0].type==116)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- if(b[sys0].type==53&&defaultBcoColor==6371)
- {
- b[sys0].pic=1
@@ -263,7 +278,7 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -624,18 +609,6 @@
@@ -627,18 +609,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
@@ -283,21 +298,30 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-07-07 19:52:18.435299522 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-07 19:52:19.367317435 +0000
@@ -12,11 +12,6 @@
--- HMI/n2t-out/cardThermo.txt 2022-07-07 21:52:20.175064730 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-07 21:52:21.071078168 +0000
@@ -12,20 +12,6 @@
Events
Preinitialize Event
- for(sys0=0;sys0<60;sys0++)
- for(sys0=0;sys0<53;sys0++)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==59)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- if(b[sys0].type==53)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].bco2=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- }
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -1161,18 +1156,6 @@
@@ -1170,18 +1156,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
@@ -317,8 +341,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-07-07 19:52:18.435299522 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-07 19:52:19.367317435 +0000
--- HMI/n2t-out/pageStartup.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-07 21:52:21.071078168 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -348,8 +372,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-07-07 19:52:18.435299522 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-07-07 19:52:19.367317435 +0000
--- HMI/n2t-out/pageTest.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-07-07 21:52:21.071078168 +0000
@@ -13,46 +13,6 @@
Events
Preinitialize Event
@@ -399,16 +423,19 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
Attributes
Only in HMI/n2t-out: popupFan.txt
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-07-07 19:52:18.435299522 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-07 19:52:19.367317435 +0000
@@ -12,25 +12,6 @@
--- HMI/n2t-out/popupLight.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-07 21:52:21.071078168 +0000
@@ -12,28 +12,6 @@
Events
Preinitialize Event
- for(sys0=0;sys0<40;sys0++)
- for(sys0=0;sys0<27;sys0++)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- if(b[sys0].type==98||b[sys0].type==116)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- if(b[sys0].type==53&&defaultBcoColor==0)
- {
- b[sys0].pic=10
@@ -427,7 +454,7 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
dim=dimValueNormal
//get entitiy name
tEntity.txt=pageIcons.tTmp1.txt
@@ -585,18 +566,6 @@
@@ -588,18 +566,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
@@ -447,8 +474,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-07-07 19:52:18.435299522 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-07 19:52:19.367317435 +0000
--- HMI/n2t-out/popupNotify.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-07 21:52:21.071078168 +0000
@@ -18,17 +18,6 @@
vis tTmp,0
vis tInstruction,0
@@ -487,8 +514,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-07-07 19:52:18.435299522 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-07 19:52:19.367317435 +0000
--- HMI/n2t-out/popupShutter.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-07 21:52:21.071078168 +0000
@@ -12,40 +12,6 @@
Events
@@ -656,8 +683,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-07-07 19:52:18.435299522 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-07 19:52:19.367317435 +0000
--- HMI/n2t-out/screensaver.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-07 21:52:21.071078168 +0000
@@ -406,22 +406,10 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1