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

Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2023-08-08 20:49:12 +00:00
committed by github-actions[bot]
parent f4db5490ed
commit 63cce74dbe
6 changed files with 83 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -240,6 +240,28 @@
│ spstr strCommand.txt,tTmp.txt,"~",1 │ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0 │ covx tTmp.txt,sleepTimeout,0,0
│ } │ }
│ --- HMI/n2t-out/popupNotify.txt
├── +++ HMI/US/landscape/n2t-out/popupNotify.txt
│ @@ -295,19 +295,14 @@
│ covx tTmp.txt,sys0,0,0
│ tText.pco=sys0
│ //preserve old sleepTimeout
│ vaOldSleepT.val=sleepTimeout
│ // sleep timeout
│ spstr strCommand.txt,tTmp.txt,"~",10
│ covx tTmp.txt,sys0,0,0
│ - if(sys0==0)
│ - {
│ - //0 is buggy, a years is permanent enough
│ - sys0=31536000
│ - }
│ sleepTimeout=sys0
│ //font size
│ spstr strCommand.txt,tTmp.txt,"~",11
│ covx tTmp.txt,sys0,0,0
│ tTextAlt.font=sys0
│ tText.font=sys0
│ //icon
│ --- HMI/n2t-out/screensaver.txt │ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/landscape/n2t-out/screensaver.txt ├── +++ HMI/US/landscape/n2t-out/screensaver.txt
│ @@ -28,17 +28,14 @@ │ @@ -28,17 +28,14 @@

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

@@ -1779,6 +1779,28 @@
│ Variable (string) entn │ Variable (string) entn
│ Attributes │ Attributes
│ Scope : local │ Scope : local
│ --- HMI/n2t-out/popupNotify.txt
├── +++ HMI/US/portrait/n2t-out/popupNotify.txt
│ @@ -295,19 +295,14 @@
│ covx tTmp.txt,sys0,0,0
│ tText.pco=sys0
│ //preserve old sleepTimeout
│ vaOldSleepT.val=sleepTimeout
│ // sleep timeout
│ spstr strCommand.txt,tTmp.txt,"~",10
│ covx tTmp.txt,sys0,0,0
│ - if(sys0==0)
│ - {
│ - //0 is buggy, a years is permanent enough
│ - sys0=31536000
│ - }
│ sleepTimeout=sys0
│ //font size
│ spstr strCommand.txt,tTmp.txt,"~",11
│ covx tTmp.txt,sys0,0,0
│ tTextAlt.font=sys0
│ tText.font=sys0
│ //icon
│ --- HMI/n2t-out/screensaver.txt │ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/portrait/n2t-out/screensaver.txt ├── +++ HMI/US/portrait/n2t-out/screensaver.txt
│ @@ -28,17 +28,14 @@ │ @@ -28,17 +28,14 @@

24
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-08-08 19:45:29.806219470 +0000 +++ /dev/fd/62 2023-08-08 20:49:02.082432386 +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 +12,11 @@ +1 +12,11 @@
@@ -1321,6 +1321,28 @@
+e (string) entn +e (string) entn
+ributes +ributes
+ Scope : local + Scope : local
+I/n2t-out/popupNotify.txt
++ HMI/US/portrait/n2t-out/popupNotify.txt
+19 +295,14 @@
+ covx tTmp.txt,sys0,0,0
+ tText.pco=sys0
+ //preserve old sleepTimeout
+ vaOldSleepT.val=sleepTimeout
+ // sleep timeout
+ spstr strCommand.txt,tTmp.txt,"~",10
+ covx tTmp.txt,sys0,0,0
+ if(sys0==0)
+ {
+ //0 is buggy, a years is permanent enough
+ sys0=31536000
+ }
+ sleepTimeout=sys0
+ //font size
+ spstr strCommand.txt,tTmp.txt,"~",11
+ covx tTmp.txt,sys0,0,0
+ tTextAlt.font=sys0
+ tText.font=sys0
+ //icon
+I/n2t-out/screensaver.txt +I/n2t-out/screensaver.txt
++ HMI/US/portrait/n2t-out/screensaver.txt ++ HMI/US/portrait/n2t-out/screensaver.txt
+7 +28,14 @@ +7 +28,14 @@

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

@@ -18,10 +18,6 @@ popupFan
27 Component(s) 27 Component(s)
355 Line(s) of event code 355 Line(s) of event code
206 Unique line(s) of event code 206 Unique line(s) of event code
popupNotify
19 Component(s)
267 Line(s) of event code
172 Unique line(s) of event code
popupShutter popupShutter
25 Component(s) 25 Component(s)
402 Line(s) of event code 402 Line(s) of event code
@@ -34,6 +30,10 @@ popupLight
28 Component(s) 28 Component(s)
408 Line(s) of event code 408 Line(s) of event code
225 Unique line(s) of event code 225 Unique line(s) of event code
popupNotify
19 Component(s)
271 Line(s) of event code
174 Unique line(s) of event code
cardGrid cardGrid
44 Component(s) 44 Component(s)
529 Line(s) of event code 529 Line(s) of event code
@@ -98,5 +98,5 @@ cardEntities
Total Total
23 Page(s) 23 Page(s)
878 Component(s) 878 Component(s)
10400 Line(s) of event code 10404 Line(s) of event code
2416 Unique line(s) of event code 2418 Unique line(s) of event code

5
HMI/n2t-out-visual/popupNotify.txt
View File

@@ -528,6 +528,11 @@ Timer tmSerial
// sleep timeout // sleep timeout
spstr strCommand.txt,tTmp.txt,"~",10 spstr strCommand.txt,tTmp.txt,"~",10
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
if(sys0==0)
{
//0 is buggy, a years is permanent enough
sys0=31536000
}
sleepTimeout=sys0 sleepTimeout=sys0
//font size //font size
spstr strCommand.txt,tTmp.txt,"~",11 spstr strCommand.txt,tTmp.txt,"~",11

5
HMI/n2t-out/popupNotify.txt
View File

@@ -299,6 +299,11 @@ Timer tmSerial
// sleep timeout // sleep timeout
spstr strCommand.txt,tTmp.txt,"~",10 spstr strCommand.txt,tTmp.txt,"~",10
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
if(sys0==0)
{
//0 is buggy, a years is permanent enough
sys0=31536000
}
sleepTimeout=sys0 sleepTimeout=sys0
//font size //font size
spstr strCommand.txt,tTmp.txt,"~",11 spstr strCommand.txt,tTmp.txt,"~",11