should fix #845 (add nextion2text)

This commit is contained in:
joBr99
2023-04-08 15:35:57 +00:00
committed by github-actions[bot]
parent 6db8685edf
commit 0736f0009f
6 changed files with 83 additions and 8 deletions

View File

@@ -108,7 +108,28 @@
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ @@ -748,18 +724,14 @@
│ @@ -626,20 +602,14 @@
│ {
│ vis tMainIcon,1
│ vis tMainIconAlt,0
│ vis tMainText,1
│ vis tMainTextAlt,0
│ vis tMainTextAlt2,0
│ vis tMainIconAlt2,0
│ - if(p0.w!=320)
│ - {
│ - vis tForecast1,1
│ - vis tF1Icon,1
│ - vis tForecast1Val,1
│ - }
│ }
│ }
│ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
│ {
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,tTime.bco,0,0
│ if(tTime.bco!=screensaver.bco)
│ @@ -754,18 +724,14 @@
│ {
│ page pageStartup
│ }

View File

@@ -1513,6 +1513,27 @@
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ @@ -626,20 +602,14 @@
│ {
│ vis tMainIcon,1
│ vis tMainIconAlt,0
│ vis tMainText,1
│ vis tMainTextAlt,0
│ vis tMainTextAlt2,0
│ vis tMainIconAlt2,0
│ - if(p0.w!=320)
│ - {
│ - vis tForecast1,1
│ - vis tF1Icon,1
│ - vis tForecast1Val,1
│ - }
│ }
│ }
│ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
│ {
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,tTime.bco,0,0
│ if(tTime.bco!=screensaver.bco)
│ --- HMI/n2t-out/screensaver2.txt
├── +++ HMI/US/portrait/n2t-out/screensaver2.txt
│ @@ -29,17 +29,14 @@

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-03-27 16:17:58.208991272 +0000
+++ /dev/fd/62 2023-04-08 15:35:50.059610175 +0000
+I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt
+1 +10,10 @@
@@ -900,6 +900,27 @@
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+20 +602,14 @@
+ {
+ vis tMainIcon,1
+ vis tMainIconAlt,0
+ vis tMainText,1
+ vis tMainTextAlt,0
+ vis tMainTextAlt2,0
+ vis tMainIconAlt2,0
+ if(p0.w!=320)
+ {
+ vis tForecast1,1
+ vis tF1Icon,1
+ vis tForecast1Val,1
+ }
+ }
+ }
+ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
+ {
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,tTime.bco,0,0
+ if(tTime.bco!=screensaver.bco)
+I/n2t-out/screensaver2.txt
++ HMI/US/portrait/n2t-out/screensaver2.txt
+7 +29,14 @@