Update cardEntities.txt (add nextion2text)

This commit is contained in:
joBr99
2022-03-31 06:59:06 +00:00
committed by GitHub Actions
parent 42565d605e
commit b793e09c5b
3 changed files with 1607 additions and 2818 deletions

View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-03-31 06:52:54.704771879 +0000 --- HMI/n2t-out/Program.s.txt 2022-03-31 06:59:04.790403176 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-31 06:52:55.636784497 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-31 06:59:05.606387623 +0000
@@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
int sleepValue=0 int sleepValue=0
// dim value // dim value
@@ -12,8 +12,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-03-31 06:52:54.704771879 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-03-31 06:59:04.790403176 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 06:52:55.636784497 +0000 +++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 06:59:05.606387623 +0000
@@ -583,12 +583,12 @@ @@ -583,12 +583,12 @@
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
@@ -53,8 +53,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
} }
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-31 06:52:54.704771879 +0000 --- HMI/n2t-out/cardEntities.txt 2022-03-31 06:59:04.790403176 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 06:52:55.636784497 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 06:59:05.606387623 +0000
@@ -1675,12 +1675,12 @@ @@ -1675,12 +1675,12 @@
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
@@ -94,8 +94,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
} }
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-03-31 06:52:54.704771879 +0000 --- HMI/n2t-out/cardGrid.txt 2022-03-31 06:59:04.790403176 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 06:52:55.636784497 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 06:59:05.606387623 +0000
@@ -765,12 +765,12 @@ @@ -765,12 +765,12 @@
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
@@ -135,8 +135,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
} }
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-03-31 06:52:54.704771879 +0000 --- HMI/n2t-out/cardMedia.txt 2022-03-31 06:59:04.790403176 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-31 06:52:55.636784497 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-31 06:59:05.606387623 +0000
@@ -551,12 +551,12 @@ @@ -551,12 +551,12 @@
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
@@ -176,8 +176,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
} }
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-03-31 06:52:54.704771879 +0000 --- HMI/n2t-out/cardThermo.txt 2022-03-31 06:59:04.790403176 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-31 06:52:55.636784497 +0000 +++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-31 06:59:05.606387623 +0000
@@ -835,12 +835,12 @@ @@ -835,12 +835,12 @@
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
@@ -217,8 +217,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
} }
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-03-31 06:52:54.704771879 +0000 --- HMI/n2t-out/pageIcons.txt 2022-03-31 06:59:04.790403176 +0000
+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-31 06:52:55.636784497 +0000 +++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-31 06:59:05.606387623 +0000
@@ -10,18 +10,6 @@ @@ -10,18 +10,6 @@
Swide left page ID : disabled Swide left page ID : disabled
Swide right page ID : disabled Swide right page ID : disabled
@@ -248,8 +248,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt
Text tTmp1 Text tTmp1
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-03-31 06:52:54.704771879 +0000 --- HMI/n2t-out/pageStartup.txt 2022-03-31 06:59:04.790403176 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-31 06:52:55.636784497 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-31 06:59:05.606387623 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -275,8 +275,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-03-31 06:52:54.704771879 +0000 --- HMI/n2t-out/popupLight.txt 2022-03-31 06:59:04.790403176 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-03-31 06:52:55.636784497 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-03-31 06:59:05.606387623 +0000
@@ -382,6 +382,7 @@ @@ -382,6 +382,7 @@
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
@@ -301,8 +301,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-03-31 06:52:54.704771879 +0000 --- HMI/n2t-out/popupNotify.txt 2022-03-31 06:59:04.790403176 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-03-31 06:52:55.636784497 +0000 +++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-03-31 06:59:05.606387623 +0000
@@ -195,6 +195,7 @@ @@ -195,6 +195,7 @@
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
@@ -327,8 +327,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-03-31 06:52:54.704771879 +0000 --- HMI/n2t-out/popupShutter.txt 2022-03-31 06:59:04.790403176 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-03-31 06:52:55.636784497 +0000 +++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-03-31 06:59:05.606387623 +0000
@@ -268,6 +268,7 @@ @@ -268,6 +268,7 @@
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
@@ -353,8 +353,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-03-31 06:52:54.704771879 +0000 --- HMI/n2t-out/screensaver.txt 2022-03-31 06:59:04.790403176 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 06:52:55.636784497 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 06:59:05.606387623 +0000
@@ -14,18 +14,19 @@ @@ -14,18 +14,19 @@
Preinitialize Event Preinitialize Event
recmod=1 recmod=1

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff