h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-13 08:28:19 +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

177
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-07 19:52:18.435299522 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-07 19:52:18.875307970 +0000
--- HMI/n2t-out/Program.s.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-07 21:52:20.607071209 +0000
@@ -14,6 +14,6 @@
//color vars
int defaultFontColor=65535
@@ -11,9 +11,22 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //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-07 19:52:18.435299522 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-07 19:52:18.875307970 +0000
@@ -138,7 +138,7 @@
--- HMI/n2t-out/cardAlarm.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-07 21:52:20.607071209 +0000
@@ -14,12 +14,9 @@
Preinitialize Event
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
@@ -141,7 +138,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
@@ -23,9 +36,24 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
Text tIcon
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-07-07 19:52:18.435299522 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-07 19:52:18.875307970 +0000
@@ -81,6 +81,18 @@
--- HMI/n2t-out/cardEntities.txt 2022-07-07 21:52:20.175064730 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-07 21:52:20.611071269 +0000
@@ -12,13 +12,10 @@
Events
Preinitialize Event
- for(sys0=0;sys0<65;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54)
+ 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
@@ -84,6 +81,18 @@
vis nNum4,0
vis bPrev,0
vis bNext,0
@@ -44,7 +72,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Variable (string) strCommand
Attributes
@@ -136,6 +148,18 @@
@@ -139,6 +148,18 @@
Text :
Max. Text Size: 80
@@ -63,7 +91,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Number nNum1
Attributes
Scope : local
@@ -172,6 +196,15 @@
@@ -175,6 +196,15 @@
Associated Keyboard : none
Value : 0
@@ -79,7 +107,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Text tHeading
Attributes
Scope : local
@@ -302,6 +335,26 @@
@@ -305,6 +335,26 @@
Text :
Max. Text Size : 50
@@ -106,7 +134,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Picture p0
Attributes
Scope : local
@@ -421,6 +474,34 @@
@@ -424,6 +474,34 @@
prints tSend.txt,0
prints crcval,2
@@ -141,7 +169,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Button bDown1
Attributes
Scope : local
@@ -878,6 +959,106 @@
@@ -881,6 +959,106 @@
prints tSend.txt,0
prints crcval,2
@@ -248,7 +276,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Dual-state Button btOnOff1
Attributes
Scope : local
@@ -986,6 +1167,33 @@
@@ -989,6 +1167,33 @@
prints tSend.txt,0
prints crcval,2
@@ -282,7 +310,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSpecial
Attributes
Scope : local
@@ -1024,10 +1232,6 @@
@@ -1027,10 +1232,6 @@
//popupLight.tEntity.txt=tEntity3.txt
page popupLight
}
@@ -293,7 +321,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot m1
Attributes
@@ -1050,10 +1254,6 @@
@@ -1053,10 +1254,6 @@
//popupLight.tEntity.txt=tEntity2.txt
page popupLight
}
@@ -304,7 +332,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot m0
Attributes
@@ -1076,10 +1276,6 @@
@@ -1079,10 +1276,6 @@
//popupLight.tEntity.txt=tEntity1.txt
page popupLight
}
@@ -315,7 +343,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot m3
Attributes
@@ -1102,9 +1298,27 @@
@@ -1105,9 +1298,27 @@
//popupLight.tEntity.txt=tEntity4.txt
page popupLight
}
@@ -346,9 +374,25 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSwipeNext
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-07-07 19:52:18.435299522 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-07 19:52:18.875307970 +0000
@@ -928,10 +928,6 @@
--- HMI/n2t-out/cardGrid.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-07 21:52:20.611071269 +0000
@@ -12,14 +12,11 @@
Events
Preinitialize Event
- for(sys0=0;sys0<42;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
+ for(sys0=0;sys0<40;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
- }
dim=dimValueNormal
//remove background & activate reparse mode
vis p0,0
@@ -931,10 +928,6 @@
{
page popupLight
}
@@ -359,17 +403,39 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
TouchCap tc0
Attributes
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-07-07 19:52:18.435299522 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-07 19:52:18.875307970 +0000
@@ -12,21 +12,6 @@
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-07 21:52:20.607071209 +0000
@@ -12,14 +12,11 @@
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)
+ for(sys0=0;sys0<40;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
- }
if(defaultBcoColor==0)
{
hVolume.pic=14
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-07 21:52:20.607071209 +0000
@@ -12,24 +12,6 @@
Events
Preinitialize Event
- for(sys0=0;sys0<32;sys0++)
- {
- 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
@@ -385,23 +451,32 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
vis p0,0
vis tSend,0
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-07-07 19:52:18.435299522 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-07 19:52:18.875307970 +0000
@@ -12,11 +12,6 @@
--- HMI/n2t-out/cardThermo.txt 2022-07-07 21:52:20.175064730 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-07 21:52:20.611071269 +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
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-07-07 19:52:18.435299522 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-07 19:52:18.875307970 +0000
--- HMI/n2t-out/pageStartup.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-07 21:52:20.607071209 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -421,8 +496,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/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-07-07 19:52:18.435299522 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-07 19:52:18.875307970 +0000
--- HMI/n2t-out/pageTest.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-07 21:52:20.607071209 +0000
@@ -13,46 +13,6 @@
Events
Preinitialize Event
@@ -471,9 +546,27 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
Picture p0
Attributes
Only in HMI/n2t-out: popupFan.txt
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-07-07 21:52:20.607071209 +0000
@@ -12,13 +12,10 @@
Events
Preinitialize Event
- for(sys0=0;sys0<27;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
+ 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
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-07-07 19:52:18.435299522 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-07 19:52:18.875307970 +0000
--- HMI/n2t-out/popupNotify.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-07 21:52:20.607071209 +0000
@@ -18,17 +18,6 @@
vis tTmp,0
vis tInstruction,0
@@ -493,8 +586,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
Variable (string) strCommand
Attributes
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-07-07 19:52:18.435299522 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-07 19:52:18.875307970 +0000
--- HMI/n2t-out/popupShutter.txt 2022-07-07 21:52:20.171064670 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-07 21:52:20.607071209 +0000
@@ -143,7 +143,7 @@
Send Component ID : disabled
Associated Keyboard : none