h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-01-09 16:13:59 +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-05-06 16:21:35 +00:00
committed by github-actions[bot]
parent 8f82f470f0
commit 4cef55e560
10 changed files with 55 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
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-05-06 16:15:46.086827231 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 16:15:46.858823403 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-06 16:21:34.354244093 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 16:21:35.210254454 +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-06 16:15:46.086827231 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 16:15:46.858823403 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:21:34.358244142 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 16:21:35.214254503 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-06 16:15:46.858823403 +0000
--- HMI/n2t-out/popupLight.txt 2022-05-06 16:21:34.358244142 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-06 16:21:35.214254503 +0000
@@ -535,12 +535,6 @@
vis pColorWheel,1
}
@@ -37,8 +37,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-06 16:15:46.858823403 +0000
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:21:34.358244142 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-06 16:21:35.214254503 +0000
@@ -109,7 +109,7 @@
Text :
Max. Text Size : 20

99
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-06 16:15:46.086827231 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:15:46.462825367 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-06 16:21:34.354244093 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:21:34.738248741 +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-06 16:15:46.086827231 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:15:46.466825347 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:21:34.358244142 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:21:34.742248790 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -426,58 +426,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 16:15:46.462825367 +0000
@@ -71,25 +71,25 @@
Attributes
Scope : local
Text :
- Max. Text Size: 80
+ Max. Text Size: 70
Variable (string) entn2
Attributes
Scope : local
Text :
- Max. Text Size: 80
+ Max. Text Size: 70
Variable (string) entn3
Attributes
Scope : local
Text :
- Max. Text Size: 80
+ Max. Text Size: 70
Variable (string) entn4
Attributes
Scope : local
Text :
- Max. Text Size: 80
+ Max. Text Size: 70
Variable (string) type5
Attributes
@@ -107,13 +107,13 @@
Attributes
Scope : local
Text :
- Max. Text Size: 80
+ Max. Text Size: 50
Variable (string) entn6
Attributes
Scope : local
Text :
- Max. Text Size: 80
+ Max. Text Size: 50
Text tHeading
Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:15:46.462825367 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:21:34.358244142 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:21:34.742248790 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -496,43 +447,9 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 16:15:46.462825367 +0000
@@ -59,8 +59,8 @@
Variable (string) entn
Attributes
Scope : local
- Text :
- Max. Text Size: 80
+ Text : newtxt
+ Max. Text Size: 50
Variable (int32) mode
Attributes
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:15:46.462825367 +0000
@@ -46,8 +46,8 @@
Variable (string) entn
Attributes
Scope : local
- Text :
- Max. Text Size: 80
+ Text : newtxt
+ Max. Text Size: 50
Text tEntity
Attributes
@@ -127,7 +127,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text :
- Max. Text Size : 40
+ Max. Text Size : 25
Picture p0
Attributes
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:21:34.358244142 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:21:34.738248741 +0000
@@ -157,7 +157,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

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

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 16:15:46.478825287 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-06 16:15:46.086827231 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:15:46.462825367 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:15:46.086827231 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:15:46.466825347 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 16:21:34.826249806 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-06 16:21:34.354244093 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:21:34.738248741 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:21:34.358244142 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:21:34.742248790 +0000
+@@ -62,6 +62,16 @@
+ vis bPrev,0
+ vis bNext,0
@@ -24,94 +24,11 @@
+ }
+ if(tInstruction.txt=="pageType")
+ {
+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
+--- HMI/n2t-out/cardGrid.txt 2022-05-06 16:15:46.086827231 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 16:15:46.462825367 +0000
+@@ -71,25 +71,25 @@
+ Attributes
+ Scope : local
+ Text :
+- Max. Text Size: 80
++ Max. Text Size: 70
+
+ Variable (string) entn2
+ Attributes
+ Scope : local
+ Text :
+- Max. Text Size: 80
++ Max. Text Size: 70
+
+ Variable (string) entn3
+ Attributes
+ Scope : local
+ Text :
+- Max. Text Size: 80
++ Max. Text Size: 70
+
+ Variable (string) entn4
+ Attributes
+ Scope : local
+ Text :
+- Max. Text Size: 80
++ Max. Text Size: 70
+
+ Variable (string) type5
+ Attributes
+@@ -107,13 +107,13 @@
+ Attributes
+ Scope : local
+ Text :
+- Max. Text Size: 80
++ Max. Text Size: 50
+
+ Variable (string) entn6
+ Attributes
+ Scope : local
+ Text :
+- Max. Text Size: 80
++ Max. Text Size: 50
+
+ Text tHeading
+ Attributes
+--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:15:46.086827231 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:15:46.462825367 +0000
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-05-06 16:15:46.086827231 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 16:15:46.462825367 +0000
+@@ -59,8 +59,8 @@
+ Variable (string) entn
+ Attributes
+ Scope : local
+- Text :
+- Max. Text Size: 80
++ Text : newtxt
++ Max. Text Size: 50
+
+ Variable (int32) mode
+ Attributes
+--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:21:34.358244142 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:21:34.742248790 +0000
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:15:46.086827231 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:15:46.462825367 +0000
+@@ -46,8 +46,8 @@
+ Variable (string) entn
+ Attributes
+ Scope : local
+- Text :
+- Max. Text Size: 80
++ Text : newtxt
++ Max. Text Size: 50
+
+ Text tEntity
+ Attributes
+@@ -127,7 +127,7 @@
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+- Max. Text Size : 40
++ Max. Text Size : 25
+
+ Picture p0
+ Attributes
+--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:21:34.358244142 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:21:34.738248741 +0000
+@@ -157,7 +157,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC

12
HMI/US/portrait/n2t-out-visual/cardGrid.txt
View File

@@ -85,28 +85,28 @@ Variable (string) entn1
ID : 18
Scope : local
Text :
Max. Text Size: 70
Max. Text Size: 80
Variable (string) entn2
Attributes
ID : 19
Scope : local
Text :
Max. Text Size: 70
Max. Text Size: 80
Variable (string) entn3
Attributes
ID : 20
Scope : local
Text :
Max. Text Size: 70
Max. Text Size: 80
Variable (string) entn4
Attributes
ID : 21
Scope : local
Text :
Max. Text Size: 70
Max. Text Size: 80
Variable (string) type5
Attributes
@@ -127,14 +127,14 @@ Variable (string) entn5
ID : 36
Scope : local
Text :
Max. Text Size: 50
Max. Text Size: 80
Variable (string) entn6
Attributes
ID : 37
Scope : local
Text :
Max. Text Size: 50
Max. Text Size: 80
Text tHeading
Attributes

16
HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
View File

@@ -18,6 +18,10 @@ popupShutter
20 Component(s)
193 Line(s) of event code
110 Unique line(s) of event code
cardGrid
39 Component(s)
420 Line(s) of event code
246 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
@@ -26,10 +30,6 @@ screensaver
35 Component(s)
292 Line(s) of event code
235 Unique line(s) of event code
popupLight
27 Component(s)
341 Line(s) of event code
185 Unique line(s) of event code
cardMedia
30 Component(s)
331 Line(s) of event code
@@ -38,10 +38,10 @@ cardAlarm
35 Component(s)
345 Line(s) of event code
216 Unique line(s) of event code
cardGrid
39 Component(s)
420 Line(s) of event code
246 Unique line(s) of event code
popupLight
27 Component(s)
341 Line(s) of event code
185 Unique line(s) of event code
cardThermo
41 Component(s)
444 Line(s) of event code

4
HMI/US/portrait/n2t-out-visual/popupLight.txt
View File

@@ -69,8 +69,8 @@ Variable (string) entn
Attributes
ID : 21
Scope : local
Text : newtxt
Max. Text Size: 50
Text :
Max. Text Size: 80
Variable (int32) mode
Attributes

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

@@ -56,8 +56,8 @@ Variable (string) entn
Attributes
ID : 18
Scope : local
Text : newtxt
Max. Text Size: 50
Text :
Max. Text Size: 80
Text tEntity
Attributes
@@ -294,7 +294,7 @@ Text tInfo1
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 25
Max. Text Size : 40
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0

12
HMI/US/portrait/n2t-out/cardGrid.txt
View File

@@ -71,25 +71,25 @@ Variable (string) entn1
Attributes
Scope : local
Text :
Max. Text Size: 70
Max. Text Size: 80
Variable (string) entn2
Attributes
Scope : local
Text :
Max. Text Size: 70
Max. Text Size: 80
Variable (string) entn3
Attributes
Scope : local
Text :
Max. Text Size: 70
Max. Text Size: 80
Variable (string) entn4
Attributes
Scope : local
Text :
Max. Text Size: 70
Max. Text Size: 80
Variable (string) type5
Attributes
@@ -107,13 +107,13 @@ Variable (string) entn5
Attributes
Scope : local
Text :
Max. Text Size: 50
Max. Text Size: 80
Variable (string) entn6
Attributes
Scope : local
Text :
Max. Text Size: 50
Max. Text Size: 80
Text tHeading
Attributes

4
HMI/US/portrait/n2t-out/popupLight.txt
View File

@@ -59,8 +59,8 @@ Variable (string) strCommand
Variable (string) entn
Attributes
Scope : local
Text : newtxt
Max. Text Size: 50
Text :
Max. Text Size: 80
Variable (int32) mode
Attributes

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

@@ -46,8 +46,8 @@ Variable (string) strCommand
Variable (string) entn
Attributes
Scope : local
Text : newtxt
Max. Text Size: 50
Text :
Max. Text Size: 80
Text tEntity
Attributes
@@ -127,7 +127,7 @@ Text tInfo1
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 25
Max. Text Size : 40
Picture p0
Attributes