removed pre-filled code from cardAlarm in us-l version (add nextion2text)

This commit is contained in:
joBr99
2022-04-07 16:14:07 +00:00
committed by GitHub Actions
parent 2bbe3ff335
commit b223954480
7 changed files with 20 additions and 32 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-04-06 21:34:50.751296428 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-06 21:34:51.215324112 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-07 16:14:06.171998815 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-07 16:14:06.556016223 +0000
@@ -11,6 +11,6 @@
// dim value
int dimValue=40
@@ -10,21 +10,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ // fix touch offset (Removed for US version)
+ //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-04-06 21:34:50.751296428 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-06 21:34:51.215324112 +0000
@@ -113,7 +113,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text : 3333
+ Text :
Max. Text Size : 10
Text tIcon
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-04-06 21:34:50.751296428 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-06 21:34:51.215324112 +0000
--- HMI/n2t-out/cardEntities.txt 2022-04-07 16:14:06.175998996 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-07 16:14:06.556016223 +0000
@@ -62,6 +62,26 @@
vis bText4,0
vis hSlider4,0
@@ -789,8 +777,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-04-06 21:34:50.751296428 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-06 21:34:51.215324112 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-07 16:14:06.171998815 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-07 16:14:06.556016223 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -810,8 +798,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-04-06 21:34:50.751296428 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-06 21:34:51.215324112 +0000
--- HMI/n2t-out/screensaver.txt 2022-04-07 16:14:06.175998996 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-07 16:14:06.556016223 +0000
@@ -48,6 +48,26 @@
Scope: local
Value: 0