h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-01-03 21:34:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

sync entn length (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-06 13:57:22 +00:00
committed by github-actions[bot]
parent 77a9d38db7
commit 48d540dd78
5 changed files with 71 additions and 118 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
--- HMI/n2t-out/Program.s.txt 2022-05-06 13:54:05.816712383 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 13:54:06.744713559 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-06 13:57:21.259205735 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 13:57:22.043215037 +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 13:54:05.816712383 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 13:54:06.748713565 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-06 13:57:21.259205735 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 13:57:22.043215037 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200

81
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 13:54:05.816712383 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 13:54:06.240712836 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-06 13:57:21.259205735 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 13:57:21.639210244 +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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-05-06 13:54:05.816712383 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 13:54:06.240712836 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-06 13:57:21.259205735 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 13:57:21.639210244 +0000
@@ -33,8 +33,6 @@
vis b9,0
vis b10,0
@@ -95,8 +95,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-06 13:54:05.816712383 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 13:54:06.240712836 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-06 13:57:21.259205735 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 13:57:21.639210244 +0000
@@ -62,8 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -116,48 +116,25 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Variable (string) strCommand
Attributes
@@ -99,25 +107,37 @@
Attributes
Scope : local
@@ -119,6 +127,18 @@
Text :
- Max. Text Size: 80
+ Max. Text Size: 70
Max. Text Size: 80
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) entn5
+ Attributes
+ Scope : local
+ Text :
+ Max. Text Size: 70
+ Max. Text Size: 80
+
+Variable (string) type5
+ Attributes
+ Scope : local
+ Text :
+ Max. Text Size: 10
+
Number nNum1
Attributes
Scope : local
@@ -155,6 +175,15 @@
Associated Keyboard : none
Value : 0
@@ -554,8 +531,8 @@ 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 13:54:05.816712383 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 13:54:06.240712836 +0000
--- HMI/n2t-out/cardGrid.txt 2022-05-06 13:57:21.259205735 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 13:57:21.639210244 +0000
@@ -34,8 +34,6 @@
vis tEntity4,0
vis tEntity5,0
@@ -693,8 +670,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-05-06 13:54:05.816712383 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 13:54:06.240712836 +0000
--- HMI/n2t-out/cardMedia.txt 2022-05-06 13:57:21.259205735 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 13:57:21.639210244 +0000
@@ -18,26 +18,25 @@
vis tTmp,0
vis tId,0
@@ -826,8 +803,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-06 13:54:05.816712383 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 13:54:06.240712836 +0000
--- HMI/n2t-out/cardThermo.txt 2022-05-06 13:57:21.259205735 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 13:57:21.639210244 +0000
@@ -31,8 +31,6 @@
vis bt6,0
vis bt7,0
@@ -973,8 +950,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-05-06 13:54:05.816712383 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 13:54:06.240712836 +0000
--- HMI/n2t-out/pageIcons.txt 2022-05-06 13:57:21.259205735 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 13:57:21.639210244 +0000
@@ -30,7 +30,7 @@
Send Component ID : disabled
Associated Keyboard : none
@@ -994,8 +971,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
Picture p0
Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-06 13:54:05.816712383 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 13:54:06.240712836 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-06 13:57:21.259205735 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 13:57:21.639210244 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -1021,8 +998,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-06 13:54:05.816712383 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 13:54:06.240712836 +0000
--- HMI/n2t-out/popupLight.txt 2022-05-06 13:57:21.259205735 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 13:57:21.639210244 +0000
@@ -29,7 +29,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -1089,8 +1066,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-05-06 13:54:05.816712383 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-06 13:54:06.240712836 +0000
--- HMI/n2t-out/popupNotify.txt 2022-05-06 13:57:21.259205735 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-06 13:57:21.639210244 +0000
@@ -120,7 +120,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -1119,8 +1096,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-06 13:54:05.816712383 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 13:54:06.240712836 +0000
--- HMI/n2t-out/popupShutter.txt 2022-05-06 13:57:21.259205735 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 13:57:21.639210244 +0000
@@ -29,7 +29,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -1187,8 +1164,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-06 13:54:05.816712383 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-06 13:54:06.240712836 +0000
--- HMI/n2t-out/screensaver.txt 2022-05-06 13:57:21.259205735 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-06 13:57:21.639210244 +0000
@@ -17,8 +17,6 @@
vis tInstruction,0
vis tTmp,0

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

@@ -1,9 +1,9 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 13:54:06.292712891 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-06 13:54:05.816712383 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 13:54:06.240712836 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 13:57:21.651210386 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-06 13:57:21.259205735 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 13:57:21.639210244 +0000
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-05-06 13:54:05.816712383 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 13:54:06.240712836 +0000
+--- HMI/n2t-out/cardAlarm.txt 2022-05-06 13:57:21.259205735 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 13:57:21.639210244 +0000
+@@ -33,8 +33,6 @@
+ vis b9,0
+ vis b10,0
@@ -85,38 +85,14 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+--- HMI/n2t-out/cardEntities.txt 2022-05-06 13:54:05.816712383 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 13:54:06.240712836 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-06 13:57:21.259205735 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 13:57:21.639210244 +0000
+@@ -62,8 +62,16 @@
+- vis bPrev,0
+- vis bNext,0
+@@ -99,25 +107,37 @@
+ Attributes
+ Scope : local
+- 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
++
+
+@@ -119,6 +127,18 @@
+ Max. Text Size: 80
++ Max. Text Size: 80
+@@ -155,6 +175,15 @@
+@@ -285,6 +314,26 @@
+@@ -404,6 +453,34 @@
@@ -151,8 +127,8 @@
+ 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 13:54:05.816712383 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 13:54:06.240712836 +0000
+--- HMI/n2t-out/cardGrid.txt 2022-05-06 13:57:21.259205735 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 13:57:21.639210244 +0000
+@@ -34,8 +34,6 @@
+ vis tEntity4,0
+ vis tEntity5,0
@@ -290,8 +266,8 @@
+ //send cmd
+ printh 55 bb
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-05-06 13:54:05.816712383 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 13:54:06.240712836 +0000
+--- HMI/n2t-out/cardMedia.txt 2022-05-06 13:57:21.259205735 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 13:57:21.639210244 +0000
+@@ -18,26 +18,25 @@
+ vis tTmp,0
+ vis tId,0
@@ -423,8 +399,8 @@
+ //send cmd
+ printh 55 bb
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+--- HMI/n2t-out/cardThermo.txt 2022-05-06 13:54:05.816712383 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 13:54:06.240712836 +0000
+--- HMI/n2t-out/cardThermo.txt 2022-05-06 13:57:21.259205735 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 13:57:21.639210244 +0000
+@@ -31,8 +31,6 @@
+ vis bt6,0
+ vis bt7,0
@@ -570,8 +546,8 @@
+ //send cmd
+ printh 55 bb
+diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
+--- HMI/n2t-out/pageIcons.txt 2022-05-06 13:54:05.816712383 +0000
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 13:54:06.240712836 +0000
+--- HMI/n2t-out/pageIcons.txt 2022-05-06 13:57:21.259205735 +0000
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 13:57:21.639210244 +0000
+@@ -30,7 +30,7 @@
+ Send Component ID : disabled
+ Associated Keyboard : none
@@ -590,8 +566,8 @@
+
+ Picture p0
+ Attributes
+--- HMI/n2t-out/pageStartup.txt 2022-05-06 13:54:05.816712383 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 13:54:06.240712836 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-06 13:57:21.259205735 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 13:57:21.639210244 +0000
+@@ -177,12 +177,12 @@
+ crcputh 55 bb
+- crcputs sys0,2
@@ -600,8 +576,8 @@
+ //send cmd
+ printh 55 bb
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-05-06 13:54:05.816712383 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 13:54:06.240712836 +0000
+--- HMI/n2t-out/popupLight.txt 2022-05-06 13:57:21.259205735 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 13:57:21.639210244 +0000
+@@ -29,7 +29,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
@@ -668,8 +644,8 @@
+ //send cmd
+ printh 55 bb
+diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
+--- HMI/n2t-out/popupNotify.txt 2022-05-06 13:54:05.816712383 +0000
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-06 13:54:06.240712836 +0000
+--- HMI/n2t-out/popupNotify.txt 2022-05-06 13:57:21.259205735 +0000
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-06 13:57:21.639210244 +0000
+@@ -120,7 +120,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
@@ -698,8 +674,8 @@
+ //send cmd
+ printh 55 bb
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-05-06 13:54:05.816712383 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 13:54:06.240712836 +0000
+--- HMI/n2t-out/popupShutter.txt 2022-05-06 13:57:21.259205735 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 13:57:21.639210244 +0000
+@@ -29,7 +29,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
@@ -766,8 +742,8 @@
+ //send cmd
+ printh 55 bb
+diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
+--- HMI/n2t-out/screensaver.txt 2022-05-06 13:54:05.816712383 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-06 13:54:06.240712836 +0000
+--- HMI/n2t-out/screensaver.txt 2022-05-06 13:57:21.259205735 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-06 13:57:21.639210244 +0000
+@@ -17,8 +17,6 @@
+ vis tInstruction,0
+ vis tTmp,0

10
HMI/US/portrait/n2t-out-visual/cardEntities.txt
View File

@@ -121,35 +121,35 @@ Variable (string) entn1
ID : 49
Scope : local
Text :
Max. Text Size: 70
Max. Text Size: 80
Variable (string) entn2
Attributes
ID : 50
Scope : local
Text :
Max. Text Size: 70
Max. Text Size: 80
Variable (string) entn3
Attributes
ID : 51
Scope : local
Text :
Max. Text Size: 70
Max. Text Size: 80
Variable (string) entn4
Attributes
ID : 52
Scope : local
Text :
Max. Text Size: 70
Max. Text Size: 80
Variable (string) entn5
Attributes
ID : 62
Scope : local
Text :
Max. Text Size: 70
Max. Text Size: 80
Variable (string) type5
Attributes

10
HMI/US/portrait/n2t-out/cardEntities.txt
View File

@@ -107,31 +107,31 @@ 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) entn5
Attributes
Scope : local
Text :
Max. Text Size: 70
Max. Text Size: 80
Variable (string) type5
Attributes