h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-22 22:18:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

should fix #845 (add nextion2text)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

23
HMI/US/landscape/diff-eu-version.txt
View File

@@ -108,7 +108,28 @@
│ 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
│ @@ -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 │ page pageStartup
│ } │ }

21
HMI/US/portrait/diff-eu-version.txt
View File

@@ -1513,6 +1513,27 @@
│ 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
│ @@ -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/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 @@

23
HMI/US/portrait/diff-filtered.txt
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 +I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt
+1 +10,10 @@ +1 +10,10 @@
@@ -900,6 +900,27 @@
+ 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
+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 +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 @@

12
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -70,6 +70,10 @@ cardMedia
59 Component(s) 59 Component(s)
645 Line(s) of event code 645 Line(s) of event code
320 Unique line(s) of event code 320 Unique line(s) of event code
screensaver
47 Component(s)
440 Line(s) of event code
314 Unique line(s) of event code
cardPower cardPower
54 Component(s) 54 Component(s)
523 Line(s) of event code 523 Line(s) of event code
@@ -78,10 +82,6 @@ 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
@@ -90,5 +90,5 @@ cardEntities
Total Total
21 Page(s) 21 Page(s)
802 Component(s) 802 Component(s)
9249 Line(s) of event code 9255 Line(s) of event code
2342 Unique line(s) of event code 2345 Unique line(s) of event code

6
HMI/n2t-out-visual/screensaver.txt
View File

@@ -1223,6 +1223,12 @@ Timer tmSerial
vis tMainTextAlt,0 vis tMainTextAlt,0
vis tMainTextAlt2,0 vis tMainTextAlt2,0
vis tMainIconAlt2,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=="") if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")

6
HMI/n2t-out/screensaver.txt
View File

@@ -630,6 +630,12 @@ Timer tmSerial
vis tMainTextAlt,0 vis tMainTextAlt,0
vis tMainTextAlt2,0 vis tMainTextAlt2,0
vis tMainIconAlt2,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=="") if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")