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

Merge branch 'main' into pr/203

Browse Source
This commit is contained in:
joBr99
2022-05-22 10:55:41 +02:00
parent 7c02e238a5 a2693de6ea
commit 386eb16bfe
27 changed files with 710 additions and 668 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
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-05-22 07:58:25.897799068 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 07:58:26.425802978 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-22 08:52:05.367816736 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:52:05.927852627 +0000
@@ -11,6 +11,6 @@
// dim value
int dimValue=40
@@ -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-05-22 07:58:25.901799098 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 07:58:26.425802978 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-22 08:52:05.367816736 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:52:05.927852627 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -297,7 +297,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSwipeNext
Attributes
Scope : local
@@ -1876,6 +2104,165 @@
@@ -1880,6 +2108,166 @@
covx tTmp.txt,sys0,0,0
hSlider4.maxval=sys0
}
@@ -342,38 +342,39 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ spstr strCommand.txt,tId.txt,"~",32
+ // up button
+ spstr tId.txt,tTmp.txt,"|",0
+ if(tTmp.txt!="")
+ {
+ bUp5.pco=65535
+ tsw bUp5,1
+ }else if(tTmp.txt!="disable")
+ if(tTmp.txt=="disable")
+ {
+ bUp5.pco=27501
+ tsw bUp5,0
+ }else if(tTmp.txt!="")
+ {
+ bUp5.pco=65535
+ bUp5.txt=tTmp.txt
+ tsw bUp5,1
+ }
+ // stop button
+ spstr tId.txt,tTmp.txt,"|",1
+ if(tTmp.txt!="")
+ if(tTmp.txt=="disable")
+ {
+ bStop5.pco=27501
+ tsw bStop5,0
+ }else if(tTmp.txt!="")
+ {
+ bStop5.pco=65535
+ bStop5.txt=tTmp.txt
+ tsw bStop5,1
+ }else if(tTmp.txt!="disable")
+ {
+ bStop5.pco=27501
+ tsw bStop5,0
+ }
+ // down button
+ spstr tId.txt,tTmp.txt,"|",2
+ if(tTmp.txt!="")
+ if(tTmp.txt=="disable")
+ {
+ bDown5.pco=27501
+ tsw bDown5,0
+ }else if(tTmp.txt!="")
+ {
+ bDown5.pco=65535
+ bDown5.txt=tTmp.txt
+ tsw bDown5,1
+ }else if(tTmp.txt!="disable")
+ {
+ bDown5.pco=27501
+ tsw bDown5,0
+ }
+ }
+ if(type5.txt=="light")
@@ -464,13 +465,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-22 07:58:25.897799068 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 07:58:26.425802978 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text : please check your backend configuration
+ Text : pls check your backend configuration
Max. Text Size : 100