sync (add nextion2text)

This commit is contained in:
joBr99
2022-06-06 20:43:20 +00:00
committed by github-actions[bot]
parent 32a01acfd8
commit f8695825b6
6 changed files with 34 additions and 40 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-06-06 20:41:13.393750277 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:41:13.825756343 +0000
--- HMI/n2t-out/Program.s.txt 2022-06-06 20:43:14.701325786 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:43:15.217352058 +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-06-06 20:41:13.397750333 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:41:13.829756399 +0000
--- HMI/n2t-out/cardEntities.txt 2022-06-06 20:43:14.705325989 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:43:15.217352058 +0000
@@ -63,6 +63,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/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:41:13.393750277 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:41:13.829756399 +0000
--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:43:14.705325989 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:43:15.217352058 +0000
@@ -45,12 +45,6 @@
Scope: local
Value: 0
@@ -518,8 +518,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:41:13.393750277 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:41:13.829756399 +0000
--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:43:14.705325989 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:43:15.217352058 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled