mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-21 15:04:24 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui
This commit is contained in:
@@ -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-05-22 18:36:48.588437763 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 18:36:49.700472423 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-05-22 18:46:01.356130319 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 18:46:02.352144025 +0000
|
||||
@@ -11,6 +11,4 @@
|
||||
// dim value
|
||||
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
|
||||
page pageStartup
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-22 18:36:48.588437763 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 18:36:49.700472423 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-22 18:46:01.356130319 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 18:46:02.352144025 +0000
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
|
||||
@@ -43,7 +43,7 @@ Variable (string) strCommand
|
||||
ID : 6
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 200
|
||||
Max. Text Size: 270
|
||||
|
||||
Variable (string) entn
|
||||
Attributes
|
||||
|
||||
@@ -34,7 +34,7 @@ Variable (string) strCommand
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 200
|
||||
Max. Text Size: 270
|
||||
|
||||
Variable (string) entn
|
||||
Attributes
|
||||
|
||||
@@ -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 18:36:48.588437763 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 18:36:49.116454220 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-05-22 18:46:01.356130319 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 18:46:01.836136925 +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 18:36:48.592437888 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 18:36:49.120454345 +0000
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-05-22 18:46:01.360130374 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 18:46:01.836136925 +0000
|
||||
@@ -62,6 +62,16 @@
|
||||
vis bText4,0
|
||||
vis hSlider4,0
|
||||
@@ -468,8 +468,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 18:36:48.588437763 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 18:36:49.120454345 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-22 18:46:01.356130319 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 18:46:01.836136925 +0000
|
||||
@@ -142,7 +142,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 18:36:49.188456464 +0000
|
||||
+--- HMI/n2t-out/Program.s.txt 2022-05-22 18:36:48.588437763 +0000
|
||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 18:36:49.116454220 +0000
|
||||
+--- HMI/n2t-out/cardEntities.txt 2022-05-22 18:36:48.592437888 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 18:36:49.120454345 +0000
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 18:46:01.852137145 +0000
|
||||
+--- HMI/n2t-out/Program.s.txt 2022-05-22 18:46:01.356130319 +0000
|
||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 18:46:01.836136925 +0000
|
||||
+--- HMI/n2t-out/cardEntities.txt 2022-05-22 18:46:01.360130374 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 18:46:01.836136925 +0000
|
||||
+ Hotspot mSwipeNext
|
||||
+ Scope : local
|
||||
+@@ -1892,6 +2120,169 @@
|
||||
@@ -31,5 +31,5 @@
|
||||
++ spstr tId.txt,bDown5.txt,"|",2
|
||||
++ }else if(tTmp.txt=="enable")
|
||||
++ spstr tId.txt,bDown5.txt,"|",2
|
||||
+--- HMI/n2t-out/pageStartup.txt 2022-05-22 18:36:48.588437763 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 18:36:49.120454345 +0000
|
||||
+--- HMI/n2t-out/pageStartup.txt 2022-05-22 18:46:01.356130319 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 18:46:01.836136925 +0000
|
||||
|
||||
@@ -43,7 +43,7 @@ Variable (string) strCommand
|
||||
ID : 6
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 200
|
||||
Max. Text Size: 270
|
||||
|
||||
Variable (string) entn
|
||||
Attributes
|
||||
|
||||
@@ -26,6 +26,10 @@ popupLight
|
||||
27 Component(s)
|
||||
345 Line(s) of event code
|
||||
187 Unique line(s) of event code
|
||||
cardQR
|
||||
30 Component(s)
|
||||
363 Line(s) of event code
|
||||
205 Unique line(s) of event code
|
||||
cardThermo
|
||||
56 Component(s)
|
||||
546 Line(s) of event code
|
||||
@@ -38,10 +42,6 @@ cardMedia
|
||||
33 Component(s)
|
||||
350 Line(s) of event code
|
||||
179 Unique line(s) of event code
|
||||
cardQR
|
||||
30 Component(s)
|
||||
363 Line(s) of event code
|
||||
205 Unique line(s) of event code
|
||||
screensaver
|
||||
35 Component(s)
|
||||
296 Line(s) of event code
|
||||
|
||||
@@ -34,7 +34,7 @@ Variable (string) strCommand
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 200
|
||||
Max. Text Size: 270
|
||||
|
||||
Variable (string) entn
|
||||
Attributes
|
||||
|
||||
@@ -43,7 +43,7 @@ Variable (string) strCommand
|
||||
ID : 6
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 200
|
||||
Max. Text Size: 270
|
||||
|
||||
Variable (string) entn
|
||||
Attributes
|
||||
|
||||
@@ -22,10 +22,6 @@ popupNotify
|
||||
17 Component(s)
|
||||
200 Line(s) of event code
|
||||
125 Unique line(s) of event code
|
||||
cardQR
|
||||
30 Component(s)
|
||||
363 Line(s) of event code
|
||||
205 Unique line(s) of event code
|
||||
screensaver
|
||||
35 Component(s)
|
||||
296 Line(s) of event code
|
||||
@@ -34,6 +30,10 @@ popupLight
|
||||
27 Component(s)
|
||||
345 Line(s) of event code
|
||||
187 Unique line(s) of event code
|
||||
cardQR
|
||||
30 Component(s)
|
||||
363 Line(s) of event code
|
||||
205 Unique line(s) of event code
|
||||
popupShutter
|
||||
20 Component(s)
|
||||
244 Line(s) of event code
|
||||
|
||||
@@ -34,7 +34,7 @@ Variable (string) strCommand
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 200
|
||||
Max. Text Size: 270
|
||||
|
||||
Variable (string) entn
|
||||
Attributes
|
||||
|
||||
Reference in New Issue
Block a user