mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-01-29 09:34:14 +01:00
Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
joBr99
committed by
github-actions[bot]
github-actions[bot]
parent
f4db5490ed
commit
63cce74dbe
@@ -240,6 +240,28 @@
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",1
|
||||
│ 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/US/landscape/n2t-out/screensaver.txt
|
||||
│ @@ -28,17 +28,14 @@
|
||||
|
||||
@@ -1779,6 +1779,28 @@
|
||||
│ Variable (string) entn
|
||||
│ Attributes
|
||||
│ 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/US/portrait/n2t-out/screensaver.txt
|
||||
│ @@ -28,17 +28,14 @@
|
||||
|
||||
@@ -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
|
||||
++ HMI/US/portrait/n2t-out/Program.s.txt
|
||||
+1 +12,11 @@
|
||||
@@ -1321,6 +1321,28 @@
|
||||
+e (string) entn
|
||||
+ributes
|
||||
+ 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
|
||||
++ HMI/US/portrait/n2t-out/screensaver.txt
|
||||
+7 +28,14 @@
|
||||
|
||||
@@ -18,10 +18,6 @@ popupFan
|
||||
27 Component(s)
|
||||
355 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
|
||||
25 Component(s)
|
||||
402 Line(s) of event code
|
||||
@@ -34,6 +30,10 @@ popupLight
|
||||
28 Component(s)
|
||||
408 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
|
||||
44 Component(s)
|
||||
529 Line(s) of event code
|
||||
@@ -98,5 +98,5 @@ cardEntities
|
||||
Total
|
||||
23 Page(s)
|
||||
878 Component(s)
|
||||
10400 Line(s) of event code
|
||||
2416 Unique line(s) of event code
|
||||
10404 Line(s) of event code
|
||||
2418 Unique line(s) of event code
|
||||
|
||||
@@ -528,6 +528,11 @@ Timer tmSerial
|
||||
// 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
|
||||
|
||||
@@ -299,6 +299,11 @@ Timer tmSerial
|
||||
// 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
|
||||
|
||||
Reference in New Issue
Block a user