From a4627e85897bb9d2b5f03c1339ecc9111ebd8d13 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Mon, 27 Nov 2023 23:29:02 +0000 Subject: [PATCH] Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 5 +++-- HMI/US/landscape/n2t-out-visual/cardThermo.txt | 1 + HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt | 8 ++++---- HMI/US/landscape/n2t-out/cardThermo.txt | 1 + HMI/US/portrait/diff-filtered.txt | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index f7227f0d..deeba627 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -46,7 +46,7 @@ │ vis tTmp,0 │ --- HMI/n2t-out/cardThermo.txt ├── +++ HMI/US/landscape/n2t-out/cardThermo.txt -│ @@ -28,14 +28,18 @@ +│ @@ -28,14 +28,19 @@ │ vis tSend,0 │ vis tInstruction,0 │ vis tTmp,0 @@ -58,6 +58,7 @@ │ + vis btUp,0 │ + vis btDown,0 │ + vis tCF,0 +│ + vis btDetail,0 │ //tEntity.txt=tHeading.txt │ // disable all buttons │ vis bt0,0 @@ -65,7 +66,7 @@ │ vis bt2,0 │ vis bt3,0 │ vis bt4,0 -│ @@ -1014,14 +1018,28 @@ +│ @@ -1014,14 +1019,28 @@ │ vis xTempDest1,1 │ vis btDown1,1 │ vis tCF1,1 diff --git a/HMI/US/landscape/n2t-out-visual/cardThermo.txt b/HMI/US/landscape/n2t-out-visual/cardThermo.txt index 39063a42..13059ed2 100644 --- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt +++ b/HMI/US/landscape/n2t-out-visual/cardThermo.txt @@ -44,6 +44,7 @@ Page cardThermo vis btUp,0 vis btDown,0 vis tCF,0 + vis btDetail,0 //tEntity.txt=tHeading.txt // disable all buttons vis bt0,0 diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index 6cb9eabd..330c5784 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -60,8 +60,8 @@ screensaver2 248 Unique line(s) of event code cardThermo 57 Component(s) - 568 Line(s) of event code - 336 Unique line(s) of event code + 569 Line(s) of event code + 337 Unique line(s) of event code cardAlarm 43 Component(s) 510 Line(s) of event code @@ -98,5 +98,5 @@ cardEntities Total 23 Page(s) 875 Component(s) - 10706 Line(s) of event code - 2465 Unique line(s) of event code + 10707 Line(s) of event code + 2466 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out/cardThermo.txt b/HMI/US/landscape/n2t-out/cardThermo.txt index ec22afbd..d68de4b5 100644 --- a/HMI/US/landscape/n2t-out/cardThermo.txt +++ b/HMI/US/landscape/n2t-out/cardThermo.txt @@ -36,6 +36,7 @@ Page cardThermo vis btUp,0 vis btDown,0 vis tCF,0 + vis btDetail,0 //tEntity.txt=tHeading.txt // disable all buttons vis bt0,0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 0d71363d..c8ecae73 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-11-27 23:21:36.547446219 +0000 ++++ /dev/fd/62 2023-11-27 23:28:52.512823638 +0000 +le list + +1,9 @@ +.s.txt