fixed length state (add nextion2text)

This commit is contained in:
joBr99
2022-05-28 19:58:08 +00:00
committed by github-actions[bot]
parent 820fa44c01
commit 06858a1e5f
12 changed files with 43 additions and 43 deletions

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-28 19:48:49.099855479 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-28 19:58:06.686291753 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 19:48:50.175937273 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 19:58:07.586304354 +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-28 19:48:49.099855479 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-28 19:58:06.686291753 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 19:48:50.175937273 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 19:58:07.590304410 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

View File

@@ -475,7 +475,7 @@ Text tStatus
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 10 Max. Text Size : 40
Word wrap : enabled Word wrap : enabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0

View File

@@ -42,10 +42,6 @@ cardMedia
33 Component(s) 33 Component(s)
350 Line(s) of event code 350 Line(s) of event code
179 Unique line(s) of event code 179 Unique line(s) of event code
cardThermo
56 Component(s)
546 Line(s) of event code
290 Unique line(s) of event code
screensaver screensaver
37 Component(s) 37 Component(s)
305 Line(s) of event code 305 Line(s) of event code
@@ -54,6 +50,10 @@ cardEntities
65 Component(s) 65 Component(s)
1133 Line(s) of event code 1133 Line(s) of event code
491 Unique line(s) of event code 491 Unique line(s) of event code
cardThermo
56 Component(s)
546 Line(s) of event code
290 Unique line(s) of event code
Total Total
13 Page(s) 13 Page(s)

View File

@@ -227,7 +227,7 @@ Text tStatus
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text :
Max. Text Size : 10 Max. Text Size : 40
Text tCF1 Text tCF1
Attributes Attributes

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-28 19:48:49.099855479 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-28 19:58:06.686291753 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 19:48:49.619895008 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 19:58:07.122297824 +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-28 19:48:49.099855479 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-28 19:58:06.686291753 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 19:48:49.623895312 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 19:58:07.122297824 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,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") if(tInstruction.txt=="pageType")
{ {
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-28 19:48:49.099855479 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-28 19:58:06.686291753 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 19:48:49.619895008 +0000 +++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 19:58:07.122297824 +0000
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
Attributes Attributes
Scope : local Scope : local
@@ -480,8 +480,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
Variable (string) entn Variable (string) entn
Attributes Attributes
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-28 19:48:49.099855479 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-28 19:58:06.686291753 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 19:48:49.619895008 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 19:58:07.122297824 +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
@@ -501,8 +501,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-28 19:48:49.099855479 +0000 --- HMI/n2t-out/screensaver.txt 2022-05-28 19:58:06.686291753 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 19:48:49.619895008 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 19:58:07.122297824 +0000
@@ -471,22 +471,6 @@ @@ -471,22 +471,6 @@
vis tMainIconAlt,1 vis tMainIconAlt,1
vis tMRIcon,1 vis tMRIcon,1

View File

@@ -1,12 +1,12 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 19:48:49.639896528 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 19:58:07.138298050 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-28 19:48:49.099855479 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-28 19:58:06.686291753 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 19:48:49.619895008 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 19:58:07.122297824 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-28 19:48:49.099855479 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-28 19:58:06.686291753 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 19:48:49.623895312 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 19:58:07.122297824 +0000
+--- HMI/n2t-out/cardQR.txt 2022-05-28 19:48:49.099855479 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-28 19:58:06.686291753 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 19:48:49.619895008 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 19:58:07.122297824 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-28 19:48:49.099855479 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-28 19:58:06.686291753 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 19:48:49.619895008 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 19:58:07.122297824 +0000
+--- HMI/n2t-out/screensaver.txt 2022-05-28 19:48:49.099855479 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-28 19:58:06.686291753 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 19:48:49.619895008 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 19:58:07.122297824 +0000
+@@ -471,22 +471,6 @@ +@@ -471,22 +471,6 @@

View File

@@ -475,7 +475,7 @@ Text tStatus
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 10 Max. Text Size : 40
Word wrap : enabled Word wrap : enabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0

View File

@@ -22,6 +22,10 @@ cardQR
30 Component(s) 30 Component(s)
363 Line(s) of event code 363 Line(s) of event code
207 Unique line(s) of event code 207 Unique line(s) of event code
cardThermo
56 Component(s)
546 Line(s) of event code
290 Unique line(s) of event code
cardAlarm cardAlarm
38 Component(s) 38 Component(s)
364 Line(s) of event code 364 Line(s) of event code
@@ -46,10 +50,6 @@ screensaver
37 Component(s) 37 Component(s)
290 Line(s) of event code 290 Line(s) of event code
229 Unique line(s) of event code 229 Unique line(s) of event code
cardThermo
56 Component(s)
546 Line(s) of event code
290 Unique line(s) of event code
cardEntities cardEntities
77 Component(s) 77 Component(s)
1363 Line(s) of event code 1363 Line(s) of event code

View File

@@ -227,7 +227,7 @@ Text tStatus
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text :
Max. Text Size : 10 Max. Text Size : 40
Text tCF1 Text tCF1
Attributes Attributes

View File

@@ -475,7 +475,7 @@ Text tStatus
Vertical Alignment : top Vertical Alignment : top
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 10 Max. Text Size : 40
Word wrap : enabled Word wrap : enabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0

View File

@@ -26,6 +26,10 @@ popupLight
27 Component(s) 27 Component(s)
348 Line(s) of event code 348 Line(s) of event code
188 Unique line(s) of event code 188 Unique line(s) of event code
cardThermo
56 Component(s)
546 Line(s) of event code
290 Unique line(s) of event code
cardQR cardQR
30 Component(s) 30 Component(s)
363 Line(s) of event code 363 Line(s) of event code
@@ -46,10 +50,6 @@ cardAlarm
38 Component(s) 38 Component(s)
364 Line(s) of event code 364 Line(s) of event code
224 Unique line(s) of event code 224 Unique line(s) of event code
cardThermo
56 Component(s)
546 Line(s) of event code
290 Unique line(s) of event code
cardEntities cardEntities
65 Component(s) 65 Component(s)
1133 Line(s) of event code 1133 Line(s) of event code

View File

@@ -227,7 +227,7 @@ Text tStatus
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text :
Max. Text Size : 10 Max. Text Size : 40
Text tCF1 Text tCF1
Attributes Attributes