chaange layout us-p (add nextion2text)

This commit is contained in:
joBr99
2022-05-28 22:14:05 +00:00
committed by github-actions[bot]
parent 3cbeb492f2
commit 9e89a549db
5 changed files with 32 additions and 32 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-05-28 21:37:53.107812375 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 21:37:53.907823982 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-28 22:14:04.109091295 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 22:14:04.997103549 +0000
@@ -11,6 +11,4 @@
// dim value
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
page pageStartup
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-28 21:37:53.107812375 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 21:37:53.907823982 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-28 22:14:04.109091295 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 22:14:04.997103549 +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-05-28 21:37:53.107812375 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 21:37:53.495818005 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-28 22:14:04.109091295 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 22:14:04.545095984 +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/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-28 21:37:53.111812433 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 21:37:53.495818005 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-28 22:14:04.109091295 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 22:14:04.545095984 +0000
@@ -62,6 +62,16 @@
vis bText4,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")
{
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-28 21:37:53.107812375 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 21:37:53.495818005 +0000
--- HMI/n2t-out/cardQR.txt 2022-05-28 22:14:04.109091295 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 22:14:04.545095984 +0000
@@ -34,7 +34,7 @@
Attributes
Scope : local
@@ -480,8 +480,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
Variable (string) entn
Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-28 21:37:53.107812375 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 21:37:53.495818005 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-28 22:14:04.109091295 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 22:14:04.545095984 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
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
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-28 21:37:53.107812375 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 21:37:53.495818005 +0000
--- HMI/n2t-out/screensaver.txt 2022-05-28 22:14:04.109091295 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 22:14:04.545095984 +0000
@@ -471,22 +471,6 @@
vis tMainIconAlt,1
vis tMRIcon,1

View File

@@ -1,12 +1,12 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 21:37:53.507818179 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-28 21:37:53.107812375 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 21:37:53.495818005 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-28 21:37:53.111812433 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 21:37:53.495818005 +0000
+--- HMI/n2t-out/cardQR.txt 2022-05-28 21:37:53.107812375 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 21:37:53.495818005 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-28 21:37:53.107812375 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 21:37:53.495818005 +0000
+--- HMI/n2t-out/screensaver.txt 2022-05-28 21:37:53.107812375 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 21:37:53.495818005 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 22:14:04.597096855 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-28 22:14:04.109091295 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 22:14:04.545095984 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-28 22:14:04.109091295 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 22:14:04.545095984 +0000
+--- HMI/n2t-out/cardQR.txt 2022-05-28 22:14:04.109091295 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 22:14:04.545095984 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-28 22:14:04.109091295 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 22:14:04.545095984 +0000
+--- HMI/n2t-out/screensaver.txt 2022-05-28 22:14:04.109091295 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 22:14:04.545095984 +0000
+@@ -471,22 +471,6 @@

View File

@@ -2,10 +2,6 @@ Program.s
0 Component(s)
10 Line(s) of event code
10 Unique line(s) of event code
popupLight
27 Component(s)
348 Line(s) of event code
188 Unique line(s) of event code
pageIcons
6 Component(s)
0 Line(s) of event code
@@ -22,6 +18,10 @@ cardGrid
42 Component(s)
439 Line(s) of event code
254 Unique line(s) of event code
popupLight
27 Component(s)
348 Line(s) of event code
188 Unique line(s) of event code
cardQR
30 Component(s)
363 Line(s) of event code

View File

@@ -153,7 +153,7 @@ Text t1
Send Component ID : disabled
Opacity : 127
x coordinate : 10
y coordinate : 319
y coordinate : 341
Width : 240
Height : 30
Effect : load
@@ -183,7 +183,7 @@ Text t2
Send Component ID : disabled
Opacity : 127
x coordinate : 10
y coordinate : 360
y coordinate : 382
Width : 45
Height : 30
Effect : load
@@ -485,7 +485,7 @@ Slider hBrightness
Send Component ID : disabled
Opacity : 127
x coordinate : 61
y coordinate : 354
y coordinate : 376
Width : 250
Height : 43
Effect : load