h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-08 22:36:33 +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-23 11:57:32 +00:00
committed by github-actions[bot]
parent 3349ce5996
commit 5dcd5be9ce
18 changed files with 350 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
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 09:50:28.361934134 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:50:28.817935625 +0000
--- HMI/n2t-out/Program.s.txt 2022-07-23 11:57:25.607877939 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 11:57:26.123891121 +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/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:50:28.361934134 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:50:28.817935625 +0000
--- HMI/n2t-out/cardEntities.txt 2022-07-23 11:57:25.611878041 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 11:57:26.123891121 +0000
@@ -65,6 +65,16 @@
vis nNum4,0
vis bPrev,0
@@ -268,11 +268,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSpecial
Attributes
Scope : local
@@ -1110,6 +1316,32 @@
{
@@ -1111,6 +1317,32 @@
page popupFan
}
+
+Hotspot m4
+ Attributes
+ Scope : local
@@ -298,12 +297,105 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ {
+ page popupFan
+ }
+
Hotspot mSwipeNext
Attributes
Scope : local
@@ -1313,7 +1545,21 @@
tsw bDown1,1
}
}
- if(type1.txt=="light"||type1.txt=="switch"||type1.txt=="fan")
+ if(type1.txt=="light")
+ {
+ vis bUp1,0
+ vis bStop1,0
+ vis bDown1,0
+ vis btOnOff1,1
+ vis bText1,0
+ vis hSlider1,0
+ vis nNum1,0
+ // get Button State (optional Value)
+ spstr strCommand.txt,tTmp.txt,"~",8
+ covx tTmp.txt,sys0,0,0
+ btOnOff1.val=sys0
+ }
+ if(type1.txt=="switch")
{
vis bUp1,0
vis bStop1,0
@@ -1462,7 +1708,21 @@
tsw bDown2,1
}
}
- if(type2.txt=="light"||type2.txt=="switch"||type2.txt=="fan")
+ if(type2.txt=="light")
+ {
+ vis bUp2,0
+ vis bStop2,0
+ vis bDown2,0
+ vis btOnOff2,1
+ vis bText2,0
+ vis hSlider2,0
+ vis nNum2,0
+ // get Button State (optional Value)
+ spstr strCommand.txt,tTmp.txt,"~",14
+ covx tTmp.txt,sys0,0,0
+ btOnOff2.val=sys0
+ }
+ if(type2.txt=="switch")
{
vis bUp2,0
vis bStop2,0
@@ -1611,7 +1871,21 @@
tsw bDown3,1
}
}
- if(type3.txt=="light"||type3.txt=="switch"||type3.txt=="fan")
+ if(type3.txt=="light")
+ {
+ vis bUp3,0
+ vis bStop3,0
+ vis bDown3,0
+ vis btOnOff3,1
+ vis bText3,0
+ vis hSlider3,0
+ vis nNum3,0
+ // get Button State (optional Value)
+ spstr strCommand.txt,tTmp.txt,"~",20
+ covx tTmp.txt,sys0,0,0
+ btOnOff3.val=sys0
+ }
+ if(type3.txt=="switch")
{
vis bUp3,0
vis bStop3,0
@@ -1760,7 +2034,21 @@
tsw bDown4,1
}
}
- if(type4.txt=="light"||type4.txt=="switch"||type4.txt=="fan")
+ if(type4.txt=="light")
+ {
+ vis bUp4,0
+ vis bStop4,0
+ vis bDown4,0
+ vis btOnOff4,1
+ vis bText4,0
+ vis hSlider4,0
+ vis nNum4,0
+ // get Button State (optional Value)
+ spstr strCommand.txt,tTmp.txt,"~",26
+ covx tTmp.txt,sys0,0,0
+ btOnOff4.val=sys0
+ }
+ if(type4.txt=="switch")
{
vis bUp4,0
vis bStop4,0
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:50:28.361934134 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:50:28.817935625 +0000
--- HMI/n2t-out/pageStartup.txt 2022-07-23 11:57:25.607877939 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 11:57:26.123891121 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled