increase char limit of speaker list (add nextion2text)

This commit is contained in:
joBr99
2022-04-20 06:06:41 +00:00
committed by github-actions[bot]
parent 0ed7882985
commit 0d5451cd21
6 changed files with 110 additions and 61 deletions

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-04-19 18:31:22.068125874 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-19 18:31:22.876138812 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-20 06:06:40.151757588 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-20 06:06:40.971767785 +0000
@@ -11,6 +11,4 @@
// dim value
int dimValue=40
@@ -8,9 +8,30 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- // fix touch offset
- lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-04-20 06:06:40.151757588 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-20 06:06:40.971767785 +0000
@@ -24,7 +24,7 @@
Attributes
Scope : local
Text :
- Max. Text Size: 750
+ Max. Text Size: 500
Variable (string) entn
Attributes
@@ -36,7 +36,7 @@
Attributes
Scope : local
Text :
- Max. Text Size: 400
+ Max. Text Size: 200
Variable (int32) vaSpeakerPos
Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-19 18:31:22.068125874 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-19 18:31:22.876138812 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-20 06:06:40.151757588 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-20 06:06:40.971767785 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200

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-04-19 18:31:22.068125874 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-19 18:31:22.456132087 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-20 06:06:40.151757588 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-20 06:06:40.491761816 +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-04-19 18:31:22.068125874 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-19 18:31:22.456132087 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-04-20 06:06:40.151757588 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-20 06:06:40.491761816 +0000
@@ -44,7 +44,7 @@
Attributes
Scope : local
@@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
Variable (string) tSend
Attributes
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-04-19 18:31:22.068125874 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-19 18:31:22.456132087 +0000
--- HMI/n2t-out/cardEntities.txt 2022-04-20 06:06:40.151757588 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-20 06:06:40.491761816 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -462,8 +462,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-04-19 18:31:22.068125874 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-19 18:31:22.456132087 +0000
--- HMI/n2t-out/cardGrid.txt 2022-04-20 06:06:40.151757588 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-20 06:06:40.491761816 +0000
@@ -69,25 +69,25 @@
Attributes
Scope : local
@@ -511,9 +511,16 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
Text tHeading
Attributes
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-04-19 18:31:22.068125874 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-19 18:31:22.456132087 +0000
@@ -30,7 +30,7 @@
--- HMI/n2t-out/cardMedia.txt 2022-04-20 06:06:40.151757588 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-20 06:06:40.491761816 +0000
@@ -24,19 +24,19 @@
Attributes
Scope : local
Text :
- Max. Text Size: 750
+ Max. Text Size: 500
Variable (string) entn
Attributes
Scope : local
Text :
@@ -522,9 +529,16 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
Variable (string) vaSpeakerList
Attributes
Scope : local
Text :
- Max. Text Size: 400
+ Max. Text Size: 200
Variable (int32) vaSpeakerPos
Attributes
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-04-19 18:31:22.068125874 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-19 18:31:22.456132087 +0000
--- HMI/n2t-out/cardThermo.txt 2022-04-20 06:06:40.151757588 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-20 06:06:40.491761816 +0000
@@ -42,7 +42,7 @@
Attributes
Scope : local
@@ -535,8 +549,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Variable (string) va0
Attributes
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-04-19 18:31:22.068125874 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-19 18:31:22.456132087 +0000
--- HMI/n2t-out/pageIcons.txt 2022-04-20 06:06:40.151757588 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-20 06:06:40.491761816 +0000
@@ -30,7 +30,7 @@
Send Component ID : disabled
Associated Keyboard : none
@@ -556,8 +570,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-04-19 18:31:22.068125874 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-19 18:31:22.456132087 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-20 06:06:40.151757588 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-20 06:06:40.491761816 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -577,8 +591,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
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-04-19 18:31:22.068125874 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-19 18:31:22.456132087 +0000
--- HMI/n2t-out/popupLight.txt 2022-04-20 06:06:40.151757588 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-20 06:06:40.491761816 +0000
@@ -59,8 +59,8 @@
Variable (string) entn
Attributes
@@ -591,8 +605,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
Variable (int32) mode
Attributes
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-04-19 18:31:22.068125874 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-19 18:31:22.456132087 +0000
--- HMI/n2t-out/popupShutter.txt 2022-04-20 06:06:40.151757588 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-20 06:06:40.491761816 +0000
@@ -46,8 +46,8 @@
Variable (string) entn
Attributes
@@ -605,8 +619,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
Text tEntity
Attributes
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-04-19 18:31:22.068125874 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-19 18:31:22.456132087 +0000
--- HMI/n2t-out/screensaver.txt 2022-04-20 06:06:40.151757588 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-20 06:06:40.491761816 +0000
@@ -17,8 +17,6 @@
vis tInstruction,0
vis tTmp,0

View File

@@ -1,9 +1,9 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-04-19 18:31:22.492132663 +0000
+--- HMI/n2t-out/Program.s.txt 2022-04-19 18:31:22.068125874 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-19 18:31:22.456132087 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-04-20 06:06:40.619763407 +0000
+--- HMI/n2t-out/Program.s.txt 2022-04-20 06:06:40.151757588 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-20 06:06:40.491761816 +0000
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-04-19 18:31:22.068125874 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-19 18:31:22.456132087 +0000
+--- HMI/n2t-out/cardAlarm.txt 2022-04-20 06:06:40.151757588 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-20 06:06:40.491761816 +0000
+@@ -44,7 +44,7 @@
+ Attributes
+ Scope : local
@@ -13,16 +13,14 @@
+
+ Variable (string) tSend
+ Attributes
+--- HMI/n2t-out/cardEntities.txt 2022-04-19 18:31:22.068125874 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-19 18:31:22.456132087 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-04-20 06:06:40.151757588 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-20 06:06:40.491761816 +0000
+@@ -62,6 +62,16 @@
+@@ -97,25 +107,37 @@
+ Attributes
+ Scope : local
+ Text :
+- Max. Text Size: 80
++ Max. Text Size: 70
+
+ Variable (string) entn2
+ Attributes
+ Scope : local
@@ -33,8 +31,10 @@
+ Variable (string) entn3
+ Attributes
+ Scope : local
+ Text :
+- Max. Text Size: 80
++ Max. Text Size: 70
+
+ Variable (string) entn4
+ Attributes
+ Scope : local
@@ -54,8 +54,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-04-19 18:31:22.068125874 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-19 18:31:22.456132087 +0000
+--- HMI/n2t-out/cardGrid.txt 2022-04-20 06:06:40.151757588 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-20 06:06:40.491761816 +0000
+@@ -69,25 +69,25 @@
+ Attributes
+ Scope : local
@@ -103,9 +103,16 @@
+ Text tHeading
+ Attributes
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-04-19 18:31:22.068125874 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-19 18:31:22.456132087 +0000
+@@ -30,7 +30,7 @@
+--- HMI/n2t-out/cardMedia.txt 2022-04-20 06:06:40.151757588 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-20 06:06:40.491761816 +0000
+@@ -24,19 +24,19 @@
+ Attributes
+ Scope : local
+ Text :
+- Max. Text Size: 750
++ Max. Text Size: 500
+
+ Variable (string) entn
+ Attributes
+ Scope : local
+ Text :
@@ -114,9 +121,16 @@
+
+ Variable (string) vaSpeakerList
+ Attributes
+ Scope : local
+ Text :
+- Max. Text Size: 400
++ Max. Text Size: 200
+
+ Variable (int32) vaSpeakerPos
+ Attributes
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+--- HMI/n2t-out/cardThermo.txt 2022-04-19 18:31:22.068125874 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-19 18:31:22.456132087 +0000
+--- HMI/n2t-out/cardThermo.txt 2022-04-20 06:06:40.151757588 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-20 06:06:40.491761816 +0000
+@@ -42,7 +42,7 @@
+ Attributes
+ Scope : local
@@ -127,8 +141,8 @@
+ Variable (string) va0
+ Attributes
+diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
+--- HMI/n2t-out/pageIcons.txt 2022-04-19 18:31:22.068125874 +0000
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-19 18:31:22.456132087 +0000
+--- HMI/n2t-out/pageIcons.txt 2022-04-20 06:06:40.151757588 +0000
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-20 06:06:40.491761816 +0000
+@@ -30,7 +30,7 @@
+ Send Component ID : disabled
+ Associated Keyboard : none
@@ -147,11 +161,11 @@
+
+ Picture p0
+ Attributes
+--- HMI/n2t-out/pageStartup.txt 2022-04-19 18:31:22.068125874 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-19 18:31:22.456132087 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-04-20 06:06:40.151757588 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-20 06:06:40.491761816 +0000
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-04-19 18:31:22.068125874 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-19 18:31:22.456132087 +0000
+--- HMI/n2t-out/popupLight.txt 2022-04-20 06:06:40.151757588 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-20 06:06:40.491761816 +0000
+@@ -59,8 +59,8 @@
+ Variable (string) entn
+ Attributes
@@ -164,8 +178,8 @@
+ Variable (int32) mode
+ Attributes
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-04-19 18:31:22.068125874 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-19 18:31:22.456132087 +0000
+--- HMI/n2t-out/popupShutter.txt 2022-04-20 06:06:40.151757588 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-20 06:06:40.491761816 +0000
+@@ -46,8 +46,8 @@
+ Variable (string) entn
+ Attributes
@@ -178,8 +192,8 @@
+ Text tEntity
+ Attributes
+diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
+--- HMI/n2t-out/screensaver.txt 2022-04-19 18:31:22.068125874 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-19 18:31:22.456132087 +0000
+--- HMI/n2t-out/screensaver.txt 2022-04-20 06:06:40.151757588 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-20 06:06:40.491761816 +0000
+@@ -17,8 +17,6 @@
+ vis tInstruction,0
+ vis tTmp,0