enable recmod on test page (add nextion2text)

This commit is contained in:
joBr99
2022-08-17 14:53:16 +00:00
committed by github-actions[bot]
parent b084c58409
commit 8aa3742514
6 changed files with 51 additions and 41 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-08-17 14:27:16.783231605 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-08-17 14:27:17.727241750 +0000
--- HMI/n2t-out/Program.s.txt 2022-08-17 14:53:10.719943618 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-08-17 14:53:11.691958420 +0000
@@ -14,6 +14,3 @@
//color vars
int defaultFontColor=65535
@@ -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-08-17 14:27:16.787231648 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-08-17 14:27:17.727241750 +0000
--- HMI/n2t-out/pageStartup.txt 2022-08-17 14:53:10.719943618 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-08-17 14:53:11.691958420 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -21,12 +21,15 @@ 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/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-08-17 14:27:16.783231605 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-08-17 14:27:17.727241750 +0000
@@ -14,34 +14,6 @@
--- HMI/n2t-out/pageTest.txt 2022-08-17 14:53:10.719943618 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-08-17 14:53:11.691958420 +0000
@@ -13,36 +13,6 @@
Events
Preinitialize Event
vis p0,0
- recmod=1
- bauds=115200
-
-Variable (string) tInstruction
- Attributes
- Scope : local
@@ -54,11 +57,10 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
- Associated Keyboard : none
- Text :
- Max. Text Size : 20
-
Picture p0
Attributes
Scope : local
@@ -218,82 +190,3 @@
@@ -220,82 +190,3 @@
Touch Press Event
page cardQR

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-08-17 14:27:16.783231605 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-17 14:27:17.243236549 +0000
--- HMI/n2t-out/Program.s.txt 2022-08-17 14:53:10.719943618 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-17 14:53:11.195950867 +0000
@@ -14,6 +14,6 @@
//color vars
int defaultFontColor=65535
@@ -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-08-17 14:27:16.787231648 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-17 14:27:17.243236549 +0000
--- HMI/n2t-out/cardEntities.txt 2022-08-17 14:53:10.723943679 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-17 14:53:11.195950867 +0000
@@ -65,6 +65,16 @@
vis nNum4,0
vis bPrev,0
@@ -458,8 +458,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-08-17 14:27:16.787231648 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-17 14:27:17.243236549 +0000
--- HMI/n2t-out/pageStartup.txt 2022-08-17 14:53:10.719943618 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-17 14:53:11.195950867 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -479,12 +479,15 @@ 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/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-08-17 14:27:16.783231605 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-17 14:27:17.243236549 +0000
@@ -14,34 +14,6 @@
--- HMI/n2t-out/pageTest.txt 2022-08-17 14:53:10.719943618 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-17 14:53:11.195950867 +0000
@@ -13,36 +13,6 @@
Events
Preinitialize Event
vis p0,0
- recmod=1
- bauds=115200
-
-Variable (string) tInstruction
- Attributes
- Scope : local
@@ -512,11 +515,10 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
- Associated Keyboard : none
- Text :
- Max. Text Size : 20
-
Picture p0
Attributes
Scope : local
@@ -218,82 +190,3 @@
@@ -220,82 +190,3 @@
Touch Press Event
page cardQR

View File

@@ -1,12 +1,12 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-08-17 14:27:17.259236721 +0000
+--- HMI/n2t-out/Program.s.txt 2022-08-17 14:27:16.783231605 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-17 14:27:17.243236549 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-08-17 14:53:11.211951111 +0000
+--- HMI/n2t-out/Program.s.txt 2022-08-17 14:53:10.719943618 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-17 14:53:11.195950867 +0000
+@@ -14,6 +14,6 @@
+ //color vars
+ int defaultFontColor=65535
+ int defaultBcoColor=6371
+--- HMI/n2t-out/cardEntities.txt 2022-08-17 14:27:16.787231648 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-17 14:27:17.243236549 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-08-17 14:53:10.723943679 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-17 14:53:11.195950867 +0000
+@@ -65,6 +65,16 @@
+ vis bPrev,0
+ vis bNext,0
@@ -33,15 +33,18 @@
++ spstr strCommand.txt,tTmp.txt,"~",32
++ covx tTmp.txt,sys0,0,0
++ btOnOff5.val=sys0
+--- HMI/n2t-out/pageStartup.txt 2022-08-17 14:27:16.787231648 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-17 14:27:17.243236549 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-08-17 14:53:10.719943618 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-17 14:53:11.195950867 +0000
+diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
+--- HMI/n2t-out/pageTest.txt 2022-08-17 14:27:16.783231605 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-17 14:27:17.243236549 +0000
+@@ -14,34 +14,6 @@
+--- HMI/n2t-out/pageTest.txt 2022-08-17 14:53:10.719943618 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-17 14:53:11.195950867 +0000
+@@ -13,36 +13,6 @@
+ Events
+ Preinitialize Event
+ vis p0,0
+
+- recmod=1
+- bauds=115200
+-
+-Variable (string) tInstruction
+- Attributes
+- Scope : local
@@ -69,11 +72,10 @@
+- Associated Keyboard : none
+- Text :
+- Max. Text Size : 20
+-
+
+ Picture p0
+ Attributes
+ Scope : local
+@@ -218,82 +190,3 @@
+@@ -220,82 +190,3 @@
+ Touch Press Event
+ page cardQR
+

View File

@@ -8,8 +8,8 @@ pageIcons
0 Unique line(s) of event code
pageTest
19 Component(s)
62 Line(s) of event code
60 Unique line(s) of event code
64 Line(s) of event code
61 Unique line(s) of event code
popupShutter
25 Component(s)
388 Line(s) of event code
@@ -62,5 +62,5 @@ cardEntities
Total
14 Page(s)
437 Component(s)
5191 Line(s) of event code
5193 Line(s) of event code
1365 Unique line(s) of event code

View File

@@ -21,6 +21,8 @@ Page pageTest
Events
Preinitialize Event
vis p0,0
recmod=1
bauds=115200
Variable (string) tInstruction
Attributes

View File

@@ -13,6 +13,8 @@ Page pageTest
Events
Preinitialize Event
vis p0,0
recmod=1
bauds=115200
Variable (string) tInstruction
Attributes