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

fix cmd length on shutter page (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-22 08:52:07 +00:00
committed by github-actions[bot]
parent 98a00b0196
commit a2693de6ea
10 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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 diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-22 08:36:42.175632757 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-22 08:52:05.367816736 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 08:36:43.131639685 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 08:52:06.663941704 +0000
@@ -11,6 +11,4 @@ @@ -11,6 +11,4 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- lcd_dev fffb 0002 0000 0020 - lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:36:42.175632757 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-22 08:52:05.367816736 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 08:36:43.131639685 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 08:52:06.667941783 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

2
HMI/US/landscape/n2t-out-visual/popupShutter.txt
View File

@@ -50,7 +50,7 @@ Variable (string) strCommand
ID : 10 ID : 10
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 200
Variable (string) entn Variable (string) entn
Attributes Attributes

2
HMI/US/landscape/n2t-out/popupShutter.txt
View File

@@ -41,7 +41,7 @@ Variable (string) strCommand
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 200
Variable (string) entn Variable (string) entn
Attributes Attributes

12
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 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 08:36:42.175632757 +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:36:42.611635917 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:52:05.927852627 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 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 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-22 08:36:42.175632757 +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:36:42.615635946 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:52:05.927852627 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -465,8 +465,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:36:42.175632757 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-22 08:52:05.367816736 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:36:42.611635917 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:52:05.927852627 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled

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

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 08:36:42.679636410 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 08:52:06.071870294 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-22 08:36:42.175632757 +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:36:42.611635917 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:52:05.927852627 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-22 08:36:42.175632757 +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:36:42.615635946 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:52:05.927852627 +0000
+ Hotspot mSwipeNext + Hotspot mSwipeNext
+ Scope : local + Scope : local
+@@ -1880,6 +2108,166 @@ +@@ -1880,6 +2108,166 @@
@@ -26,5 +26,5 @@
++ if(tTmp.txt=="disable") ++ if(tTmp.txt=="disable")
++ }else if(tTmp.txt!="") ++ }else if(tTmp.txt!="")
++ bDown5.txt=tTmp.txt ++ bDown5.txt=tTmp.txt
+--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:36:42.175632757 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:52:05.367816736 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:36:42.611635917 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:52:05.927852627 +0000

2
HMI/US/portrait/n2t-out-visual/popupShutter.txt
View File

@@ -50,7 +50,7 @@ Variable (string) strCommand
ID : 10 ID : 10
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 200
Variable (string) entn Variable (string) entn
Attributes Attributes

2
HMI/US/portrait/n2t-out/popupShutter.txt
View File

@@ -41,7 +41,7 @@ Variable (string) strCommand
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 200
Variable (string) entn Variable (string) entn
Attributes Attributes

8
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -22,6 +22,10 @@ popupNotify
17 Component(s) 17 Component(s)
200 Line(s) of event code 200 Line(s) of event code
125 Unique line(s) of event code 125 Unique line(s) of event code
popupShutter
20 Component(s)
241 Line(s) of event code
138 Unique line(s) of event code
screensaver screensaver
35 Component(s) 35 Component(s)
296 Line(s) of event code 296 Line(s) of event code
@@ -34,10 +38,6 @@ cardQR
30 Component(s) 30 Component(s)
363 Line(s) of event code 363 Line(s) of event code
205 Unique line(s) of event code 205 Unique line(s) of event code
popupShutter
20 Component(s)
241 Line(s) of event code
138 Unique line(s) of event code
cardGrid cardGrid
42 Component(s) 42 Component(s)
439 Line(s) of event code 439 Line(s) of event code

2
HMI/n2t-out-visual/popupShutter.txt
View File

@@ -50,7 +50,7 @@ Variable (string) strCommand
ID : 10 ID : 10
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 200
Variable (string) entn Variable (string) entn
Attributes Attributes

2
HMI/n2t-out/popupShutter.txt
View File

@@ -41,7 +41,7 @@ Variable (string) strCommand
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 200
Variable (string) entn Variable (string) entn
Attributes Attributes