h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-08 14:26:34 +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/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-23 09:50:28.361934134 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-23 09:50:29.301937207 +0000
--- HMI/n2t-out/Program.s.txt 2022-07-23 11:57:25.607877939 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-23 11:57:26.699905836 +0000
@@ -14,6 +14,3 @@
//color vars
int defaultFontColor=65535
@@ -8,18 +8,104 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- // fix touch offset
- lcd_dev fffb 0002 0000 0020
- page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-07-23 11:57:25.611878041 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-23 11:57:26.703905939 +0000
@@ -1313,7 +1313,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 +1476,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 +1639,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 +1802,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/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:50:28.361934134 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-23 09:50:29.301937207 +0000
@@ -152,7 +152,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text : 38
+ Text : 39
Max. Text Size : 10
Picture p0
--- HMI/n2t-out/pageStartup.txt 2022-07-23 11:57:25.607877939 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-23 11:57:26.703905939 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200

8
HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
View File

@@ -12,8 +12,8 @@ popupNotify
143 Unique line(s) of event code
popupFan
20 Component(s)
234 Line(s) of event code
148 Unique line(s) of event code
236 Line(s) of event code
150 Unique line(s) of event code
popupLight
27 Component(s)
386 Line(s) of event code
@@ -62,5 +62,5 @@ cardEntities
Total
14 Page(s)
432 Component(s)
5191 Line(s) of event code
1350 Unique line(s) of event code
5193 Line(s) of event code
1351 Unique line(s) of event code

7
HMI/US/landscape/n2t-out-visual/popupFan.txt
View File

@@ -544,7 +544,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0
// get Brightness value
// get Speed value
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable")
{
@@ -560,8 +560,11 @@ Timer tmSerial
hSpeed.val=sys0
}
}
// set hSpeed maxValue
spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,hSpeed.maxval,0,0
// set t1 Speed (Localization)
spstr strCommand.txt,t1.txt,"~",6
spstr strCommand.txt,t1.txt,"~",7
}
if(tInstruction.txt=="time")
{

7
HMI/US/landscape/n2t-out/popupFan.txt
View File

@@ -325,7 +325,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0
// get Brightness value
// get Speed value
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable")
{
@@ -341,8 +341,11 @@ Timer tmSerial
hSpeed.val=sys0
}
}
// set hSpeed maxValue
spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,hSpeed.maxval,0,0
// set t1 Speed (Localization)
spstr strCommand.txt,t1.txt,"~",6
spstr strCommand.txt,t1.txt,"~",7
}
if(tInstruction.txt=="time")
{