h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-01-04 13:45:47 +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

142
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-06-25 19:33:02.213732211 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-25 19:33:03.053725892 +0000
--- HMI/n2t-out/Program.s.txt 2022-06-28 19:11:03.434183841 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-28 19:11:04.446197053 +0000
@@ -11,9 +11,4 @@
// dim value
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
page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-06-25 19:33:03.053725892 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-06-28 19:11:03.434183841 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-06-28 19:11:04.450197106 +0000
@@ -12,21 +12,6 @@
Events
@@ -65,8 +65,8 @@ 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-06-25 19:33:02.217732181 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-25 19:33:03.053725892 +0000
--- HMI/n2t-out/cardEntities.txt 2022-06-28 19:11:03.438183894 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-28 19:11:04.450197106 +0000
@@ -12,22 +12,6 @@
Events
@@ -90,7 +90,51 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
dim=dimValueNormal
//wup=cardEntities
//remove background & activate reparse mode
@@ -1945,18 +1929,6 @@
@@ -1024,10 +1008,6 @@
//popupLight.tEntity.txt=tEntity3.txt
page popupLight
}
- if(type3.txt=="fan")
- {
- page popupFan
- }
Hotspot m1
Attributes
@@ -1050,10 +1030,6 @@
//popupLight.tEntity.txt=tEntity2.txt
page popupLight
}
- if(type2.txt=="fan")
- {
- page popupFan
- }
Hotspot m0
Attributes
@@ -1076,10 +1052,6 @@
//popupLight.tEntity.txt=tEntity1.txt
page popupLight
}
- if(type1.txt=="fan")
- {
- page popupFan
- }
Hotspot m3
Attributes
@@ -1102,10 +1074,6 @@
//popupLight.tEntity.txt=tEntity4.txt
page popupLight
}
- if(type4.txt=="fan")
- {
- page popupFan
- }
Hotspot mSwipeNext
Attributes
@@ -1961,18 +1929,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
@@ -110,8 +154,8 @@ 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-06-25 19:33:02.213732211 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-25 19:33:03.053725892 +0000
--- HMI/n2t-out/cardGrid.txt 2022-06-28 19:11:03.438183894 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-28 19:11:04.446197053 +0000
@@ -12,11 +12,6 @@
Events
@@ -143,9 +187,20 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
}
if(tInstruction.txt=="timeout")
{
@@ -928,10 +911,6 @@
{
page popupLight
}
- if(tTmp.txt=="fan")
- {
- page popupFan
- }
TouchCap tc0
Attributes
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-25 19:33:03.053725892 +0000
--- HMI/n2t-out/cardMedia.txt 2022-06-28 19:11:03.434183841 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-28 19:11:04.446197053 +0000
@@ -12,17 +12,6 @@
Events
@@ -184,8 +239,8 @@ 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-06-25 19:33:02.213732211 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-06-25 19:33:03.053725892 +0000
--- HMI/n2t-out/cardQR.txt 2022-06-28 19:11:03.434183841 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-06-28 19:11:04.446197053 +0000
@@ -12,21 +12,6 @@
Events
@@ -228,8 +283,8 @@ 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-06-25 19:33:02.213732211 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-25 19:33:03.053725892 +0000
--- HMI/n2t-out/cardThermo.txt 2022-06-28 19:11:03.438183894 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-28 19:11:04.450197106 +0000
@@ -12,11 +12,6 @@
Events
@@ -262,8 +317,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-06-25 19:33:02.213732211 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-25 19:33:03.053725892 +0000
--- HMI/n2t-out/pageStartup.txt 2022-06-28 19:11:03.434183841 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-28 19:11:04.446197053 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -293,8 +348,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-06-25 19:33:02.213732211 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-06-25 19:33:03.053725892 +0000
--- HMI/n2t-out/pageTest.txt 2022-06-28 19:11:03.434183841 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-06-28 19:11:04.446197053 +0000
@@ -13,46 +13,6 @@
Events
Preinitialize Event
@@ -342,9 +397,10 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
Picture p0
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-06-25 19:33:02.213732211 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-25 19:33:03.053725892 +0000
--- HMI/n2t-out/popupLight.txt 2022-06-28 19:11:03.434183841 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-28 19:11:04.446197053 +0000
@@ -12,25 +12,6 @@
Events
@@ -391,21 +447,27 @@ 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-06-25 19:33:02.213732211 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-25 19:33:03.053725892 +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
@@ -320,18 +315,6 @@
--- HMI/n2t-out/popupNotify.txt 2022-06-28 19:11:03.434183841 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-28 19:11:04.446197053 +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
@@ -326,18 +315,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
@@ -425,8 +487,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-06-25 19:33:02.213732211 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-25 19:33:03.053725892 +0000
--- HMI/n2t-out/popupShutter.txt 2022-06-28 19:11:03.434183841 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-28 19:11:04.446197053 +0000
@@ -12,40 +12,6 @@
Events
@@ -576,8 +638,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-06-25 19:33:02.213732211 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-25 19:33:03.053725892 +0000
--- HMI/n2t-out/screensaver.txt 2022-06-28 19:11:03.434183841 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-28 19:11:04.450197106 +0000
@@ -406,22 +406,10 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1