diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 1aebee41..85c62b11 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -14,570 +14,6 @@ │ + //lcd_dev fffb 0002 0000 0020 │ printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port │ page pageStartup -│ --- HMI/n2t-out/cardGrid.txt -├── +++ HMI/US/landscape/n2t-out/cardGrid.txt -│ @@ -715,25 +715,14 @@ -│ { -│ vis tEntity1,0 -│ vis bEntity1,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity1.txt,"~",16 -│ - // way to get force font adjustment -│ - strlen bEntity1.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity1.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity1.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity1.font=sys1 -│ - substr bEntity1.txt,bEntity1.txt,0,sys0-2 -│ - } -│ vis bEntity1,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",17 -│ covx tTmp.txt,sys0,0,0 -│ bEntity1.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity1.txt,"~",18 -│ @@ -747,25 +736,14 @@ -│ { -│ vis tEntity2,0 -│ vis bEntity2,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity2.txt,"~",22 -│ - // way to get force font adjustment -│ - strlen bEntity2.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity2.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity2.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity2.font=sys1 -│ - substr bEntity2.txt,bEntity2.txt,0,sys0-2 -│ - } -│ vis bEntity2,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",23 -│ covx tTmp.txt,sys0,0,0 -│ bEntity2.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity2.txt,"~",24 -│ @@ -779,25 +757,14 @@ -│ { -│ vis tEntity3,0 -│ vis bEntity3,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity3.txt,"~",28 -│ - // way to get force font adjustment -│ - strlen bEntity3.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity3.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity3.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity3.font=sys1 -│ - substr bEntity3.txt,bEntity3.txt,0,sys0-2 -│ - } -│ vis bEntity3,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",29 -│ covx tTmp.txt,sys0,0,0 -│ bEntity3.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity3.txt,"~",30 -│ @@ -811,25 +778,14 @@ -│ { -│ vis tEntity4,0 -│ vis bEntity4,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity4.txt,"~",34 -│ - // way to get force font adjustment -│ - strlen bEntity4.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity4.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity4.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity4.font=sys1 -│ - substr bEntity4.txt,bEntity4.txt,0,sys0-2 -│ - } -│ vis bEntity4,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",35 -│ covx tTmp.txt,sys0,0,0 -│ bEntity4.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity4.txt,"~",36 -│ @@ -843,25 +799,14 @@ -│ { -│ vis tEntity5,0 -│ vis bEntity5,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity5.txt,"~",40 -│ - // way to get force font adjustment -│ - strlen bEntity5.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity5.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity5.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity5.font=sys1 -│ - substr bEntity5.txt,bEntity5.txt,0,sys0-2 -│ - } -│ vis bEntity5,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",41 -│ covx tTmp.txt,sys0,0,0 -│ bEntity5.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity5.txt,"~",42 -│ @@ -875,25 +820,14 @@ -│ { -│ vis tEntity6,0 -│ vis bEntity6,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity6.txt,"~",46 -│ - // way to get force font adjustment -│ - strlen bEntity6.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity6.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity6.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity6.font=sys1 -│ - substr bEntity6.txt,bEntity6.txt,0,sys0-2 -│ - } -│ vis bEntity6,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",47 -│ covx tTmp.txt,sys0,0,0 -│ bEntity6.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity6.txt,"~",48 -│ @@ -972,14 +906,18 @@ -│ { -│ page cardPower -│ } -│ if(tId.txt=="cardChart") -│ { -│ page cardChart -│ } -│ + 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") -│ --- HMI/n2t-out/cardGrid2.txt -├── +++ HMI/US/landscape/n2t-out/cardGrid2.txt -│ @@ -849,25 +849,14 @@ -│ { -│ vis tEntity1,0 -│ vis bEntity1,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity1.txt,"~",16 -│ - // way to get force font adjustment -│ - strlen bEntity1.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity1.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity1.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity1.font=sys1 -│ - substr bEntity1.txt,bEntity1.txt,0,sys0-2 -│ - } -│ vis bEntity1,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",17 -│ covx tTmp.txt,sys0,0,0 -│ bEntity1.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity1.txt,"~",18 -│ @@ -881,25 +870,14 @@ -│ { -│ vis tEntity2,0 -│ vis bEntity2,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity2.txt,"~",22 -│ - // way to get force font adjustment -│ - strlen bEntity2.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity2.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity2.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity2.font=sys1 -│ - substr bEntity2.txt,bEntity2.txt,0,sys0-2 -│ - } -│ vis bEntity2,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",23 -│ covx tTmp.txt,sys0,0,0 -│ bEntity2.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity2.txt,"~",24 -│ @@ -913,25 +891,14 @@ -│ { -│ vis tEntity3,0 -│ vis bEntity3,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity3.txt,"~",28 -│ - // way to get force font adjustment -│ - strlen bEntity3.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity3.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity3.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity3.font=sys1 -│ - substr bEntity3.txt,bEntity3.txt,0,sys0-2 -│ - } -│ vis bEntity3,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",29 -│ covx tTmp.txt,sys0,0,0 -│ bEntity3.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity3.txt,"~",30 -│ @@ -945,25 +912,14 @@ -│ { -│ vis tEntity4,0 -│ vis bEntity4,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity4.txt,"~",34 -│ - // way to get force font adjustment -│ - strlen bEntity4.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity4.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity4.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity4.font=sys1 -│ - substr bEntity4.txt,bEntity4.txt,0,sys0-2 -│ - } -│ vis bEntity4,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",35 -│ covx tTmp.txt,sys0,0,0 -│ bEntity4.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity4.txt,"~",36 -│ @@ -977,25 +933,14 @@ -│ { -│ vis tEntity5,0 -│ vis bEntity5,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity5.txt,"~",40 -│ - // way to get force font adjustment -│ - strlen bEntity5.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity5.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity5.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity5.font=sys1 -│ - substr bEntity5.txt,bEntity5.txt,0,sys0-2 -│ - } -│ vis bEntity5,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",41 -│ covx tTmp.txt,sys0,0,0 -│ bEntity5.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity5.txt,"~",42 -│ @@ -1009,25 +954,14 @@ -│ { -│ vis tEntity6,0 -│ vis bEntity6,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity6.txt,"~",46 -│ - // way to get force font adjustment -│ - strlen bEntity6.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity6.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity6.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity6.font=sys1 -│ - substr bEntity6.txt,bEntity6.txt,0,sys0-2 -│ - } -│ vis bEntity6,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",47 -│ covx tTmp.txt,sys0,0,0 -│ bEntity6.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity6.txt,"~",48 -│ @@ -1041,25 +975,14 @@ -│ { -│ vis tEntity7,0 -│ vis bEntity7,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity7.txt,"~",52 -│ - // way to get force font adjustment -│ - strlen bEntity7.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity7.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity7.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity7.font=sys1 -│ - substr bEntity7.txt,bEntity7.txt,0,sys0-2 -│ - } -│ vis bEntity7,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",53 -│ covx tTmp.txt,sys0,0,0 -│ bEntity7.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity7.txt,"~",54 -│ @@ -1073,25 +996,14 @@ -│ { -│ vis tEntity8,0 -│ vis bEntity8,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity8.txt,"~",58 -│ - // way to get force font adjustment -│ - strlen bEntity8.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity8.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity8.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity8.font=sys1 -│ - substr bEntity8.txt,bEntity8.txt,0,sys0-2 -│ - } -│ vis bEntity8,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",59 -│ covx tTmp.txt,sys0,0,0 -│ bEntity8.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity8.txt,"~",60 -│ --- HMI/n2t-out/cardMedia.txt -├── +++ HMI/US/landscape/n2t-out/cardMedia.txt -│ @@ -993,25 +993,14 @@ -│ vis tEntity1,0 -│ vis bEntity1,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity1.txt,"~",25 -│ vis bEntity1,1 -│ - // way to get force font adjustment -│ - strlen bEntity1.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity1.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity1.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity1.font=sys1 -│ - substr bEntity1.txt,bEntity1.txt,0,sys0-2 -│ - } -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",26 -│ covx tTmp.txt,sys0,0,0 -│ bEntity1.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity1.txt,"~",27 -│ vis tEntity1,1 -│ @@ -1025,25 +1014,14 @@ -│ vis tEntity2,0 -│ vis bEntity2,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity2.txt,"~",31 -│ vis bEntity2,1 -│ - // way to get force font adjustment -│ - strlen bEntity2.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity2.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity2.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity2.font=sys1 -│ - substr bEntity2.txt,bEntity2.txt,0,sys0-2 -│ - } -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",32 -│ covx tTmp.txt,sys0,0,0 -│ bEntity2.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity2.txt,"~",33 -│ vis tEntity2,1 -│ @@ -1057,25 +1035,14 @@ -│ vis tEntity3,0 -│ vis bEntity3,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity3.txt,"~",37 -│ vis bEntity3,1 -│ - // way to get force font adjustment -│ - strlen bEntity3.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity3.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity3.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity3.font=sys1 -│ - substr bEntity3.txt,bEntity3.txt,0,sys0-2 -│ - } -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",38 -│ covx tTmp.txt,sys0,0,0 -│ bEntity3.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity3.txt,"~",39 -│ vis tEntity3,1 -│ @@ -1089,25 +1056,14 @@ -│ vis tEntity4,0 -│ vis bEntity4,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity4.txt,"~",43 -│ vis bEntity4,1 -│ - // way to get force font adjustment -│ - strlen bEntity4.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity4.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity4.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity4.font=sys1 -│ - substr bEntity4.txt,bEntity4.txt,0,sys0-2 -│ - } -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",44 -│ covx tTmp.txt,sys0,0,0 -│ bEntity4.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity4.txt,"~",45 -│ vis tEntity4,1 -│ @@ -1121,25 +1077,14 @@ -│ vis tEntity5,0 -│ vis bEntity5,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity5.txt,"~",49 -│ vis bEntity5,1 -│ - // way to get force font adjustment -│ - strlen bEntity5.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity5.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity5.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity5.font=sys1 -│ - substr bEntity5.txt,bEntity5.txt,0,sys0-2 -│ - } -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",50 -│ covx tTmp.txt,sys0,0,0 -│ bEntity5.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity5.txt,"~",51 -│ vis tEntity5,1 -│ @@ -1153,25 +1098,14 @@ -│ vis tEntity6,0 -│ vis bEntity6,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity6.txt,"~",55 -│ vis bEntity6,1 -│ - // way to get force font adjustment -│ - strlen bEntity6.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity6.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity6.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity6.font=sys1 -│ - substr bEntity6.txt,bEntity6.txt,0,sys0-2 -│ - } -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",56 -│ covx tTmp.txt,sys0,0,0 -│ bEntity6.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity6.txt,"~",57 -│ vis tEntity6,1 -│ @@ -1249,14 +1183,18 @@ -│ { -│ page cardPower -│ } -│ if(tId.txt=="cardChart") -│ { -│ page cardChart -│ } -│ + 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") │ --- HMI/n2t-out/pageStartup.txt ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt │ @@ -164,15 +164,15 @@ @@ -597,27 +33,6 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd -│ @@ -275,20 +275,14 @@ -│ } -│ // get font color -│ spstr strCommand.txt,tTmp.txt,"~",4 -│ if(tTmp.txt!="") -│ { -│ covx tTmp.txt,defaultFontColor,0,0 -│ } -│ - // get feature flag popup -│ - spstr strCommand.txt,tTmp.txt,"~",5 -│ - if(tTmp.txt!="") -│ - { -│ - covx tTmp.txt,featNewSliders,0,0 -│ - } -│ } -│ if(tInstruction.txt=="timeout") -│ { -│ //set timeout to global var -│ spstr strCommand.txt,tTmp.txt,"~",1 -│ covx tTmp.txt,sleepTimeout,0,0 -│ } │ --- HMI/n2t-out/screensaver.txt ├── +++ HMI/US/landscape/n2t-out/screensaver.txt │ @@ -28,17 +28,14 @@ diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt index 311c1168..4f37818f 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt +++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt @@ -1167,6 +1167,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity1.txt,"~",16 + // way to get force font adjustment + strlen bEntity1.txt,sys0 + //check 2nd last char for ¬ + substr bEntity1.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity1.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity1.font=sys1 + substr bEntity1.txt,bEntity1.txt,0,sys0-2 + } vis bEntity1,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",17 @@ -1188,6 +1199,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity2.txt,"~",22 + // way to get force font adjustment + strlen bEntity2.txt,sys0 + //check 2nd last char for ¬ + substr bEntity2.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity2.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity2.font=sys1 + substr bEntity2.txt,bEntity2.txt,0,sys0-2 + } vis bEntity2,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",23 @@ -1209,6 +1231,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity3.txt,"~",28 + // way to get force font adjustment + strlen bEntity3.txt,sys0 + //check 2nd last char for ¬ + substr bEntity3.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity3.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity3.font=sys1 + substr bEntity3.txt,bEntity3.txt,0,sys0-2 + } vis bEntity3,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",29 @@ -1230,6 +1263,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity4.txt,"~",34 + // way to get force font adjustment + strlen bEntity4.txt,sys0 + //check 2nd last char for ¬ + substr bEntity4.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity4.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity4.font=sys1 + substr bEntity4.txt,bEntity4.txt,0,sys0-2 + } vis bEntity4,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",35 @@ -1251,6 +1295,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity5.txt,"~",40 + // way to get force font adjustment + strlen bEntity5.txt,sys0 + //check 2nd last char for ¬ + substr bEntity5.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity5.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity5.font=sys1 + substr bEntity5.txt,bEntity5.txt,0,sys0-2 + } vis bEntity5,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",41 @@ -1272,6 +1327,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity6.txt,"~",46 + // way to get force font adjustment + strlen bEntity6.txt,sys0 + //check 2nd last char for ¬ + substr bEntity6.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity6.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity6.font=sys1 + substr bEntity6.txt,bEntity6.txt,0,sys0-2 + } vis bEntity6,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",47 @@ -1358,10 +1424,6 @@ Timer tmSerial { page cardChart } - if(tId.txt=="cardLChart") - { - page cardLChart - } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid2.txt b/HMI/US/landscape/n2t-out-visual/cardGrid2.txt index 2c936965..bf80be92 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid2.txt +++ b/HMI/US/landscape/n2t-out-visual/cardGrid2.txt @@ -1389,6 +1389,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity1.txt,"~",16 + // way to get force font adjustment + strlen bEntity1.txt,sys0 + //check 2nd last char for ¬ + substr bEntity1.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity1.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity1.font=sys1 + substr bEntity1.txt,bEntity1.txt,0,sys0-2 + } vis bEntity1,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",17 @@ -1410,6 +1421,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity2.txt,"~",22 + // way to get force font adjustment + strlen bEntity2.txt,sys0 + //check 2nd last char for ¬ + substr bEntity2.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity2.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity2.font=sys1 + substr bEntity2.txt,bEntity2.txt,0,sys0-2 + } vis bEntity2,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",23 @@ -1431,6 +1453,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity3.txt,"~",28 + // way to get force font adjustment + strlen bEntity3.txt,sys0 + //check 2nd last char for ¬ + substr bEntity3.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity3.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity3.font=sys1 + substr bEntity3.txt,bEntity3.txt,0,sys0-2 + } vis bEntity3,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",29 @@ -1452,6 +1485,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity4.txt,"~",34 + // way to get force font adjustment + strlen bEntity4.txt,sys0 + //check 2nd last char for ¬ + substr bEntity4.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity4.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity4.font=sys1 + substr bEntity4.txt,bEntity4.txt,0,sys0-2 + } vis bEntity4,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",35 @@ -1473,6 +1517,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity5.txt,"~",40 + // way to get force font adjustment + strlen bEntity5.txt,sys0 + //check 2nd last char for ¬ + substr bEntity5.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity5.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity5.font=sys1 + substr bEntity5.txt,bEntity5.txt,0,sys0-2 + } vis bEntity5,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",41 @@ -1494,6 +1549,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity6.txt,"~",46 + // way to get force font adjustment + strlen bEntity6.txt,sys0 + //check 2nd last char for ¬ + substr bEntity6.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity6.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity6.font=sys1 + substr bEntity6.txt,bEntity6.txt,0,sys0-2 + } vis bEntity6,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",47 @@ -1515,6 +1581,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity7.txt,"~",52 + // way to get force font adjustment + strlen bEntity7.txt,sys0 + //check 2nd last char for ¬ + substr bEntity7.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity7.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity7.font=sys1 + substr bEntity7.txt,bEntity7.txt,0,sys0-2 + } vis bEntity7,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",53 @@ -1536,6 +1613,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity8.txt,"~",58 + // way to get force font adjustment + strlen bEntity8.txt,sys0 + //check 2nd last char for ¬ + substr bEntity8.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity8.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity8.font=sys1 + substr bEntity8.txt,bEntity8.txt,0,sys0-2 + } vis bEntity8,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",59 diff --git a/HMI/US/landscape/n2t-out-visual/cardMedia.txt b/HMI/US/landscape/n2t-out-visual/cardMedia.txt index 62c17ec7..73936cc6 100644 --- a/HMI/US/landscape/n2t-out-visual/cardMedia.txt +++ b/HMI/US/landscape/n2t-out-visual/cardMedia.txt @@ -1485,6 +1485,17 @@ Timer tmSerial // change icon spstr strCommand.txt,bEntity1.txt,"~",25 vis bEntity1,1 + // way to get force font adjustment + strlen bEntity1.txt,sys0 + //check 2nd last char for ¬ + substr bEntity1.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity1.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity1.font=sys1 + substr bEntity1.txt,bEntity1.txt,0,sys0-2 + } // change icon color spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,sys0,0,0 @@ -1506,6 +1517,17 @@ Timer tmSerial // change icon spstr strCommand.txt,bEntity2.txt,"~",31 vis bEntity2,1 + // way to get force font adjustment + strlen bEntity2.txt,sys0 + //check 2nd last char for ¬ + substr bEntity2.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity2.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity2.font=sys1 + substr bEntity2.txt,bEntity2.txt,0,sys0-2 + } // change icon color spstr strCommand.txt,tTmp.txt,"~",32 covx tTmp.txt,sys0,0,0 @@ -1527,6 +1549,17 @@ Timer tmSerial // change icon spstr strCommand.txt,bEntity3.txt,"~",37 vis bEntity3,1 + // way to get force font adjustment + strlen bEntity3.txt,sys0 + //check 2nd last char for ¬ + substr bEntity3.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity3.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity3.font=sys1 + substr bEntity3.txt,bEntity3.txt,0,sys0-2 + } // change icon color spstr strCommand.txt,tTmp.txt,"~",38 covx tTmp.txt,sys0,0,0 @@ -1548,6 +1581,17 @@ Timer tmSerial // change icon spstr strCommand.txt,bEntity4.txt,"~",43 vis bEntity4,1 + // way to get force font adjustment + strlen bEntity4.txt,sys0 + //check 2nd last char for ¬ + substr bEntity4.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity4.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity4.font=sys1 + substr bEntity4.txt,bEntity4.txt,0,sys0-2 + } // change icon color spstr strCommand.txt,tTmp.txt,"~",44 covx tTmp.txt,sys0,0,0 @@ -1569,6 +1613,17 @@ Timer tmSerial // change icon spstr strCommand.txt,bEntity5.txt,"~",49 vis bEntity5,1 + // way to get force font adjustment + strlen bEntity5.txt,sys0 + //check 2nd last char for ¬ + substr bEntity5.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity5.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity5.font=sys1 + substr bEntity5.txt,bEntity5.txt,0,sys0-2 + } // change icon color spstr strCommand.txt,tTmp.txt,"~",50 covx tTmp.txt,sys0,0,0 @@ -1590,6 +1645,17 @@ Timer tmSerial // change icon spstr strCommand.txt,bEntity6.txt,"~",55 vis bEntity6,1 + // way to get force font adjustment + strlen bEntity6.txt,sys0 + //check 2nd last char for ¬ + substr bEntity6.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity6.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity6.font=sys1 + substr bEntity6.txt,bEntity6.txt,0,sys0-2 + } // change icon color spstr strCommand.txt,tTmp.txt,"~",56 covx tTmp.txt,sys0,0,0 @@ -1675,10 +1741,6 @@ Timer tmSerial { page cardChart } - if(tId.txt=="cardLChart") - { - page cardLChart - } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index c7131fda..52ee001c 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -10,14 +10,14 @@ pageIcons 7 Component(s) 0 Line(s) of event code 0 Unique line(s) of event code +pageStartup + 20 Component(s) + 198 Line(s) of event code + 137 Unique line(s) of event code popupTimer 42 Component(s) 516 Line(s) of event code 257 Unique line(s) of event code -pageStartup - 20 Component(s) - 193 Line(s) of event code - 135 Unique line(s) of event code cardChart 33 Component(s) 437 Line(s) of event code @@ -70,22 +70,22 @@ cardThermo 57 Component(s) 540 Line(s) of event code 319 Unique line(s) of event code +cardGrid + 44 Component(s) + 579 Line(s) of event code + 330 Unique line(s) of event code cardMedia 59 Component(s) - 649 Line(s) of event code - 322 Unique line(s) of event code -cardGrid2 - 52 Component(s) - 617 Line(s) of event code - 338 Unique line(s) of event code + 699 Line(s) of event code + 354 Unique line(s) of event code popupLight 28 Component(s) 412 Line(s) of event code 227 Unique line(s) of event code -cardGrid - 44 Component(s) - 529 Line(s) of event code - 298 Unique line(s) of event code +cardGrid2 + 52 Component(s) + 689 Line(s) of event code + 382 Unique line(s) of event code cardEntities 67 Component(s) 1194 Line(s) of event code @@ -98,5 +98,5 @@ screensaver2 Total 23 Page(s) 875 Component(s) - 10379 Line(s) of event code - 2407 Unique line(s) of event code + 10556 Line(s) of event code + 2450 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/pageStartup.txt b/HMI/US/landscape/n2t-out-visual/pageStartup.txt index 00a1902e..d67c86fa 100644 --- a/HMI/US/landscape/n2t-out-visual/pageStartup.txt +++ b/HMI/US/landscape/n2t-out-visual/pageStartup.txt @@ -575,6 +575,12 @@ Timer tmSerial { covx tTmp.txt,defaultFontColor,0,0 } + // get feature flag popup + spstr strCommand.txt,tTmp.txt,"~",5 + if(tTmp.txt!="") + { + covx tTmp.txt,featNewSliders,0,0 + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/landscape/n2t-out/cardGrid.txt b/HMI/US/landscape/n2t-out/cardGrid.txt index 6d8abda1..e546b270 100644 --- a/HMI/US/landscape/n2t-out/cardGrid.txt +++ b/HMI/US/landscape/n2t-out/cardGrid.txt @@ -719,6 +719,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity1.txt,"~",16 + // way to get force font adjustment + strlen bEntity1.txt,sys0 + //check 2nd last char for ¬ + substr bEntity1.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity1.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity1.font=sys1 + substr bEntity1.txt,bEntity1.txt,0,sys0-2 + } vis bEntity1,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",17 @@ -740,6 +751,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity2.txt,"~",22 + // way to get force font adjustment + strlen bEntity2.txt,sys0 + //check 2nd last char for ¬ + substr bEntity2.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity2.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity2.font=sys1 + substr bEntity2.txt,bEntity2.txt,0,sys0-2 + } vis bEntity2,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",23 @@ -761,6 +783,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity3.txt,"~",28 + // way to get force font adjustment + strlen bEntity3.txt,sys0 + //check 2nd last char for ¬ + substr bEntity3.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity3.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity3.font=sys1 + substr bEntity3.txt,bEntity3.txt,0,sys0-2 + } vis bEntity3,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",29 @@ -782,6 +815,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity4.txt,"~",34 + // way to get force font adjustment + strlen bEntity4.txt,sys0 + //check 2nd last char for ¬ + substr bEntity4.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity4.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity4.font=sys1 + substr bEntity4.txt,bEntity4.txt,0,sys0-2 + } vis bEntity4,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",35 @@ -803,6 +847,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity5.txt,"~",40 + // way to get force font adjustment + strlen bEntity5.txt,sys0 + //check 2nd last char for ¬ + substr bEntity5.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity5.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity5.font=sys1 + substr bEntity5.txt,bEntity5.txt,0,sys0-2 + } vis bEntity5,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",41 @@ -824,6 +879,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity6.txt,"~",46 + // way to get force font adjustment + strlen bEntity6.txt,sys0 + //check 2nd last char for ¬ + substr bEntity6.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity6.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity6.font=sys1 + substr bEntity6.txt,bEntity6.txt,0,sys0-2 + } vis bEntity6,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",47 @@ -910,10 +976,6 @@ Timer tmSerial { page cardChart } - if(tId.txt=="cardLChart") - { - page cardLChart - } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out/cardGrid2.txt b/HMI/US/landscape/n2t-out/cardGrid2.txt index 0f5a64e7..811d5596 100644 --- a/HMI/US/landscape/n2t-out/cardGrid2.txt +++ b/HMI/US/landscape/n2t-out/cardGrid2.txt @@ -853,6 +853,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity1.txt,"~",16 + // way to get force font adjustment + strlen bEntity1.txt,sys0 + //check 2nd last char for ¬ + substr bEntity1.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity1.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity1.font=sys1 + substr bEntity1.txt,bEntity1.txt,0,sys0-2 + } vis bEntity1,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",17 @@ -874,6 +885,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity2.txt,"~",22 + // way to get force font adjustment + strlen bEntity2.txt,sys0 + //check 2nd last char for ¬ + substr bEntity2.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity2.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity2.font=sys1 + substr bEntity2.txt,bEntity2.txt,0,sys0-2 + } vis bEntity2,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",23 @@ -895,6 +917,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity3.txt,"~",28 + // way to get force font adjustment + strlen bEntity3.txt,sys0 + //check 2nd last char for ¬ + substr bEntity3.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity3.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity3.font=sys1 + substr bEntity3.txt,bEntity3.txt,0,sys0-2 + } vis bEntity3,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",29 @@ -916,6 +949,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity4.txt,"~",34 + // way to get force font adjustment + strlen bEntity4.txt,sys0 + //check 2nd last char for ¬ + substr bEntity4.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity4.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity4.font=sys1 + substr bEntity4.txt,bEntity4.txt,0,sys0-2 + } vis bEntity4,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",35 @@ -937,6 +981,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity5.txt,"~",40 + // way to get force font adjustment + strlen bEntity5.txt,sys0 + //check 2nd last char for ¬ + substr bEntity5.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity5.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity5.font=sys1 + substr bEntity5.txt,bEntity5.txt,0,sys0-2 + } vis bEntity5,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",41 @@ -958,6 +1013,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity6.txt,"~",46 + // way to get force font adjustment + strlen bEntity6.txt,sys0 + //check 2nd last char for ¬ + substr bEntity6.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity6.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity6.font=sys1 + substr bEntity6.txt,bEntity6.txt,0,sys0-2 + } vis bEntity6,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",47 @@ -979,6 +1045,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity7.txt,"~",52 + // way to get force font adjustment + strlen bEntity7.txt,sys0 + //check 2nd last char for ¬ + substr bEntity7.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity7.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity7.font=sys1 + substr bEntity7.txt,bEntity7.txt,0,sys0-2 + } vis bEntity7,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",53 @@ -1000,6 +1077,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity8.txt,"~",58 + // way to get force font adjustment + strlen bEntity8.txt,sys0 + //check 2nd last char for ¬ + substr bEntity8.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity8.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity8.font=sys1 + substr bEntity8.txt,bEntity8.txt,0,sys0-2 + } vis bEntity8,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",59 diff --git a/HMI/US/landscape/n2t-out/cardMedia.txt b/HMI/US/landscape/n2t-out/cardMedia.txt index 951f1cc6..bc04351b 100644 --- a/HMI/US/landscape/n2t-out/cardMedia.txt +++ b/HMI/US/landscape/n2t-out/cardMedia.txt @@ -997,6 +997,17 @@ Timer tmSerial // change icon spstr strCommand.txt,bEntity1.txt,"~",25 vis bEntity1,1 + // way to get force font adjustment + strlen bEntity1.txt,sys0 + //check 2nd last char for ¬ + substr bEntity1.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity1.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity1.font=sys1 + substr bEntity1.txt,bEntity1.txt,0,sys0-2 + } // change icon color spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,sys0,0,0 @@ -1018,6 +1029,17 @@ Timer tmSerial // change icon spstr strCommand.txt,bEntity2.txt,"~",31 vis bEntity2,1 + // way to get force font adjustment + strlen bEntity2.txt,sys0 + //check 2nd last char for ¬ + substr bEntity2.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity2.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity2.font=sys1 + substr bEntity2.txt,bEntity2.txt,0,sys0-2 + } // change icon color spstr strCommand.txt,tTmp.txt,"~",32 covx tTmp.txt,sys0,0,0 @@ -1039,6 +1061,17 @@ Timer tmSerial // change icon spstr strCommand.txt,bEntity3.txt,"~",37 vis bEntity3,1 + // way to get force font adjustment + strlen bEntity3.txt,sys0 + //check 2nd last char for ¬ + substr bEntity3.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity3.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity3.font=sys1 + substr bEntity3.txt,bEntity3.txt,0,sys0-2 + } // change icon color spstr strCommand.txt,tTmp.txt,"~",38 covx tTmp.txt,sys0,0,0 @@ -1060,6 +1093,17 @@ Timer tmSerial // change icon spstr strCommand.txt,bEntity4.txt,"~",43 vis bEntity4,1 + // way to get force font adjustment + strlen bEntity4.txt,sys0 + //check 2nd last char for ¬ + substr bEntity4.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity4.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity4.font=sys1 + substr bEntity4.txt,bEntity4.txt,0,sys0-2 + } // change icon color spstr strCommand.txt,tTmp.txt,"~",44 covx tTmp.txt,sys0,0,0 @@ -1081,6 +1125,17 @@ Timer tmSerial // change icon spstr strCommand.txt,bEntity5.txt,"~",49 vis bEntity5,1 + // way to get force font adjustment + strlen bEntity5.txt,sys0 + //check 2nd last char for ¬ + substr bEntity5.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity5.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity5.font=sys1 + substr bEntity5.txt,bEntity5.txt,0,sys0-2 + } // change icon color spstr strCommand.txt,tTmp.txt,"~",50 covx tTmp.txt,sys0,0,0 @@ -1102,6 +1157,17 @@ Timer tmSerial // change icon spstr strCommand.txt,bEntity6.txt,"~",55 vis bEntity6,1 + // way to get force font adjustment + strlen bEntity6.txt,sys0 + //check 2nd last char for ¬ + substr bEntity6.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity6.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity6.font=sys1 + substr bEntity6.txt,bEntity6.txt,0,sys0-2 + } // change icon color spstr strCommand.txt,tTmp.txt,"~",56 covx tTmp.txt,sys0,0,0 @@ -1187,10 +1253,6 @@ Timer tmSerial { page cardChart } - if(tId.txt=="cardLChart") - { - page cardLChart - } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out/pageStartup.txt b/HMI/US/landscape/n2t-out/pageStartup.txt index dd49b712..1f98f37d 100644 --- a/HMI/US/landscape/n2t-out/pageStartup.txt +++ b/HMI/US/landscape/n2t-out/pageStartup.txt @@ -279,6 +279,12 @@ Timer tmSerial { covx tTmp.txt,defaultFontColor,0,0 } + // get feature flag popup + spstr strCommand.txt,tTmp.txt,"~",5 + if(tTmp.txt!="") + { + covx tTmp.txt,featNewSliders,0,0 + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 8dbd2d5a..921ba27c 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1038,183 +1038,6 @@ │ //command format pageType,specialPageName │ //write name of speical page to tId │ spstr strCommand.txt,tId.txt,"~",1 -│ --- HMI/n2t-out/cardGrid.txt -├── +++ HMI/US/portrait/n2t-out/cardGrid.txt -│ @@ -715,25 +715,14 @@ -│ { -│ vis tEntity1,0 -│ vis bEntity1,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity1.txt,"~",16 -│ - // way to get force font adjustment -│ - strlen bEntity1.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity1.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity1.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity1.font=sys1 -│ - substr bEntity1.txt,bEntity1.txt,0,sys0-2 -│ - } -│ vis bEntity1,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",17 -│ covx tTmp.txt,sys0,0,0 -│ bEntity1.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity1.txt,"~",18 -│ @@ -747,25 +736,14 @@ -│ { -│ vis tEntity2,0 -│ vis bEntity2,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity2.txt,"~",22 -│ - // way to get force font adjustment -│ - strlen bEntity2.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity2.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity2.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity2.font=sys1 -│ - substr bEntity2.txt,bEntity2.txt,0,sys0-2 -│ - } -│ vis bEntity2,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",23 -│ covx tTmp.txt,sys0,0,0 -│ bEntity2.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity2.txt,"~",24 -│ @@ -779,25 +757,14 @@ -│ { -│ vis tEntity3,0 -│ vis bEntity3,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity3.txt,"~",28 -│ - // way to get force font adjustment -│ - strlen bEntity3.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity3.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity3.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity3.font=sys1 -│ - substr bEntity3.txt,bEntity3.txt,0,sys0-2 -│ - } -│ vis bEntity3,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",29 -│ covx tTmp.txt,sys0,0,0 -│ bEntity3.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity3.txt,"~",30 -│ @@ -811,25 +778,14 @@ -│ { -│ vis tEntity4,0 -│ vis bEntity4,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity4.txt,"~",34 -│ - // way to get force font adjustment -│ - strlen bEntity4.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity4.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity4.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity4.font=sys1 -│ - substr bEntity4.txt,bEntity4.txt,0,sys0-2 -│ - } -│ vis bEntity4,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",35 -│ covx tTmp.txt,sys0,0,0 -│ bEntity4.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity4.txt,"~",36 -│ @@ -843,25 +799,14 @@ -│ { -│ vis tEntity5,0 -│ vis bEntity5,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity5.txt,"~",40 -│ - // way to get force font adjustment -│ - strlen bEntity5.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity5.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity5.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity5.font=sys1 -│ - substr bEntity5.txt,bEntity5.txt,0,sys0-2 -│ - } -│ vis bEntity5,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",41 -│ covx tTmp.txt,sys0,0,0 -│ bEntity5.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity5.txt,"~",42 -│ @@ -875,25 +820,14 @@ -│ { -│ vis tEntity6,0 -│ vis bEntity6,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity6.txt,"~",46 -│ - // way to get force font adjustment -│ - strlen bEntity6.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity6.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity6.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity6.font=sys1 -│ - substr bEntity6.txt,bEntity6.txt,0,sys0-2 -│ - } -│ vis bEntity6,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",47 -│ covx tTmp.txt,sys0,0,0 -│ bEntity6.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity6.txt,"~",48 -│ @@ -972,14 +906,18 @@ -│ { -│ page cardPower -│ } -│ if(tId.txt=="cardChart") -│ { -│ page cardChart -│ } -│ + 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") │ --- HMI/n2t-out/cardGrid2.txt ├── +++ HMI/US/portrait/n2t-out/cardGrid2.txt │ @@ -25,26 +25,28 @@ @@ -1372,209 +1195,7 @@ │ Send Component ID: disabled │ State : unpressed │ Text :  -│ @@ -849,25 +916,14 @@ -│ { -│ vis tEntity1,0 -│ vis bEntity1,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity1.txt,"~",16 -│ - // way to get force font adjustment -│ - strlen bEntity1.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity1.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity1.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity1.font=sys1 -│ - substr bEntity1.txt,bEntity1.txt,0,sys0-2 -│ - } -│ vis bEntity1,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",17 -│ covx tTmp.txt,sys0,0,0 -│ bEntity1.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity1.txt,"~",18 -│ @@ -881,25 +937,14 @@ -│ { -│ vis tEntity2,0 -│ vis bEntity2,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity2.txt,"~",22 -│ - // way to get force font adjustment -│ - strlen bEntity2.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity2.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity2.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity2.font=sys1 -│ - substr bEntity2.txt,bEntity2.txt,0,sys0-2 -│ - } -│ vis bEntity2,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",23 -│ covx tTmp.txt,sys0,0,0 -│ bEntity2.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity2.txt,"~",24 -│ @@ -913,25 +958,14 @@ -│ { -│ vis tEntity3,0 -│ vis bEntity3,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity3.txt,"~",28 -│ - // way to get force font adjustment -│ - strlen bEntity3.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity3.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity3.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity3.font=sys1 -│ - substr bEntity3.txt,bEntity3.txt,0,sys0-2 -│ - } -│ vis bEntity3,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",29 -│ covx tTmp.txt,sys0,0,0 -│ bEntity3.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity3.txt,"~",30 -│ @@ -945,25 +979,14 @@ -│ { -│ vis tEntity4,0 -│ vis bEntity4,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity4.txt,"~",34 -│ - // way to get force font adjustment -│ - strlen bEntity4.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity4.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity4.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity4.font=sys1 -│ - substr bEntity4.txt,bEntity4.txt,0,sys0-2 -│ - } -│ vis bEntity4,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",35 -│ covx tTmp.txt,sys0,0,0 -│ bEntity4.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity4.txt,"~",36 -│ @@ -977,25 +1000,14 @@ -│ { -│ vis tEntity5,0 -│ vis bEntity5,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity5.txt,"~",40 -│ - // way to get force font adjustment -│ - strlen bEntity5.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity5.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity5.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity5.font=sys1 -│ - substr bEntity5.txt,bEntity5.txt,0,sys0-2 -│ - } -│ vis bEntity5,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",41 -│ covx tTmp.txt,sys0,0,0 -│ bEntity5.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity5.txt,"~",42 -│ @@ -1009,25 +1021,14 @@ -│ { -│ vis tEntity6,0 -│ vis bEntity6,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity6.txt,"~",46 -│ - // way to get force font adjustment -│ - strlen bEntity6.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity6.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity6.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity6.font=sys1 -│ - substr bEntity6.txt,bEntity6.txt,0,sys0-2 -│ - } -│ vis bEntity6,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",47 -│ covx tTmp.txt,sys0,0,0 -│ bEntity6.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity6.txt,"~",48 -│ @@ -1041,25 +1042,14 @@ -│ { -│ vis tEntity7,0 -│ vis bEntity7,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity7.txt,"~",52 -│ - // way to get force font adjustment -│ - strlen bEntity7.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity7.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity7.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity7.font=sys1 -│ - substr bEntity7.txt,bEntity7.txt,0,sys0-2 -│ - } -│ vis bEntity7,1 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",53 -│ covx tTmp.txt,sys0,0,0 -│ bEntity7.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity7.txt,"~",54 -│ @@ -1073,34 +1063,44 @@ -│ { -│ vis tEntity8,0 -│ vis bEntity8,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity8.txt,"~",58 -│ - // way to get force font adjustment -│ - strlen bEntity8.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity8.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity8.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity8.font=sys1 -│ - substr bEntity8.txt,bEntity8.txt,0,sys0-2 -│ - } -│ vis bEntity8,1 -│ // change icon color +│ @@ -1093,14 +1160,46 @@ │ spstr strCommand.txt,tTmp.txt,"~",59 │ covx tTmp.txt,sys0,0,0 │ bEntity8.pco=sys0 @@ -1594,6 +1215,17 @@ │ + { │ + // change icon │ + spstr strCommand.txt,bEntity9.txt,"~",64 +│ + // way to get force font adjustment +│ + strlen bEntity9.txt,sys0 +│ + //check 2nd last char for ¬ +│ + substr bEntity9.txt,tTmp.txt,sys0-2,1 +│ + if(tTmp.txt=="¬") +│ + { +│ + substr bEntity9.txt,tTmp.txt,sys0-1,1 +│ + covx tTmp.txt,sys1,0,0 +│ + bEntity9.font=sys1 +│ + substr bEntity9.txt,bEntity9.txt,0,sys0-2 +│ + } │ + vis bEntity9,1 │ + // change icon color │ + spstr strCommand.txt,tTmp.txt,"~",65 @@ -1610,183 +1242,6 @@ │ //command format pageType,specialPageName │ //write name of speical page to tId │ spstr strCommand.txt,tId.txt,"~",1 -│ --- HMI/n2t-out/cardMedia.txt -├── +++ HMI/US/portrait/n2t-out/cardMedia.txt -│ @@ -993,25 +993,14 @@ -│ vis tEntity1,0 -│ vis bEntity1,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity1.txt,"~",25 -│ vis bEntity1,1 -│ - // way to get force font adjustment -│ - strlen bEntity1.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity1.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity1.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity1.font=sys1 -│ - substr bEntity1.txt,bEntity1.txt,0,sys0-2 -│ - } -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",26 -│ covx tTmp.txt,sys0,0,0 -│ bEntity1.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity1.txt,"~",27 -│ vis tEntity1,1 -│ @@ -1025,25 +1014,14 @@ -│ vis tEntity2,0 -│ vis bEntity2,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity2.txt,"~",31 -│ vis bEntity2,1 -│ - // way to get force font adjustment -│ - strlen bEntity2.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity2.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity2.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity2.font=sys1 -│ - substr bEntity2.txt,bEntity2.txt,0,sys0-2 -│ - } -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",32 -│ covx tTmp.txt,sys0,0,0 -│ bEntity2.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity2.txt,"~",33 -│ vis tEntity2,1 -│ @@ -1057,25 +1035,14 @@ -│ vis tEntity3,0 -│ vis bEntity3,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity3.txt,"~",37 -│ vis bEntity3,1 -│ - // way to get force font adjustment -│ - strlen bEntity3.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity3.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity3.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity3.font=sys1 -│ - substr bEntity3.txt,bEntity3.txt,0,sys0-2 -│ - } -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",38 -│ covx tTmp.txt,sys0,0,0 -│ bEntity3.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity3.txt,"~",39 -│ vis tEntity3,1 -│ @@ -1089,25 +1056,14 @@ -│ vis tEntity4,0 -│ vis bEntity4,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity4.txt,"~",43 -│ vis bEntity4,1 -│ - // way to get force font adjustment -│ - strlen bEntity4.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity4.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity4.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity4.font=sys1 -│ - substr bEntity4.txt,bEntity4.txt,0,sys0-2 -│ - } -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",44 -│ covx tTmp.txt,sys0,0,0 -│ bEntity4.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity4.txt,"~",45 -│ vis tEntity4,1 -│ @@ -1121,25 +1077,14 @@ -│ vis tEntity5,0 -│ vis bEntity5,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity5.txt,"~",49 -│ vis bEntity5,1 -│ - // way to get force font adjustment -│ - strlen bEntity5.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity5.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity5.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity5.font=sys1 -│ - substr bEntity5.txt,bEntity5.txt,0,sys0-2 -│ - } -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",50 -│ covx tTmp.txt,sys0,0,0 -│ bEntity5.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity5.txt,"~",51 -│ vis tEntity5,1 -│ @@ -1153,25 +1098,14 @@ -│ vis tEntity6,0 -│ vis bEntity6,0 -│ }else -│ { -│ // change icon -│ spstr strCommand.txt,bEntity6.txt,"~",55 -│ vis bEntity6,1 -│ - // way to get force font adjustment -│ - strlen bEntity6.txt,sys0 -│ - //check 2nd last char for ¬ -│ - substr bEntity6.txt,tTmp.txt,sys0-2,1 -│ - if(tTmp.txt=="¬") -│ - { -│ - substr bEntity6.txt,tTmp.txt,sys0-1,1 -│ - covx tTmp.txt,sys1,0,0 -│ - bEntity6.font=sys1 -│ - substr bEntity6.txt,bEntity6.txt,0,sys0-2 -│ - } -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",56 -│ covx tTmp.txt,sys0,0,0 -│ bEntity6.pco=sys0 -│ // set name -│ spstr strCommand.txt,tEntity6.txt,"~",57 -│ vis tEntity6,1 -│ @@ -1249,14 +1183,18 @@ -│ { -│ page cardPower -│ } -│ if(tId.txt=="cardChart") -│ { -│ page cardChart -│ } -│ + 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") │ --- HMI/n2t-out/cardPower.txt ├── +++ HMI/US/portrait/n2t-out/cardPower.txt │ @@ -45,16 +45,16 @@ diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 2c6596aa..049d9e16 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-08-24 14:39:45.102960368 +0000 ++++ /dev/fd/62 2023-08-24 14:50:12.470366313 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +1 +12,11 @@ @@ -600,183 +600,6 @@ + covx tTmp.txt,sys0,0,0 + hSlider6.maxval=sys0 + } -+I/n2t-out/cardGrid.txt -++ HMI/US/portrait/n2t-out/cardGrid.txt -+25 +715,14 @@ -+ { -+ vis tEntity1,0 -+ vis bEntity1,0 -+ }else -+ { -+ // change icon -+ spstr strCommand.txt,bEntity1.txt,"~",16 -+ // way to get force font adjustment -+ strlen bEntity1.txt,sys0 -+ //check 2nd last char for ¬ -+ substr bEntity1.txt,tTmp.txt,sys0-2,1 -+ if(tTmp.txt=="¬") -+ { -+ substr bEntity1.txt,tTmp.txt,sys0-1,1 -+ covx tTmp.txt,sys1,0,0 -+ bEntity1.font=sys1 -+ substr bEntity1.txt,bEntity1.txt,0,sys0-2 -+ } -+ vis bEntity1,1 -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",17 -+ covx tTmp.txt,sys0,0,0 -+ bEntity1.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity1.txt,"~",18 -+25 +736,14 @@ -+ { -+ vis tEntity2,0 -+ vis bEntity2,0 -+ }else -+ { -+ // change icon -+ spstr strCommand.txt,bEntity2.txt,"~",22 -+ // way to get force font adjustment -+ strlen bEntity2.txt,sys0 -+ //check 2nd last char for ¬ -+ substr bEntity2.txt,tTmp.txt,sys0-2,1 -+ if(tTmp.txt=="¬") -+ { -+ substr bEntity2.txt,tTmp.txt,sys0-1,1 -+ covx tTmp.txt,sys1,0,0 -+ bEntity2.font=sys1 -+ substr bEntity2.txt,bEntity2.txt,0,sys0-2 -+ } -+ vis bEntity2,1 -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",23 -+ covx tTmp.txt,sys0,0,0 -+ bEntity2.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity2.txt,"~",24 -+25 +757,14 @@ -+ { -+ vis tEntity3,0 -+ vis bEntity3,0 -+ }else -+ { -+ // change icon -+ spstr strCommand.txt,bEntity3.txt,"~",28 -+ // way to get force font adjustment -+ strlen bEntity3.txt,sys0 -+ //check 2nd last char for ¬ -+ substr bEntity3.txt,tTmp.txt,sys0-2,1 -+ if(tTmp.txt=="¬") -+ { -+ substr bEntity3.txt,tTmp.txt,sys0-1,1 -+ covx tTmp.txt,sys1,0,0 -+ bEntity3.font=sys1 -+ substr bEntity3.txt,bEntity3.txt,0,sys0-2 -+ } -+ vis bEntity3,1 -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",29 -+ covx tTmp.txt,sys0,0,0 -+ bEntity3.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity3.txt,"~",30 -+25 +778,14 @@ -+ { -+ vis tEntity4,0 -+ vis bEntity4,0 -+ }else -+ { -+ // change icon -+ spstr strCommand.txt,bEntity4.txt,"~",34 -+ // way to get force font adjustment -+ strlen bEntity4.txt,sys0 -+ //check 2nd last char for ¬ -+ substr bEntity4.txt,tTmp.txt,sys0-2,1 -+ if(tTmp.txt=="¬") -+ { -+ substr bEntity4.txt,tTmp.txt,sys0-1,1 -+ covx tTmp.txt,sys1,0,0 -+ bEntity4.font=sys1 -+ substr bEntity4.txt,bEntity4.txt,0,sys0-2 -+ } -+ vis bEntity4,1 -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",35 -+ covx tTmp.txt,sys0,0,0 -+ bEntity4.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity4.txt,"~",36 -+25 +799,14 @@ -+ { -+ vis tEntity5,0 -+ vis bEntity5,0 -+ }else -+ { -+ // change icon -+ spstr strCommand.txt,bEntity5.txt,"~",40 -+ // way to get force font adjustment -+ strlen bEntity5.txt,sys0 -+ //check 2nd last char for ¬ -+ substr bEntity5.txt,tTmp.txt,sys0-2,1 -+ if(tTmp.txt=="¬") -+ { -+ substr bEntity5.txt,tTmp.txt,sys0-1,1 -+ covx tTmp.txt,sys1,0,0 -+ bEntity5.font=sys1 -+ substr bEntity5.txt,bEntity5.txt,0,sys0-2 -+ } -+ vis bEntity5,1 -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",41 -+ covx tTmp.txt,sys0,0,0 -+ bEntity5.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity5.txt,"~",42 -+25 +820,14 @@ -+ { -+ vis tEntity6,0 -+ vis bEntity6,0 -+ }else -+ { -+ // change icon -+ spstr strCommand.txt,bEntity6.txt,"~",46 -+ // way to get force font adjustment -+ strlen bEntity6.txt,sys0 -+ //check 2nd last char for ¬ -+ substr bEntity6.txt,tTmp.txt,sys0-2,1 -+ if(tTmp.txt=="¬") -+ { -+ substr bEntity6.txt,tTmp.txt,sys0-1,1 -+ covx tTmp.txt,sys1,0,0 -+ bEntity6.font=sys1 -+ substr bEntity6.txt,bEntity6.txt,0,sys0-2 -+ } -+ vis bEntity6,1 -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",47 -+ covx tTmp.txt,sys0,0,0 -+ bEntity6.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity6.txt,"~",48 -+14 +906,18 @@ -+ { -+ page cardPower -+ } -+ if(tId.txt=="cardChart") -+ { -+ page cardChart -+ } -+ 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") +I/n2t-out/cardGrid2.txt ++ HMI/US/portrait/n2t-out/cardGrid2.txt +6 +25,28 @@ @@ -934,209 +757,7 @@ + Send Component ID: disabled + State : unpressed + Text :  -+25 +916,14 @@ -+ { -+ vis tEntity1,0 -+ vis bEntity1,0 -+ }else -+ { -+ // change icon -+ spstr strCommand.txt,bEntity1.txt,"~",16 -+ // way to get force font adjustment -+ strlen bEntity1.txt,sys0 -+ //check 2nd last char for ¬ -+ substr bEntity1.txt,tTmp.txt,sys0-2,1 -+ if(tTmp.txt=="¬") -+ { -+ substr bEntity1.txt,tTmp.txt,sys0-1,1 -+ covx tTmp.txt,sys1,0,0 -+ bEntity1.font=sys1 -+ substr bEntity1.txt,bEntity1.txt,0,sys0-2 -+ } -+ vis bEntity1,1 -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",17 -+ covx tTmp.txt,sys0,0,0 -+ bEntity1.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity1.txt,"~",18 -+25 +937,14 @@ -+ { -+ vis tEntity2,0 -+ vis bEntity2,0 -+ }else -+ { -+ // change icon -+ spstr strCommand.txt,bEntity2.txt,"~",22 -+ // way to get force font adjustment -+ strlen bEntity2.txt,sys0 -+ //check 2nd last char for ¬ -+ substr bEntity2.txt,tTmp.txt,sys0-2,1 -+ if(tTmp.txt=="¬") -+ { -+ substr bEntity2.txt,tTmp.txt,sys0-1,1 -+ covx tTmp.txt,sys1,0,0 -+ bEntity2.font=sys1 -+ substr bEntity2.txt,bEntity2.txt,0,sys0-2 -+ } -+ vis bEntity2,1 -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",23 -+ covx tTmp.txt,sys0,0,0 -+ bEntity2.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity2.txt,"~",24 -+25 +958,14 @@ -+ { -+ vis tEntity3,0 -+ vis bEntity3,0 -+ }else -+ { -+ // change icon -+ spstr strCommand.txt,bEntity3.txt,"~",28 -+ // way to get force font adjustment -+ strlen bEntity3.txt,sys0 -+ //check 2nd last char for ¬ -+ substr bEntity3.txt,tTmp.txt,sys0-2,1 -+ if(tTmp.txt=="¬") -+ { -+ substr bEntity3.txt,tTmp.txt,sys0-1,1 -+ covx tTmp.txt,sys1,0,0 -+ bEntity3.font=sys1 -+ substr bEntity3.txt,bEntity3.txt,0,sys0-2 -+ } -+ vis bEntity3,1 -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",29 -+ covx tTmp.txt,sys0,0,0 -+ bEntity3.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity3.txt,"~",30 -+25 +979,14 @@ -+ { -+ vis tEntity4,0 -+ vis bEntity4,0 -+ }else -+ { -+ // change icon -+ spstr strCommand.txt,bEntity4.txt,"~",34 -+ // way to get force font adjustment -+ strlen bEntity4.txt,sys0 -+ //check 2nd last char for ¬ -+ substr bEntity4.txt,tTmp.txt,sys0-2,1 -+ if(tTmp.txt=="¬") -+ { -+ substr bEntity4.txt,tTmp.txt,sys0-1,1 -+ covx tTmp.txt,sys1,0,0 -+ bEntity4.font=sys1 -+ substr bEntity4.txt,bEntity4.txt,0,sys0-2 -+ } -+ vis bEntity4,1 -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",35 -+ covx tTmp.txt,sys0,0,0 -+ bEntity4.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity4.txt,"~",36 -+25 +1000,14 @@ -+ { -+ vis tEntity5,0 -+ vis bEntity5,0 -+ }else -+ { -+ // change icon -+ spstr strCommand.txt,bEntity5.txt,"~",40 -+ // way to get force font adjustment -+ strlen bEntity5.txt,sys0 -+ //check 2nd last char for ¬ -+ substr bEntity5.txt,tTmp.txt,sys0-2,1 -+ if(tTmp.txt=="¬") -+ { -+ substr bEntity5.txt,tTmp.txt,sys0-1,1 -+ covx tTmp.txt,sys1,0,0 -+ bEntity5.font=sys1 -+ substr bEntity5.txt,bEntity5.txt,0,sys0-2 -+ } -+ vis bEntity5,1 -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",41 -+ covx tTmp.txt,sys0,0,0 -+ bEntity5.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity5.txt,"~",42 -+,25 +1021,14 @@ -+ { -+ vis tEntity6,0 -+ vis bEntity6,0 -+ }else -+ { -+ // change icon -+ spstr strCommand.txt,bEntity6.txt,"~",46 -+ // way to get force font adjustment -+ strlen bEntity6.txt,sys0 -+ //check 2nd last char for ¬ -+ substr bEntity6.txt,tTmp.txt,sys0-2,1 -+ if(tTmp.txt=="¬") -+ { -+ substr bEntity6.txt,tTmp.txt,sys0-1,1 -+ covx tTmp.txt,sys1,0,0 -+ bEntity6.font=sys1 -+ substr bEntity6.txt,bEntity6.txt,0,sys0-2 -+ } -+ vis bEntity6,1 -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",47 -+ covx tTmp.txt,sys0,0,0 -+ bEntity6.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity6.txt,"~",48 -+,25 +1042,14 @@ -+ { -+ vis tEntity7,0 -+ vis bEntity7,0 -+ }else -+ { -+ // change icon -+ spstr strCommand.txt,bEntity7.txt,"~",52 -+ // way to get force font adjustment -+ strlen bEntity7.txt,sys0 -+ //check 2nd last char for ¬ -+ substr bEntity7.txt,tTmp.txt,sys0-2,1 -+ if(tTmp.txt=="¬") -+ { -+ substr bEntity7.txt,tTmp.txt,sys0-1,1 -+ covx tTmp.txt,sys1,0,0 -+ bEntity7.font=sys1 -+ substr bEntity7.txt,bEntity7.txt,0,sys0-2 -+ } -+ vis bEntity7,1 -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",53 -+ covx tTmp.txt,sys0,0,0 -+ bEntity7.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity7.txt,"~",54 -+,34 +1063,44 @@ -+ { -+ vis tEntity8,0 -+ vis bEntity8,0 -+ }else -+ { -+ // change icon -+ spstr strCommand.txt,bEntity8.txt,"~",58 -+ // way to get force font adjustment -+ strlen bEntity8.txt,sys0 -+ //check 2nd last char for ¬ -+ substr bEntity8.txt,tTmp.txt,sys0-2,1 -+ if(tTmp.txt=="¬") -+ { -+ substr bEntity8.txt,tTmp.txt,sys0-1,1 -+ covx tTmp.txt,sys1,0,0 -+ bEntity8.font=sys1 -+ substr bEntity8.txt,bEntity8.txt,0,sys0-2 -+ } -+ vis bEntity8,1 -+ // change icon color ++,14 +1160,46 @@ + spstr strCommand.txt,tTmp.txt,"~",59 + covx tTmp.txt,sys0,0,0 + bEntity8.pco=sys0 @@ -1156,6 +777,17 @@ + { + // change icon + spstr strCommand.txt,bEntity9.txt,"~",64 ++ // way to get force font adjustment ++ strlen bEntity9.txt,sys0 ++ //check 2nd last char for ¬ ++ substr bEntity9.txt,tTmp.txt,sys0-2,1 ++ if(tTmp.txt=="¬") ++ { ++ substr bEntity9.txt,tTmp.txt,sys0-1,1 ++ covx tTmp.txt,sys1,0,0 ++ bEntity9.font=sys1 ++ substr bEntity9.txt,bEntity9.txt,0,sys0-2 ++ } + vis bEntity9,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",65 @@ -1172,183 +804,6 @@ + //command format pageType,specialPageName + //write name of speical page to tId + spstr strCommand.txt,tId.txt,"~",1 -+I/n2t-out/cardMedia.txt -++ HMI/US/portrait/n2t-out/cardMedia.txt -+25 +993,14 @@ -+ vis tEntity1,0 -+ vis bEntity1,0 -+ }else -+ { -+ // change icon -+ spstr strCommand.txt,bEntity1.txt,"~",25 -+ vis bEntity1,1 -+ // way to get force font adjustment -+ strlen bEntity1.txt,sys0 -+ //check 2nd last char for ¬ -+ substr bEntity1.txt,tTmp.txt,sys0-2,1 -+ if(tTmp.txt=="¬") -+ { -+ substr bEntity1.txt,tTmp.txt,sys0-1,1 -+ covx tTmp.txt,sys1,0,0 -+ bEntity1.font=sys1 -+ substr bEntity1.txt,bEntity1.txt,0,sys0-2 -+ } -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",26 -+ covx tTmp.txt,sys0,0,0 -+ bEntity1.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity1.txt,"~",27 -+ vis tEntity1,1 -+,25 +1014,14 @@ -+ vis tEntity2,0 -+ vis bEntity2,0 -+ }else -+ { -+ // change icon -+ spstr strCommand.txt,bEntity2.txt,"~",31 -+ vis bEntity2,1 -+ // way to get force font adjustment -+ strlen bEntity2.txt,sys0 -+ //check 2nd last char for ¬ -+ substr bEntity2.txt,tTmp.txt,sys0-2,1 -+ if(tTmp.txt=="¬") -+ { -+ substr bEntity2.txt,tTmp.txt,sys0-1,1 -+ covx tTmp.txt,sys1,0,0 -+ bEntity2.font=sys1 -+ substr bEntity2.txt,bEntity2.txt,0,sys0-2 -+ } -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",32 -+ covx tTmp.txt,sys0,0,0 -+ bEntity2.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity2.txt,"~",33 -+ vis tEntity2,1 -+,25 +1035,14 @@ -+ vis tEntity3,0 -+ vis bEntity3,0 -+ }else -+ { -+ // change icon -+ spstr strCommand.txt,bEntity3.txt,"~",37 -+ vis bEntity3,1 -+ // way to get force font adjustment -+ strlen bEntity3.txt,sys0 -+ //check 2nd last char for ¬ -+ substr bEntity3.txt,tTmp.txt,sys0-2,1 -+ if(tTmp.txt=="¬") -+ { -+ substr bEntity3.txt,tTmp.txt,sys0-1,1 -+ covx tTmp.txt,sys1,0,0 -+ bEntity3.font=sys1 -+ substr bEntity3.txt,bEntity3.txt,0,sys0-2 -+ } -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",38 -+ covx tTmp.txt,sys0,0,0 -+ bEntity3.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity3.txt,"~",39 -+ vis tEntity3,1 -+,25 +1056,14 @@ -+ vis tEntity4,0 -+ vis bEntity4,0 -+ }else -+ { -+ // change icon -+ spstr strCommand.txt,bEntity4.txt,"~",43 -+ vis bEntity4,1 -+ // way to get force font adjustment -+ strlen bEntity4.txt,sys0 -+ //check 2nd last char for ¬ -+ substr bEntity4.txt,tTmp.txt,sys0-2,1 -+ if(tTmp.txt=="¬") -+ { -+ substr bEntity4.txt,tTmp.txt,sys0-1,1 -+ covx tTmp.txt,sys1,0,0 -+ bEntity4.font=sys1 -+ substr bEntity4.txt,bEntity4.txt,0,sys0-2 -+ } -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",44 -+ covx tTmp.txt,sys0,0,0 -+ bEntity4.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity4.txt,"~",45 -+ vis tEntity4,1 -+,25 +1077,14 @@ -+ vis tEntity5,0 -+ vis bEntity5,0 -+ }else -+ { -+ // change icon -+ spstr strCommand.txt,bEntity5.txt,"~",49 -+ vis bEntity5,1 -+ // way to get force font adjustment -+ strlen bEntity5.txt,sys0 -+ //check 2nd last char for ¬ -+ substr bEntity5.txt,tTmp.txt,sys0-2,1 -+ if(tTmp.txt=="¬") -+ { -+ substr bEntity5.txt,tTmp.txt,sys0-1,1 -+ covx tTmp.txt,sys1,0,0 -+ bEntity5.font=sys1 -+ substr bEntity5.txt,bEntity5.txt,0,sys0-2 -+ } -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",50 -+ covx tTmp.txt,sys0,0,0 -+ bEntity5.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity5.txt,"~",51 -+ vis tEntity5,1 -+,25 +1098,14 @@ -+ vis tEntity6,0 -+ vis bEntity6,0 -+ }else -+ { -+ // change icon -+ spstr strCommand.txt,bEntity6.txt,"~",55 -+ vis bEntity6,1 -+ // way to get force font adjustment -+ strlen bEntity6.txt,sys0 -+ //check 2nd last char for ¬ -+ substr bEntity6.txt,tTmp.txt,sys0-2,1 -+ if(tTmp.txt=="¬") -+ { -+ substr bEntity6.txt,tTmp.txt,sys0-1,1 -+ covx tTmp.txt,sys1,0,0 -+ bEntity6.font=sys1 -+ substr bEntity6.txt,bEntity6.txt,0,sys0-2 -+ } -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",56 -+ covx tTmp.txt,sys0,0,0 -+ bEntity6.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity6.txt,"~",57 -+ vis tEntity6,1 -+,14 +1183,18 @@ -+ { -+ page cardPower -+ } -+ if(tId.txt=="cardChart") -+ { -+ page cardChart -+ } -+ 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") +I/n2t-out/cardPower.txt ++ HMI/US/portrait/n2t-out/cardPower.txt +6 +45,16 @@ diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt index f4e7cf38..5f4c7143 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt @@ -1167,6 +1167,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity1.txt,"~",16 + // way to get force font adjustment + strlen bEntity1.txt,sys0 + //check 2nd last char for ¬ + substr bEntity1.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity1.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity1.font=sys1 + substr bEntity1.txt,bEntity1.txt,0,sys0-2 + } vis bEntity1,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",17 @@ -1188,6 +1199,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity2.txt,"~",22 + // way to get force font adjustment + strlen bEntity2.txt,sys0 + //check 2nd last char for ¬ + substr bEntity2.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity2.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity2.font=sys1 + substr bEntity2.txt,bEntity2.txt,0,sys0-2 + } vis bEntity2,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",23 @@ -1209,6 +1231,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity3.txt,"~",28 + // way to get force font adjustment + strlen bEntity3.txt,sys0 + //check 2nd last char for ¬ + substr bEntity3.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity3.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity3.font=sys1 + substr bEntity3.txt,bEntity3.txt,0,sys0-2 + } vis bEntity3,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",29 @@ -1230,6 +1263,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity4.txt,"~",34 + // way to get force font adjustment + strlen bEntity4.txt,sys0 + //check 2nd last char for ¬ + substr bEntity4.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity4.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity4.font=sys1 + substr bEntity4.txt,bEntity4.txt,0,sys0-2 + } vis bEntity4,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",35 @@ -1251,6 +1295,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity5.txt,"~",40 + // way to get force font adjustment + strlen bEntity5.txt,sys0 + //check 2nd last char for ¬ + substr bEntity5.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity5.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity5.font=sys1 + substr bEntity5.txt,bEntity5.txt,0,sys0-2 + } vis bEntity5,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",41 @@ -1272,6 +1327,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity6.txt,"~",46 + // way to get force font adjustment + strlen bEntity6.txt,sys0 + //check 2nd last char for ¬ + substr bEntity6.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity6.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity6.font=sys1 + substr bEntity6.txt,bEntity6.txt,0,sys0-2 + } vis bEntity6,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",47 @@ -1358,10 +1424,6 @@ Timer tmSerial { page cardChart } - if(tId.txt=="cardLChart") - { - page cardLChart - } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid2.txt b/HMI/US/portrait/n2t-out-visual/cardGrid2.txt index b7a5b8cd..48f82f29 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid2.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid2.txt @@ -1500,6 +1500,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity1.txt,"~",16 + // way to get force font adjustment + strlen bEntity1.txt,sys0 + //check 2nd last char for ¬ + substr bEntity1.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity1.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity1.font=sys1 + substr bEntity1.txt,bEntity1.txt,0,sys0-2 + } vis bEntity1,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",17 @@ -1521,6 +1532,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity2.txt,"~",22 + // way to get force font adjustment + strlen bEntity2.txt,sys0 + //check 2nd last char for ¬ + substr bEntity2.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity2.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity2.font=sys1 + substr bEntity2.txt,bEntity2.txt,0,sys0-2 + } vis bEntity2,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",23 @@ -1542,6 +1564,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity3.txt,"~",28 + // way to get force font adjustment + strlen bEntity3.txt,sys0 + //check 2nd last char for ¬ + substr bEntity3.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity3.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity3.font=sys1 + substr bEntity3.txt,bEntity3.txt,0,sys0-2 + } vis bEntity3,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",29 @@ -1563,6 +1596,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity4.txt,"~",34 + // way to get force font adjustment + strlen bEntity4.txt,sys0 + //check 2nd last char for ¬ + substr bEntity4.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity4.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity4.font=sys1 + substr bEntity4.txt,bEntity4.txt,0,sys0-2 + } vis bEntity4,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",35 @@ -1584,6 +1628,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity5.txt,"~",40 + // way to get force font adjustment + strlen bEntity5.txt,sys0 + //check 2nd last char for ¬ + substr bEntity5.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity5.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity5.font=sys1 + substr bEntity5.txt,bEntity5.txt,0,sys0-2 + } vis bEntity5,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",41 @@ -1605,6 +1660,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity6.txt,"~",46 + // way to get force font adjustment + strlen bEntity6.txt,sys0 + //check 2nd last char for ¬ + substr bEntity6.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity6.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity6.font=sys1 + substr bEntity6.txt,bEntity6.txt,0,sys0-2 + } vis bEntity6,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",47 @@ -1626,6 +1692,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity7.txt,"~",52 + // way to get force font adjustment + strlen bEntity7.txt,sys0 + //check 2nd last char for ¬ + substr bEntity7.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity7.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity7.font=sys1 + substr bEntity7.txt,bEntity7.txt,0,sys0-2 + } vis bEntity7,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",53 @@ -1647,6 +1724,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity8.txt,"~",58 + // way to get force font adjustment + strlen bEntity8.txt,sys0 + //check 2nd last char for ¬ + substr bEntity8.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity8.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity8.font=sys1 + substr bEntity8.txt,bEntity8.txt,0,sys0-2 + } vis bEntity8,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",59 @@ -1668,6 +1756,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity9.txt,"~",64 + // way to get force font adjustment + strlen bEntity9.txt,sys0 + //check 2nd last char for ¬ + substr bEntity9.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity9.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity9.font=sys1 + substr bEntity9.txt,bEntity9.txt,0,sys0-2 + } vis bEntity9,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",65 diff --git a/HMI/US/portrait/n2t-out-visual/cardMedia.txt b/HMI/US/portrait/n2t-out-visual/cardMedia.txt index d5ace02e..521e2246 100644 --- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt +++ b/HMI/US/portrait/n2t-out-visual/cardMedia.txt @@ -1485,6 +1485,17 @@ Timer tmSerial // change icon spstr strCommand.txt,bEntity1.txt,"~",25 vis bEntity1,1 + // way to get force font adjustment + strlen bEntity1.txt,sys0 + //check 2nd last char for ¬ + substr bEntity1.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity1.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity1.font=sys1 + substr bEntity1.txt,bEntity1.txt,0,sys0-2 + } // change icon color spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,sys0,0,0 @@ -1506,6 +1517,17 @@ Timer tmSerial // change icon spstr strCommand.txt,bEntity2.txt,"~",31 vis bEntity2,1 + // way to get force font adjustment + strlen bEntity2.txt,sys0 + //check 2nd last char for ¬ + substr bEntity2.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity2.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity2.font=sys1 + substr bEntity2.txt,bEntity2.txt,0,sys0-2 + } // change icon color spstr strCommand.txt,tTmp.txt,"~",32 covx tTmp.txt,sys0,0,0 @@ -1527,6 +1549,17 @@ Timer tmSerial // change icon spstr strCommand.txt,bEntity3.txt,"~",37 vis bEntity3,1 + // way to get force font adjustment + strlen bEntity3.txt,sys0 + //check 2nd last char for ¬ + substr bEntity3.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity3.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity3.font=sys1 + substr bEntity3.txt,bEntity3.txt,0,sys0-2 + } // change icon color spstr strCommand.txt,tTmp.txt,"~",38 covx tTmp.txt,sys0,0,0 @@ -1548,6 +1581,17 @@ Timer tmSerial // change icon spstr strCommand.txt,bEntity4.txt,"~",43 vis bEntity4,1 + // way to get force font adjustment + strlen bEntity4.txt,sys0 + //check 2nd last char for ¬ + substr bEntity4.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity4.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity4.font=sys1 + substr bEntity4.txt,bEntity4.txt,0,sys0-2 + } // change icon color spstr strCommand.txt,tTmp.txt,"~",44 covx tTmp.txt,sys0,0,0 @@ -1569,6 +1613,17 @@ Timer tmSerial // change icon spstr strCommand.txt,bEntity5.txt,"~",49 vis bEntity5,1 + // way to get force font adjustment + strlen bEntity5.txt,sys0 + //check 2nd last char for ¬ + substr bEntity5.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity5.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity5.font=sys1 + substr bEntity5.txt,bEntity5.txt,0,sys0-2 + } // change icon color spstr strCommand.txt,tTmp.txt,"~",50 covx tTmp.txt,sys0,0,0 @@ -1590,6 +1645,17 @@ Timer tmSerial // change icon spstr strCommand.txt,bEntity6.txt,"~",55 vis bEntity6,1 + // way to get force font adjustment + strlen bEntity6.txt,sys0 + //check 2nd last char for ¬ + substr bEntity6.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity6.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity6.font=sys1 + substr bEntity6.txt,bEntity6.txt,0,sys0-2 + } // change icon color spstr strCommand.txt,tTmp.txt,"~",56 covx tTmp.txt,sys0,0,0 @@ -1675,10 +1741,6 @@ Timer tmSerial { page cardChart } - if(tId.txt=="cardLChart") - { - page cardLChart - } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index ca23c1f2..35587c25 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -14,10 +14,6 @@ popupNotify 19 Component(s) 267 Line(s) of event code 172 Unique line(s) of event code -cardGrid - 44 Component(s) - 529 Line(s) of event code - 298 Unique line(s) of event code popupTimer 42 Component(s) 516 Line(s) of event code @@ -38,10 +34,10 @@ cardChart 33 Component(s) 437 Line(s) of event code 296 Unique line(s) of event code -cardMedia - 59 Component(s) - 649 Line(s) of event code - 322 Unique line(s) of event code +cardGrid + 44 Component(s) + 579 Line(s) of event code + 330 Unique line(s) of event code cardLChart 33 Component(s) 402 Line(s) of event code @@ -66,14 +62,14 @@ popupInSel 34 Component(s) 621 Line(s) of event code 297 Unique line(s) of event code -cardGrid2 - 56 Component(s) - 663 Line(s) of event code - 359 Unique line(s) of event code cardAlarm 43 Component(s) 500 Line(s) of event code 273 Unique line(s) of event code +cardMedia + 59 Component(s) + 699 Line(s) of event code + 354 Unique line(s) of event code cardThermo 57 Component(s) 540 Line(s) of event code @@ -94,9 +90,13 @@ cardEntities 91 Component(s) 1666 Line(s) of event code 711 Unique line(s) of event code +cardGrid2 + 56 Component(s) + 744 Line(s) of event code + 408 Unique line(s) of event code Total 23 Page(s) 890 Component(s) - 10836 Line(s) of event code - 2553 Unique line(s) of event code + 11017 Line(s) of event code + 2600 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index 6d8abda1..e546b270 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/n2t-out/cardGrid.txt @@ -719,6 +719,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity1.txt,"~",16 + // way to get force font adjustment + strlen bEntity1.txt,sys0 + //check 2nd last char for ¬ + substr bEntity1.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity1.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity1.font=sys1 + substr bEntity1.txt,bEntity1.txt,0,sys0-2 + } vis bEntity1,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",17 @@ -740,6 +751,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity2.txt,"~",22 + // way to get force font adjustment + strlen bEntity2.txt,sys0 + //check 2nd last char for ¬ + substr bEntity2.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity2.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity2.font=sys1 + substr bEntity2.txt,bEntity2.txt,0,sys0-2 + } vis bEntity2,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",23 @@ -761,6 +783,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity3.txt,"~",28 + // way to get force font adjustment + strlen bEntity3.txt,sys0 + //check 2nd last char for ¬ + substr bEntity3.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity3.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity3.font=sys1 + substr bEntity3.txt,bEntity3.txt,0,sys0-2 + } vis bEntity3,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",29 @@ -782,6 +815,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity4.txt,"~",34 + // way to get force font adjustment + strlen bEntity4.txt,sys0 + //check 2nd last char for ¬ + substr bEntity4.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity4.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity4.font=sys1 + substr bEntity4.txt,bEntity4.txt,0,sys0-2 + } vis bEntity4,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",35 @@ -803,6 +847,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity5.txt,"~",40 + // way to get force font adjustment + strlen bEntity5.txt,sys0 + //check 2nd last char for ¬ + substr bEntity5.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity5.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity5.font=sys1 + substr bEntity5.txt,bEntity5.txt,0,sys0-2 + } vis bEntity5,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",41 @@ -824,6 +879,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity6.txt,"~",46 + // way to get force font adjustment + strlen bEntity6.txt,sys0 + //check 2nd last char for ¬ + substr bEntity6.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity6.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity6.font=sys1 + substr bEntity6.txt,bEntity6.txt,0,sys0-2 + } vis bEntity6,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",47 @@ -910,10 +976,6 @@ Timer tmSerial { page cardChart } - if(tId.txt=="cardLChart") - { - page cardLChart - } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out/cardGrid2.txt b/HMI/US/portrait/n2t-out/cardGrid2.txt index e6d4dfab..797c8224 100644 --- a/HMI/US/portrait/n2t-out/cardGrid2.txt +++ b/HMI/US/portrait/n2t-out/cardGrid2.txt @@ -920,6 +920,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity1.txt,"~",16 + // way to get force font adjustment + strlen bEntity1.txt,sys0 + //check 2nd last char for ¬ + substr bEntity1.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity1.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity1.font=sys1 + substr bEntity1.txt,bEntity1.txt,0,sys0-2 + } vis bEntity1,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",17 @@ -941,6 +952,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity2.txt,"~",22 + // way to get force font adjustment + strlen bEntity2.txt,sys0 + //check 2nd last char for ¬ + substr bEntity2.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity2.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity2.font=sys1 + substr bEntity2.txt,bEntity2.txt,0,sys0-2 + } vis bEntity2,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",23 @@ -962,6 +984,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity3.txt,"~",28 + // way to get force font adjustment + strlen bEntity3.txt,sys0 + //check 2nd last char for ¬ + substr bEntity3.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity3.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity3.font=sys1 + substr bEntity3.txt,bEntity3.txt,0,sys0-2 + } vis bEntity3,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",29 @@ -983,6 +1016,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity4.txt,"~",34 + // way to get force font adjustment + strlen bEntity4.txt,sys0 + //check 2nd last char for ¬ + substr bEntity4.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity4.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity4.font=sys1 + substr bEntity4.txt,bEntity4.txt,0,sys0-2 + } vis bEntity4,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",35 @@ -1004,6 +1048,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity5.txt,"~",40 + // way to get force font adjustment + strlen bEntity5.txt,sys0 + //check 2nd last char for ¬ + substr bEntity5.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity5.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity5.font=sys1 + substr bEntity5.txt,bEntity5.txt,0,sys0-2 + } vis bEntity5,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",41 @@ -1025,6 +1080,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity6.txt,"~",46 + // way to get force font adjustment + strlen bEntity6.txt,sys0 + //check 2nd last char for ¬ + substr bEntity6.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity6.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity6.font=sys1 + substr bEntity6.txt,bEntity6.txt,0,sys0-2 + } vis bEntity6,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",47 @@ -1046,6 +1112,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity7.txt,"~",52 + // way to get force font adjustment + strlen bEntity7.txt,sys0 + //check 2nd last char for ¬ + substr bEntity7.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity7.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity7.font=sys1 + substr bEntity7.txt,bEntity7.txt,0,sys0-2 + } vis bEntity7,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",53 @@ -1067,6 +1144,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity8.txt,"~",58 + // way to get force font adjustment + strlen bEntity8.txt,sys0 + //check 2nd last char for ¬ + substr bEntity8.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity8.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity8.font=sys1 + substr bEntity8.txt,bEntity8.txt,0,sys0-2 + } vis bEntity8,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",59 @@ -1088,6 +1176,17 @@ Timer tmSerial { // change icon spstr strCommand.txt,bEntity9.txt,"~",64 + // way to get force font adjustment + strlen bEntity9.txt,sys0 + //check 2nd last char for ¬ + substr bEntity9.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity9.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity9.font=sys1 + substr bEntity9.txt,bEntity9.txt,0,sys0-2 + } vis bEntity9,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",65 diff --git a/HMI/US/portrait/n2t-out/cardMedia.txt b/HMI/US/portrait/n2t-out/cardMedia.txt index 951f1cc6..bc04351b 100644 --- a/HMI/US/portrait/n2t-out/cardMedia.txt +++ b/HMI/US/portrait/n2t-out/cardMedia.txt @@ -997,6 +997,17 @@ Timer tmSerial // change icon spstr strCommand.txt,bEntity1.txt,"~",25 vis bEntity1,1 + // way to get force font adjustment + strlen bEntity1.txt,sys0 + //check 2nd last char for ¬ + substr bEntity1.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity1.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity1.font=sys1 + substr bEntity1.txt,bEntity1.txt,0,sys0-2 + } // change icon color spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,sys0,0,0 @@ -1018,6 +1029,17 @@ Timer tmSerial // change icon spstr strCommand.txt,bEntity2.txt,"~",31 vis bEntity2,1 + // way to get force font adjustment + strlen bEntity2.txt,sys0 + //check 2nd last char for ¬ + substr bEntity2.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity2.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity2.font=sys1 + substr bEntity2.txt,bEntity2.txt,0,sys0-2 + } // change icon color spstr strCommand.txt,tTmp.txt,"~",32 covx tTmp.txt,sys0,0,0 @@ -1039,6 +1061,17 @@ Timer tmSerial // change icon spstr strCommand.txt,bEntity3.txt,"~",37 vis bEntity3,1 + // way to get force font adjustment + strlen bEntity3.txt,sys0 + //check 2nd last char for ¬ + substr bEntity3.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity3.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity3.font=sys1 + substr bEntity3.txt,bEntity3.txt,0,sys0-2 + } // change icon color spstr strCommand.txt,tTmp.txt,"~",38 covx tTmp.txt,sys0,0,0 @@ -1060,6 +1093,17 @@ Timer tmSerial // change icon spstr strCommand.txt,bEntity4.txt,"~",43 vis bEntity4,1 + // way to get force font adjustment + strlen bEntity4.txt,sys0 + //check 2nd last char for ¬ + substr bEntity4.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity4.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity4.font=sys1 + substr bEntity4.txt,bEntity4.txt,0,sys0-2 + } // change icon color spstr strCommand.txt,tTmp.txt,"~",44 covx tTmp.txt,sys0,0,0 @@ -1081,6 +1125,17 @@ Timer tmSerial // change icon spstr strCommand.txt,bEntity5.txt,"~",49 vis bEntity5,1 + // way to get force font adjustment + strlen bEntity5.txt,sys0 + //check 2nd last char for ¬ + substr bEntity5.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity5.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity5.font=sys1 + substr bEntity5.txt,bEntity5.txt,0,sys0-2 + } // change icon color spstr strCommand.txt,tTmp.txt,"~",50 covx tTmp.txt,sys0,0,0 @@ -1102,6 +1157,17 @@ Timer tmSerial // change icon spstr strCommand.txt,bEntity6.txt,"~",55 vis bEntity6,1 + // way to get force font adjustment + strlen bEntity6.txt,sys0 + //check 2nd last char for ¬ + substr bEntity6.txt,tTmp.txt,sys0-2,1 + if(tTmp.txt=="¬") + { + substr bEntity6.txt,tTmp.txt,sys0-1,1 + covx tTmp.txt,sys1,0,0 + bEntity6.font=sys1 + substr bEntity6.txt,bEntity6.txt,0,sys0-2 + } // change icon color spstr strCommand.txt,tTmp.txt,"~",56 covx tTmp.txt,sys0,0,0 @@ -1187,10 +1253,6 @@ Timer tmSerial { page cardChart } - if(tId.txt=="cardLChart") - { - page cardLChart - } } if(tInstruction.txt=="time") {