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

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

Browse Source
This commit is contained in:
joBr99
2022-04-04 23:25:40 +02:00
parent f47360544a 1b46588015
commit 5a36467477
8 changed files with 1064 additions and 1170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-04-04 19:12:53.675941297 +0000 --- HMI/n2t-out/Program.s.txt 2022-04-04 21:08:13.436944769 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-04 19:12:54.651948984 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-04 21:08:14.140947479 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-04 19:12:53.675941297 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-04 21:08:13.436944769 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-04 19:12:54.651948984 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-04 21:08:14.144947495 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

148
HMI/US/landscape/n2t-out-visual/cardThermo.txt
View File

@@ -1199,7 +1199,7 @@ Timer tmSerial
if(tInstruction.txt=="entityUpd") if(tInstruction.txt=="entityUpd")
{ {
//heading //heading
spstr strCommand.txt,tHeading.txt,",",1 spstr strCommand.txt,tHeading.txt,"~",1
// navigation icons // navigation icons
spstr strCommand.txt,tId.txt,"~",2 spstr strCommand.txt,tId.txt,"~",2
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
@@ -1228,23 +1228,23 @@ Timer tmSerial
bNext.txt="" bNext.txt=""
} }
//entity name //entity name
spstr strCommand.txt,entn.txt,",",3 spstr strCommand.txt,entn.txt,"~",3
//currentTemp //currentTemp
spstr strCommand.txt,tTmp.txt,",",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,xTempCurr.val,0,0 covx tTmp.txt,xTempCurr.val,0,0
//dstTemp //dstTemp
spstr strCommand.txt,tTmp.txt,",",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,xTempDest.val,0,0 covx tTmp.txt,xTempDest.val,0,0
//status //status
spstr strCommand.txt,tStatus.txt,",",6 spstr strCommand.txt,tStatus.txt,"~",6
//minTemp //minTemp
spstr strCommand.txt,tTmp.txt,",",7 spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,xTempMin.val,0,0 covx tTmp.txt,xTempMin.val,0,0
//maxTemp //maxTemp
spstr strCommand.txt,tTmp.txt,",",8 spstr strCommand.txt,tTmp.txt,"~",8
covx tTmp.txt,xTempMax.val,0,0 covx tTmp.txt,xTempMax.val,0,0
//tempStep //tempStep
spstr strCommand.txt,tTmp.txt,",",9 spstr strCommand.txt,tTmp.txt,"~",9
covx tTmp.txt,xTempStep.val,0,0 covx tTmp.txt,xTempStep.val,0,0
// disable all buttons // disable all buttons
vis bt0,0 vis bt0,0
@@ -1257,147 +1257,137 @@ Timer tmSerial
vis bt7,0 vis bt7,0
vis bt8,0 vis bt8,0
//bt0 //bt0
spstr strCommand.txt,tTmp.txt,",",10 spstr strCommand.txt,bt0.txt,"~",10
if(tTmp.txt!="") if(bt0.txt!="")
{ {
// set icon
bt0.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",11 spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,bt0.pco2,0,0 covx tTmp.txt,bt0.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",12 spstr strCommand.txt,tTmp.txt,"~",12
covx tTmp.txt,bt0.val,0,0 covx tTmp.txt,bt0.val,0,0
// save action // save action
spstr strCommand.txt,va0.txt,",",13 spstr strCommand.txt,va0.txt,"~",13
//enable //enable
vis bt0,1 vis bt0,1
} //bt1 }
spstr strCommand.txt,tTmp.txt,",",14 //bt1
if(tTmp.txt!="") spstr strCommand.txt,bt1.txt,"~",14
if(bt1.txt!="")
{ {
// set icon
bt1.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",15 spstr strCommand.txt,tTmp.txt,"~",15
covx tTmp.txt,bt1.pco2,0,0 covx tTmp.txt,bt1.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",16 spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,bt1.val,0,0 covx tTmp.txt,bt1.val,0,0
// save action // save action
spstr strCommand.txt,va1.txt,",",17 spstr strCommand.txt,va1.txt,"~",17
//enable //enable
vis bt1,1 vis bt1,1
} //bt2 }
spstr strCommand.txt,tTmp.txt,",",18 //bt2
if(tTmp.txt!="") spstr strCommand.txt,bt2.txt,"~",18
if(bt2.txt!="")
{ {
// set icon
bt2.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",19 spstr strCommand.txt,tTmp.txt,"~",19
covx tTmp.txt,bt2.pco2,0,0 covx tTmp.txt,bt2.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",20 spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,bt2.val,0,0 covx tTmp.txt,bt2.val,0,0
// save action // save action
spstr strCommand.txt,va2.txt,",",21 spstr strCommand.txt,va2.txt,"~",21
//enable //enable
vis bt2,1 vis bt2,1
} //bt3 }
spstr strCommand.txt,tTmp.txt,",",22 //bt3
if(tTmp.txt!="") spstr strCommand.txt,bt3.txt,"~",22
if(bt3.txt!="")
{ {
// set icon
bt3.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",23 spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,bt3.pco2,0,0 covx tTmp.txt,bt3.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",24 spstr strCommand.txt,tTmp.txt,"~",24
covx tTmp.txt,bt3.val,0,0 covx tTmp.txt,bt3.val,0,0
// save action // save action
spstr strCommand.txt,va3.txt,",",25 spstr strCommand.txt,va3.txt,"~",25
//enable //enable
vis bt3,1 vis bt3,1
} //bt4 }
spstr strCommand.txt,tTmp.txt,",",26 //bt4
if(tTmp.txt!="") spstr strCommand.txt,bt4.txt,"~",26
if(bt4.txt!="")
{ {
// set icon
bt4.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",27 spstr strCommand.txt,tTmp.txt,"~",27
covx tTmp.txt,bt4.pco2,0,0 covx tTmp.txt,bt4.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",28 spstr strCommand.txt,tTmp.txt,"~",28
covx tTmp.txt,bt4.val,0,0 covx tTmp.txt,bt4.val,0,0
// save action // save action
spstr strCommand.txt,va4.txt,",",29 spstr strCommand.txt,va4.txt,"~",29
//enable //enable
vis bt4,1 vis bt4,1
} //bt5 }
spstr strCommand.txt,tTmp.txt,",",30 //bt5
if(tTmp.txt!="") spstr strCommand.txt,bt5.txt,"~",30
if(bt5.txt!="")
{ {
// set icon
bt5.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",31 spstr strCommand.txt,tTmp.txt,"~",31
covx tTmp.txt,bt5.pco2,0,0 covx tTmp.txt,bt5.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",32 spstr strCommand.txt,tTmp.txt,"~",32
covx tTmp.txt,bt5.val,0,0 covx tTmp.txt,bt5.val,0,0
// save action // save action
spstr strCommand.txt,va5.txt,",",33 spstr strCommand.txt,va5.txt,"~",33
//enable //enable
vis bt5,1 vis bt5,1
} //bt6 }
spstr strCommand.txt,tTmp.txt,",",34 //bt6
if(tTmp.txt!="") spstr strCommand.txt,bt6.txt,"~",34
if(bt6.txt!="")
{ {
// set icon
bt6.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",35 spstr strCommand.txt,tTmp.txt,"~",35
covx tTmp.txt,bt6.pco2,0,0 covx tTmp.txt,bt6.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",36 spstr strCommand.txt,tTmp.txt,"~",36
covx tTmp.txt,bt6.val,0,0 covx tTmp.txt,bt6.val,0,0
// save action // save action
spstr strCommand.txt,va6.txt,",",37 spstr strCommand.txt,va6.txt,"~",37
//enable //enable
vis bt6,1 vis bt6,1
} //bt7 }
spstr strCommand.txt,tTmp.txt,",",38 //bt7
if(tTmp.txt!="") spstr strCommand.txt,bt7.txt,"~",38
if(bt7.txt!="")
{ {
// set icon
bt7.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",39 spstr strCommand.txt,tTmp.txt,"~",39
covx tTmp.txt,bt7.pco2,0,0 covx tTmp.txt,bt7.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",40 spstr strCommand.txt,tTmp.txt,"~",40
covx tTmp.txt,bt7.val,0,0 covx tTmp.txt,bt7.val,0,0
// save action // save action
spstr strCommand.txt,va7.txt,",",41 spstr strCommand.txt,va7.txt,"~",41
//enable //enable
vis bt7,1 vis bt7,1
} //bt8 }
spstr strCommand.txt,tTmp.txt,",",42 //bt8
if(tTmp.txt!="") spstr strCommand.txt,bt8.txt,"~",42
if(bt8.txt!="")
{ {
// set icon
bt8.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",43 spstr strCommand.txt,tTmp.txt,"~",43
covx tTmp.txt,bt8.pco2,0,0 covx tTmp.txt,bt8.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",44 spstr strCommand.txt,tTmp.txt,"~",44
covx tTmp.txt,bt8.val,0,0 covx tTmp.txt,bt8.val,0,0
// save action // save action
spstr strCommand.txt,va8.txt,",",45 spstr strCommand.txt,va8.txt,"~",45
//enable //enable
vis bt8,1 vis bt8,1
} }

12
HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
View File

@@ -10,6 +10,10 @@ pageTest
13 Component(s) 13 Component(s)
13 Line(s) of event code 13 Line(s) of event code
13 Unique line(s) of event code 13 Unique line(s) of event code
cardThermo
41 Component(s)
442 Line(s) of event code
245 Unique line(s) of event code
popupNotify popupNotify
17 Component(s) 17 Component(s)
178 Line(s) of event code 178 Line(s) of event code
@@ -46,13 +50,9 @@ cardEntities
62 Component(s) 62 Component(s)
964 Line(s) of event code 964 Line(s) of event code
409 Unique line(s) of event code 409 Unique line(s) of event code
cardThermo
41 Component(s)
451 Line(s) of event code
274 Unique line(s) of event code
Total Total
12 Page(s) 12 Page(s)
341 Component(s) 341 Component(s)
3549 Line(s) of event code 3540 Line(s) of event code
1039 Unique line(s) of event code 964 Unique line(s) of event code

148
HMI/US/landscape/n2t-out/cardThermo.txt
View File

@@ -646,7 +646,7 @@ Timer tmSerial
if(tInstruction.txt=="entityUpd") if(tInstruction.txt=="entityUpd")
{ {
//heading //heading
spstr strCommand.txt,tHeading.txt,",",1 spstr strCommand.txt,tHeading.txt,"~",1
// navigation icons // navigation icons
spstr strCommand.txt,tId.txt,"~",2 spstr strCommand.txt,tId.txt,"~",2
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
@@ -675,23 +675,23 @@ Timer tmSerial
bNext.txt="" bNext.txt=""
} }
//entity name //entity name
spstr strCommand.txt,entn.txt,",",3 spstr strCommand.txt,entn.txt,"~",3
//currentTemp //currentTemp
spstr strCommand.txt,tTmp.txt,",",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,xTempCurr.val,0,0 covx tTmp.txt,xTempCurr.val,0,0
//dstTemp //dstTemp
spstr strCommand.txt,tTmp.txt,",",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,xTempDest.val,0,0 covx tTmp.txt,xTempDest.val,0,0
//status //status
spstr strCommand.txt,tStatus.txt,",",6 spstr strCommand.txt,tStatus.txt,"~",6
//minTemp //minTemp
spstr strCommand.txt,tTmp.txt,",",7 spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,xTempMin.val,0,0 covx tTmp.txt,xTempMin.val,0,0
//maxTemp //maxTemp
spstr strCommand.txt,tTmp.txt,",",8 spstr strCommand.txt,tTmp.txt,"~",8
covx tTmp.txt,xTempMax.val,0,0 covx tTmp.txt,xTempMax.val,0,0
//tempStep //tempStep
spstr strCommand.txt,tTmp.txt,",",9 spstr strCommand.txt,tTmp.txt,"~",9
covx tTmp.txt,xTempStep.val,0,0 covx tTmp.txt,xTempStep.val,0,0
// disable all buttons // disable all buttons
vis bt0,0 vis bt0,0
@@ -704,147 +704,137 @@ Timer tmSerial
vis bt7,0 vis bt7,0
vis bt8,0 vis bt8,0
//bt0 //bt0
spstr strCommand.txt,tTmp.txt,",",10 spstr strCommand.txt,bt0.txt,"~",10
if(tTmp.txt!="") if(bt0.txt!="")
{ {
// set icon
bt0.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",11 spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,bt0.pco2,0,0 covx tTmp.txt,bt0.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",12 spstr strCommand.txt,tTmp.txt,"~",12
covx tTmp.txt,bt0.val,0,0 covx tTmp.txt,bt0.val,0,0
// save action // save action
spstr strCommand.txt,va0.txt,",",13 spstr strCommand.txt,va0.txt,"~",13
//enable //enable
vis bt0,1 vis bt0,1
} //bt1 }
spstr strCommand.txt,tTmp.txt,",",14 //bt1
if(tTmp.txt!="") spstr strCommand.txt,bt1.txt,"~",14
if(bt1.txt!="")
{ {
// set icon
bt1.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",15 spstr strCommand.txt,tTmp.txt,"~",15
covx tTmp.txt,bt1.pco2,0,0 covx tTmp.txt,bt1.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",16 spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,bt1.val,0,0 covx tTmp.txt,bt1.val,0,0
// save action // save action
spstr strCommand.txt,va1.txt,",",17 spstr strCommand.txt,va1.txt,"~",17
//enable //enable
vis bt1,1 vis bt1,1
} //bt2 }
spstr strCommand.txt,tTmp.txt,",",18 //bt2
if(tTmp.txt!="") spstr strCommand.txt,bt2.txt,"~",18
if(bt2.txt!="")
{ {
// set icon
bt2.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",19 spstr strCommand.txt,tTmp.txt,"~",19
covx tTmp.txt,bt2.pco2,0,0 covx tTmp.txt,bt2.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",20 spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,bt2.val,0,0 covx tTmp.txt,bt2.val,0,0
// save action // save action
spstr strCommand.txt,va2.txt,",",21 spstr strCommand.txt,va2.txt,"~",21
//enable //enable
vis bt2,1 vis bt2,1
} //bt3 }
spstr strCommand.txt,tTmp.txt,",",22 //bt3
if(tTmp.txt!="") spstr strCommand.txt,bt3.txt,"~",22
if(bt3.txt!="")
{ {
// set icon
bt3.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",23 spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,bt3.pco2,0,0 covx tTmp.txt,bt3.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",24 spstr strCommand.txt,tTmp.txt,"~",24
covx tTmp.txt,bt3.val,0,0 covx tTmp.txt,bt3.val,0,0
// save action // save action
spstr strCommand.txt,va3.txt,",",25 spstr strCommand.txt,va3.txt,"~",25
//enable //enable
vis bt3,1 vis bt3,1
} //bt4 }
spstr strCommand.txt,tTmp.txt,",",26 //bt4
if(tTmp.txt!="") spstr strCommand.txt,bt4.txt,"~",26
if(bt4.txt!="")
{ {
// set icon
bt4.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",27 spstr strCommand.txt,tTmp.txt,"~",27
covx tTmp.txt,bt4.pco2,0,0 covx tTmp.txt,bt4.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",28 spstr strCommand.txt,tTmp.txt,"~",28
covx tTmp.txt,bt4.val,0,0 covx tTmp.txt,bt4.val,0,0
// save action // save action
spstr strCommand.txt,va4.txt,",",29 spstr strCommand.txt,va4.txt,"~",29
//enable //enable
vis bt4,1 vis bt4,1
} //bt5 }
spstr strCommand.txt,tTmp.txt,",",30 //bt5
if(tTmp.txt!="") spstr strCommand.txt,bt5.txt,"~",30
if(bt5.txt!="")
{ {
// set icon
bt5.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",31 spstr strCommand.txt,tTmp.txt,"~",31
covx tTmp.txt,bt5.pco2,0,0 covx tTmp.txt,bt5.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",32 spstr strCommand.txt,tTmp.txt,"~",32
covx tTmp.txt,bt5.val,0,0 covx tTmp.txt,bt5.val,0,0
// save action // save action
spstr strCommand.txt,va5.txt,",",33 spstr strCommand.txt,va5.txt,"~",33
//enable //enable
vis bt5,1 vis bt5,1
} //bt6 }
spstr strCommand.txt,tTmp.txt,",",34 //bt6
if(tTmp.txt!="") spstr strCommand.txt,bt6.txt,"~",34
if(bt6.txt!="")
{ {
// set icon
bt6.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",35 spstr strCommand.txt,tTmp.txt,"~",35
covx tTmp.txt,bt6.pco2,0,0 covx tTmp.txt,bt6.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",36 spstr strCommand.txt,tTmp.txt,"~",36
covx tTmp.txt,bt6.val,0,0 covx tTmp.txt,bt6.val,0,0
// save action // save action
spstr strCommand.txt,va6.txt,",",37 spstr strCommand.txt,va6.txt,"~",37
//enable //enable
vis bt6,1 vis bt6,1
} //bt7 }
spstr strCommand.txt,tTmp.txt,",",38 //bt7
if(tTmp.txt!="") spstr strCommand.txt,bt7.txt,"~",38
if(bt7.txt!="")
{ {
// set icon
bt7.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",39 spstr strCommand.txt,tTmp.txt,"~",39
covx tTmp.txt,bt7.pco2,0,0 covx tTmp.txt,bt7.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",40 spstr strCommand.txt,tTmp.txt,"~",40
covx tTmp.txt,bt7.val,0,0 covx tTmp.txt,bt7.val,0,0
// save action // save action
spstr strCommand.txt,va7.txt,",",41 spstr strCommand.txt,va7.txt,"~",41
//enable //enable
vis bt7,1 vis bt7,1
} //bt8 }
spstr strCommand.txt,tTmp.txt,",",42 //bt8
if(tTmp.txt!="") spstr strCommand.txt,bt8.txt,"~",42
if(bt8.txt!="")
{ {
// set icon
bt8.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",43 spstr strCommand.txt,tTmp.txt,"~",43
covx tTmp.txt,bt8.pco2,0,0 covx tTmp.txt,bt8.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",44 spstr strCommand.txt,tTmp.txt,"~",44
covx tTmp.txt,bt8.val,0,0 covx tTmp.txt,bt8.val,0,0
// save action // save action
spstr strCommand.txt,va8.txt,",",45 spstr strCommand.txt,va8.txt,"~",45
//enable //enable
vis bt8,1 vis bt8,1
} }

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

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-04-04 19:12:53.675941297 +0000 --- HMI/n2t-out/Program.s.txt 2022-04-04 21:08:13.436944769 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-04 19:12:54.171945204 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-04 21:08:13.792946140 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-04-04 19:12:53.675941297 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-04-04 21:08:13.436944769 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-04 19:12:54.171945204 +0000 +++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-04 21:08:13.792946140 +0000
@@ -113,7 +113,7 @@ @@ -113,7 +113,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
@@ -34,8 +34,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
spstr strCommand.txt,tTmp.txt,"~",12 spstr strCommand.txt,tTmp.txt,"~",12
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-04-04 19:12:53.679941329 +0000 --- HMI/n2t-out/cardEntities.txt 2022-04-04 21:08:13.436944769 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-04 19:12:54.175945235 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-04 21:08:13.792946140 +0000
@@ -62,6 +62,26 @@ @@ -62,6 +62,26 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -848,8 +848,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-04-04 19:12:53.675941297 +0000 --- HMI/n2t-out/cardGrid.txt 2022-04-04 21:08:13.436944769 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-04 19:12:54.171945204 +0000 +++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-04 21:08:13.792946140 +0000
@@ -574,7 +574,7 @@ @@ -574,7 +574,7 @@
if(tInstruction.txt=="entityUpd") if(tInstruction.txt=="entityUpd")
{ {
@@ -1032,8 +1032,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
} }
} }
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-04-04 19:12:53.675941297 +0000 --- HMI/n2t-out/cardMedia.txt 2022-04-04 21:08:13.436944769 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-04 19:12:54.171945204 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-04 21:08:13.792946140 +0000
@@ -540,7 +540,9 @@ @@ -540,7 +540,9 @@
//entity name //entity name
spstr strCommand.txt,entn.txt,"~",3 spstr strCommand.txt,entn.txt,"~",3
@@ -1057,253 +1057,187 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
spstr strCommand.txt,tSpeaker.txt,"~",9 spstr strCommand.txt,tSpeaker.txt,"~",9
if(tSpeaker.txt!="") if(tSpeaker.txt!="")
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-04-04 19:12:53.679941329 +0000 --- HMI/n2t-out/cardThermo.txt 2022-04-04 21:08:13.436944769 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-04 19:12:54.171945204 +0000 +++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-04 21:08:13.792946140 +0000
@@ -646,7 +646,7 @@ @@ -680,7 +680,7 @@
if(tInstruction.txt=="entityUpd") spstr strCommand.txt,tTmp.txt,"~",4
{
//heading
- spstr strCommand.txt,tHeading.txt,",",1
+ spstr strCommand.txt,tHeading.txt,"~",1
// navigation icons
spstr strCommand.txt,tId.txt,"~",2
spstr tId.txt,tTmp.txt,"|",0
@@ -675,23 +675,23 @@
bNext.txt=""
}
//entity name
- spstr strCommand.txt,entn.txt,",",3
+ spstr strCommand.txt,entn.txt,"~",3
//currentTemp
- spstr strCommand.txt,tTmp.txt,",",4
+ spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,xTempCurr.val,0,0 covx tTmp.txt,xTempCurr.val,0,0
//dstTemp //dstTemp
- spstr strCommand.txt,tTmp.txt,",",4 - spstr strCommand.txt,tTmp.txt,"~",4
+ spstr strCommand.txt,tTmp.txt,"~",5 + spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,xTempDest.val,0,0 covx tTmp.txt,xTempDest.val,0,0
//status //status
- spstr strCommand.txt,tStatus.txt,",",6 spstr strCommand.txt,tStatus.txt,"~",6
+ spstr strCommand.txt,tStatus.txt,"~",6 @@ -704,9 +704,12 @@
//minTemp
- spstr strCommand.txt,tTmp.txt,",",7
+ spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,xTempMin.val,0,0
//maxTemp
- spstr strCommand.txt,tTmp.txt,",",8
+ spstr strCommand.txt,tTmp.txt,"~",8
covx tTmp.txt,xTempMax.val,0,0
//tempStep
- spstr strCommand.txt,tTmp.txt,",",9
+ spstr strCommand.txt,tTmp.txt,"~",9
covx tTmp.txt,xTempStep.val,0,0
// disable all buttons
vis bt0,0
@@ -704,147 +704,156 @@
vis bt7,0 vis bt7,0
vis bt8,0 vis bt8,0
//bt0 //bt0
- spstr strCommand.txt,tTmp.txt,",",10 - spstr strCommand.txt,bt0.txt,"~",10
- if(bt0.txt!="")
+ spstr strCommand.txt,tTmp.txt,"~",10 + spstr strCommand.txt,tTmp.txt,"~",10
if(tTmp.txt!="") + if(tTmp.txt!="")
{ {
// set icon + // set icon
- bt0.txt=tTmp.txt
+ covx tTmp.txt,sys0,0,0 + covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,bt0.txt,sys0,1 + substr pageIcons.tIcons.txt,bt0.txt,sys0,1
// set text color on active state // set text color on active state
- spstr strCommand.txt,tTmp.txt,",",11 spstr strCommand.txt,tTmp.txt,"~",11
+ spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,bt0.pco2,0,0 covx tTmp.txt,bt0.pco2,0,0
// set state @@ -717,11 +720,13 @@
- spstr strCommand.txt,tTmp.txt,",",12 spstr strCommand.txt,va0.txt,"~",13
+ spstr strCommand.txt,tTmp.txt,"~",12
covx tTmp.txt,bt0.val,0,0
// save action
- spstr strCommand.txt,va0.txt,",",13
+ spstr strCommand.txt,va0.txt,"~",13
//enable //enable
vis bt0,1 vis bt0,1
} //bt1 - }
- spstr strCommand.txt,tTmp.txt,",",14 - //bt1
- spstr strCommand.txt,bt1.txt,"~",14
- if(bt1.txt!="")
- {
+ } //bt1
+ spstr strCommand.txt,tTmp.txt,"~",14 + spstr strCommand.txt,tTmp.txt,"~",14
if(tTmp.txt!="") + if(tTmp.txt!="")
{ + {
// set icon + // set icon
- bt1.txt=tTmp.txt
+ covx tTmp.txt,sys0,0,0 + covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,bt1.txt,sys0,1 + substr pageIcons.tIcons.txt,bt1.txt,sys0,1
// set text color on active state // set text color on active state
- spstr strCommand.txt,tTmp.txt,",",15 spstr strCommand.txt,tTmp.txt,"~",15
+ spstr strCommand.txt,tTmp.txt,"~",15
covx tTmp.txt,bt1.pco2,0,0 covx tTmp.txt,bt1.pco2,0,0
// set state @@ -732,11 +737,13 @@
- spstr strCommand.txt,tTmp.txt,",",16 spstr strCommand.txt,va1.txt,"~",17
+ spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,bt1.val,0,0
// save action
- spstr strCommand.txt,va1.txt,",",17
+ spstr strCommand.txt,va1.txt,"~",17
//enable //enable
vis bt1,1 vis bt1,1
} //bt2 - }
- spstr strCommand.txt,tTmp.txt,",",18 - //bt2
- spstr strCommand.txt,bt2.txt,"~",18
- if(bt2.txt!="")
- {
+ } //bt2
+ spstr strCommand.txt,tTmp.txt,"~",18 + spstr strCommand.txt,tTmp.txt,"~",18
if(tTmp.txt!="") + if(tTmp.txt!="")
{ + {
// set icon + // set icon
- bt2.txt=tTmp.txt
+ covx tTmp.txt,sys0,0,0 + covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,bt2.txt,sys0,1 + substr pageIcons.tIcons.txt,bt2.txt,sys0,1
// set text color on active state // set text color on active state
- spstr strCommand.txt,tTmp.txt,",",19 spstr strCommand.txt,tTmp.txt,"~",19
+ spstr strCommand.txt,tTmp.txt,"~",19
covx tTmp.txt,bt2.pco2,0,0 covx tTmp.txt,bt2.pco2,0,0
// set state @@ -747,11 +754,13 @@
- spstr strCommand.txt,tTmp.txt,",",20 spstr strCommand.txt,va2.txt,"~",21
+ spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,bt2.val,0,0
// save action
- spstr strCommand.txt,va2.txt,",",21
+ spstr strCommand.txt,va2.txt,"~",21
//enable //enable
vis bt2,1 vis bt2,1
} //bt3 - }
- spstr strCommand.txt,tTmp.txt,",",22 - //bt3
- spstr strCommand.txt,bt3.txt,"~",22
- if(bt3.txt!="")
- {
+ } //bt3
+ spstr strCommand.txt,tTmp.txt,"~",22 + spstr strCommand.txt,tTmp.txt,"~",22
if(tTmp.txt!="") + if(tTmp.txt!="")
{ + {
// set icon + // set icon
- bt3.txt=tTmp.txt
+ covx tTmp.txt,sys0,0,0 + covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,bt3.txt,sys0,1 + substr pageIcons.tIcons.txt,bt3.txt,sys0,1
// set text color on active state // set text color on active state
- spstr strCommand.txt,tTmp.txt,",",23 spstr strCommand.txt,tTmp.txt,"~",23
+ spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,bt3.pco2,0,0 covx tTmp.txt,bt3.pco2,0,0
// set state @@ -762,11 +771,13 @@
- spstr strCommand.txt,tTmp.txt,",",24 spstr strCommand.txt,va3.txt,"~",25
+ spstr strCommand.txt,tTmp.txt,"~",24
covx tTmp.txt,bt3.val,0,0
// save action
- spstr strCommand.txt,va3.txt,",",25
+ spstr strCommand.txt,va3.txt,"~",25
//enable //enable
vis bt3,1 vis bt3,1
} //bt4 - }
- spstr strCommand.txt,tTmp.txt,",",26 - //bt4
- spstr strCommand.txt,bt4.txt,"~",26
- if(bt4.txt!="")
- {
+ } //bt4
+ spstr strCommand.txt,tTmp.txt,"~",26 + spstr strCommand.txt,tTmp.txt,"~",26
if(tTmp.txt!="") + if(tTmp.txt!="")
{ + {
// set icon + // set icon
- bt4.txt=tTmp.txt
+ covx tTmp.txt,sys0,0,0 + covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,bt4.txt,sys0,1 + substr pageIcons.tIcons.txt,bt4.txt,sys0,1
// set text color on active state // set text color on active state
- spstr strCommand.txt,tTmp.txt,",",27 spstr strCommand.txt,tTmp.txt,"~",27
+ spstr strCommand.txt,tTmp.txt,"~",27
covx tTmp.txt,bt4.pco2,0,0 covx tTmp.txt,bt4.pco2,0,0
// set state @@ -777,11 +788,13 @@
- spstr strCommand.txt,tTmp.txt,",",28 spstr strCommand.txt,va4.txt,"~",29
+ spstr strCommand.txt,tTmp.txt,"~",28
covx tTmp.txt,bt4.val,0,0
// save action
- spstr strCommand.txt,va4.txt,",",29
+ spstr strCommand.txt,va4.txt,"~",29
//enable //enable
vis bt4,1 vis bt4,1
} //bt5 - }
- spstr strCommand.txt,tTmp.txt,",",30 - //bt5
- spstr strCommand.txt,bt5.txt,"~",30
- if(bt5.txt!="")
- {
+ } //bt5
+ spstr strCommand.txt,tTmp.txt,"~",30 + spstr strCommand.txt,tTmp.txt,"~",30
if(tTmp.txt!="") + if(tTmp.txt!="")
{ + {
// set icon + // set icon
- bt5.txt=tTmp.txt
+ covx tTmp.txt,sys0,0,0 + covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,bt5.txt,sys0,1 + substr pageIcons.tIcons.txt,bt5.txt,sys0,1
// set text color on active state // set text color on active state
- spstr strCommand.txt,tTmp.txt,",",31 spstr strCommand.txt,tTmp.txt,"~",31
+ spstr strCommand.txt,tTmp.txt,"~",31
covx tTmp.txt,bt5.pco2,0,0 covx tTmp.txt,bt5.pco2,0,0
// set state @@ -792,11 +805,13 @@
- spstr strCommand.txt,tTmp.txt,",",32 spstr strCommand.txt,va5.txt,"~",33
+ spstr strCommand.txt,tTmp.txt,"~",32
covx tTmp.txt,bt5.val,0,0
// save action
- spstr strCommand.txt,va5.txt,",",33
+ spstr strCommand.txt,va5.txt,"~",33
//enable //enable
vis bt5,1 vis bt5,1
} //bt6 - }
- spstr strCommand.txt,tTmp.txt,",",34 - //bt6
- spstr strCommand.txt,bt6.txt,"~",34
- if(bt6.txt!="")
- {
+ } //bt6
+ spstr strCommand.txt,tTmp.txt,"~",34 + spstr strCommand.txt,tTmp.txt,"~",34
if(tTmp.txt!="") + if(tTmp.txt!="")
{ + {
// set icon + // set icon
- bt6.txt=tTmp.txt
+ covx tTmp.txt,sys0,0,0 + covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,bt6.txt,sys0,1 + substr pageIcons.tIcons.txt,bt6.txt,sys0,1
// set text color on active state // set text color on active state
- spstr strCommand.txt,tTmp.txt,",",35 spstr strCommand.txt,tTmp.txt,"~",35
+ spstr strCommand.txt,tTmp.txt,"~",35
covx tTmp.txt,bt6.pco2,0,0 covx tTmp.txt,bt6.pco2,0,0
// set state @@ -807,11 +822,13 @@
- spstr strCommand.txt,tTmp.txt,",",36 spstr strCommand.txt,va6.txt,"~",37
+ spstr strCommand.txt,tTmp.txt,"~",36
covx tTmp.txt,bt6.val,0,0
// save action
- spstr strCommand.txt,va6.txt,",",37
+ spstr strCommand.txt,va6.txt,"~",37
//enable //enable
vis bt6,1 vis bt6,1
} //bt7 - }
- spstr strCommand.txt,tTmp.txt,",",38 - //bt7
- spstr strCommand.txt,bt7.txt,"~",38
- if(bt7.txt!="")
- {
+ } //bt7
+ spstr strCommand.txt,tTmp.txt,"~",38 + spstr strCommand.txt,tTmp.txt,"~",38
if(tTmp.txt!="") + if(tTmp.txt!="")
{ + {
// set icon + // set icon
- bt7.txt=tTmp.txt
+ covx tTmp.txt,sys0,0,0 + covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,bt7.txt,sys0,1 + substr pageIcons.tIcons.txt,bt7.txt,sys0,1
// set text color on active state // set text color on active state
- spstr strCommand.txt,tTmp.txt,",",39 spstr strCommand.txt,tTmp.txt,"~",39
+ spstr strCommand.txt,tTmp.txt,"~",39
covx tTmp.txt,bt7.pco2,0,0 covx tTmp.txt,bt7.pco2,0,0
// set state @@ -822,11 +839,13 @@
- spstr strCommand.txt,tTmp.txt,",",40 spstr strCommand.txt,va7.txt,"~",41
+ spstr strCommand.txt,tTmp.txt,"~",40
covx tTmp.txt,bt7.val,0,0
// save action
- spstr strCommand.txt,va7.txt,",",41
+ spstr strCommand.txt,va7.txt,"~",41
//enable //enable
vis bt7,1 vis bt7,1
} //bt8 - }
- spstr strCommand.txt,tTmp.txt,",",42 - //bt8
- spstr strCommand.txt,bt8.txt,"~",42
- if(bt8.txt!="")
- {
+ } //bt8
+ spstr strCommand.txt,tTmp.txt,"~",42 + spstr strCommand.txt,tTmp.txt,"~",42
if(tTmp.txt!="") + if(tTmp.txt!="")
{ + {
// set icon + // set icon
- bt8.txt=tTmp.txt
+ covx tTmp.txt,sys0,0,0 + covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,bt8.txt,sys0,1 + substr pageIcons.tIcons.txt,bt8.txt,sys0,1
// set text color on active state // set text color on active state
- spstr strCommand.txt,tTmp.txt,",",43 spstr strCommand.txt,tTmp.txt,"~",43
+ spstr strCommand.txt,tTmp.txt,"~",43
covx tTmp.txt,bt8.pco2,0,0 covx tTmp.txt,bt8.pco2,0,0
// set state
- spstr strCommand.txt,tTmp.txt,",",44
+ spstr strCommand.txt,tTmp.txt,"~",44
covx tTmp.txt,bt8.val,0,0
// save action
- spstr strCommand.txt,va8.txt,",",45
+ spstr strCommand.txt,va8.txt,"~",45
//enable
vis bt8,1
}
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-04-04 19:12:53.675941297 +0000 --- HMI/n2t-out/pageIcons.txt 2022-04-04 21:08:13.436944769 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-04 19:12:54.171945204 +0000 +++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-04 21:08:13.792946140 +0000
@@ -22,6 +22,16 @@ @@ -22,6 +22,16 @@
Text : Text :
Max. Text Size: 35 Max. Text Size: 35
@@ -1323,8 +1257,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
Scope : global Scope : global
Only in HMI/US/portrait/n2t-out: pageSerialTest.txt Only in HMI/US/portrait/n2t-out: pageSerialTest.txt
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-04 19:12:53.675941297 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-04 21:08:13.436944769 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-04 19:12:54.171945204 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-04 21:08:13.792946140 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
@@ -1353,8 +1287,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-04-04 19:12:53.675941297 +0000 --- HMI/n2t-out/pageTest.txt 2022-04-04 21:08:13.436944769 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-04-04 19:12:54.171945204 +0000 +++ HMI/US/portrait/n2t-out/pageTest.txt 2022-04-04 21:08:13.792946140 +0000
@@ -35,6 +35,20 @@ @@ -35,6 +35,20 @@
Touch Press Event Touch Press Event
page cardEntities page cardEntities
@@ -1395,8 +1329,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
- bauds=115200 - bauds=115200
- -
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-04-04 19:12:53.675941297 +0000 --- HMI/n2t-out/popupLight.txt 2022-04-04 21:08:13.436944769 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-04 19:12:54.171945204 +0000 +++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-04 21:08:13.792946140 +0000
@@ -442,7 +442,9 @@ @@ -442,7 +442,9 @@
if(tInstruction.txt=="entityUpdateDetail") if(tInstruction.txt=="entityUpdateDetail")
{ {
@@ -1409,8 +1343,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-04-04 19:12:53.675941297 +0000 --- HMI/n2t-out/screensaver.txt 2022-04-04 21:08:13.436944769 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-04 19:12:54.171945204 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-04 21:08:13.792946140 +0000
@@ -48,6 +48,26 @@ @@ -48,6 +48,26 @@
Scope: local Scope: local
Value: 0 Value: 0

148
HMI/n2t-out-visual/cardThermo.txt
View File

@@ -1199,7 +1199,7 @@ Timer tmSerial
if(tInstruction.txt=="entityUpd") if(tInstruction.txt=="entityUpd")
{ {
//heading //heading
spstr strCommand.txt,tHeading.txt,",",1 spstr strCommand.txt,tHeading.txt,"~",1
// navigation icons // navigation icons
spstr strCommand.txt,tId.txt,"~",2 spstr strCommand.txt,tId.txt,"~",2
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
@@ -1228,23 +1228,23 @@ Timer tmSerial
bNext.txt="" bNext.txt=""
} }
//entity name //entity name
spstr strCommand.txt,entn.txt,",",3 spstr strCommand.txt,entn.txt,"~",3
//currentTemp //currentTemp
spstr strCommand.txt,tTmp.txt,",",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,xTempCurr.val,0,0 covx tTmp.txt,xTempCurr.val,0,0
//dstTemp //dstTemp
spstr strCommand.txt,tTmp.txt,",",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,xTempDest.val,0,0 covx tTmp.txt,xTempDest.val,0,0
//status //status
spstr strCommand.txt,tStatus.txt,",",6 spstr strCommand.txt,tStatus.txt,"~",6
//minTemp //minTemp
spstr strCommand.txt,tTmp.txt,",",7 spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,xTempMin.val,0,0 covx tTmp.txt,xTempMin.val,0,0
//maxTemp //maxTemp
spstr strCommand.txt,tTmp.txt,",",8 spstr strCommand.txt,tTmp.txt,"~",8
covx tTmp.txt,xTempMax.val,0,0 covx tTmp.txt,xTempMax.val,0,0
//tempStep //tempStep
spstr strCommand.txt,tTmp.txt,",",9 spstr strCommand.txt,tTmp.txt,"~",9
covx tTmp.txt,xTempStep.val,0,0 covx tTmp.txt,xTempStep.val,0,0
// disable all buttons // disable all buttons
vis bt0,0 vis bt0,0
@@ -1257,147 +1257,137 @@ Timer tmSerial
vis bt7,0 vis bt7,0
vis bt8,0 vis bt8,0
//bt0 //bt0
spstr strCommand.txt,tTmp.txt,",",10 spstr strCommand.txt,bt0.txt,"~",10
if(tTmp.txt!="") if(bt0.txt!="")
{ {
// set icon
bt0.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",11 spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,bt0.pco2,0,0 covx tTmp.txt,bt0.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",12 spstr strCommand.txt,tTmp.txt,"~",12
covx tTmp.txt,bt0.val,0,0 covx tTmp.txt,bt0.val,0,0
// save action // save action
spstr strCommand.txt,va0.txt,",",13 spstr strCommand.txt,va0.txt,"~",13
//enable //enable
vis bt0,1 vis bt0,1
} //bt1 }
spstr strCommand.txt,tTmp.txt,",",14 //bt1
if(tTmp.txt!="") spstr strCommand.txt,bt1.txt,"~",14
if(bt1.txt!="")
{ {
// set icon
bt1.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",15 spstr strCommand.txt,tTmp.txt,"~",15
covx tTmp.txt,bt1.pco2,0,0 covx tTmp.txt,bt1.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",16 spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,bt1.val,0,0 covx tTmp.txt,bt1.val,0,0
// save action // save action
spstr strCommand.txt,va1.txt,",",17 spstr strCommand.txt,va1.txt,"~",17
//enable //enable
vis bt1,1 vis bt1,1
} //bt2 }
spstr strCommand.txt,tTmp.txt,",",18 //bt2
if(tTmp.txt!="") spstr strCommand.txt,bt2.txt,"~",18
if(bt2.txt!="")
{ {
// set icon
bt2.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",19 spstr strCommand.txt,tTmp.txt,"~",19
covx tTmp.txt,bt2.pco2,0,0 covx tTmp.txt,bt2.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",20 spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,bt2.val,0,0 covx tTmp.txt,bt2.val,0,0
// save action // save action
spstr strCommand.txt,va2.txt,",",21 spstr strCommand.txt,va2.txt,"~",21
//enable //enable
vis bt2,1 vis bt2,1
} //bt3 }
spstr strCommand.txt,tTmp.txt,",",22 //bt3
if(tTmp.txt!="") spstr strCommand.txt,bt3.txt,"~",22
if(bt3.txt!="")
{ {
// set icon
bt3.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",23 spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,bt3.pco2,0,0 covx tTmp.txt,bt3.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",24 spstr strCommand.txt,tTmp.txt,"~",24
covx tTmp.txt,bt3.val,0,0 covx tTmp.txt,bt3.val,0,0
// save action // save action
spstr strCommand.txt,va3.txt,",",25 spstr strCommand.txt,va3.txt,"~",25
//enable //enable
vis bt3,1 vis bt3,1
} //bt4 }
spstr strCommand.txt,tTmp.txt,",",26 //bt4
if(tTmp.txt!="") spstr strCommand.txt,bt4.txt,"~",26
if(bt4.txt!="")
{ {
// set icon
bt4.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",27 spstr strCommand.txt,tTmp.txt,"~",27
covx tTmp.txt,bt4.pco2,0,0 covx tTmp.txt,bt4.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",28 spstr strCommand.txt,tTmp.txt,"~",28
covx tTmp.txt,bt4.val,0,0 covx tTmp.txt,bt4.val,0,0
// save action // save action
spstr strCommand.txt,va4.txt,",",29 spstr strCommand.txt,va4.txt,"~",29
//enable //enable
vis bt4,1 vis bt4,1
} //bt5 }
spstr strCommand.txt,tTmp.txt,",",30 //bt5
if(tTmp.txt!="") spstr strCommand.txt,bt5.txt,"~",30
if(bt5.txt!="")
{ {
// set icon
bt5.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",31 spstr strCommand.txt,tTmp.txt,"~",31
covx tTmp.txt,bt5.pco2,0,0 covx tTmp.txt,bt5.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",32 spstr strCommand.txt,tTmp.txt,"~",32
covx tTmp.txt,bt5.val,0,0 covx tTmp.txt,bt5.val,0,0
// save action // save action
spstr strCommand.txt,va5.txt,",",33 spstr strCommand.txt,va5.txt,"~",33
//enable //enable
vis bt5,1 vis bt5,1
} //bt6 }
spstr strCommand.txt,tTmp.txt,",",34 //bt6
if(tTmp.txt!="") spstr strCommand.txt,bt6.txt,"~",34
if(bt6.txt!="")
{ {
// set icon
bt6.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",35 spstr strCommand.txt,tTmp.txt,"~",35
covx tTmp.txt,bt6.pco2,0,0 covx tTmp.txt,bt6.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",36 spstr strCommand.txt,tTmp.txt,"~",36
covx tTmp.txt,bt6.val,0,0 covx tTmp.txt,bt6.val,0,0
// save action // save action
spstr strCommand.txt,va6.txt,",",37 spstr strCommand.txt,va6.txt,"~",37
//enable //enable
vis bt6,1 vis bt6,1
} //bt7 }
spstr strCommand.txt,tTmp.txt,",",38 //bt7
if(tTmp.txt!="") spstr strCommand.txt,bt7.txt,"~",38
if(bt7.txt!="")
{ {
// set icon
bt7.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",39 spstr strCommand.txt,tTmp.txt,"~",39
covx tTmp.txt,bt7.pco2,0,0 covx tTmp.txt,bt7.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",40 spstr strCommand.txt,tTmp.txt,"~",40
covx tTmp.txt,bt7.val,0,0 covx tTmp.txt,bt7.val,0,0
// save action // save action
spstr strCommand.txt,va7.txt,",",41 spstr strCommand.txt,va7.txt,"~",41
//enable //enable
vis bt7,1 vis bt7,1
} //bt8 }
spstr strCommand.txt,tTmp.txt,",",42 //bt8
if(tTmp.txt!="") spstr strCommand.txt,bt8.txt,"~",42
if(bt8.txt!="")
{ {
// set icon
bt8.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",43 spstr strCommand.txt,tTmp.txt,"~",43
covx tTmp.txt,bt8.pco2,0,0 covx tTmp.txt,bt8.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",44 spstr strCommand.txt,tTmp.txt,"~",44
covx tTmp.txt,bt8.val,0,0 covx tTmp.txt,bt8.val,0,0
// save action // save action
spstr strCommand.txt,va8.txt,",",45 spstr strCommand.txt,va8.txt,"~",45
//enable //enable
vis bt8,1 vis bt8,1
} }

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

@@ -44,8 +44,8 @@ cardGrid
243 Unique line(s) of event code 243 Unique line(s) of event code
cardThermo cardThermo
41 Component(s) 41 Component(s)
451 Line(s) of event code 442 Line(s) of event code
274 Unique line(s) of event code 245 Unique line(s) of event code
cardEntities cardEntities
62 Component(s) 62 Component(s)
964 Line(s) of event code 964 Line(s) of event code
@@ -54,5 +54,5 @@ cardEntities
Total Total
12 Page(s) 12 Page(s)
341 Component(s) 341 Component(s)
3550 Line(s) of event code 3541 Line(s) of event code
1040 Unique line(s) of event code 965 Unique line(s) of event code

148
HMI/n2t-out/cardThermo.txt
View File

@@ -646,7 +646,7 @@ Timer tmSerial
if(tInstruction.txt=="entityUpd") if(tInstruction.txt=="entityUpd")
{ {
//heading //heading
spstr strCommand.txt,tHeading.txt,",",1 spstr strCommand.txt,tHeading.txt,"~",1
// navigation icons // navigation icons
spstr strCommand.txt,tId.txt,"~",2 spstr strCommand.txt,tId.txt,"~",2
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
@@ -675,23 +675,23 @@ Timer tmSerial
bNext.txt="" bNext.txt=""
} }
//entity name //entity name
spstr strCommand.txt,entn.txt,",",3 spstr strCommand.txt,entn.txt,"~",3
//currentTemp //currentTemp
spstr strCommand.txt,tTmp.txt,",",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,xTempCurr.val,0,0 covx tTmp.txt,xTempCurr.val,0,0
//dstTemp //dstTemp
spstr strCommand.txt,tTmp.txt,",",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,xTempDest.val,0,0 covx tTmp.txt,xTempDest.val,0,0
//status //status
spstr strCommand.txt,tStatus.txt,",",6 spstr strCommand.txt,tStatus.txt,"~",6
//minTemp //minTemp
spstr strCommand.txt,tTmp.txt,",",7 spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,xTempMin.val,0,0 covx tTmp.txt,xTempMin.val,0,0
//maxTemp //maxTemp
spstr strCommand.txt,tTmp.txt,",",8 spstr strCommand.txt,tTmp.txt,"~",8
covx tTmp.txt,xTempMax.val,0,0 covx tTmp.txt,xTempMax.val,0,0
//tempStep //tempStep
spstr strCommand.txt,tTmp.txt,",",9 spstr strCommand.txt,tTmp.txt,"~",9
covx tTmp.txt,xTempStep.val,0,0 covx tTmp.txt,xTempStep.val,0,0
// disable all buttons // disable all buttons
vis bt0,0 vis bt0,0
@@ -704,147 +704,137 @@ Timer tmSerial
vis bt7,0 vis bt7,0
vis bt8,0 vis bt8,0
//bt0 //bt0
spstr strCommand.txt,tTmp.txt,",",10 spstr strCommand.txt,bt0.txt,"~",10
if(tTmp.txt!="") if(bt0.txt!="")
{ {
// set icon
bt0.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",11 spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,bt0.pco2,0,0 covx tTmp.txt,bt0.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",12 spstr strCommand.txt,tTmp.txt,"~",12
covx tTmp.txt,bt0.val,0,0 covx tTmp.txt,bt0.val,0,0
// save action // save action
spstr strCommand.txt,va0.txt,",",13 spstr strCommand.txt,va0.txt,"~",13
//enable //enable
vis bt0,1 vis bt0,1
} //bt1 }
spstr strCommand.txt,tTmp.txt,",",14 //bt1
if(tTmp.txt!="") spstr strCommand.txt,bt1.txt,"~",14
if(bt1.txt!="")
{ {
// set icon
bt1.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",15 spstr strCommand.txt,tTmp.txt,"~",15
covx tTmp.txt,bt1.pco2,0,0 covx tTmp.txt,bt1.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",16 spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,bt1.val,0,0 covx tTmp.txt,bt1.val,0,0
// save action // save action
spstr strCommand.txt,va1.txt,",",17 spstr strCommand.txt,va1.txt,"~",17
//enable //enable
vis bt1,1 vis bt1,1
} //bt2 }
spstr strCommand.txt,tTmp.txt,",",18 //bt2
if(tTmp.txt!="") spstr strCommand.txt,bt2.txt,"~",18
if(bt2.txt!="")
{ {
// set icon
bt2.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",19 spstr strCommand.txt,tTmp.txt,"~",19
covx tTmp.txt,bt2.pco2,0,0 covx tTmp.txt,bt2.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",20 spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,bt2.val,0,0 covx tTmp.txt,bt2.val,0,0
// save action // save action
spstr strCommand.txt,va2.txt,",",21 spstr strCommand.txt,va2.txt,"~",21
//enable //enable
vis bt2,1 vis bt2,1
} //bt3 }
spstr strCommand.txt,tTmp.txt,",",22 //bt3
if(tTmp.txt!="") spstr strCommand.txt,bt3.txt,"~",22
if(bt3.txt!="")
{ {
// set icon
bt3.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",23 spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,bt3.pco2,0,0 covx tTmp.txt,bt3.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",24 spstr strCommand.txt,tTmp.txt,"~",24
covx tTmp.txt,bt3.val,0,0 covx tTmp.txt,bt3.val,0,0
// save action // save action
spstr strCommand.txt,va3.txt,",",25 spstr strCommand.txt,va3.txt,"~",25
//enable //enable
vis bt3,1 vis bt3,1
} //bt4 }
spstr strCommand.txt,tTmp.txt,",",26 //bt4
if(tTmp.txt!="") spstr strCommand.txt,bt4.txt,"~",26
if(bt4.txt!="")
{ {
// set icon
bt4.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",27 spstr strCommand.txt,tTmp.txt,"~",27
covx tTmp.txt,bt4.pco2,0,0 covx tTmp.txt,bt4.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",28 spstr strCommand.txt,tTmp.txt,"~",28
covx tTmp.txt,bt4.val,0,0 covx tTmp.txt,bt4.val,0,0
// save action // save action
spstr strCommand.txt,va4.txt,",",29 spstr strCommand.txt,va4.txt,"~",29
//enable //enable
vis bt4,1 vis bt4,1
} //bt5 }
spstr strCommand.txt,tTmp.txt,",",30 //bt5
if(tTmp.txt!="") spstr strCommand.txt,bt5.txt,"~",30
if(bt5.txt!="")
{ {
// set icon
bt5.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",31 spstr strCommand.txt,tTmp.txt,"~",31
covx tTmp.txt,bt5.pco2,0,0 covx tTmp.txt,bt5.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",32 spstr strCommand.txt,tTmp.txt,"~",32
covx tTmp.txt,bt5.val,0,0 covx tTmp.txt,bt5.val,0,0
// save action // save action
spstr strCommand.txt,va5.txt,",",33 spstr strCommand.txt,va5.txt,"~",33
//enable //enable
vis bt5,1 vis bt5,1
} //bt6 }
spstr strCommand.txt,tTmp.txt,",",34 //bt6
if(tTmp.txt!="") spstr strCommand.txt,bt6.txt,"~",34
if(bt6.txt!="")
{ {
// set icon
bt6.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",35 spstr strCommand.txt,tTmp.txt,"~",35
covx tTmp.txt,bt6.pco2,0,0 covx tTmp.txt,bt6.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",36 spstr strCommand.txt,tTmp.txt,"~",36
covx tTmp.txt,bt6.val,0,0 covx tTmp.txt,bt6.val,0,0
// save action // save action
spstr strCommand.txt,va6.txt,",",37 spstr strCommand.txt,va6.txt,"~",37
//enable //enable
vis bt6,1 vis bt6,1
} //bt7 }
spstr strCommand.txt,tTmp.txt,",",38 //bt7
if(tTmp.txt!="") spstr strCommand.txt,bt7.txt,"~",38
if(bt7.txt!="")
{ {
// set icon
bt7.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",39 spstr strCommand.txt,tTmp.txt,"~",39
covx tTmp.txt,bt7.pco2,0,0 covx tTmp.txt,bt7.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",40 spstr strCommand.txt,tTmp.txt,"~",40
covx tTmp.txt,bt7.val,0,0 covx tTmp.txt,bt7.val,0,0
// save action // save action
spstr strCommand.txt,va7.txt,",",41 spstr strCommand.txt,va7.txt,"~",41
//enable //enable
vis bt7,1 vis bt7,1
} //bt8 }
spstr strCommand.txt,tTmp.txt,",",42 //bt8
if(tTmp.txt!="") spstr strCommand.txt,bt8.txt,"~",42
if(bt8.txt!="")
{ {
// set icon
bt8.txt=tTmp.txt
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,",",43 spstr strCommand.txt,tTmp.txt,"~",43
covx tTmp.txt,bt8.pco2,0,0 covx tTmp.txt,bt8.pco2,0,0
// set state // set state
spstr strCommand.txt,tTmp.txt,",",44 spstr strCommand.txt,tTmp.txt,"~",44
covx tTmp.txt,bt8.val,0,0 covx tTmp.txt,bt8.val,0,0
// save action // save action
spstr strCommand.txt,va8.txt,",",45 spstr strCommand.txt,va8.txt,"~",45
//enable //enable
vis bt8,1 vis bt8,1
} }