h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-01-07 07:05:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

start implementing detail page for fans (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-06-28 19:11:06 +00:00
committed by github-actions[bot]
parent 505284865a
commit 707a64de6a
12 changed files with 1520 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
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-06-25 19:33:02.213732211 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-25 19:33:02.625729111 +0000
--- HMI/n2t-out/Program.s.txt 2022-06-28 19:11:03.434183841 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-28 19:11:03.922190212 +0000
@@ -14,6 +14,6 @@
//color vars
int defaultFontColor=65535
@@ -11,8 +11,8 @@ 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-06-25 19:33:02.213732211 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-25 19:33:02.625729111 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-06-28 19:11:03.434183841 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-28 19:11:03.922190212 +0000
@@ -138,7 +138,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -23,8 +23,8 @@ 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-06-25 19:33:02.217732181 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-25 19:33:02.629729081 +0000
--- HMI/n2t-out/cardEntities.txt 2022-06-28 19:11:03.438183894 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-28 19:11:03.926190265 +0000
@@ -81,6 +81,18 @@
vis nNum4,0
vis bPrev,0
@@ -282,10 +282,45 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSpecial
Attributes
Scope : local
@@ -1091,6 +1299,28 @@
@@ -1024,10 +1232,6 @@
//popupLight.tEntity.txt=tEntity3.txt
page popupLight
}
- if(type3.txt=="fan")
- {
- page popupFan
- }
Hotspot m1
Attributes
@@ -1050,10 +1254,6 @@
//popupLight.tEntity.txt=tEntity2.txt
page popupLight
}
- if(type2.txt=="fan")
- {
- page popupFan
- }
Hotspot m0
Attributes
@@ -1076,10 +1276,6 @@
//popupLight.tEntity.txt=tEntity1.txt
page popupLight
}
- if(type1.txt=="fan")
- {
- page popupFan
- }
Hotspot m3
Attributes
@@ -1102,9 +1298,27 @@
//popupLight.tEntity.txt=tEntity4.txt
page popupLight
}
- if(type4.txt=="fan")
+
+Hotspot m4
+ Attributes
+ Scope : local
@@ -303,17 +338,30 @@ 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
+ }
+
}
Hotspot mSwipeNext
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-06-28 19:11:03.438183894 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-06-28 19:11:03.922190212 +0000
@@ -928,10 +928,6 @@
{
page popupLight
}
- if(tTmp.txt=="fan")
- {
- page popupFan
- }
TouchCap tc0
Attributes
Scope : local
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-25 19:33:02.625729111 +0000
--- HMI/n2t-out/cardQR.txt 2022-06-28 19:11:03.434183841 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-28 19:11:03.922190212 +0000
@@ -12,21 +12,6 @@
Events
@@ -337,8 +385,8 @@ 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-06-25 19:33:02.213732211 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-25 19:33:02.625729111 +0000
--- HMI/n2t-out/cardThermo.txt 2022-06-28 19:11:03.438183894 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-28 19:11:03.922190212 +0000
@@ -12,11 +12,6 @@
Events
@@ -352,8 +400,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
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-06-25 19:33:02.213732211 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-25 19:33:02.625729111 +0000
--- HMI/n2t-out/pageStartup.txt 2022-06-28 19:11:03.434183841 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-28 19:11:03.922190212 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -373,8 +421,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-06-25 19:33:02.213732211 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-25 19:33:02.625729111 +0000
--- HMI/n2t-out/pageTest.txt 2022-06-28 19:11:03.434183841 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-28 19:11:03.922190212 +0000
@@ -13,46 +13,6 @@
Events
Preinitialize Event
@@ -422,18 +470,25 @@ 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/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-25 19:33:02.625729111 +0000
@@ -12,11 +12,6 @@
Events
Preinitialize Event
- for(sys0=0;sys0<40;sys0++)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
dim=dimValueNormal
vis p0,0
vis tSend,0
--- HMI/n2t-out/popupNotify.txt 2022-06-28 19:11:03.434183841 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-28 19:11:03.922190212 +0000
@@ -18,17 +18,6 @@
vis tTmp,0
vis tInstruction,0
vis tId,0
- popupNotify.bco=defaultBcoColor
- tHeading.bco=defaultBcoColor
- b0.bco=defaultBcoColor
- tText.bco=defaultBcoColor
- b1.bco=defaultBcoColor
- b2.bco=defaultBcoColor
- tHeading.pco=defaultFontColor
- b0.pco=defaultFontColor
- tText.pco=defaultFontColor
- b1.pco=defaultFontColor
- b2.pco=defaultFontColor
Variable (string) strCommand
Attributes

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

