fix (add nextion2text)

This commit is contained in:
joBr99
2023-02-18 15:07:59 +00:00
committed by github-actions[bot]
parent 8772bd9d46
commit 4c23d8e194
6 changed files with 8 additions and 42 deletions

View File

@@ -98,7 +98,7 @@
│ } │ }
│ - if(tId.txt=="screensaver2") │ - if(tId.txt=="screensaver2")
│ - { │ - {
│ - page screensaver │ - page screensaver2
│ - } │ - }
│ if(tId.txt=="cardEntities") │ if(tId.txt=="cardEntities")
│ { │ {

View File

@@ -1493,23 +1493,6 @@
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ Send Component ID : disabled │ Send Component ID : disabled
│ Associated Keyboard : none │ Associated Keyboard : none
│ @@ -750,15 +726,15 @@
│ }
│ if(tId.txt=="screensaver")
│ {
│ page screensaver
│ }
│ if(tId.txt=="screensaver2")
│ {
│ - page screensaver
│ + page screensaver2
│ }
│ if(tId.txt=="cardEntities")
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ --- HMI/n2t-out/screensaver2.txt │ --- HMI/n2t-out/screensaver2.txt
├── +++ HMI/US/portrait/n2t-out/screensaver2.txt ├── +++ HMI/US/portrait/n2t-out/screensaver2.txt
│ @@ -29,17 +29,14 @@ │ @@ -29,17 +29,14 @@

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-02-18 13:46:17.475034495 +0000 +++ /dev/fd/62 2023-02-18 15:07:51.297065909 +0000
+I/n2t-out/Program.s.txt +I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt
+I/n2t-out/cardEntities.txt +I/n2t-out/cardEntities.txt
@@ -879,23 +879,6 @@
+ Disable release event after dragging: 0 + Disable release event after dragging: 0
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard : none + Associated Keyboard : none
+15 +726,15 @@
+ }
+ if(tId.txt=="screensaver")
+ {
+ page screensaver
+ }
+ if(tId.txt=="screensaver2")
+ {
+ page screensaver
+ page screensaver2
+ }
+ if(tId.txt=="cardEntities")
+ {
+ page cardEntities
+ }
+ if(tId.txt=="cardGrid")
+ {
+I/n2t-out/screensaver2.txt +I/n2t-out/screensaver2.txt
++ HMI/US/portrait/n2t-out/screensaver2.txt ++ HMI/US/portrait/n2t-out/screensaver2.txt
+7 +29,14 @@ +7 +29,14 @@

View File

@@ -50,10 +50,6 @@ cardThermo
57 Component(s) 57 Component(s)
536 Line(s) of event code 536 Line(s) of event code
317 Unique line(s) of event code 317 Unique line(s) of event code
screensaver
47 Component(s)
434 Line(s) of event code
310 Unique line(s) of event code
popupInSel popupInSel
34 Component(s) 34 Component(s)
617 Line(s) of event code 617 Line(s) of event code
@@ -82,6 +78,10 @@ popupTimer
42 Component(s) 42 Component(s)
512 Line(s) of event code 512 Line(s) of event code
255 Unique line(s) of event code 255 Unique line(s) of event code
screensaver
47 Component(s)
434 Line(s) of event code
311 Unique line(s) of event code
cardEntities cardEntities
67 Component(s) 67 Component(s)
1166 Line(s) of event code 1166 Line(s) of event code

View File

@@ -1347,7 +1347,7 @@ Timer tmSerial
} }
if(tId.txt=="screensaver2") if(tId.txt=="screensaver2")
{ {
page screensaver page screensaver2
} }
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {

View File

@@ -754,7 +754,7 @@ Timer tmSerial
} }
if(tId.txt=="screensaver2") if(tId.txt=="screensaver2")
{ {
page screensaver page screensaver2
} }
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {