fix tmep (add nextion2text)

This commit is contained in:
joBr99
2022-05-14 14:51:21 +00:00
committed by github-actions[bot]
parent f3600f5c27
commit f3905c3eaa
6 changed files with 44 additions and 44 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-14 14:37:58.882388573 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 14:37:59.270393790 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-14 14:51:20.255641436 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 14:51:20.647641526 +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-14 14:37:58.882388573 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 14:37:59.274393844 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-14 14:51:20.259641424 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 14:51:20.647641526 +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-14 14:37:58.882388573 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 14:37:59.274393844 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-14 14:51:20.259641424 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 14:51:20.651641551 +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-14 14:37:58.882388573 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 14:37:59.274393844 +0000
--- HMI/n2t-out/cardThermo.txt 2022-05-14 14:51:20.259641424 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 14:51:20.651641551 +0000
@@ -17,12 +17,9 @@
vis tInstruction,0
vis tTmp,0
@@ -1155,7 +1155,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
//dstTemp
spstr strCommand.txt,tTmp.txt,"~",5
- covx tTmp.txt,xTempDest1.val,0,0
- xTempDest1.val=xTempDest.val
- xTempDest.val=xTempDest1.val
+ covx tTmp.txt,xTempDest.val,0,0
//status
spstr strCommand.txt,tStatus.txt,"~",6
@@ -1211,8 +1211,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-14 14:37:58.882388573 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 14:37:59.274393844 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-14 14:51:20.255641436 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 14:51:20.647641526 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled

View File

@@ -1,9 +1,9 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-14 14:37:59.286394006 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-14 14:37:58.882388573 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 14:37:59.270393790 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-14 14:51:20.695641824 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-14 14:51:20.255641436 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 14:51:20.647641526 +0000
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-05-14 14:37:58.882388573 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 14:37:59.274393844 +0000
+--- HMI/n2t-out/cardAlarm.txt 2022-05-14 14:51:20.259641424 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 14:51:20.647641526 +0000
+@@ -466,7 +466,7 @@
+ prints crcval,2
+ tCode.txt=""
@@ -67,14 +67,14 @@
+ {
+ click bPrev,1
+ }
+--- HMI/n2t-out/cardEntities.txt 2022-05-14 14:37:58.882388573 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 14:37:59.274393844 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-14 14:51:20.259641424 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 14:51:20.651641551 +0000
+ Hotspot mSwipeNext
+ Scope : local
+@@ -1728,6 +1956,128 @@
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+--- HMI/n2t-out/cardThermo.txt 2022-05-14 14:37:58.882388573 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 14:37:59.274393844 +0000
+--- HMI/n2t-out/cardThermo.txt 2022-05-14 14:51:20.259641424 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 14:51:20.651641551 +0000
+@@ -17,12 +17,9 @@
+ vis tInstruction,0
+ vis tTmp,0
@@ -735,7 +735,7 @@
+ //dstTemp
+ spstr strCommand.txt,tTmp.txt,"~",5
+- covx tTmp.txt,xTempDest1.val,0,0
+- xTempDest1.val=xTempDest.val
+- xTempDest.val=xTempDest1.val
++ covx tTmp.txt,xTempDest.val,0,0
+ //status
+ spstr strCommand.txt,tStatus.txt,"~",6
@@ -790,8 +790,8 @@
+ }
+ if(tInstruction.txt=="pageType")
+ {
+--- HMI/n2t-out/pageStartup.txt 2022-05-14 14:37:58.882388573 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 14:37:59.274393844 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-14 14:51:20.255641436 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 14:51:20.647641526 +0000
+@@ -351,7 +351,7 @@
+
+ Events