From 63cce74dbe1293d501d9a6b3a80c460a46588f24 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Tue, 8 Aug 2023 20:49:12 +0000 Subject: [PATCH] Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 22 ++++++++++++++++++++++ HMI/US/portrait/diff-eu-version.txt | 22 ++++++++++++++++++++++ HMI/US/portrait/diff-filtered.txt | 24 +++++++++++++++++++++++- HMI/n2t-out-visual/nspanel_Stats.txt | 12 ++++++------ HMI/n2t-out-visual/popupNotify.txt | 5 +++++ HMI/n2t-out/popupNotify.txt | 5 +++++ 6 files changed, 83 insertions(+), 7 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index faef8e75..e8b4c0f4 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -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 @@ diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index fd3160f0..57645483 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -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 @@ diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index b0b6c997..f873a4fc 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -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 @@ diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 0554644f..13993665 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -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 diff --git a/HMI/n2t-out-visual/popupNotify.txt b/HMI/n2t-out-visual/popupNotify.txt index 3d1dff84..70c7b440 100644 --- a/HMI/n2t-out-visual/popupNotify.txt +++ b/HMI/n2t-out-visual/popupNotify.txt @@ -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 diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index 04ace4e8..dc0c1daa 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -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