From d2964220fcbc0ba35582963ad4cd704276bbcb0e Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 14 Jan 2023 13:50:56 +0000 Subject: [PATCH] some final cleanup of power page (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 242 ++++++++++++++++++++++++-- HMI/US/portrait/diff-eu-version.txt | 242 ++++++++++++++++++++++++-- HMI/US/portrait/diff-filtered.txt | 244 +++++++++++++++++++++++++-- HMI/n2t-out-visual/cardPower.txt | 158 +++++++++++++---- HMI/n2t-out-visual/nspanel_Stats.txt | 14 +- HMI/n2t-out/cardPower.txt | 96 +++++++---- 6 files changed, 879 insertions(+), 117 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index b700d76c..46efd622 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -524,25 +524,235 @@ │ if(tInstruction.txt=="date") │ --- HMI/n2t-out/cardPower.txt ├── +++ HMI/US/landscape/n2t-out/cardPower.txt -│ @@ -785,18 +785,14 @@ -│ { -│ page cardPower +│ @@ -35,15 +35,15 @@ +│ vis t0Icon,0 +│ vis t1Icon,0 +│ vis t2Icon,0 +│ vis t3Icon,0 +│ vis t4Icon,0 +│ vis t5Icon,0 +│ cardPower.bco=defaultBcoColor +│ - for(sys0=0;sys0<48;sys0++) +│ + for(sys0=0;sys0<43;sys0++) +│ { +│ if(b[sys0].type==98||b[sys0].type==116) +│ { +│ b[sys0].bco=defaultBcoColor +│ b[sys0].pco=defaultFontColor +│ } +│ if(defaultBcoColor==0) +│ @@ -275,44 +275,14 @@ +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ Max. Text Size : 20 +│ +│ -Text tHome2 +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Disable release event after dragging: 0 +│ - Send Component ID : disabled +│ - Associated Keyboard : none +│ - Text : +│ - Max. Text Size : 10 +│ - +│ -Text tHomeO +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Disable release event after dragging: 0 +│ - Send Component ID : disabled +│ - Associated Keyboard : none +│ - Text : +│ - Max. Text Size : 20 +│ - +│ -Text tHomeO2 +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Disable release event after dragging: 0 +│ - Send Component ID : disabled +│ - Associated Keyboard : none +│ - Text : +│ - Max. Text Size : 10 +│ - +│ Picture p0 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ +│ @@ -618,141 +588,131 @@ +│ vis bNext,1 │ } -│ if(tId.txt=="cardChart") +│ // icon color home +│ spstr strCommand.txt,tTmp.txt,"~",14 +│ covx tTmp.txt,t1.pco,0,0 +│ // icon home +│ spstr strCommand.txt,t1.txt,"~",15 +│ - // speed 16 ignored +│ - // text home +│ - spstr strCommand.txt,tHome.txt,"~",17 +│ - spstr tHome.txt,tHome2.txt," ",1 +│ - spstr tHome.txt,tHome.txt," ",0 +│ - // icon color 18 ignored +│ - // icon 19 ignored +│ - // speed 20 ignored +│ // text home +│ - spstr strCommand.txt,tHomeO.txt,"~",21 +│ - spstr tHomeO.txt,tHomeO2.txt," ",1 +│ - spstr tHomeO.txt,tHomeO.txt," ",0 +│ + spstr strCommand.txt,tHome.txt,"~",16 +│ // iconColor +│ - spstr strCommand.txt,tTmp.txt,"~",22 +│ + spstr strCommand.txt,tTmp.txt,"~",17 +│ covx tTmp.txt,t0Icon.pco,0,0 +│ // icon +│ - spstr strCommand.txt,t0Icon.txt,"~",23 +│ + spstr strCommand.txt,t0Icon.txt,"~",18 +│ // speed +│ - spstr strCommand.txt,tTmp.txt,"~",24 +│ + spstr strCommand.txt,tTmp.txt,"~",19 +│ covx tTmp.txt,t0Speed.val,0,0 +│ // lower text +│ - spstr strCommand.txt,t0u.txt,"~",25 +│ + spstr strCommand.txt,t0u.txt,"~",20 +│ if(t0Icon.txt!="") │ { -│ page cardChart +│ vis t0Icon,1 +│ vis t0u,1 +│ vis h0,1 +│ }else +│ { +│ vis t0Icon,0 +│ vis t0u,0 +│ vis h0,0 │ } -│ - if(tId.txt=="cardLChart") -│ - { -│ - page cardLChart -│ - } -│ } -│ if(tInstruction.txt=="time") -│ { -│ // get set time to global variable -│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -│ } -│ if(tInstruction.txt=="date") +│ // iconColor +│ - spstr strCommand.txt,tTmp.txt,"~",26 +│ + spstr strCommand.txt,tTmp.txt,"~",21 +│ covx tTmp.txt,t1Icon.pco,0,0 +│ // icon +│ - spstr strCommand.txt,t1Icon.txt,"~",27 +│ + spstr strCommand.txt,t1Icon.txt,"~",22 +│ // speed +│ - spstr strCommand.txt,tTmp.txt,"~",28 +│ + spstr strCommand.txt,tTmp.txt,"~",23 +│ covx tTmp.txt,t1Speed.val,0,0 +│ // lower text +│ - spstr strCommand.txt,t1u.txt,"~",29 +│ + spstr strCommand.txt,t1u.txt,"~",24 +│ if(t1Icon.txt!="") +│ { +│ vis t1Icon,1 +│ vis t1u,1 +│ vis h1,1 +│ }else +│ { +│ vis t1Icon,0 +│ vis t1u,0 +│ vis h1,0 +│ } +│ // iconColor +│ - spstr strCommand.txt,tTmp.txt,"~",30 +│ + spstr strCommand.txt,tTmp.txt,"~",25 +│ covx tTmp.txt,t2Icon.pco,0,0 +│ // icon +│ - spstr strCommand.txt,t2Icon.txt,"~",31 +│ + spstr strCommand.txt,t2Icon.txt,"~",26 +│ // speed +│ - spstr strCommand.txt,tTmp.txt,"~",32 +│ + spstr strCommand.txt,tTmp.txt,"~",27 +│ covx tTmp.txt,t2Speed.val,0,0 +│ // lower text +│ - spstr strCommand.txt,t2u.txt,"~",33 +│ + spstr strCommand.txt,t2u.txt,"~",28 +│ if(t2Icon.txt!="") +│ { +│ vis t2Icon,1 +│ vis t2u,1 +│ vis h2,1 +│ }else +│ { +│ vis t2Icon,0 +│ vis t2u,0 +│ vis h2,0 +│ } +│ // iconColor +│ - spstr strCommand.txt,tTmp.txt,"~",34 +│ + spstr strCommand.txt,tTmp.txt,"~",29 +│ covx tTmp.txt,t3Icon.pco,0,0 +│ // icon +│ - spstr strCommand.txt,t3Icon.txt,"~",35 +│ + spstr strCommand.txt,t3Icon.txt,"~",30 +│ // speed +│ - spstr strCommand.txt,tTmp.txt,"~",36 +│ + spstr strCommand.txt,tTmp.txt,"~",31 +│ covx tTmp.txt,t3Speed.val,0,0 +│ // lower text +│ - spstr strCommand.txt,t3u.txt,"~",37 +│ + spstr strCommand.txt,t3u.txt,"~",32 +│ if(t3Icon.txt!="") +│ { +│ vis t3Icon,1 +│ vis t3u,1 +│ vis h3,1 +│ }else +│ { +│ vis t3Icon,0 +│ vis t3u,0 +│ vis h3,0 +│ } +│ // iconColor +│ - spstr strCommand.txt,tTmp.txt,"~",38 +│ + spstr strCommand.txt,tTmp.txt,"~",33 +│ covx tTmp.txt,t4Icon.pco,0,0 +│ // icon +│ - spstr strCommand.txt,t4Icon.txt,"~",39 +│ + spstr strCommand.txt,t4Icon.txt,"~",34 +│ // speed +│ - spstr strCommand.txt,tTmp.txt,"~",40 +│ + spstr strCommand.txt,tTmp.txt,"~",35 +│ covx tTmp.txt,t4Speed.val,0,0 +│ // lower text +│ - spstr strCommand.txt,t4u.txt,"~",41 +│ + spstr strCommand.txt,t4u.txt,"~",36 +│ if(t4Icon.txt!="") +│ { +│ vis t4Icon,1 +│ vis t4u,1 +│ vis h4,1 +│ }else +│ { +│ vis t4Icon,0 +│ vis t4u,0 +│ vis h4,0 +│ } +│ // iconColor +│ - spstr strCommand.txt,tTmp.txt,"~",42 +│ + spstr strCommand.txt,tTmp.txt,"~",37 +│ covx tTmp.txt,t5Icon.pco,0,0 +│ // icon +│ - spstr strCommand.txt,t5Icon.txt,"~",43 +│ + spstr strCommand.txt,t5Icon.txt,"~",38 +│ // speed +│ - spstr strCommand.txt,tTmp.txt,"~",44 +│ + spstr strCommand.txt,tTmp.txt,"~",39 +│ covx tTmp.txt,t5Speed.val,0,0 +│ // lower text +│ - spstr strCommand.txt,t5u.txt,"~",45 +│ + spstr strCommand.txt,t5u.txt,"~",40 +│ if(t5Icon.txt!="") +│ { +│ vis t5Icon,1 +│ vis t5u,1 +│ vis h5,1 +│ }else +│ { │ --- HMI/n2t-out/cardQR.txt ├── +++ HMI/US/landscape/n2t-out/cardQR.txt │ @@ -602,19 +602,19 @@ diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index ff331602..e79726d5 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1539,25 +1539,235 @@ │ if(tInstruction.txt=="date") │ --- HMI/n2t-out/cardPower.txt ├── +++ HMI/US/portrait/n2t-out/cardPower.txt -│ @@ -785,18 +785,14 @@ -│ { -│ page cardPower +│ @@ -35,15 +35,15 @@ +│ vis t0Icon,0 +│ vis t1Icon,0 +│ vis t2Icon,0 +│ vis t3Icon,0 +│ vis t4Icon,0 +│ vis t5Icon,0 +│ cardPower.bco=defaultBcoColor +│ - for(sys0=0;sys0<48;sys0++) +│ + for(sys0=0;sys0<43;sys0++) +│ { +│ if(b[sys0].type==98||b[sys0].type==116) +│ { +│ b[sys0].bco=defaultBcoColor +│ b[sys0].pco=defaultFontColor +│ } +│ if(defaultBcoColor==0) +│ @@ -275,44 +275,14 @@ +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ Max. Text Size : 20 +│ +│ -Text tHome2 +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Disable release event after dragging: 0 +│ - Send Component ID : disabled +│ - Associated Keyboard : none +│ - Text : +│ - Max. Text Size : 10 +│ - +│ -Text tHomeO +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Disable release event after dragging: 0 +│ - Send Component ID : disabled +│ - Associated Keyboard : none +│ - Text : +│ - Max. Text Size : 20 +│ - +│ -Text tHomeO2 +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Disable release event after dragging: 0 +│ - Send Component ID : disabled +│ - Associated Keyboard : none +│ - Text : +│ - Max. Text Size : 10 +│ - +│ Picture p0 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ +│ @@ -618,141 +588,131 @@ +│ vis bNext,1 │ } -│ if(tId.txt=="cardChart") +│ // icon color home +│ spstr strCommand.txt,tTmp.txt,"~",14 +│ covx tTmp.txt,t1.pco,0,0 +│ // icon home +│ spstr strCommand.txt,t1.txt,"~",15 +│ - // speed 16 ignored +│ - // text home +│ - spstr strCommand.txt,tHome.txt,"~",17 +│ - spstr tHome.txt,tHome2.txt," ",1 +│ - spstr tHome.txt,tHome.txt," ",0 +│ - // icon color 18 ignored +│ - // icon 19 ignored +│ - // speed 20 ignored +│ // text home +│ - spstr strCommand.txt,tHomeO.txt,"~",21 +│ - spstr tHomeO.txt,tHomeO2.txt," ",1 +│ - spstr tHomeO.txt,tHomeO.txt," ",0 +│ + spstr strCommand.txt,tHome.txt,"~",16 +│ // iconColor +│ - spstr strCommand.txt,tTmp.txt,"~",22 +│ + spstr strCommand.txt,tTmp.txt,"~",17 +│ covx tTmp.txt,t0Icon.pco,0,0 +│ // icon +│ - spstr strCommand.txt,t0Icon.txt,"~",23 +│ + spstr strCommand.txt,t0Icon.txt,"~",18 +│ // speed +│ - spstr strCommand.txt,tTmp.txt,"~",24 +│ + spstr strCommand.txt,tTmp.txt,"~",19 +│ covx tTmp.txt,t0Speed.val,0,0 +│ // lower text +│ - spstr strCommand.txt,t0u.txt,"~",25 +│ + spstr strCommand.txt,t0u.txt,"~",20 +│ if(t0Icon.txt!="") │ { -│ page cardChart +│ vis t0Icon,1 +│ vis t0u,1 +│ vis h0,1 +│ }else +│ { +│ vis t0Icon,0 +│ vis t0u,0 +│ vis h0,0 │ } -│ - if(tId.txt=="cardLChart") -│ - { -│ - page cardLChart -│ - } -│ } -│ if(tInstruction.txt=="time") -│ { -│ // get set time to global variable -│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -│ } -│ if(tInstruction.txt=="date") +│ // iconColor +│ - spstr strCommand.txt,tTmp.txt,"~",26 +│ + spstr strCommand.txt,tTmp.txt,"~",21 +│ covx tTmp.txt,t1Icon.pco,0,0 +│ // icon +│ - spstr strCommand.txt,t1Icon.txt,"~",27 +│ + spstr strCommand.txt,t1Icon.txt,"~",22 +│ // speed +│ - spstr strCommand.txt,tTmp.txt,"~",28 +│ + spstr strCommand.txt,tTmp.txt,"~",23 +│ covx tTmp.txt,t1Speed.val,0,0 +│ // lower text +│ - spstr strCommand.txt,t1u.txt,"~",29 +│ + spstr strCommand.txt,t1u.txt,"~",24 +│ if(t1Icon.txt!="") +│ { +│ vis t1Icon,1 +│ vis t1u,1 +│ vis h1,1 +│ }else +│ { +│ vis t1Icon,0 +│ vis t1u,0 +│ vis h1,0 +│ } +│ // iconColor +│ - spstr strCommand.txt,tTmp.txt,"~",30 +│ + spstr strCommand.txt,tTmp.txt,"~",25 +│ covx tTmp.txt,t2Icon.pco,0,0 +│ // icon +│ - spstr strCommand.txt,t2Icon.txt,"~",31 +│ + spstr strCommand.txt,t2Icon.txt,"~",26 +│ // speed +│ - spstr strCommand.txt,tTmp.txt,"~",32 +│ + spstr strCommand.txt,tTmp.txt,"~",27 +│ covx tTmp.txt,t2Speed.val,0,0 +│ // lower text +│ - spstr strCommand.txt,t2u.txt,"~",33 +│ + spstr strCommand.txt,t2u.txt,"~",28 +│ if(t2Icon.txt!="") +│ { +│ vis t2Icon,1 +│ vis t2u,1 +│ vis h2,1 +│ }else +│ { +│ vis t2Icon,0 +│ vis t2u,0 +│ vis h2,0 +│ } +│ // iconColor +│ - spstr strCommand.txt,tTmp.txt,"~",34 +│ + spstr strCommand.txt,tTmp.txt,"~",29 +│ covx tTmp.txt,t3Icon.pco,0,0 +│ // icon +│ - spstr strCommand.txt,t3Icon.txt,"~",35 +│ + spstr strCommand.txt,t3Icon.txt,"~",30 +│ // speed +│ - spstr strCommand.txt,tTmp.txt,"~",36 +│ + spstr strCommand.txt,tTmp.txt,"~",31 +│ covx tTmp.txt,t3Speed.val,0,0 +│ // lower text +│ - spstr strCommand.txt,t3u.txt,"~",37 +│ + spstr strCommand.txt,t3u.txt,"~",32 +│ if(t3Icon.txt!="") +│ { +│ vis t3Icon,1 +│ vis t3u,1 +│ vis h3,1 +│ }else +│ { +│ vis t3Icon,0 +│ vis t3u,0 +│ vis h3,0 +│ } +│ // iconColor +│ - spstr strCommand.txt,tTmp.txt,"~",38 +│ + spstr strCommand.txt,tTmp.txt,"~",33 +│ covx tTmp.txt,t4Icon.pco,0,0 +│ // icon +│ - spstr strCommand.txt,t4Icon.txt,"~",39 +│ + spstr strCommand.txt,t4Icon.txt,"~",34 +│ // speed +│ - spstr strCommand.txt,tTmp.txt,"~",40 +│ + spstr strCommand.txt,tTmp.txt,"~",35 +│ covx tTmp.txt,t4Speed.val,0,0 +│ // lower text +│ - spstr strCommand.txt,t4u.txt,"~",41 +│ + spstr strCommand.txt,t4u.txt,"~",36 +│ if(t4Icon.txt!="") +│ { +│ vis t4Icon,1 +│ vis t4u,1 +│ vis h4,1 +│ }else +│ { +│ vis t4Icon,0 +│ vis t4u,0 +│ vis h4,0 +│ } +│ // iconColor +│ - spstr strCommand.txt,tTmp.txt,"~",42 +│ + spstr strCommand.txt,tTmp.txt,"~",37 +│ covx tTmp.txt,t5Icon.pco,0,0 +│ // icon +│ - spstr strCommand.txt,t5Icon.txt,"~",43 +│ + spstr strCommand.txt,t5Icon.txt,"~",38 +│ // speed +│ - spstr strCommand.txt,tTmp.txt,"~",44 +│ + spstr strCommand.txt,tTmp.txt,"~",39 +│ covx tTmp.txt,t5Speed.val,0,0 +│ // lower text +│ - spstr strCommand.txt,t5u.txt,"~",45 +│ + spstr strCommand.txt,t5u.txt,"~",40 +│ if(t5Icon.txt!="") +│ { +│ vis t5Icon,1 +│ vis t5u,1 +│ vis h5,1 +│ }else +│ { │ --- HMI/n2t-out/cardQR.txt ├── +++ HMI/US/portrait/n2t-out/cardQR.txt │ @@ -602,19 +602,19 @@ diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index ef758500..60953fc5 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-01-14 10:23:59.645842082 +0000 ++++ /dev/fd/62 2023-01-14 13:50:48.538380619 +0000 +le list + +1,12 @@ +.s.txt @@ -483,13 +483,13 @@ +ributes + Scope : local + Text : -+ Max. Text Size: 80 + Max. Text Size: 40 + +e (string) nent2 +ributes + Scope : local + Text : ++ Max. Text Size: 80 + Max. Text Size: 40 +14 +186,26 @@ +e (string) type6 @@ -958,25 +958,235 @@ + if(tInstruction.txt=="date") +I/n2t-out/cardPower.txt ++ HMI/US/portrait/n2t-out/cardPower.txt -+18 +785,14 @@ -+ { -+ page cardPower ++5 +35,15 @@ ++ vis t0Icon,0 ++ vis t1Icon,0 ++ vis t2Icon,0 ++ vis t3Icon,0 ++ vis t4Icon,0 ++ vis t5Icon,0 ++ cardPower.bco=defaultBcoColor ++ for(sys0=0;sys0<48;sys0++) ++ for(sys0=0;sys0<43;sys0++) ++ { ++ if(b[sys0].type==98||b[sys0].type==116) ++ { ++ b[sys0].bco=defaultBcoColor ++ b[sys0].pco=defaultFontColor ++ } ++ if(defaultBcoColor==0) ++44 +275,14 @@ ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 20 ++ ++ome2 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 10 ++ ++omeO ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 20 ++ ++omeO2 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 10 ++ ++ p0 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ ++141 +588,131 @@ ++ vis bNext,1 + } -+ if(tId.txt=="cardChart") ++ // icon color home ++ spstr strCommand.txt,tTmp.txt,"~",14 ++ covx tTmp.txt,t1.pco,0,0 ++ // icon home ++ spstr strCommand.txt,t1.txt,"~",15 ++ // speed 16 ignored ++ // text home ++ spstr strCommand.txt,tHome.txt,"~",17 ++ spstr tHome.txt,tHome2.txt," ",1 ++ spstr tHome.txt,tHome.txt," ",0 ++ // icon color 18 ignored ++ // icon 19 ignored ++ // speed 20 ignored ++ // text home ++ spstr strCommand.txt,tHomeO.txt,"~",21 ++ spstr tHomeO.txt,tHomeO2.txt," ",1 ++ spstr tHomeO.txt,tHomeO.txt," ",0 ++ spstr strCommand.txt,tHome.txt,"~",16 ++ // iconColor ++ spstr strCommand.txt,tTmp.txt,"~",22 ++ spstr strCommand.txt,tTmp.txt,"~",17 ++ covx tTmp.txt,t0Icon.pco,0,0 ++ // icon ++ spstr strCommand.txt,t0Icon.txt,"~",23 ++ spstr strCommand.txt,t0Icon.txt,"~",18 ++ // speed ++ spstr strCommand.txt,tTmp.txt,"~",24 ++ spstr strCommand.txt,tTmp.txt,"~",19 ++ covx tTmp.txt,t0Speed.val,0,0 ++ // lower text ++ spstr strCommand.txt,t0u.txt,"~",25 ++ spstr strCommand.txt,t0u.txt,"~",20 ++ if(t0Icon.txt!="") + { -+ page cardChart -+ } -+ if(tId.txt=="cardLChart") ++ vis t0Icon,1 ++ vis t0u,1 ++ vis h0,1 ++ }else + { -+ page cardLChart ++ vis t0Icon,0 ++ vis t0u,0 ++ vis h0,0 + } -+ } -+ if(tInstruction.txt=="time") -+ { -+ // get set time to global variable -+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ } -+ if(tInstruction.txt=="date") ++ // iconColor ++ spstr strCommand.txt,tTmp.txt,"~",26 ++ spstr strCommand.txt,tTmp.txt,"~",21 ++ covx tTmp.txt,t1Icon.pco,0,0 ++ // icon ++ spstr strCommand.txt,t1Icon.txt,"~",27 ++ spstr strCommand.txt,t1Icon.txt,"~",22 ++ // speed ++ spstr strCommand.txt,tTmp.txt,"~",28 ++ spstr strCommand.txt,tTmp.txt,"~",23 ++ covx tTmp.txt,t1Speed.val,0,0 ++ // lower text ++ spstr strCommand.txt,t1u.txt,"~",29 ++ spstr strCommand.txt,t1u.txt,"~",24 ++ if(t1Icon.txt!="") ++ { ++ vis t1Icon,1 ++ vis t1u,1 ++ vis h1,1 ++ }else ++ { ++ vis t1Icon,0 ++ vis t1u,0 ++ vis h1,0 ++ } ++ // iconColor ++ spstr strCommand.txt,tTmp.txt,"~",30 ++ spstr strCommand.txt,tTmp.txt,"~",25 ++ covx tTmp.txt,t2Icon.pco,0,0 ++ // icon ++ spstr strCommand.txt,t2Icon.txt,"~",31 ++ spstr strCommand.txt,t2Icon.txt,"~",26 ++ // speed ++ spstr strCommand.txt,tTmp.txt,"~",32 ++ spstr strCommand.txt,tTmp.txt,"~",27 ++ covx tTmp.txt,t2Speed.val,0,0 ++ // lower text ++ spstr strCommand.txt,t2u.txt,"~",33 ++ spstr strCommand.txt,t2u.txt,"~",28 ++ if(t2Icon.txt!="") ++ { ++ vis t2Icon,1 ++ vis t2u,1 ++ vis h2,1 ++ }else ++ { ++ vis t2Icon,0 ++ vis t2u,0 ++ vis h2,0 ++ } ++ // iconColor ++ spstr strCommand.txt,tTmp.txt,"~",34 ++ spstr strCommand.txt,tTmp.txt,"~",29 ++ covx tTmp.txt,t3Icon.pco,0,0 ++ // icon ++ spstr strCommand.txt,t3Icon.txt,"~",35 ++ spstr strCommand.txt,t3Icon.txt,"~",30 ++ // speed ++ spstr strCommand.txt,tTmp.txt,"~",36 ++ spstr strCommand.txt,tTmp.txt,"~",31 ++ covx tTmp.txt,t3Speed.val,0,0 ++ // lower text ++ spstr strCommand.txt,t3u.txt,"~",37 ++ spstr strCommand.txt,t3u.txt,"~",32 ++ if(t3Icon.txt!="") ++ { ++ vis t3Icon,1 ++ vis t3u,1 ++ vis h3,1 ++ }else ++ { ++ vis t3Icon,0 ++ vis t3u,0 ++ vis h3,0 ++ } ++ // iconColor ++ spstr strCommand.txt,tTmp.txt,"~",38 ++ spstr strCommand.txt,tTmp.txt,"~",33 ++ covx tTmp.txt,t4Icon.pco,0,0 ++ // icon ++ spstr strCommand.txt,t4Icon.txt,"~",39 ++ spstr strCommand.txt,t4Icon.txt,"~",34 ++ // speed ++ spstr strCommand.txt,tTmp.txt,"~",40 ++ spstr strCommand.txt,tTmp.txt,"~",35 ++ covx tTmp.txt,t4Speed.val,0,0 ++ // lower text ++ spstr strCommand.txt,t4u.txt,"~",41 ++ spstr strCommand.txt,t4u.txt,"~",36 ++ if(t4Icon.txt!="") ++ { ++ vis t4Icon,1 ++ vis t4u,1 ++ vis h4,1 ++ }else ++ { ++ vis t4Icon,0 ++ vis t4u,0 ++ vis h4,0 ++ } ++ // iconColor ++ spstr strCommand.txt,tTmp.txt,"~",42 ++ spstr strCommand.txt,tTmp.txt,"~",37 ++ covx tTmp.txt,t5Icon.pco,0,0 ++ // icon ++ spstr strCommand.txt,t5Icon.txt,"~",43 ++ spstr strCommand.txt,t5Icon.txt,"~",38 ++ // speed ++ spstr strCommand.txt,tTmp.txt,"~",44 ++ spstr strCommand.txt,tTmp.txt,"~",39 ++ covx tTmp.txt,t5Speed.val,0,0 ++ // lower text ++ spstr strCommand.txt,t5u.txt,"~",45 ++ spstr strCommand.txt,t5u.txt,"~",40 ++ if(t5Icon.txt!="") ++ { ++ vis t5Icon,1 ++ vis t5u,1 ++ vis h5,1 ++ }else ++ { +I/n2t-out/cardQR.txt ++ HMI/US/portrait/n2t-out/cardQR.txt +19 +602,19 @@ diff --git a/HMI/n2t-out-visual/cardPower.txt b/HMI/n2t-out-visual/cardPower.txt index 67f89e54..86ad615c 100644 --- a/HMI/n2t-out-visual/cardPower.txt +++ b/HMI/n2t-out-visual/cardPower.txt @@ -47,7 +47,7 @@ Page cardPower vis t4Icon,0 vis t5Icon,0 cardPower.bco=defaultBcoColor - for(sys0=0;sys0<43;sys0++) + for(sys0=0;sys0<48;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { @@ -595,7 +595,37 @@ Text tHome x coordinate : 200 y coordinate : 214 Width : 56 - Height : 81 + Height : 54 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : bottom + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tHome2 + Attributes + ID : 45 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 200 + y coordinate : 271 + Width : 56 + Height : 28 Effect : load Effect Priority : 0 Effect Time : 300 @@ -609,11 +639,71 @@ Text tHome Vertical Alignment : center Input Type : character Text : + Max. Text Size : 10 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tHomeO + Attributes + ID : 46 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 200 + y coordinate : 73 + Width : 56 + Height : 54 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : bottom + Input Type : character + Text : Max. Text Size : 20 Word wrap : enabled Horizontal Spacing : 0 Vertical Spacing : 0 +Text tHomeO2 + Attributes + ID : 47 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 200 + y coordinate : 130 + Width : 56 + Height : 28 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + Picture p0 Attributes ID : 1 @@ -1100,18 +1190,28 @@ Timer tmSerial covx tTmp.txt,t1.pco,0,0 // icon home spstr strCommand.txt,t1.txt,"~",15 + // speed 16 ignored // text home - spstr strCommand.txt,tHome.txt,"~",16 + spstr strCommand.txt,tHome.txt,"~",17 + spstr tHome.txt,tHome2.txt," ",1 + spstr tHome.txt,tHome.txt," ",0 + // icon color 18 ignored + // icon 19 ignored + // speed 20 ignored + // text home + spstr strCommand.txt,tHomeO.txt,"~",21 + spstr tHomeO.txt,tHomeO2.txt," ",1 + spstr tHomeO.txt,tHomeO.txt," ",0 // iconColor - spstr strCommand.txt,tTmp.txt,"~",17 + spstr strCommand.txt,tTmp.txt,"~",22 covx tTmp.txt,t0Icon.pco,0,0 // icon - spstr strCommand.txt,t0Icon.txt,"~",18 + spstr strCommand.txt,t0Icon.txt,"~",23 // speed - spstr strCommand.txt,tTmp.txt,"~",19 + spstr strCommand.txt,tTmp.txt,"~",24 covx tTmp.txt,t0Speed.val,0,0 // lower text - spstr strCommand.txt,t0u.txt,"~",20 + spstr strCommand.txt,t0u.txt,"~",25 if(t0Icon.txt!="") { vis t0Icon,1 @@ -1124,15 +1224,15 @@ Timer tmSerial vis h0,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",21 + spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,t1Icon.pco,0,0 // icon - spstr strCommand.txt,t1Icon.txt,"~",22 + spstr strCommand.txt,t1Icon.txt,"~",27 // speed - spstr strCommand.txt,tTmp.txt,"~",23 + spstr strCommand.txt,tTmp.txt,"~",28 covx tTmp.txt,t1Speed.val,0,0 // lower text - spstr strCommand.txt,t1u.txt,"~",24 + spstr strCommand.txt,t1u.txt,"~",29 if(t1Icon.txt!="") { vis t1Icon,1 @@ -1145,15 +1245,15 @@ Timer tmSerial vis h1,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",25 + spstr strCommand.txt,tTmp.txt,"~",30 covx tTmp.txt,t2Icon.pco,0,0 // icon - spstr strCommand.txt,t2Icon.txt,"~",26 + spstr strCommand.txt,t2Icon.txt,"~",31 // speed - spstr strCommand.txt,tTmp.txt,"~",27 + spstr strCommand.txt,tTmp.txt,"~",32 covx tTmp.txt,t2Speed.val,0,0 // lower text - spstr strCommand.txt,t2u.txt,"~",28 + spstr strCommand.txt,t2u.txt,"~",33 if(t2Icon.txt!="") { vis t2Icon,1 @@ -1166,15 +1266,15 @@ Timer tmSerial vis h2,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",29 + spstr strCommand.txt,tTmp.txt,"~",34 covx tTmp.txt,t3Icon.pco,0,0 // icon - spstr strCommand.txt,t3Icon.txt,"~",30 + spstr strCommand.txt,t3Icon.txt,"~",35 // speed - spstr strCommand.txt,tTmp.txt,"~",31 + spstr strCommand.txt,tTmp.txt,"~",36 covx tTmp.txt,t3Speed.val,0,0 // lower text - spstr strCommand.txt,t3u.txt,"~",32 + spstr strCommand.txt,t3u.txt,"~",37 if(t3Icon.txt!="") { vis t3Icon,1 @@ -1187,15 +1287,15 @@ Timer tmSerial vis h3,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",33 + spstr strCommand.txt,tTmp.txt,"~",38 covx tTmp.txt,t4Icon.pco,0,0 // icon - spstr strCommand.txt,t4Icon.txt,"~",34 + spstr strCommand.txt,t4Icon.txt,"~",39 // speed - spstr strCommand.txt,tTmp.txt,"~",35 + spstr strCommand.txt,tTmp.txt,"~",40 covx tTmp.txt,t4Speed.val,0,0 // lower text - spstr strCommand.txt,t4u.txt,"~",36 + spstr strCommand.txt,t4u.txt,"~",41 if(t4Icon.txt!="") { vis t4Icon,1 @@ -1208,15 +1308,15 @@ Timer tmSerial vis h4,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",37 + spstr strCommand.txt,tTmp.txt,"~",42 covx tTmp.txt,t5Icon.pco,0,0 // icon - spstr strCommand.txt,t5Icon.txt,"~",38 + spstr strCommand.txt,t5Icon.txt,"~",43 // speed - spstr strCommand.txt,tTmp.txt,"~",39 + spstr strCommand.txt,tTmp.txt,"~",44 covx tTmp.txt,t5Speed.val,0,0 // lower text - spstr strCommand.txt,t5u.txt,"~",40 + spstr strCommand.txt,t5u.txt,"~",45 if(t5Icon.txt!="") { vis t5Icon,1 @@ -1297,10 +1397,6 @@ Timer tmSerial { page cardChart } - if(tId.txt=="cardLChart") - { - page cardLChart - } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 2318e490..b81bf015 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -46,6 +46,10 @@ screensaver 47 Component(s) 443 Line(s) of event code 311 Unique line(s) of event code +cardPower + 48 Component(s) + 417 Line(s) of event code + 294 Unique line(s) of event code popupInSel 34 Component(s) 617 Line(s) of event code @@ -58,10 +62,6 @@ popupShutter 25 Component(s) 398 Line(s) of event code 218 Unique line(s) of event code -cardPower - 45 Component(s) - 416 Line(s) of event code - 291 Unique line(s) of event code cardMedia 59 Component(s) 641 Line(s) of event code @@ -85,6 +85,6 @@ cardEntities Total 20 Page(s) - 734 Component(s) - 8735 Line(s) of event code - 2234 Unique line(s) of event code + 737 Component(s) + 8736 Line(s) of event code + 2241 Unique line(s) of event code diff --git a/HMI/n2t-out/cardPower.txt b/HMI/n2t-out/cardPower.txt index 2ab310a0..a34570da 100644 --- a/HMI/n2t-out/cardPower.txt +++ b/HMI/n2t-out/cardPower.txt @@ -39,7 +39,7 @@ Page cardPower vis t4Icon,0 vis t5Icon,0 cardPower.bco=defaultBcoColor - for(sys0=0;sys0<43;sys0++) + for(sys0=0;sys0<48;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { @@ -279,6 +279,36 @@ Text tHome Text : Max. Text Size : 20 +Text tHome2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text tHomeO + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + +Text tHomeO2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + Picture p0 Attributes Scope : local @@ -592,18 +622,28 @@ Timer tmSerial covx tTmp.txt,t1.pco,0,0 // icon home spstr strCommand.txt,t1.txt,"~",15 + // speed 16 ignored // text home - spstr strCommand.txt,tHome.txt,"~",16 + spstr strCommand.txt,tHome.txt,"~",17 + spstr tHome.txt,tHome2.txt," ",1 + spstr tHome.txt,tHome.txt," ",0 + // icon color 18 ignored + // icon 19 ignored + // speed 20 ignored + // text home + spstr strCommand.txt,tHomeO.txt,"~",21 + spstr tHomeO.txt,tHomeO2.txt," ",1 + spstr tHomeO.txt,tHomeO.txt," ",0 // iconColor - spstr strCommand.txt,tTmp.txt,"~",17 + spstr strCommand.txt,tTmp.txt,"~",22 covx tTmp.txt,t0Icon.pco,0,0 // icon - spstr strCommand.txt,t0Icon.txt,"~",18 + spstr strCommand.txt,t0Icon.txt,"~",23 // speed - spstr strCommand.txt,tTmp.txt,"~",19 + spstr strCommand.txt,tTmp.txt,"~",24 covx tTmp.txt,t0Speed.val,0,0 // lower text - spstr strCommand.txt,t0u.txt,"~",20 + spstr strCommand.txt,t0u.txt,"~",25 if(t0Icon.txt!="") { vis t0Icon,1 @@ -616,15 +656,15 @@ Timer tmSerial vis h0,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",21 + spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,t1Icon.pco,0,0 // icon - spstr strCommand.txt,t1Icon.txt,"~",22 + spstr strCommand.txt,t1Icon.txt,"~",27 // speed - spstr strCommand.txt,tTmp.txt,"~",23 + spstr strCommand.txt,tTmp.txt,"~",28 covx tTmp.txt,t1Speed.val,0,0 // lower text - spstr strCommand.txt,t1u.txt,"~",24 + spstr strCommand.txt,t1u.txt,"~",29 if(t1Icon.txt!="") { vis t1Icon,1 @@ -637,15 +677,15 @@ Timer tmSerial vis h1,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",25 + spstr strCommand.txt,tTmp.txt,"~",30 covx tTmp.txt,t2Icon.pco,0,0 // icon - spstr strCommand.txt,t2Icon.txt,"~",26 + spstr strCommand.txt,t2Icon.txt,"~",31 // speed - spstr strCommand.txt,tTmp.txt,"~",27 + spstr strCommand.txt,tTmp.txt,"~",32 covx tTmp.txt,t2Speed.val,0,0 // lower text - spstr strCommand.txt,t2u.txt,"~",28 + spstr strCommand.txt,t2u.txt,"~",33 if(t2Icon.txt!="") { vis t2Icon,1 @@ -658,15 +698,15 @@ Timer tmSerial vis h2,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",29 + spstr strCommand.txt,tTmp.txt,"~",34 covx tTmp.txt,t3Icon.pco,0,0 // icon - spstr strCommand.txt,t3Icon.txt,"~",30 + spstr strCommand.txt,t3Icon.txt,"~",35 // speed - spstr strCommand.txt,tTmp.txt,"~",31 + spstr strCommand.txt,tTmp.txt,"~",36 covx tTmp.txt,t3Speed.val,0,0 // lower text - spstr strCommand.txt,t3u.txt,"~",32 + spstr strCommand.txt,t3u.txt,"~",37 if(t3Icon.txt!="") { vis t3Icon,1 @@ -679,15 +719,15 @@ Timer tmSerial vis h3,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",33 + spstr strCommand.txt,tTmp.txt,"~",38 covx tTmp.txt,t4Icon.pco,0,0 // icon - spstr strCommand.txt,t4Icon.txt,"~",34 + spstr strCommand.txt,t4Icon.txt,"~",39 // speed - spstr strCommand.txt,tTmp.txt,"~",35 + spstr strCommand.txt,tTmp.txt,"~",40 covx tTmp.txt,t4Speed.val,0,0 // lower text - spstr strCommand.txt,t4u.txt,"~",36 + spstr strCommand.txt,t4u.txt,"~",41 if(t4Icon.txt!="") { vis t4Icon,1 @@ -700,15 +740,15 @@ Timer tmSerial vis h4,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",37 + spstr strCommand.txt,tTmp.txt,"~",42 covx tTmp.txt,t5Icon.pco,0,0 // icon - spstr strCommand.txt,t5Icon.txt,"~",38 + spstr strCommand.txt,t5Icon.txt,"~",43 // speed - spstr strCommand.txt,tTmp.txt,"~",39 + spstr strCommand.txt,tTmp.txt,"~",44 covx tTmp.txt,t5Speed.val,0,0 // lower text - spstr strCommand.txt,t5u.txt,"~",40 + spstr strCommand.txt,t5u.txt,"~",45 if(t5Icon.txt!="") { vis t5Icon,1 @@ -789,10 +829,6 @@ Timer tmSerial { page cardChart } - if(tId.txt=="cardLChart") - { - page cardLChart - } } if(tInstruction.txt=="time") {