Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui

joBr99 · Nov 27, 2023 · 51dd978 · 51dd978
2 parents 1521a45 + 03ac046
commit 51dd978
Show file tree

Hide file tree

Showing 5 changed files with 93 additions and 7 deletions.
diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt
@@ -44,6 +44,56 @@
 │ baud=115200
 │ //debug stuff
 │ vis tTmp,0
+│ --- HMI/n2t-out/cardThermo.txt
+├── +++ HMI/US/landscape/n2t-out/cardThermo.txt
+│ @@ -28,14 +28,18 @@
+│ vis tSend,0
+│ vis tInstruction,0
+│ vis tTmp,0
+│ vis tId,0
+│ vis xTempMin1,0
+│ vis xTempMax1,0
+│ vis xTempStep1,0
+│ + vis xTempDest,0
+│ + vis btUp,0
+│ + vis btDown,0
+│ + vis tCF,0
+│ //tEntity.txt=tHeading.txt
+│ // disable all buttons
+│ vis bt0,0
+│ vis bt1,0
+│ vis bt2,0
+│ vis bt3,0
+│ vis bt4,0
+│ @@ -1014,14 +1018,28 @@
+│ vis xTempDest1,1
+│ vis btDown1,1
+│ vis tCF1,1
+│ vis bUp2,1
+│ vis xTempDest2,1
+│ vis bDown2,1
+│ vis tCF2,1
+│ + }else
+│ + {
+│ + vis btUp,1
+│ + vis xTempDest,1
+│ + vis btDown,1
+│ + vis tCF,1
+│ + vis btUp1,0
+│ + vis xTempDest1,0
+│ + vis btDown1,0
+│ + vis tCF1,0
+│ + vis bUp2,0
+│ + vis xTempDest2,0
+│ + vis bDown2,0
+│ + vis tCF2,0
+│ }
+│ //Show btDetail
+│ spstr strCommand.txt,tTmp.txt,"~",58
+│ if(tTmp.txt!="1")
+│ {
+│ vis btDetail,1
+│ }else
 │ --- HMI/n2t-out/pageStartup.txt
 ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt
 │ @@ -164,15 +164,15 @@

diff --git a/HMI/US/landscape/n2t-out-visual/cardThermo.txt b/HMI/US/landscape/n2t-out-visual/cardThermo.txt
@@ -40,6 +40,10 @@ Page cardThermo
  vis xTempMin1,0
  vis xTempMax1,0
  vis xTempStep1,0
+ vis xTempDest,0
+ vis btUp,0
+ vis btDown,0
+ vis tCF,0
  //tEntity.txt=tHeading.txt
  // disable all buttons
  vis bt0,0
@@ -1742,6 +1746,20 @@ Timer tmSerial
  vis xTempDest2,1
  vis bDown2,1
  vis tCF2,1
+ }else
+ {
+ vis btUp,1
+ vis xTempDest,1
+ vis btDown,1
+ vis tCF,1
+ vis btUp1,0
+ vis xTempDest1,0
+ vis btDown1,0
+ vis tCF1,0
+ vis bUp2,0
+ vis xTempDest2,0
+ vis bDown2,0
+ vis tCF2,0
  }
  //Show btDetail
  spstr strCommand.txt,tTmp.txt,"~",58

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
@@ -58,6 +58,10 @@ screensaver2
  58 Component(s)
  362 Line(s) of event code
  248 Unique line(s) of event code
+cardThermo
+ 57 Component(s)
+ 568 Line(s) of event code
+ 336 Unique line(s) of event code
 cardAlarm
  43 Component(s)
  510 Line(s) of event code
@@ -66,10 +70,6 @@ cardMedia
  59 Component(s)
  713 Line(s) of event code
  357 Unique line(s) of event code
-cardThermo
- 57 Component(s)
- 550 Line(s) of event code
- 320 Unique line(s) of event code
 screensaver
  46 Component(s)
  445 Line(s) of event code
@@ -98,5 +98,5 @@ cardEntities
 Total
  23 Page(s)
  875 Component(s)
- 10688 Line(s) of event code
- 2451 Unique line(s) of event code
+ 10706 Line(s) of event code
+ 2465 Unique line(s) of event code
diff --git a/HMI/US/landscape/n2t-out/cardThermo.txt b/HMI/US/landscape/n2t-out/cardThermo.txt
@@ -32,6 +32,10 @@ Page cardThermo
  vis xTempMin1,0
  vis xTempMax1,0
  vis xTempStep1,0
+ vis xTempDest,0
+ vis btUp,0
+ vis btDown,0
+ vis tCF,0
  //tEntity.txt=tHeading.txt
  // disable all buttons
  vis bt0,0
@@ -1018,6 +1022,20 @@ Timer tmSerial
  vis xTempDest2,1
  vis bDown2,1
  vis tCF2,1
+ }else
+ {
+ vis btUp,1
+ vis xTempDest,1
+ vis btDown,1
+ vis tCF,1
+ vis btUp1,0
+ vis xTempDest1,0
+ vis btDown1,0
+ vis tCF1,0
+ vis bUp2,0
+ vis xTempDest2,0
+ vis bDown2,0
+ vis tCF2,0
  }
  //Show btDetail
  spstr strCommand.txt,tTmp.txt,"~",58

diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt
@@ -1,4 +1,4 @@
-+++ /dev/fd/62 2023-11-24 20:03:10.110051853 +0000
++++ /dev/fd/62 2023-11-27 23:21:36.547446219 +0000
 +le list
 + +1,9 @@
 +.s.txt