Merge pull request #107 from jmbinette/main (add nextion2text)

This commit is contained in:
joBr99
2022-04-01 04:54:14 +00:00
committed by GitHub Actions
parent bdd15963d1
commit 747b6b1c6e
2 changed files with 16 additions and 16 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-01 01:57:12.799742561 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-01 01:57:13.279776641 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-01 04:54:12.884151859 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-01 04:54:13.372185922 +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-04-01 01:57:12.803742845 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-01 01:57:13.283776925 +0000
--- HMI/n2t-out/cardEntities.txt 2022-04-01 04:54:12.888152138 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-01 04:54:13.372185922 +0000
@@ -62,6 +62,26 @@
vis bText4,0
vis hSlider4,0
@@ -781,8 +781,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-01 01:57:12.799742561 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 01:57:13.279776641 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-01 04:54:12.884151859 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 04:54:13.372185922 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled