h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-24 00:14:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

enable recmod on test page (add nextion2text)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

24
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-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

28
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-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

30
HMI/US/portrait/diff-filtered.txt
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
+