add some more pages (add nextion2text)

This commit is contained in:
joBr99
2022-06-11 16:39:31 +00:00
committed by github-actions[bot]
parent 9dec118192
commit 6f9842c9eb
4 changed files with 21 additions and 28 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-06-08 20:00:07.004980492 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-11 16:39:28.495786817 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-08 20:00:08.089056883 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-11 16:39:29.571843283 +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-06-08 20:00:07.004980492 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-11 16:39:28.495786817 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-08 20:00:08.089056883 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-11 16:39:29.571843283 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

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-06-08 20:00:07.004980492 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-11 16:39:28.495786817 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-08 20:00:07.521016838 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-11 16:39:29.003813476 +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-06-08 20:00:07.004980492 +0000 --- HMI/n2t-out/cardEntities.txt 2022-06-11 16:39:28.495786817 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-08 20:00:07.521016838 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-11 16:39:29.003813476 +0000
@@ -63,6 +63,16 @@ @@ -63,6 +63,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/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-08 20:00:07.004980492 +0000 --- HMI/n2t-out/cardMedia.txt 2022-06-11 16:39:28.495786817 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-08 20:00:07.521016838 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-11 16:39:29.003813476 +0000
@@ -45,12 +45,6 @@ @@ -45,12 +45,6 @@
Scope: local Scope: local
Value: 0 Value: 0
@@ -518,8 +518,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
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-06-08 20:00:07.004980492 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-11 16:39:28.495786817 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-08 20:00:07.525017120 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-11 16:39:29.003813476 +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

View File

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-08 20:00:07.557019374 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-06-11 16:39:29.019814315 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-08 20:00:07.004980492 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-11 16:39:28.495786817 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-08 20:00:07.521016838 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-11 16:39:29.003813476 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-08 20:00:07.004980492 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-11 16:39:28.495786817 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-08 20:00:07.521016838 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-11 16:39:29.003813476 +0000
+@@ -63,6 +63,16 @@ +@@ -63,6 +63,16 @@
+@@ -120,6 +130,18 @@ +@@ -120,6 +130,18 @@
+@@ -156,6 +178,15 @@ +@@ -156,6 +178,15 @@
@@ -13,8 +13,8 @@
+@@ -1075,6 +1281,28 @@ +@@ -1075,6 +1281,28 @@
+@@ -1850,6 +2078,169 @@ +@@ -1850,6 +2078,169 @@
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-06-08 20:00:07.004980492 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-11 16:39:28.495786817 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-08 20:00:07.521016838 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-11 16:39:29.003813476 +0000
+@@ -45,12 +45,6 @@ +@@ -45,12 +45,6 @@
+ Scope: local + Scope: local
+ Value: 0 + Value: 0
@@ -59,5 +59,5 @@
+ } + }
+ if(tInstruction.txt=="time") + if(tInstruction.txt=="time")
+ { + {
+--- HMI/n2t-out/pageStartup.txt 2022-06-08 20:00:07.004980492 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-11 16:39:28.495786817 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-08 20:00:07.525017120 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-11 16:39:29.003813476 +0000

View File

@@ -1,7 +0,0 @@
attributes = {
"id": {
"ignore": True,
"name": "ID",
"struct": "i",
}
}