sync us-l version (add nextion2text)

This commit is contained in:
joBr99
2022-05-15 09:04:05 +00:00
committed by github-actions[bot]
parent 2f7d240379
commit 3b47f25adb
18 changed files with 2461 additions and 1975 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-05-15 08:50:22.549240409 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-15 08:50:22.973267856 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-15 09:04:03.078760396 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-15 09:04:03.594763248 +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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-05-15 08:50:22.549240409 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-15 08:50:22.977268115 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-15 09:04:03.082760419 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-15 09:04:03.594763248 +0000
@@ -466,7 +466,7 @@
prints crcval,2
tCode.txt=""
@@ -77,8 +77,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
click bPrev,1
}
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-15 08:50:22.553240668 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-15 08:50:22.977268115 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-15 09:04:03.082760419 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-15 09:04:03.594763248 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -493,8 +493,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-15 08:50:22.549240409 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-15 08:50:22.977268115 +0000
--- HMI/n2t-out/cardThermo.txt 2022-05-15 09:04:03.082760419 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-15 09:04:03.594763248 +0000
@@ -17,12 +17,9 @@
vis tInstruction,0
vis tTmp,0
@@ -1248,8 +1248,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.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-05-15 08:50:22.549240409 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-15 08:50:22.977268115 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-15 09:04:03.082760419 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-15 09:04:03.594763248 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled