diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt --- HMI/n2t-out/Program.s.txt 2022-07-03 21:07:05.128220620 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-03 21:07:06.032233062 +0000 @@ -11,9 +11,4 @@ // dim value int dimValue=40 int dimValueNormal=100 - //color vars - int defaultFontColor=65535 - int defaultBcoColor=6371 - // fix touch offset - lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt --- HMI/n2t-out/cardAlarm.txt 2022-07-03 21:07:05.128220620 +0000 +++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-03 21:07:06.032233062 +0000 @@ -12,21 +12,6 @@ Events Preinitialize Event - for(sys0=0;sys0<40;sys0++) - { - b[sys0].bco=defaultBcoColor - b[sys0].pco=defaultFontColor - } - if(defaultBcoColor==0) - { - tCode.bco=6371 - tCode.pco=40179 - } - if(defaultBcoColor==6371) - { - tCode.bco=10565 - tCode.pco=40179 - } dim=dimValueNormal vis p0,0 vis tSend,0 @@ -138,7 +123,7 @@ Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : xxxxxxx + Text : Max. Text Size : 10 Text tIcon @@ -755,18 +740,6 @@ spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal - // get background color - spstr strCommand.txt,tTmp.txt,"~",3 - if(tTmp.txt!="") - { - covx tTmp.txt,defaultBcoColor,0,0 - } - // get font color - spstr strCommand.txt,tTmp.txt,"~",4 - if(tTmp.txt!="") - { - covx tTmp.txt,defaultFontColor,0,0 - } } if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt --- HMI/n2t-out/cardEntities.txt 2022-07-03 21:07:05.128220620 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-03 21:07:06.032233062 +0000 @@ -12,22 +12,6 @@ Events Preinitialize Event - for(sys0=0;sys0<40;sys0++) - { - b[sys0].bco=defaultBcoColor - b[sys0].pco=defaultFontColor - if(b[sys0].type==53&&defaultBcoColor==0) - { - b[sys0].pic=10 - b[sys0].pic2=11 - } - if(b[sys0].type==1&&defaultBcoColor==0) - { - b[sys0].pic=14 - b[sys0].pic1=13 - b[sys0].pic2=15 - } - } dim=dimValueNormal //wup=cardEntities //remove background & activate reparse mode @@ -1024,10 +1008,6 @@ //popupLight.tEntity.txt=tEntity3.txt page popupLight } - if(type3.txt=="fan") - { - page popupFan - } Hotspot m1 Attributes @@ -1050,10 +1030,6 @@ //popupLight.tEntity.txt=tEntity2.txt page popupLight } - if(type2.txt=="fan") - { - page popupFan - } Hotspot m0 Attributes @@ -1076,10 +1052,6 @@ //popupLight.tEntity.txt=tEntity1.txt page popupLight } - if(type1.txt=="fan") - { - page popupFan - } Hotspot m3 Attributes @@ -1102,10 +1074,6 @@ //popupLight.tEntity.txt=tEntity4.txt page popupLight } - if(type4.txt=="fan") - { - page popupFan - } Hotspot mSwipeNext Attributes @@ -1961,18 +1929,6 @@ spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal - // get background color - spstr strCommand.txt,tTmp.txt,"~",3 - if(tTmp.txt!="") - { - covx tTmp.txt,defaultBcoColor,0,0 - } - // get font color - spstr strCommand.txt,tTmp.txt,"~",4 - if(tTmp.txt!="") - { - covx tTmp.txt,defaultFontColor,0,0 - } } if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt --- HMI/n2t-out/cardGrid.txt 2022-07-03 21:07:05.128220620 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-03 21:07:06.032233062 +0000 @@ -12,11 +12,6 @@ Events Preinitialize Event - for(sys0=0;sys0<40;sys0++) - { - b[sys0].bco=defaultBcoColor - b[sys0].pco=defaultFontColor - } dim=dimValueNormal //remove background & activate reparse mode vis p0,0 @@ -855,18 +850,6 @@ spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal - // get background color - spstr strCommand.txt,tTmp.txt,"~",3 - if(tTmp.txt!="") - { - covx tTmp.txt,defaultBcoColor,0,0 - } - // get font color - spstr strCommand.txt,tTmp.txt,"~",4 - if(tTmp.txt!="") - { - covx tTmp.txt,defaultFontColor,0,0 - } } if(tInstruction.txt=="timeout") { @@ -928,10 +911,6 @@ { page popupLight } - if(tTmp.txt=="fan") - { - page popupFan - } TouchCap tc0 Attributes diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt --- HMI/n2t-out/cardMedia.txt 2022-07-03 21:07:05.128220620 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-03 21:07:06.032233062 +0000 @@ -12,17 +12,6 @@ Events Preinitialize Event - for(sys0=0;sys0<40;sys0++) - { - b[sys0].bco=defaultBcoColor - b[sys0].pco=defaultFontColor - } - if(defaultBcoColor==0) - { - hVolume.pic=14 - hVolume.pic1=13 - hVolume.pic2=15 - } dim=dimValueNormal vis p0,0 vis tSend,0 @@ -677,18 +666,6 @@ spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal - // get background color - spstr strCommand.txt,tTmp.txt,"~",3 - if(tTmp.txt!="") - { - covx tTmp.txt,defaultBcoColor,0,0 - } - // get font color - spstr strCommand.txt,tTmp.txt,"~",4 - if(tTmp.txt!="") - { - covx tTmp.txt,defaultFontColor,0,0 - } } if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt --- HMI/n2t-out/cardQR.txt 2022-07-03 21:07:05.128220620 +0000 +++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-03 21:07:06.032233062 +0000 @@ -12,21 +12,6 @@ Events Preinitialize Event - for(sys0=0;sys0<40;sys0++) - { - b[sys0].bco=defaultBcoColor - b[sys0].pco=defaultFontColor - if(b[sys0].type==53&&defaultBcoColor==6371) - { - b[sys0].pic=1 - b[sys0].pic2=2 - } - if(b[sys0].type==53&&defaultBcoColor==0) - { - b[sys0].pic=10 - b[sys0].pic2=11 - } - } dim=dimValueNormal vis p0,0 vis tSend,0 @@ -624,18 +609,6 @@ spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal - // get background color - spstr strCommand.txt,tTmp.txt,"~",3 - if(tTmp.txt!="") - { - covx tTmp.txt,defaultBcoColor,0,0 - } - // get font color - spstr strCommand.txt,tTmp.txt,"~",4 - if(tTmp.txt!="") - { - covx tTmp.txt,defaultFontColor,0,0 - } } if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt --- HMI/n2t-out/cardThermo.txt 2022-07-03 21:07:05.128220620 +0000 +++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-03 21:07:06.032233062 +0000 @@ -12,11 +12,6 @@ Events Preinitialize Event - for(sys0=0;sys0<60;sys0++) - { - b[sys0].bco=defaultBcoColor - b[sys0].pco=defaultFontColor - } dim=dimValueNormal vis p0,0 vis tSend,0 @@ -1161,18 +1156,6 @@ spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal - // get background color - spstr strCommand.txt,tTmp.txt,"~",3 - if(tTmp.txt!="") - { - covx tTmp.txt,defaultBcoColor,0,0 - } - // get font color - spstr strCommand.txt,tTmp.txt,"~",4 - if(tTmp.txt!="") - { - covx tTmp.txt,defaultFontColor,0,0 - } } if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt --- HMI/n2t-out/pageStartup.txt 2022-07-03 21:07:05.128220620 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-03 21:07:06.032233062 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 // startup event - tSend.txt="event,startup,"+tVersion.txt+",eu" + tSend.txt="event,startup,"+tVersion.txt+",us-l" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -277,18 +277,6 @@ spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal - // get background color - spstr strCommand.txt,tTmp.txt,"~",3 - if(tTmp.txt!="") - { - covx tTmp.txt,defaultBcoColor,0,0 - } - // get font color - spstr strCommand.txt,tTmp.txt,"~",4 - if(tTmp.txt!="") - { - covx tTmp.txt,defaultFontColor,0,0 - } } if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt --- HMI/n2t-out/pageTest.txt 2022-07-03 21:07:05.128220620 +0000 +++ HMI/US/landscape/n2t-out/pageTest.txt 2022-07-03 21:07:06.032233062 +0000 @@ -13,46 +13,6 @@ Events Preinitialize Event vis p0,0 - n0.val=defaultBcoColor - n1.val=defaultFontColor - -Number n0 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Value : 0 - -Number n1 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Value : 0 - -Text t0 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : bco - Max. Text Size : 10 - -Text t1 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : font - Max. Text Size : 10 Picture p0 Attributes Only in HMI/n2t-out: popupFan.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt --- HMI/n2t-out/popupLight.txt 2022-07-03 21:07:05.128220620 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-03 21:07:06.032233062 +0000 @@ -12,25 +12,6 @@ Events Preinitialize Event - for(sys0=0;sys0<40;sys0++) - { - b[sys0].bco=defaultBcoColor - b[sys0].pco=defaultFontColor - if(b[sys0].type==53&&defaultBcoColor==0) - { - b[sys0].pic=10 - b[sys0].pic2=11 - } - } - if(defaultBcoColor==0) - { - hBrightness.pic=14 - hBrightness.pic1=13 - hBrightness.pic2=15 - hTempSlider.pic=16 - hTempSlider.pic1=17 - hTempSlider.pic2=15 - } dim=dimValueNormal //get entitiy name tEntity.txt=pageIcons.tTmp1.txt @@ -585,18 +566,6 @@ spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal - // get background color - spstr strCommand.txt,tTmp.txt,"~",3 - if(tTmp.txt!="") - { - covx tTmp.txt,defaultBcoColor,0,0 - } - // get font color - spstr strCommand.txt,tTmp.txt,"~",4 - if(tTmp.txt!="") - { - covx tTmp.txt,defaultFontColor,0,0 - } } if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt --- HMI/n2t-out/popupNotify.txt 2022-07-03 21:07:05.128220620 +0000 +++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-03 21:07:06.032233062 +0000 @@ -18,17 +18,6 @@ vis tTmp,0 vis tInstruction,0 vis tId,0 - popupNotify.bco=defaultBcoColor - tHeading.bco=defaultBcoColor - b0.bco=defaultBcoColor - tText.bco=defaultBcoColor - b1.bco=defaultBcoColor - b2.bco=defaultBcoColor - tHeading.pco=defaultFontColor - b0.pco=defaultFontColor - tText.pco=defaultFontColor - b1.pco=defaultFontColor - b2.pco=defaultFontColor Variable (string) strCommand Attributes @@ -326,18 +315,6 @@ spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal - // get background color - spstr strCommand.txt,tTmp.txt,"~",3 - if(tTmp.txt!="") - { - covx tTmp.txt,defaultBcoColor,0,0 - } - // get font color - spstr strCommand.txt,tTmp.txt,"~",4 - if(tTmp.txt!="") - { - covx tTmp.txt,defaultFontColor,0,0 - } } if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt --- HMI/n2t-out/popupShutter.txt 2022-07-03 21:07:05.128220620 +0000 +++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-03 21:07:06.032233062 +0000 @@ -12,40 +12,6 @@ Events Preinitialize Event - popupShutter.bco=defaultBcoColor - b0.bco=defaultBcoColor - tIcon1.bco=defaultBcoColor - tEntity.bco=defaultBcoColor - tInfo1.bco=defaultBcoColor - tPosHeading.bco=defaultBcoColor - tTiltHeading.bco=defaultBcoColor - bUp1.bco=defaultBcoColor - bStop1.bco=defaultBcoColor - bDown1.bco=defaultBcoColor - bTLeft.bco=defaultBcoColor - bTStop.bco=defaultBcoColor - bTRight.bco=defaultBcoColor - b0.pco=defaultFontColor - tIcon1.pco=defaultFontColor - tEntity.pco=defaultFontColor - tInfo1.pco=defaultFontColor - tPosHeading.pco=defaultFontColor - tTiltHeading.pco=defaultFontColor - bUp1.pco=defaultFontColor - bStop1.pco=defaultFontColor - bDown1.pco=defaultFontColor - bTLeft.pco=defaultFontColor - bTStop.pco=defaultFontColor - bTRight.pco=defaultFontColor - if(defaultBcoColor==0) - { - hTilt.pic=14 - hTilt.pic1=13 - hTilt.pic2=15 - hPosition.pic=14 - hPosition.pic1=13 - hPosition.pic2=15 - } dim=dimValueNormal //get entitiy name tEntity.txt=pageIcons.tTmp1.txt @@ -215,7 +181,7 @@ Touch Release Event // event,buttonPress2,internalNameEntity,positionSlider,50 //craft command - tSend.txt="event,buttonPress2,"+entn.txt+",tiltSlider," + tSend.txt="event,buttonPress2,"+entn.txt+",positionSlider," covx hPosition.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt //send calc crc @@ -342,7 +308,7 @@ Events Touch Press Event - tSend.txt="event,buttonPress2,"+entn.txt+",tiltOpen" + tSend.txt="event,buttonPress2,"+entn.txt+",up" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -367,7 +333,7 @@ Events Touch Press Event - tSend.txt="event,buttonPress2,"+entn.txt+",tiltStop" + tSend.txt="event,buttonPress2,"+entn.txt+",stop" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -392,7 +358,7 @@ Events Touch Press Event - tSend.txt="event,buttonPress2,"+entn.txt+",tiltClose" + tSend.txt="event,buttonPress2,"+entn.txt+",down" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -549,13 +515,11 @@ tsw bTLeft,0 spstr strCommand.txt,bTLeft.txt,"~",13 bTLeft.pco=27501 - vis bTLeft,1 }else if(tTmp.txt=="enable") { spstr strCommand.txt,bTLeft.txt,"~",13 tsw bTLeft,1 bTLeft.pco=65535 - vis bTLeft,1 } // set icon bStop spstr strCommand.txt,tTmp.txt,"~",17 @@ -564,36 +528,24 @@ tsw bTStop,0 spstr strCommand.txt,bTStop.txt,"~",14 bTStop.pco=27501 - vis bTStop,1 }else if(tTmp.txt=="enable") { spstr strCommand.txt,bTStop.txt,"~",14 tsw bTStop,1 bTStop.pco=65535 - vis bTStop,1 } // set icon bDown - spstr strCommand.txt,tTmp.txt,"~",18 + spstr strCommand.txt,tTmp.txt,"~",10 if(tTmp.txt=="disable") { spstr strCommand.txt,bTRight.txt,"~",15 tsw bTRight,0 bTRight.pco=27501 - vis bTRight,1 }else if(tTmp.txt=="enable") { spstr strCommand.txt,bTRight.txt,"~",15 tsw bTRight,1 bTRight.pco=65535 - vis bTRight,1 - } - // set tilt slider - spstr strCommand.txt,tTmp.txt,"~",19 - if(tTmp.txt!="disable") - { - vis hTilt,1 - covx tTmp.txt,sys0,0,0 - hTilt.val=sys0 } } if(tInstruction.txt=="dimmode") @@ -605,18 +557,6 @@ spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal - // get background color - spstr strCommand.txt,tTmp.txt,"~",3 - if(tTmp.txt!="") - { - covx tTmp.txt,defaultBcoColor,0,0 - } - // get font color - spstr strCommand.txt,tTmp.txt,"~",4 - if(tTmp.txt!="") - { - covx tTmp.txt,defaultFontColor,0,0 - } } if(tInstruction.txt=="time") { diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt --- HMI/n2t-out/screensaver.txt 2022-07-03 21:07:05.128220620 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-03 21:07:06.032233062 +0000 @@ -406,22 +406,10 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 + dim=dimValue // get value normal spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 - dim=dimValueNormal - // get background color - spstr strCommand.txt,tTmp.txt,"~",3 - if(tTmp.txt!="") - { - covx tTmp.txt,defaultBcoColor,0,0 - } - // get font color - spstr strCommand.txt,tTmp.txt,"~",4 - if(tTmp.txt!="") - { - covx tTmp.txt,defaultFontColor,0,0 - } } if(tInstruction.txt=="time") {