diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 066e1e65..b700d76c 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -30,6 +30,23 @@ │ page pageStartup │ --- HMI/n2t-out/cardAlarm.txt ├── +++ HMI/US/landscape/n2t-out/cardAlarm.txt +│ @@ -34,15 +34,15 @@ +│ vis b9,0 +│ vis b10,0 +│ vis b11,0 +│ vis tCode,0 +│ vis bPrev,0 +│ vis bNext,0 +│ cardAlarm.bco=defaultBcoColor +│ - for(sys0=0;sys0<44;sys0++) +│ + for(sys0=0;sys0<40;sys0++) +│ { +│ if(b[sys0].type==98||b[sys0].type==116) +│ { +│ b[sys0].bco=defaultBcoColor +│ //b[sys0].pco=defaultFontColor +│ } +│ } │ @@ -123,24 +123,14 @@ │ Dragging : 0 │ Disable release event after dragging: 0 @@ -232,7 +249,7 @@ │ Dragging : 0 │ Disable release event after dragging: 0 │ Send Component ID : disabled -│ @@ -665,24 +633,15 @@ +│ @@ -665,26 +633,15 @@ │ // write command to variable strCommand │ ucopy strCommand.txt,4,payloadLength-5,0 │ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) @@ -241,13 +258,15 @@ │ { │ //entn │ - spstr strCommand.txt,tHeading.txt,"~",1 +│ - if(tHeading.txt=="unknown") +│ - { +│ - tHeading.txt="" +│ - } │ - if(tHeading.txt!="") │ - { -│ - vis tCode,0 │ - vis tHeading,1 │ - }else │ - { -│ - vis tCode,1 │ - vis tHeading,0 │ - } │ + spstr strCommand.txt,entn.txt,"~",1 @@ -258,7 +277,7 @@ │ vis bPrev,0 │ }else │ { -│ @@ -709,56 +668,54 @@ +│ @@ -711,77 +668,69 @@ │ spstr strCommand.txt,bNext.txt,"~",10 │ // change icon color │ spstr strCommand.txt,tTmp.txt,"~",11 @@ -326,7 +345,29 @@ │ vis b2,1 │ vis b3,1 │ vis b4,1 -│ @@ -783,30 +740,30 @@ +│ vis b5,1 +│ vis b6,1 +│ vis b7,1 +│ vis b8,1 +│ vis b9,1 +│ vis b10,1 +│ vis b11,1 +│ - if(tHeading.txt!="") +│ - { +│ - vis tCode,0 +│ - }else +│ - { +│ - vis tCode,1 +│ - } +│ + vis tCode,1 +│ }else +│ { +│ vis b0,0 +│ vis b1,0 +│ vis b2,0 +│ vis b3,0 +│ vis b4,0 +│ @@ -791,30 +740,30 @@ │ vis b8,0 │ vis b9,0 │ vis b10,0 @@ -361,7 +402,7 @@ │ // get set time to global variable │ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 │ } -│ @@ -907,18 +864,14 @@ +│ @@ -915,18 +864,14 @@ │ { │ page cardPower │ } @@ -403,6 +444,23 @@ │ } │ --- HMI/n2t-out/cardEntities.txt ├── +++ HMI/US/landscape/n2t-out/cardEntities.txt +│ @@ -62,15 +62,15 @@ +│ vis tEntity4,0 +│ vis bText4,0 +│ vis hSlider4,0 +│ vis nNum4,0 +│ vis bPrev,0 +│ vis bNext,0 +│ cardEntities.bco=defaultBcoColor +│ - for(sys0=0;sys0<67;sys0++) +│ + for(sys0=0;sys0<65;sys0++) +│ { +│ if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54) +│ { +│ b[sys0].bco=defaultBcoColor +│ b[sys0].pco=defaultFontColor +│ } +│ if(b[sys0].type==53&&defaultBcoColor==0) │ @@ -1931,18 +1931,14 @@ │ { │ page cardPower @@ -487,6 +545,28 @@ │ if(tInstruction.txt=="date") │ --- HMI/n2t-out/cardQR.txt ├── +++ HMI/US/landscape/n2t-out/cardQR.txt +│ @@ -602,19 +602,19 @@ +│ // get Text (optional Value) +│ spstr strCommand.txt,bText2.txt,"~",26 +│ } +│ if(type2.txt=="delete"||type2.txt=="") +│ { +│ if(type1.txt=="delete"||type1.txt=="") +│ { +│ - qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt +│ + qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt +│ } +│ }else +│ { +│ - qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt +│ + qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt +│ } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } │ @@ -715,18 +715,14 @@ │ { │ page cardPower diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index c2515cea..ff331602 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -32,6 +32,23 @@ │ page pageStartup │ --- HMI/n2t-out/cardAlarm.txt ├── +++ HMI/US/portrait/n2t-out/cardAlarm.txt +│ @@ -34,15 +34,15 @@ +│ vis b9,0 +│ vis b10,0 +│ vis b11,0 +│ vis tCode,0 +│ vis bPrev,0 +│ vis bNext,0 +│ cardAlarm.bco=defaultBcoColor +│ - for(sys0=0;sys0<44;sys0++) +│ + for(sys0=0;sys0<40;sys0++) +│ { +│ if(b[sys0].type==98||b[sys0].type==116) +│ { +│ b[sys0].bco=defaultBcoColor +│ //b[sys0].pco=defaultFontColor +│ } +│ } │ @@ -123,24 +123,14 @@ │ Dragging : 0 │ Disable release event after dragging: 0 @@ -234,7 +251,7 @@ │ Dragging : 0 │ Disable release event after dragging: 0 │ Send Component ID : disabled -│ @@ -665,24 +633,15 @@ +│ @@ -665,26 +633,15 @@ │ // write command to variable strCommand │ ucopy strCommand.txt,4,payloadLength-5,0 │ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) @@ -243,13 +260,15 @@ │ { │ //entn │ - spstr strCommand.txt,tHeading.txt,"~",1 +│ - if(tHeading.txt=="unknown") +│ - { +│ - tHeading.txt="" +│ - } │ - if(tHeading.txt!="") │ - { -│ - vis tCode,0 │ - vis tHeading,1 │ - }else │ - { -│ - vis tCode,1 │ - vis tHeading,0 │ - } │ + spstr strCommand.txt,entn.txt,"~",1 @@ -260,7 +279,7 @@ │ vis bPrev,0 │ }else │ { -│ @@ -709,56 +668,54 @@ +│ @@ -711,77 +668,69 @@ │ spstr strCommand.txt,bNext.txt,"~",10 │ // change icon color │ spstr strCommand.txt,tTmp.txt,"~",11 @@ -328,7 +347,29 @@ │ vis b2,1 │ vis b3,1 │ vis b4,1 -│ @@ -783,30 +740,30 @@ +│ vis b5,1 +│ vis b6,1 +│ vis b7,1 +│ vis b8,1 +│ vis b9,1 +│ vis b10,1 +│ vis b11,1 +│ - if(tHeading.txt!="") +│ - { +│ - vis tCode,0 +│ - }else +│ - { +│ - vis tCode,1 +│ - } +│ + vis tCode,1 +│ }else +│ { +│ vis b0,0 +│ vis b1,0 +│ vis b2,0 +│ vis b3,0 +│ vis b4,0 +│ @@ -791,30 +740,30 @@ │ vis b8,0 │ vis b9,0 │ vis b10,0 @@ -363,7 +404,7 @@ │ // get set time to global variable │ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 │ } -│ @@ -907,18 +864,14 @@ +│ @@ -915,18 +864,14 @@ │ { │ page cardPower │ } @@ -405,7 +446,7 @@ │ } │ --- HMI/n2t-out/cardEntities.txt ├── +++ HMI/US/portrait/n2t-out/cardEntities.txt -│ @@ -61,14 +61,34 @@ +│ @@ -61,16 +61,36 @@ │ vis tIcon4,0 │ vis tEntity4,0 │ vis bText4,0 @@ -434,12 +475,15 @@ │ + vis hSlider6,0 │ + vis nNum6,0 │ cardEntities.bco=defaultBcoColor -│ for(sys0=0;sys0<65;sys0++) +│ - for(sys0=0;sys0<67;sys0++) +│ + for(sys0=0;sys0<65;sys0++) │ { │ if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54) │ { │ b[sys0].bco=defaultBcoColor │ b[sys0].pco=defaultFontColor +│ } +│ if(b[sys0].type==53&&defaultBcoColor==0) │ @@ -86,45 +106,57 @@ │ } │ } @@ -1516,6 +1560,28 @@ │ if(tInstruction.txt=="date") │ --- HMI/n2t-out/cardQR.txt ├── +++ HMI/US/portrait/n2t-out/cardQR.txt +│ @@ -602,19 +602,19 @@ +│ // get Text (optional Value) +│ spstr strCommand.txt,bText2.txt,"~",26 +│ } +│ if(type2.txt=="delete"||type2.txt=="") +│ { +│ if(type1.txt=="delete"||type1.txt=="") +│ { +│ - qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt +│ + qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt +│ } +│ }else +│ { +│ - qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt +│ + qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt +│ } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } │ @@ -715,18 +715,14 @@ │ { │ page cardPower diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 3c9bc16b..ef758500 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-01-12 21:12:36.218426206 +0000 ++++ /dev/fd/62 2023-01-14 10:23:59.645842082 +0000 +le list + +1,12 @@ +.s.txt @@ -18,6 +18,23 @@ ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardAlarm.txt ++ HMI/US/portrait/n2t-out/cardAlarm.txt ++5 +34,15 @@ ++ vis b9,0 ++ vis b10,0 ++ vis b11,0 ++ vis tCode,0 ++ vis bPrev,0 ++ vis bNext,0 ++ cardAlarm.bco=defaultBcoColor ++ for(sys0=0;sys0<44;sys0++) ++ for(sys0=0;sys0<40;sys0++) ++ { ++ if(b[sys0].type==98||b[sys0].type==116) ++ { ++ b[sys0].bco=defaultBcoColor ++ //b[sys0].pco=defaultFontColor ++ } ++ } +24 +123,14 @@ + Dragging : 0 + Disable release event after dragging: 0 @@ -220,7 +237,7 @@ + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled -+24 +633,15 @@ ++26 +633,15 @@ + // write command to variable strCommand + ucopy strCommand.txt,4,payloadLength-5,0 + // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) @@ -229,13 +246,15 @@ + { + //entn + spstr strCommand.txt,tHeading.txt,"~",1 ++ if(tHeading.txt=="unknown") ++ { ++ tHeading.txt="" ++ } + if(tHeading.txt!="") + { -+ vis tCode,0 + vis tHeading,1 + }else + { -+ vis tCode,1 + vis tHeading,0 + } + spstr strCommand.txt,entn.txt,"~",1 @@ -246,7 +265,7 @@ + vis bPrev,0 + }else + { -+56 +668,54 @@ ++77 +668,69 @@ + spstr strCommand.txt,bNext.txt,"~",10 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",11 @@ -314,6 +333,28 @@ + vis b2,1 + vis b3,1 + vis b4,1 ++ vis b5,1 ++ vis b6,1 ++ vis b7,1 ++ vis b8,1 ++ vis b9,1 ++ vis b10,1 ++ vis b11,1 ++ if(tHeading.txt!="") ++ { ++ vis tCode,0 ++ }else ++ { ++ vis tCode,1 ++ } ++ vis tCode,1 ++ }else ++ { ++ vis b0,0 ++ vis b1,0 ++ vis b2,0 ++ vis b3,0 ++ vis b4,0 +30 +740,30 @@ + vis b8,0 + vis b9,0 @@ -391,7 +432,7 @@ + } +I/n2t-out/cardEntities.txt ++ HMI/US/portrait/n2t-out/cardEntities.txt -+4 +61,34 @@ ++6 +61,36 @@ + //ui e6 + vis btOnOff6,0 + vis bUp6,0 @@ -402,6 +443,9 @@ + vis bText6,0 + vis hSlider6,0 + vis nNum6,0 ++ for(sys0=0;sys0<67;sys0++) ++ } ++ if(b[sys0].type==53&&defaultBcoColor==0) +5 +106,57 @@ + } + } @@ -935,6 +979,28 @@ + if(tInstruction.txt=="date") +I/n2t-out/cardQR.txt ++ HMI/US/portrait/n2t-out/cardQR.txt ++19 +602,19 @@ ++ // get Text (optional Value) ++ spstr strCommand.txt,bText2.txt,"~",26 ++ } ++ if(type2.txt=="delete"||type2.txt=="") ++ { ++ if(type1.txt=="delete"||type1.txt=="") ++ { ++ qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt ++ qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt ++ } ++ }else ++ { ++ qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt ++ qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt ++ } ++ } ++ if(tInstruction.txt=="time") ++ { ++ // get set time to global variable ++ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 ++ } +18 +715,14 @@ + { + page cardPower diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index be10d416..bea9c100 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -46,7 +46,7 @@ Page cardAlarm vis bPrev,0 vis bNext,0 cardAlarm.bco=defaultBcoColor - for(sys0=0;sys0<40;sys0++) + for(sys0=0;sys0<44;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { @@ -1275,13 +1275,15 @@ Timer tmSerial { //entn spstr strCommand.txt,tHeading.txt,"~",1 + if(tHeading.txt=="unknown") + { + tHeading.txt="" + } if(tHeading.txt!="") { - vis tCode,0 vis tHeading,1 }else { - vis tCode,1 vis tHeading,0 } // navigation icon left @@ -1374,7 +1376,13 @@ Timer tmSerial vis b9,1 vis b10,1 vis b11,1 - vis tCode,1 + if(tHeading.txt!="") + { + vis tCode,0 + }else + { + vis tCode,1 + } }else { vis b0,0 diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index 53134c11..8f96c3e3 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -74,7 +74,7 @@ Page cardEntities vis bPrev,0 vis bNext,0 cardEntities.bco=defaultBcoColor - for(sys0=0;sys0<65;sys0++) + for(sys0=0;sys0<67;sys0++) { if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54) { diff --git a/HMI/n2t-out-visual/cardQR.txt b/HMI/n2t-out-visual/cardQR.txt index c7650e40..5296287a 100644 --- a/HMI/n2t-out-visual/cardQR.txt +++ b/HMI/n2t-out-visual/cardQR.txt @@ -907,11 +907,11 @@ Timer tmSerial { if(type1.txt=="delete"||type1.txt=="") { - qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt + qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt } }else { - qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt + qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt } } if(tInstruction.txt=="time") diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index cf6a973e..2318e490 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -32,8 +32,8 @@ pageTest 66 Unique line(s) of event code cardAlarm 43 Component(s) - 451 Line(s) of event code - 261 Unique line(s) of event code + 459 Line(s) of event code + 268 Unique line(s) of event code popupFan 27 Component(s) 351 Line(s) of event code @@ -86,5 +86,5 @@ cardEntities Total 20 Page(s) 734 Component(s) - 8727 Line(s) of event code - 2230 Unique line(s) of event code + 8735 Line(s) of event code + 2234 Unique line(s) of event code diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index 94b9e51c..000820b6 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -38,7 +38,7 @@ Page cardAlarm vis bPrev,0 vis bNext,0 cardAlarm.bco=defaultBcoColor - for(sys0=0;sys0<40;sys0++) + for(sys0=0;sys0<44;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { @@ -670,13 +670,15 @@ Timer tmSerial { //entn spstr strCommand.txt,tHeading.txt,"~",1 + if(tHeading.txt=="unknown") + { + tHeading.txt="" + } if(tHeading.txt!="") { - vis tCode,0 vis tHeading,1 }else { - vis tCode,1 vis tHeading,0 } // navigation icon left @@ -769,7 +771,13 @@ Timer tmSerial vis b9,1 vis b10,1 vis b11,1 - vis tCode,1 + if(tHeading.txt!="") + { + vis tCode,0 + }else + { + vis tCode,1 + } }else { vis b0,0 diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 5b237ce0..05517a76 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -66,7 +66,7 @@ Page cardEntities vis bPrev,0 vis bNext,0 cardEntities.bco=defaultBcoColor - for(sys0=0;sys0<65;sys0++) + for(sys0=0;sys0<67;sys0++) { if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54) { diff --git a/HMI/n2t-out/cardQR.txt b/HMI/n2t-out/cardQR.txt index ebf2df3b..7855710f 100644 --- a/HMI/n2t-out/cardQR.txt +++ b/HMI/n2t-out/cardQR.txt @@ -606,11 +606,11 @@ Timer tmSerial { if(type1.txt=="delete"||type1.txt=="") { - qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt + qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt } }else { - qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt + qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt } } if(tInstruction.txt=="time")