@@ -1,13 +1,13 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-25 19:33:02.641728991 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-25 19:33:02.213732211 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-25 19:33:02.625729111 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-28 19:11:03.938190421 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-28 19:11:03.434183841 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-28 19:11:03.922190212 +0000
+@@ -14,6 +14,6 @@
+ //color vars
+ int defaultFontColor=65535
+ int defaultBcoColor=6371
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-06-25 19:33:02.213732211 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-25 19:33:02.625729111 +0000
+--- HMI/n2t-out/cardAlarm.txt 2022-06-28 19:11:03.434183841 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-28 19:11:03.922190212 +0000
+@@ -138,7 +138,7 @@
+ Disable release event after dragging: 0
+ Send Component ID : disabled
@@ -17,8 +17,8 @@
+ Max. Text Size : 10
+
+ Text tIcon
+--- HMI/n2t-out/cardEntities.txt 2022-06-25 19:33:02.217732181 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-25 19:33:02.629729081 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-28 19:11:03.438183894 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-28 19:11:03.926190265 +0000
+@@ -81,6 +81,18 @@
+ vis bPrev,0
+ vis bNext,0
@@ -34,9 +34,61 @@
++ Text :
++ Max. Text Size : 20
+@@ -986,6 +1167,33 @@
+@@ -1091,6 +1299,28 @@
+--- HMI/n2t-out/cardQR.txt 2022-06-25 19:33:02.213732211 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-25 19:33:02.625729111 +0000
+@@ -1024,10 +1232,6 @@
+ //popupLight.tEntity.txt=tEntity3.txt
+ page popupLight
+ }
+- if(type3.txt=="fan")
+- {
+- page popupFan
+- }
+
+ Hotspot m1
+ Attributes
+@@ -1050,10 +1254,6 @@
+ //popupLight.tEntity.txt=tEntity2.txt
+- if(type2.txt=="fan")
+- {
+- page popupFan
+- }
+ Hotspot m0
+ Attributes
+@@ -1076,10 +1276,6 @@
+ //popupLight.tEntity.txt=tEntity1.txt
+ page popupLight
+ }
+- if(type1.txt=="fan")
+- {
+- page popupFan
+- }
+
+ Hotspot m3
+ Attributes
+@@ -1102,9 +1298,27 @@
+ //popupLight.tEntity.txt=tEntity4.txt
+ page popupLight
+ }
+- if(type4.txt=="fan")
++
+ {
+- page popupFan
+ }
+
+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
+--- HMI/n2t-out/cardGrid.txt 2022-06-28 19:11:03.438183894 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-06-28 19:11:03.922190212 +0000
+@@ -928,10 +928,6 @@
+ {
+ page popupLight
+ }
+- if(tTmp.txt=="fan")
+- {
+- page popupFan
+- }
+
+ TouchCap tc0
+--- HMI/n2t-out/cardQR.txt 2022-06-28 19:11:03.434183841 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-28 19:11:03.922190212 +0000
+@@ -12,21 +12,6 @@
+ Events
+ Preinitialize Event
@@ -59,8 +111,8 @@
+ 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-06-25 19:33:02.213732211 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-25 19:33:02.625729111 +0000
+--- HMI/n2t-out/cardThermo.txt 2022-06-28 19:11:03.438183894 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-28 19:11:03.922190212 +0000
+@@ -12,11 +12,6 @@
+
+ Events
@@ -73,11 +125,11 @@
+ dim=dimValueNormal
+ vis p0,0
+ vis tSend,0
+--- HMI/n2t-out/pageStartup.txt 2022-06-25 19:33:02.213732211 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-25 19:33:02.625729111 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-06-28 19:11:03.434183841 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-28 19:11:03.922190212 +0000
+diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
+--- HMI/n2t-out/pageTest.txt 2022-06-25 19:33:02.213732211 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-25 19:33:02.625729111 +0000
+--- HMI/n2t-out/pageTest.txt 2022-06-28 19:11:03.434183841 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-28 19:11:03.922190212 +0000
+@@ -13,46 +13,6 @@
+ Events
+ Preinitialize Event
@@ -125,18 +177,25 @@
+
+ Picture p0
+ Attributes
+Only in HMI/n2t-out: popupFan.txt
+diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
+--- HMI/n2t-out/popupNotify.txt 2022-06-25 19:33:02.213732211 +0000
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-25 19:33:02.625729111 +0000
+@@ -12,11 +12,6 @@
+
+ Events
+ Preinitialize Event
+- for(sys0=0;sys0<40;sys0++)
+- {
+- b[sys0].bco=defaultBcoColor
+- b[sys0].pco=defaultFontColor
+- }
+ dim=dimValueNormal
+ vis p0,0
+ vis tSend,0
+--- HMI/n2t-out/popupNotify.txt 2022-06-28 19:11:03.434183841 +0000
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-28 19:11:03.922190212 +0000
+@@ -18,17 +18,6 @@
+ vis tTmp,0
+ vis tInstruction,0
+ vis tId,0
+- popupNotify.bco=defaultBcoColor
+- tHeading.bco=defaultBcoColor
+- b0.bco=defaultBcoColor
+- tText.bco=defaultBcoColor
+- b1.bco=defaultBcoColor
+- b2.bco=defaultBcoColor
+- tHeading.pco=defaultFontColor
+- b0.pco=defaultFontColor
+- tText.pco=defaultFontColor
+- b1.pco=defaultFontColor
+- b2.pco=defaultFontColor
+
+ Variable (string) strCommand
+ Attributes