change layout cardMedia US-P (add nextion2text)

This commit is contained in:
joBr99
2022-07-06 18:04:32 +00:00
committed by github-actions[bot]
parent 42d9caad0b
commit eb19fbf3f3
4 changed files with 75 additions and 75 deletions

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-07-06 17:55:39.090930690 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-06 17:55:39.590965477 +0000
--- HMI/n2t-out/Program.s.txt 2022-07-06 18:04:27.190883004 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-06 18:04:27.714891861 +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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-07-06 17:55:39.094930968 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-06 17:55:39.590965477 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-07-06 18:04:27.194883072 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-06 18:04:27.714891861 +0000
@@ -138,7 +138,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
Text tIcon
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-07-06 17:55:39.094930968 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-06 17:55:39.590965477 +0000
--- HMI/n2t-out/cardEntities.txt 2022-07-06 18:04:27.194883072 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-06 18:04:27.718891929 +0000
@@ -81,6 +81,18 @@
vis nNum4,0
vis bPrev,0
@@ -346,8 +346,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSwipeNext
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-07-06 17:55:39.094930968 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-06 17:55:39.590965477 +0000
--- HMI/n2t-out/cardGrid.txt 2022-07-06 18:04:27.194883072 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-06 18:04:27.718891929 +0000
@@ -928,10 +928,6 @@
{
page popupLight
@@ -360,8 +360,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
TouchCap tc0
Attributes
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-07-06 17:55:39.094930968 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-06 17:55:39.590965477 +0000
--- HMI/n2t-out/cardQR.txt 2022-07-06 18:04:27.190883004 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-06 18:04:27.714891861 +0000
@@ -12,21 +12,6 @@
Events
@@ -385,8 +385,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
vis p0,0
vis tSend,0
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-07-06 17:55:39.094930968 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-06 17:55:39.590965477 +0000
--- HMI/n2t-out/cardThermo.txt 2022-07-06 18:04:27.194883072 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-06 18:04:27.718891929 +0000
@@ -12,11 +12,6 @@
Events
@@ -400,8 +400,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
vis p0,0
vis tSend,0
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-07-06 17:55:39.090930690 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-06 17:55:39.590965477 +0000
--- HMI/n2t-out/pageStartup.txt 2022-07-06 18:04:27.190883004 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-06 18:04:27.714891861 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -421,8 +421,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/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-07-06 17:55:39.090930690 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-06 17:55:39.590965477 +0000
--- HMI/n2t-out/pageTest.txt 2022-07-06 18:04:27.190883004 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-06 18:04:27.714891861 +0000
@@ -13,46 +13,6 @@
Events
Preinitialize Event
@@ -472,8 +472,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
Attributes
Only in HMI/n2t-out: popupFan.txt
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-07-06 17:55:39.090930690 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-06 17:55:39.590965477 +0000
--- HMI/n2t-out/popupNotify.txt 2022-07-06 18:04:27.190883004 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-06 18:04:27.714891861 +0000
@@ -18,17 +18,6 @@
vis tTmp,0
vis tInstruction,0
@@ -493,8 +493,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
Variable (string) strCommand
Attributes
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-07-06 17:55:39.094930968 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-06 17:55:39.590965477 +0000
--- HMI/n2t-out/popupShutter.txt 2022-07-06 18:04:27.194883072 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-06 18:04:27.714891861 +0000
@@ -143,7 +143,7 @@
Send Component ID : disabled
Associated Keyboard : none