diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 5a7e728e..da122967 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-09-18 17:49:16.743058332 +0000 ++++ /dev/fd/62 2022-09-18 17:54:57.913385223 +0000 +rdAlarm.txt +18 +833,14 @@ + { diff --git a/HMI/n2t-out-visual/cardPower.txt b/HMI/n2t-out-visual/cardPower.txt index fd3d941e..31ec4836 100644 --- a/HMI/n2t-out-visual/cardPower.txt +++ b/HMI/n2t-out-visual/cardPower.txt @@ -1018,15 +1018,15 @@ Timer tmSerial vis h0,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",11 + spstr strCommand.txt,tTmp.txt,"~",10 covx tTmp.txt,t1Icon.pco,0,0 // icon - spstr strCommand.txt,t1Icon.txt,"~",12 + spstr strCommand.txt,t1Icon.txt,"~",11 // speed - spstr strCommand.txt,tTmp.txt,"~",13 + spstr strCommand.txt,tTmp.txt,"~",12 covx tTmp.txt,t1Speed.val,0,0 // lower text - spstr strCommand.txt,t1u.txt,"~",14 + spstr strCommand.txt,t1u.txt,"~",13 if(t1Icon.txt!="") { vis t1Icon,1 @@ -1039,15 +1039,15 @@ Timer tmSerial vis h1,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",16 + spstr strCommand.txt,tTmp.txt,"~",14 covx tTmp.txt,t2Icon.pco,0,0 // icon - spstr strCommand.txt,t2Icon.txt,"~",17 + spstr strCommand.txt,t2Icon.txt,"~",15 // speed - spstr strCommand.txt,tTmp.txt,"~",18 + spstr strCommand.txt,tTmp.txt,"~",16 covx tTmp.txt,t2Speed.val,0,0 // lower text - spstr strCommand.txt,t2u.txt,"~",19 + spstr strCommand.txt,t2u.txt,"~",17 if(t2Icon.txt!="") { vis t2Icon,1 @@ -1060,15 +1060,15 @@ Timer tmSerial vis h2,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",21 + spstr strCommand.txt,tTmp.txt,"~",18 covx tTmp.txt,t3Icon.pco,0,0 // icon - spstr strCommand.txt,t3Icon.txt,"~",22 + spstr strCommand.txt,t3Icon.txt,"~",19 // speed - spstr strCommand.txt,tTmp.txt,"~",23 + spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,t3Speed.val,0,0 // lower text - spstr strCommand.txt,t3u.txt,"~",24 + spstr strCommand.txt,t3u.txt,"~",21 if(t3Icon.txt!="") { vis t3Icon,1 @@ -1081,15 +1081,15 @@ Timer tmSerial vis h3,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",26 + spstr strCommand.txt,tTmp.txt,"~",22 covx tTmp.txt,t4Icon.pco,0,0 // icon - spstr strCommand.txt,t4Icon.txt,"~",27 + spstr strCommand.txt,t4Icon.txt,"~",23 // speed - spstr strCommand.txt,tTmp.txt,"~",28 + spstr strCommand.txt,tTmp.txt,"~",24 covx tTmp.txt,t4Speed.val,0,0 // lower text - spstr strCommand.txt,t4u.txt,"~",29 + spstr strCommand.txt,t4u.txt,"~",25 if(t4Icon.txt!="") { vis t4Icon,1 @@ -1102,15 +1102,15 @@ Timer tmSerial vis h4,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",31 + spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,t5Icon.pco,0,0 // icon - spstr strCommand.txt,t5Icon.txt,"~",32 + spstr strCommand.txt,t5Icon.txt,"~",27 // speed - spstr strCommand.txt,tTmp.txt,"~",33 + spstr strCommand.txt,tTmp.txt,"~",28 covx tTmp.txt,t5Speed.val,0,0 // lower text - spstr strCommand.txt,t5u.txt,"~",34 + spstr strCommand.txt,t5u.txt,"~",29 if(t5Icon.txt!="") { vis t5Icon,1 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index eaf5f741..e48fb390 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -26,10 +26,6 @@ screensaver 38 Component(s) 345 Line(s) of event code 265 Unique line(s) of event code -cardPower - 43 Component(s) - 364 Line(s) of event code - 256 Unique line(s) of event code popupFan 27 Component(s) 346 Line(s) of event code @@ -46,6 +42,10 @@ popupShutter 25 Component(s) 393 Line(s) of event code 214 Unique line(s) of event code +cardPower + 43 Component(s) + 364 Line(s) of event code + 256 Unique line(s) of event code cardQR 32 Component(s) 408 Line(s) of event code @@ -67,4 +67,4 @@ Total 15 Page(s) 488 Component(s) 5733 Line(s) of event code - 1536 Unique line(s) of event code + 1534 Unique line(s) of event code diff --git a/HMI/n2t-out/cardPower.txt b/HMI/n2t-out/cardPower.txt index 27ac40fc..47ab3fce 100644 --- a/HMI/n2t-out/cardPower.txt +++ b/HMI/n2t-out/cardPower.txt @@ -513,15 +513,15 @@ Timer tmSerial vis h0,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",11 + spstr strCommand.txt,tTmp.txt,"~",10 covx tTmp.txt,t1Icon.pco,0,0 // icon - spstr strCommand.txt,t1Icon.txt,"~",12 + spstr strCommand.txt,t1Icon.txt,"~",11 // speed - spstr strCommand.txt,tTmp.txt,"~",13 + spstr strCommand.txt,tTmp.txt,"~",12 covx tTmp.txt,t1Speed.val,0,0 // lower text - spstr strCommand.txt,t1u.txt,"~",14 + spstr strCommand.txt,t1u.txt,"~",13 if(t1Icon.txt!="") { vis t1Icon,1 @@ -534,15 +534,15 @@ Timer tmSerial vis h1,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",16 + spstr strCommand.txt,tTmp.txt,"~",14 covx tTmp.txt,t2Icon.pco,0,0 // icon - spstr strCommand.txt,t2Icon.txt,"~",17 + spstr strCommand.txt,t2Icon.txt,"~",15 // speed - spstr strCommand.txt,tTmp.txt,"~",18 + spstr strCommand.txt,tTmp.txt,"~",16 covx tTmp.txt,t2Speed.val,0,0 // lower text - spstr strCommand.txt,t2u.txt,"~",19 + spstr strCommand.txt,t2u.txt,"~",17 if(t2Icon.txt!="") { vis t2Icon,1 @@ -555,15 +555,15 @@ Timer tmSerial vis h2,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",21 + spstr strCommand.txt,tTmp.txt,"~",18 covx tTmp.txt,t3Icon.pco,0,0 // icon - spstr strCommand.txt,t3Icon.txt,"~",22 + spstr strCommand.txt,t3Icon.txt,"~",19 // speed - spstr strCommand.txt,tTmp.txt,"~",23 + spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,t3Speed.val,0,0 // lower text - spstr strCommand.txt,t3u.txt,"~",24 + spstr strCommand.txt,t3u.txt,"~",21 if(t3Icon.txt!="") { vis t3Icon,1 @@ -576,15 +576,15 @@ Timer tmSerial vis h3,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",26 + spstr strCommand.txt,tTmp.txt,"~",22 covx tTmp.txt,t4Icon.pco,0,0 // icon - spstr strCommand.txt,t4Icon.txt,"~",27 + spstr strCommand.txt,t4Icon.txt,"~",23 // speed - spstr strCommand.txt,tTmp.txt,"~",28 + spstr strCommand.txt,tTmp.txt,"~",24 covx tTmp.txt,t4Speed.val,0,0 // lower text - spstr strCommand.txt,t4u.txt,"~",29 + spstr strCommand.txt,t4u.txt,"~",25 if(t4Icon.txt!="") { vis t4Icon,1 @@ -597,15 +597,15 @@ Timer tmSerial vis h4,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",31 + spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,t5Icon.pco,0,0 // icon - spstr strCommand.txt,t5Icon.txt,"~",32 + spstr strCommand.txt,t5Icon.txt,"~",27 // speed - spstr strCommand.txt,tTmp.txt,"~",33 + spstr strCommand.txt,tTmp.txt,"~",28 covx tTmp.txt,t5Speed.val,0,0 // lower text - spstr strCommand.txt,t5u.txt,"~",34 + spstr strCommand.txt,t5u.txt,"~",29 if(t5Icon.txt!="") { vis t5Icon,1