diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index e69de29b..867a249e 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -0,0 +1,409 @@ +--- HMI/n2t-out ++++ HMI/US/landscape/n2t-out +│ --- HMI/n2t-out/Program.s.txt +├── +++ HMI/US/landscape/n2t-out/Program.s.txt +│ @@ -11,9 +11,9 @@ +│ // 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 +│ + //lcd_dev fffb 0002 0000 0020 +│ page pageStartup +│ --- HMI/n2t-out/cardAlarm.txt +├── +++ HMI/US/landscape/n2t-out/cardAlarm.txt +│ @@ -902,18 +902,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardChart.txt +├── +++ HMI/US/landscape/n2t-out/cardChart.txt +│ @@ -635,18 +635,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardEntities.txt +├── +++ HMI/US/landscape/n2t-out/cardEntities.txt +│ @@ -1885,18 +1885,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardGrid.txt +├── +++ HMI/US/landscape/n2t-out/cardGrid.txt +│ @@ -870,18 +870,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardLChart.txt +├── +++ HMI/US/landscape/n2t-out/cardLChart.txt +│ @@ -616,18 +616,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardMedia.txt +├── +++ HMI/US/landscape/n2t-out/cardMedia.txt +│ @@ -1154,18 +1154,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardQR.txt +├── +++ HMI/US/landscape/n2t-out/cardQR.txt +│ @@ -669,18 +669,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardThermo.txt +├── +++ HMI/US/landscape/n2t-out/cardThermo.txt +│ @@ -1071,18 +1071,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/pageStartup.txt +├── +++ HMI/US/landscape/n2t-out/pageStartup.txt +│ @@ -179,15 +179,15 @@ +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ 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 +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ @@ -320,18 +320,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/screensaver.txt +├── +++ HMI/US/landscape/n2t-out/screensaver.txt +│ @@ -29,17 +29,14 @@ +│ } +│ tDate.txt=pageIcons.vaDate.txt +│ dim=dimValue +│ vis tSend,0 +│ //page open event +│ // clear weather elements, to keep example content in HMI +│ +│ - Postinitialize Event +│ - click m0,1 +│ - +│ Variable (string) strCommand +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 600 +│ +│ Variable (string) strTmp +│ @@ -103,35 +100,14 @@ +│ Value: 0 +│ +│ Variable (int32) ycR +│ Attributes +│ Scope: local +│ Value: 0 +│ +│ -Text m0 +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Disable release event after dragging: 0 +│ - Send Component ID : disabled +│ - Associated Keyboard : none +│ - Text : +│ - Max. Text Size : 10 +│ - +│ - Events +│ - Touch Press Event +│ - tTmp.txt="change model conf to us-l/p " +│ - strlen tTmp.txt,sys1 +│ - sya1=sys1*11+m0.h-48/2 +│ - for(sys0=0;sys0120) { t0Speed.val=120 @@ -1237,7 +1423,9 @@ Timer tmSerial t0Speed.val=-120 } // lower text - spstr strCommand.txt,t0u.txt,"~",25 + spstr strCommand.txt,t0u.txt,"~",33 + // upper text + spstr strCommand.txt,t0o.txt,"~",32 if(t0Icon.txt!="") { vis t0Icon,1 @@ -1250,13 +1438,17 @@ Timer tmSerial vis h0,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",26 + spstr strCommand.txt,tTmp.txt,"~",38 covx tTmp.txt,t1Icon.pco,0,0 // icon - spstr strCommand.txt,t1Icon.txt,"~",27 + spstr strCommand.txt,t1Icon.txt,"~",37 // speed - spstr strCommand.txt,tTmp.txt,"~",28 + spstr strCommand.txt,tTmp.txt,"~",41 covx tTmp.txt,t1Speed.val,0,0 + if(p0.h==320) + { + t1Speed.val=t1Speed.val*-1 + } if(t1Speed.val>120) { t1Speed.val=120 @@ -1266,7 +1458,9 @@ Timer tmSerial t1Speed.val=-120 } // lower text - spstr strCommand.txt,t1u.txt,"~",29 + spstr strCommand.txt,t1u.txt,"~",40 + // upper text + spstr strCommand.txt,t1o.txt,"~",39 if(t1Icon.txt!="") { vis t1Icon,1 @@ -1279,13 +1473,17 @@ Timer tmSerial vis h1,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",30 + spstr strCommand.txt,tTmp.txt,"~",45 covx tTmp.txt,t2Icon.pco,0,0 // icon - spstr strCommand.txt,t2Icon.txt,"~",31 + spstr strCommand.txt,t2Icon.txt,"~",44 // speed - spstr strCommand.txt,tTmp.txt,"~",32 + spstr strCommand.txt,tTmp.txt,"~",48 covx tTmp.txt,t2Speed.val,0,0 + if(p0.h==320) + { + t2Speed.val=t2Speed.val*-1 + } if(t2Speed.val>120) { t2Speed.val=120 @@ -1295,7 +1493,9 @@ Timer tmSerial t2Speed.val=-120 } // lower text - spstr strCommand.txt,t2u.txt,"~",33 + spstr strCommand.txt,t2u.txt,"~",47 + // upper text + spstr strCommand.txt,t2o.txt,"~",46 if(t2Icon.txt!="") { vis t2Icon,1 @@ -1308,13 +1508,17 @@ Timer tmSerial vis h2,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",34 + spstr strCommand.txt,tTmp.txt,"~",52 covx tTmp.txt,t3Icon.pco,0,0 // icon - spstr strCommand.txt,t3Icon.txt,"~",35 + spstr strCommand.txt,t3Icon.txt,"~",51 // speed - spstr strCommand.txt,tTmp.txt,"~",36 + spstr strCommand.txt,tTmp.txt,"~",55 covx tTmp.txt,t3Speed.val,0,0 + if(p0.h==320) + { + t3Speed.val=t3Speed.val*-1 + } if(t3Speed.val>120) { t3Speed.val=120 @@ -1324,7 +1528,9 @@ Timer tmSerial t3Speed.val=-120 } // lower text - spstr strCommand.txt,t3u.txt,"~",37 + spstr strCommand.txt,t3u.txt,"~",54 + // upper text + spstr strCommand.txt,t3o.txt,"~",53 if(t3Icon.txt!="") { vis t3Icon,1 @@ -1337,13 +1543,17 @@ Timer tmSerial vis h3,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",38 + spstr strCommand.txt,tTmp.txt,"~",59 covx tTmp.txt,t4Icon.pco,0,0 // icon - spstr strCommand.txt,t4Icon.txt,"~",39 + spstr strCommand.txt,t4Icon.txt,"~",58 // speed - spstr strCommand.txt,tTmp.txt,"~",40 + spstr strCommand.txt,tTmp.txt,"~",62 covx tTmp.txt,t4Speed.val,0,0 + if(p0.h==320) + { + t4Speed.val=t4Speed.val*-1 + } if(t4Speed.val>120) { t4Speed.val=120 @@ -1353,7 +1563,9 @@ Timer tmSerial t4Speed.val=-120 } // lower text - spstr strCommand.txt,t4u.txt,"~",41 + spstr strCommand.txt,t4u.txt,"~",61 + // upper text + spstr strCommand.txt,t4o.txt,"~",60 if(t4Icon.txt!="") { vis t4Icon,1 @@ -1366,13 +1578,17 @@ Timer tmSerial vis h4,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",42 + spstr strCommand.txt,tTmp.txt,"~",66 covx tTmp.txt,t5Icon.pco,0,0 // icon - spstr strCommand.txt,t5Icon.txt,"~",43 + spstr strCommand.txt,t5Icon.txt,"~",65 // speed - spstr strCommand.txt,tTmp.txt,"~",44 + spstr strCommand.txt,tTmp.txt,"~",69 covx tTmp.txt,t5Speed.val,0,0 + if(p0.h==320) + { + t5Speed.val=t5Speed.val*-1 + } if(t5Speed.val>120) { t5Speed.val=120 @@ -1382,7 +1598,9 @@ Timer tmSerial t5Speed.val=-120 } // lower text - spstr strCommand.txt,t5u.txt,"~",45 + spstr strCommand.txt,t5u.txt,"~",68 + // upper text + spstr strCommand.txt,t5o.txt,"~",67 if(t5Icon.txt!="") { vis t5Icon,1 @@ -1417,6 +1635,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities @@ -1463,10 +1685,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 a494a671..e7b1d3ea 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 @@ -18,6 +18,10 @@ cardLChart 33 Component(s) 394 Line(s) of event code 262 Unique line(s) of event code +pageStartup + 20 Component(s) + 185 Line(s) of event code + 131 Unique line(s) of event code cardChart 33 Component(s) 429 Line(s) of event code @@ -42,10 +46,10 @@ cardQR 34 Component(s) 402 Line(s) of event code 234 Unique line(s) of event code -pageStartup - 20 Component(s) - 185 Line(s) of event code - 131 Unique line(s) of event code +cardPower + 54 Component(s) + 523 Line(s) of event code + 345 Unique line(s) of event code screensaver 46 Component(s) 418 Line(s) of event code @@ -78,10 +82,6 @@ cardAlarm 43 Component(s) 492 Line(s) of event code 269 Unique line(s) of event code -cardPower - 48 Component(s) - 487 Line(s) of event code - 326 Unique line(s) of event code screensaver2 58 Component(s) 344 Line(s) of event code @@ -89,6 +89,6 @@ screensaver2 Total 21 Page(s) - 794 Component(s) - 9143 Line(s) of event code - 2307 Unique line(s) of event code + 800 Component(s) + 9179 Line(s) of event code + 2329 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out/cardPower.txt b/HMI/US/landscape/n2t-out/cardPower.txt index adea13c4..45911b1e 100644 --- a/HMI/US/landscape/n2t-out/cardPower.txt +++ b/HMI/US/landscape/n2t-out/cardPower.txt @@ -39,7 +39,7 @@ Page cardPower vis t4Icon,0 vis t5Icon,0 cardPower.bco=defaultBcoColor - for(sys0=0;sys0<48;sys0++) + for(sys0=0;sys0<54;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { @@ -50,8 +50,8 @@ Page cardPower { if(b[sys0].type==1) { - b[sys0].pic=19 - b[sys0].pic1=19 + b[sys0].pic=21 + b[sys0].pic1=21 b[sys0].pic2=15 } } @@ -73,7 +73,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 275 + Max. Text Size: 1000 Variable (int32) t0Speed Attributes @@ -139,6 +139,16 @@ Text t0Icon Text :  Max. Text Size : 5 +Text t0o + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + Text t0u Attributes Scope : local @@ -169,6 +179,16 @@ Text t1Icon Text :  Max. Text Size : 5 +Text t1o + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + Text t1u Attributes Scope : local @@ -189,6 +209,16 @@ Text t2Icon Text : î ° Max. Text Size : 5 +Text t2o + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + Text t2u Attributes Scope : local @@ -209,6 +239,16 @@ Text t3Icon Text : î ° Max. Text Size : 5 +Text t3o + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + Text t3u Attributes Scope : local @@ -229,6 +269,16 @@ Text t4Icon Text : î´½ Max. Text Size : 5 +Text t4o + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + Text t4u Attributes Scope : local @@ -249,6 +299,16 @@ Text t5Icon Text :  Max. Text Size : 5 +Text t5o + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + Text t5u Attributes Scope : local @@ -479,6 +539,7 @@ Timer tm0 h0.val=h0.maxval } h0.val+=t0Speed.val + ref t0u } if(t1Speed.val!=0) { @@ -492,6 +553,7 @@ Timer tm0 h1.val=h1.maxval } h1.val+=t1Speed.val + ref t1u } if(t2Speed.val!=0) { @@ -505,6 +567,7 @@ Timer tm0 h2.val=h2.maxval } h2.val+=t2Speed.val + ref t2u } if(t3Speed.val!=0) { @@ -518,6 +581,7 @@ Timer tm0 h3.val=h3.maxval } h3.val+=t3Speed.val + ref t3u } if(t4Speed.val!=0) { @@ -531,6 +595,7 @@ Timer tm0 h4.val=h4.maxval } h4.val+=t4Speed.val + ref t4u } if(t5Speed.val!=0) { @@ -544,6 +609,7 @@ Timer tm0 h5.val=h5.maxval } h5.val+=t5Speed.val + ref t5u } Timer tmSerial @@ -599,7 +665,6 @@ Timer tmSerial spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpd") { - // command format: entityUpd,heading,navigation,colorHome,iconHome[,iconColor,icon,speed,valueUp,valueDown]x6 spstr strCommand.txt,tHeading.txt,"~",1 // navigation icon left spstr strCommand.txt,tTmp.txt,"~",2 //type @@ -636,30 +701,31 @@ Timer tmSerial vis bNext,1 } // icon color home - spstr strCommand.txt,tTmp.txt,"~",14 + spstr strCommand.txt,tTmp.txt,"~",17 covx tTmp.txt,t1.pco,0,0 // icon home - spstr strCommand.txt,t1.txt,"~",15 + spstr strCommand.txt,t1.txt,"~",16 // speed 16 ignored // text home - spstr strCommand.txt,tHome.txt,"~",17 + spstr strCommand.txt,tHome.txt,"~",19 spstr tHome.txt,tHome2.txt," ",1 spstr tHome.txt,tHome.txt," ",0 - // icon color 18 ignored - // icon 19 ignored - // speed 20 ignored // text home - spstr strCommand.txt,tHomeO.txt,"~",21 + spstr strCommand.txt,tHomeO.txt,"~",26 spstr tHomeO.txt,tHomeO2.txt," ",1 spstr tHomeO.txt,tHomeO.txt," ",0 // iconColor - spstr strCommand.txt,tTmp.txt,"~",22 + spstr strCommand.txt,tTmp.txt,"~",31 covx tTmp.txt,t0Icon.pco,0,0 // icon - spstr strCommand.txt,t0Icon.txt,"~",23 + spstr strCommand.txt,t0Icon.txt,"~",30 // speed - spstr strCommand.txt,tTmp.txt,"~",24 + spstr strCommand.txt,tTmp.txt,"~",34 covx tTmp.txt,t0Speed.val,0,0 + if(p0.h==320) + { + t0Speed.val=t0Speed.val*-1 + } if(t0Speed.val>120) { t0Speed.val=120 @@ -669,7 +735,9 @@ Timer tmSerial t0Speed.val=-120 } // lower text - spstr strCommand.txt,t0u.txt,"~",25 + spstr strCommand.txt,t0u.txt,"~",33 + // upper text + spstr strCommand.txt,t0o.txt,"~",32 if(t0Icon.txt!="") { vis t0Icon,1 @@ -682,13 +750,17 @@ Timer tmSerial vis h0,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",26 + spstr strCommand.txt,tTmp.txt,"~",38 covx tTmp.txt,t1Icon.pco,0,0 // icon - spstr strCommand.txt,t1Icon.txt,"~",27 + spstr strCommand.txt,t1Icon.txt,"~",37 // speed - spstr strCommand.txt,tTmp.txt,"~",28 + spstr strCommand.txt,tTmp.txt,"~",41 covx tTmp.txt,t1Speed.val,0,0 + if(p0.h==320) + { + t1Speed.val=t1Speed.val*-1 + } if(t1Speed.val>120) { t1Speed.val=120 @@ -698,7 +770,9 @@ Timer tmSerial t1Speed.val=-120 } // lower text - spstr strCommand.txt,t1u.txt,"~",29 + spstr strCommand.txt,t1u.txt,"~",40 + // upper text + spstr strCommand.txt,t1o.txt,"~",39 if(t1Icon.txt!="") { vis t1Icon,1 @@ -711,13 +785,17 @@ Timer tmSerial vis h1,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",30 + spstr strCommand.txt,tTmp.txt,"~",45 covx tTmp.txt,t2Icon.pco,0,0 // icon - spstr strCommand.txt,t2Icon.txt,"~",31 + spstr strCommand.txt,t2Icon.txt,"~",44 // speed - spstr strCommand.txt,tTmp.txt,"~",32 + spstr strCommand.txt,tTmp.txt,"~",48 covx tTmp.txt,t2Speed.val,0,0 + if(p0.h==320) + { + t2Speed.val=t2Speed.val*-1 + } if(t2Speed.val>120) { t2Speed.val=120 @@ -727,7 +805,9 @@ Timer tmSerial t2Speed.val=-120 } // lower text - spstr strCommand.txt,t2u.txt,"~",33 + spstr strCommand.txt,t2u.txt,"~",47 + // upper text + spstr strCommand.txt,t2o.txt,"~",46 if(t2Icon.txt!="") { vis t2Icon,1 @@ -740,13 +820,17 @@ Timer tmSerial vis h2,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",34 + spstr strCommand.txt,tTmp.txt,"~",52 covx tTmp.txt,t3Icon.pco,0,0 // icon - spstr strCommand.txt,t3Icon.txt,"~",35 + spstr strCommand.txt,t3Icon.txt,"~",51 // speed - spstr strCommand.txt,tTmp.txt,"~",36 + spstr strCommand.txt,tTmp.txt,"~",55 covx tTmp.txt,t3Speed.val,0,0 + if(p0.h==320) + { + t3Speed.val=t3Speed.val*-1 + } if(t3Speed.val>120) { t3Speed.val=120 @@ -756,7 +840,9 @@ Timer tmSerial t3Speed.val=-120 } // lower text - spstr strCommand.txt,t3u.txt,"~",37 + spstr strCommand.txt,t3u.txt,"~",54 + // upper text + spstr strCommand.txt,t3o.txt,"~",53 if(t3Icon.txt!="") { vis t3Icon,1 @@ -769,13 +855,17 @@ Timer tmSerial vis h3,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",38 + spstr strCommand.txt,tTmp.txt,"~",59 covx tTmp.txt,t4Icon.pco,0,0 // icon - spstr strCommand.txt,t4Icon.txt,"~",39 + spstr strCommand.txt,t4Icon.txt,"~",58 // speed - spstr strCommand.txt,tTmp.txt,"~",40 + spstr strCommand.txt,tTmp.txt,"~",62 covx tTmp.txt,t4Speed.val,0,0 + if(p0.h==320) + { + t4Speed.val=t4Speed.val*-1 + } if(t4Speed.val>120) { t4Speed.val=120 @@ -785,7 +875,9 @@ Timer tmSerial t4Speed.val=-120 } // lower text - spstr strCommand.txt,t4u.txt,"~",41 + spstr strCommand.txt,t4u.txt,"~",61 + // upper text + spstr strCommand.txt,t4o.txt,"~",60 if(t4Icon.txt!="") { vis t4Icon,1 @@ -798,13 +890,17 @@ Timer tmSerial vis h4,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",42 + spstr strCommand.txt,tTmp.txt,"~",66 covx tTmp.txt,t5Icon.pco,0,0 // icon - spstr strCommand.txt,t5Icon.txt,"~",43 + spstr strCommand.txt,t5Icon.txt,"~",65 // speed - spstr strCommand.txt,tTmp.txt,"~",44 + spstr strCommand.txt,tTmp.txt,"~",69 covx tTmp.txt,t5Speed.val,0,0 + if(p0.h==320) + { + t5Speed.val=t5Speed.val*-1 + } if(t5Speed.val>120) { t5Speed.val=120 @@ -814,7 +910,9 @@ Timer tmSerial t5Speed.val=-120 } // lower text - spstr strCommand.txt,t5u.txt,"~",45 + spstr strCommand.txt,t5u.txt,"~",68 + // upper text + spstr strCommand.txt,t5o.txt,"~",67 if(t5Icon.txt!="") { vis t5Icon,1 @@ -849,6 +947,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities @@ -895,10 +997,6 @@ Timer tmSerial { page cardChart } - if(tId.txt=="cardLChart") - { - page cardLChart - } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index e69de29b..95e01675 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -0,0 +1,1772 @@ +--- HMI/n2t-out ++++ HMI/US/portrait/n2t-out +│ --- HMI/n2t-out/Program.s.txt +├── +++ HMI/US/portrait/n2t-out/Program.s.txt +│ @@ -10,10 +10,10 @@ +│ int sleepValue=0 +│ // 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 +│ + // fix touch offset (Removed for US version) +│ + //lcd_dev fffb 0002 0000 0020 +│ page pageStartup +│ --- HMI/n2t-out/cardAlarm.txt +├── +++ HMI/US/portrait/n2t-out/cardAlarm.txt +│ @@ -902,18 +902,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardChart.txt +├── +++ HMI/US/portrait/n2t-out/cardChart.txt +│ @@ -635,18 +635,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardEntities.txt +├── +++ HMI/US/portrait/n2t-out/cardEntities.txt +│ @@ -61,16 +61,36 @@ +│ vis tIcon4,0 +│ vis tEntity4,0 +│ vis bText4,0 +│ vis hSlider4,0 +│ vis nNum4,0 +│ vis bPrev,0 +│ vis bNext,0 +│ + //ui e5 +│ + vis btOnOff5,0 +│ + vis bUp5,0 +│ + vis bStop5,0 +│ + vis bDown5,0 +│ + vis tIcon5,0 +│ + vis tEntity5,0 +│ + vis bText5,0 +│ + vis hSlider5,0 +│ + vis nNum5,0 +│ + //ui e6 +│ + vis btOnOff6,0 +│ + vis bUp6,0 +│ + vis bStop6,0 +│ + vis bDown6,0 +│ + vis tIcon6,0 +│ + vis tEntity6,0 +│ + vis bText6,0 +│ + vis hSlider6,0 +│ + vis nNum6,0 +│ cardEntities.bco=defaultBcoColor +│ - for(sys0=0;sys0<67;sys0++) +│ + for(sys0=0;sys0<65;sys0++) +│ { +│ if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54) +│ { +│ b[sys0].bco=defaultBcoColor +│ b[sys0].pco=defaultFontColor +│ } +│ if(b[sys0].type==53&&defaultBcoColor==0) +│ @@ -86,45 +106,57 @@ +│ } +│ } +│ +│ Variable (string) entn1 +│ Attributes +│ Scope : local +│ Text : +│ - Max. Text Size: 80 +│ + Max. Text Size: 65 +│ +│ Variable (string) entn2 +│ Attributes +│ Scope : local +│ Text : +│ - Max. Text Size: 80 +│ + Max. Text Size: 65 +│ +│ Variable (string) entn3 +│ Attributes +│ Scope : local +│ Text : +│ - Max. Text Size: 80 +│ + Max. Text Size: 65 +│ +│ Variable (string) entn4 +│ Attributes +│ Scope : local +│ Text : +│ - Max. Text Size: 80 +│ + Max. Text Size: 65 +│ + +│ +Variable (string) entn5 +│ + Attributes +│ + Scope : local +│ + Text : +│ + Max. Text Size: 65 +│ + +│ +Variable (string) entn6 +│ + Attributes +│ + Scope : local +│ + Text : +│ + Max. Text Size: 65 +│ +│ Variable (string) nent1 +│ Attributes +│ Scope : local +│ Text : +│ - Max. Text Size: 80 +│ + Max. Text Size: 40 +│ +│ Variable (string) nent2 +│ Attributes +│ Scope : local +│ Text : +│ - Max. Text Size: 80 +│ + Max. Text Size: 40 +│ +│ Variable (string) strCommand +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 500 +│ +│ @@ -154,14 +186,26 @@ +│ +│ Variable (string) type4 +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 10 +│ +│ +Variable (string) type5 +│ + Attributes +│ + Scope : local +│ + Text : +│ + Max. Text Size: 10 +│ + +│ +Variable (string) type6 +│ + Attributes +│ + Scope : local +│ + Text : +│ + Max. Text Size: 10 +│ + +│ Number nNum1 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ @@ -190,14 +234,32 @@ +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Value : 0 +│ +│ +Number nNum5 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Value : 0 +│ + +│ +Number nNum6 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Value : 0 +│ + +│ Text tEntity1 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ @@ -230,14 +292,34 @@ +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : tEntity4 +│ Max. Text Size : 30 +│ +│ +Text tEntity5 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Text : tEntity5 +│ + Max. Text Size : 30 +│ + +│ +Text tEntity6 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Text : tEntity5 +│ + Max. Text Size : 30 +│ + +│ Text tHeading +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ @@ -280,14 +362,34 @@ +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text :  +│ Max. Text Size : 5 +│ +│ +Text tIcon5 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Text :  +│ + Max. Text Size : 5 +│ + +│ +Text tIcon6 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Text :  +│ + Max. Text Size : 5 +│ + +│ Text tId +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ @@ -429,14 +531,70 @@ +│ crcputs tSend.txt,0 +│ //send cmd +│ printh 55 bb +│ prints sys0,2 +│ prints tSend.txt,0 +│ prints crcval,2 +│ +│ +Slider hSlider5 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Position : 50 +│ + Upper range limit : 100 +│ + Lower range limit : 0 +│ + +│ + Events +│ + Touch Release Event +│ + nNum5.val=hSlider5.val +│ + tSend.txt="event,buttonPress2,"+entn5.txt+",number-set," +│ + covx nNum5.val,tTmp.txt,0,0 +│ + tSend.txt+=tTmp.txt +│ + //send calc crc +│ + btlen tSend.txt,sys0 +│ + crcrest 1,0xffff // reset CRC +│ + crcputh 55 bb +│ + crcputs sys0,2 +│ + crcputs tSend.txt,0 +│ + //send cmd +│ + printh 55 bb +│ + prints sys0,2 +│ + prints tSend.txt,0 +│ + prints crcval,2 +│ + +│ +Slider hSlider6 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Position : 50 +│ + Upper range limit : 100 +│ + Lower range limit : 0 +│ + +│ + Events +│ + Touch Release Event +│ + nNum5.val=hSlider5.val +│ + tSend.txt="event,buttonPress2,"+entn6.txt+",number-set," +│ + covx nNum5.val,tTmp.txt,0,0 +│ + tSend.txt+=tTmp.txt +│ + //send calc crc +│ + btlen tSend.txt,sys0 +│ + crcrest 1,0xffff // reset CRC +│ + crcputh 55 bb +│ + crcputs sys0,2 +│ + crcputs tSend.txt,0 +│ + //send cmd +│ + printh 55 bb +│ + prints sys0,2 +│ + prints tSend.txt,0 +│ + prints crcval,2 +│ + +│ Button bDown1 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ @@ -529,14 +687,64 @@ +│ crcputs tSend.txt,0 +│ //send cmd +│ printh 55 bb +│ prints sys0,2 +│ prints tSend.txt,0 +│ prints crcval,2 +│ +│ +Button bDown5 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + State : unpressed +│ + Text :  +│ + Max. Text Size : 10 +│ + +│ + Events +│ + Touch Press Event +│ + tSend.txt="event,buttonPress2,"+entn5.txt+",down" +│ + //send calc crc +│ + btlen tSend.txt,sys0 +│ + crcrest 1,0xffff // reset CRC +│ + crcputh 55 bb +│ + crcputs sys0,2 +│ + crcputs tSend.txt,0 +│ + //send cmd +│ + printh 55 bb +│ + prints sys0,2 +│ + prints tSend.txt,0 +│ + prints crcval,2 +│ + +│ +Button bDown6 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + State : unpressed +│ + Text :  +│ + Max. Text Size : 10 +│ + +│ + Events +│ + Touch Press Event +│ + tSend.txt="event,buttonPress2,"+entn6.txt+",down" +│ + //send calc crc +│ + btlen tSend.txt,sys0 +│ + crcrest 1,0xffff // reset CRC +│ + crcputh 55 bb +│ + crcputs sys0,2 +│ + crcputs tSend.txt,0 +│ + //send cmd +│ + printh 55 bb +│ + prints sys0,2 +│ + prints tSend.txt,0 +│ + prints crcval,2 +│ + +│ Button bNext +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ @@ -679,14 +887,64 @@ +│ crcputs tSend.txt,0 +│ //send cmd +│ printh 55 bb +│ prints sys0,2 +│ prints tSend.txt,0 +│ prints crcval,2 +│ +│ +Button bStop5 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + State : unpressed +│ + Text :  +│ + Max. Text Size : 10 +│ + +│ + Events +│ + Touch Press Event +│ + tSend.txt="event,buttonPress2,"+entn5.txt+",stop" +│ + //send calc crc +│ + btlen tSend.txt,sys0 +│ + crcrest 1,0xffff // reset CRC +│ + crcputh 55 bb +│ + crcputs sys0,2 +│ + crcputs tSend.txt,0 +│ + //send cmd +│ + printh 55 bb +│ + prints sys0,2 +│ + prints tSend.txt,0 +│ + prints crcval,2 +│ + +│ +Button bStop6 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + State : unpressed +│ + Text :  +│ + Max. Text Size : 10 +│ + +│ + Events +│ + Touch Press Event +│ + tSend.txt="event,buttonPress2,"+entn6.txt+",stop" +│ + //send calc crc +│ + btlen tSend.txt,sys0 +│ + crcrest 1,0xffff // reset CRC +│ + crcputh 55 bb +│ + crcputs sys0,2 +│ + crcputs tSend.txt,0 +│ + //send cmd +│ + printh 55 bb +│ + prints sys0,2 +│ + prints tSend.txt,0 +│ + prints crcval,2 +│ + +│ Button bText1 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ @@ -779,14 +1037,64 @@ +│ crcputs tSend.txt,0 +│ //send cmd +│ printh 55 bb +│ prints sys0,2 +│ prints tSend.txt,0 +│ prints crcval,2 +│ +│ +Button bText5 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + State : unpressed +│ + Text : +│ + Max. Text Size : 45 +│ + +│ + Events +│ + Touch Press Event +│ + tSend.txt="event,buttonPress2,"+entn5.txt+",button" +│ + //send calc crc +│ + btlen tSend.txt,sys0 +│ + crcrest 1,0xffff // reset CRC +│ + crcputh 55 bb +│ + crcputs sys0,2 +│ + crcputs tSend.txt,0 +│ + //send cmd +│ + printh 55 bb +│ + prints sys0,2 +│ + prints tSend.txt,0 +│ + prints crcval,2 +│ + +│ +Button bText6 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + State : unpressed +│ + Text : +│ + Max. Text Size : 45 +│ + +│ + Events +│ + Touch Press Event +│ + tSend.txt="event,buttonPress2,"+entn6.txt+",button" +│ + //send calc crc +│ + btlen tSend.txt,sys0 +│ + crcrest 1,0xffff // reset CRC +│ + crcputh 55 bb +│ + crcputs sys0,2 +│ + crcputs tSend.txt,0 +│ + //send cmd +│ + printh 55 bb +│ + prints sys0,2 +│ + prints tSend.txt,0 +│ + prints crcval,2 +│ + +│ Button bUp1 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ @@ -879,14 +1187,64 @@ +│ crcputs tSend.txt,0 +│ //send cmd +│ printh 55 bb +│ prints sys0,2 +│ prints tSend.txt,0 +│ prints crcval,2 +│ +│ +Button bUp5 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + State : unpressed +│ + Text :  +│ + Max. Text Size : 10 +│ + +│ + Events +│ + Touch Press Event +│ + tSend.txt="event,buttonPress2,"+entn5.txt+",up" +│ + //send calc crc +│ + btlen tSend.txt,sys0 +│ + crcrest 1,0xffff // reset CRC +│ + crcputh 55 bb +│ + crcputs sys0,2 +│ + crcputs tSend.txt,0 +│ + //send cmd +│ + printh 55 bb +│ + prints sys0,2 +│ + prints tSend.txt,0 +│ + prints crcval,2 +│ + +│ +Button bUp6 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + State : unpressed +│ + Text :  +│ + Max. Text Size : 10 +│ + +│ + Events +│ + Touch Press Event +│ + tSend.txt="event,buttonPress2,"+entn6.txt+",up" +│ + //send calc crc +│ + btlen tSend.txt,sys0 +│ + crcrest 1,0xffff // reset CRC +│ + crcputh 55 bb +│ + crcputs sys0,2 +│ + crcputs tSend.txt,0 +│ + //send cmd +│ + printh 55 bb +│ + prints sys0,2 +│ + prints tSend.txt,0 +│ + prints crcval,2 +│ + +│ Dual-state Button btOnOff1 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ @@ -987,14 +1345,68 @@ +│ crcputs tSend.txt,0 +│ //send cmd +│ printh 55 bb +│ prints sys0,2 +│ prints tSend.txt,0 +│ prints crcval,2 +│ +│ +Dual-state Button btOnOff5 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + State : unpressed +│ + Text : +│ + Max. Text Size : 10 +│ + +│ + Events +│ + Touch Press Event +│ + tSend.txt="event,buttonPress2,"+entn5.txt+",OnOff," +│ + covx btOnOff5.val,tTmp.txt,0,0 +│ + tSend.txt+=tTmp.txt +│ + //send calc crc +│ + btlen tSend.txt,sys0 +│ + crcrest 1,0xffff // reset CRC +│ + crcputh 55 bb +│ + crcputs sys0,2 +│ + crcputs tSend.txt,0 +│ + //send cmd +│ + printh 55 bb +│ + prints sys0,2 +│ + prints tSend.txt,0 +│ + prints crcval,2 +│ + +│ +Dual-state Button btOnOff6 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + State : unpressed +│ + Text : +│ + Max. Text Size : 10 +│ + +│ + Events +│ + Touch Press Event +│ + tSend.txt="event,buttonPress2,"+entn6.txt+",OnOff," +│ + covx btOnOff5.val,tTmp.txt,0,0 +│ + tSend.txt+=tTmp.txt +│ + //send calc crc +│ + btlen tSend.txt,sys0 +│ + crcrest 1,0xffff // reset CRC +│ + crcputh 55 bb +│ + crcputs sys0,2 +│ + crcputs tSend.txt,0 +│ + //send cmd +│ + printh 55 bb +│ + prints sys0,2 +│ + prints tSend.txt,0 +│ + prints crcval,2 +│ + +│ Hotspot m0 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ +│ @@ -1127,14 +1539,84 @@ +│ page popupInSel +│ } +│ if(type4.txt=="timer") +│ { +│ page popupTimer +│ } +│ +│ +Hotspot m4 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + +│ + Events +│ + Touch Press Event +│ + pageIcons.tTmp1.txt=tEntity5.txt +│ + pageIcons.tTmp2.txt=entn5.txt +│ + pageIcons.tTmp3.txt=tIcon5.txt +│ + if(type5.txt=="shutter") +│ + { +│ + //popupShutter.tHeading.txt=tEntity5.txt +│ + page popupShutter +│ + } +│ + if(type5.txt=="light") +│ + { +│ + //popupLight.tEntity.txt=tEntity5.txt +│ + page popupLight +│ + } +│ + if(type5.txt=="fan") +│ + { +│ + page popupFan +│ + } +│ + if(type5.txt=="input_sel") +│ + { +│ + page popupInSel +│ + } +│ + if(type5.txt=="timer") +│ + { +│ + page popupTimer +│ + } +│ + +│ +Hotspot m5 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + +│ + Events +│ + Touch Press Event +│ + pageIcons.tTmp1.txt=tEntity6.txt +│ + pageIcons.tTmp2.txt=entn6.txt +│ + pageIcons.tTmp3.txt=tIcon6.txt +│ + if(type6.txt=="shutter") +│ + { +│ + //popupShutter.tHeading.txt=tEntity5.txt +│ + page popupShutter +│ + } +│ + if(type6.txt=="light") +│ + { +│ + //popupLight.tEntity.txt=tEntity5.txt +│ + page popupLight +│ + } +│ + if(type6.txt=="fan") +│ + { +│ + page popupFan +│ + } +│ + if(type6.txt=="input_sel") +│ + { +│ + page popupInSel +│ + } +│ + if(type6.txt=="timer") +│ + { +│ + page popupTimer +│ + } +│ + +│ Hotspot mSpecial +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ +│ @@ -1862,14 +2344,312 @@ +│ covx tTmp.txt,sys0,0,0 +│ hSlider4.minval=sys0 +│ //third value is max value +│ spstr bText4.txt,tTmp.txt,"|",2 +│ covx tTmp.txt,sys0,0,0 +│ hSlider4.maxval=sys0 +│ } +│ + // get Type +│ + spstr strCommand.txt,type5.txt,"~",38 +│ + // get internal name +│ + spstr strCommand.txt,entn5.txt,"~",39 +│ + if(type5.txt=="delete"||type5.txt=="") +│ + { +│ + vis bUp5,0 +│ + vis bStop5,0 +│ + vis bDown5,0 +│ + vis btOnOff5,0 +│ + vis tEntity5,0 +│ + vis tIcon5,0 +│ + vis bText5,0 +│ + vis hSlider5,0 +│ + vis nNum5,0 +│ + }else +│ + { +│ + // change icon +│ + spstr strCommand.txt,tIcon5.txt,"~",40 +│ + vis tIcon5,1 +│ + // change icon color +│ + spstr strCommand.txt,tTmp.txt,"~",41 +│ + covx tTmp.txt,sys0,0,0 +│ + tIcon5.pco=sys0 +│ + // set name +│ + spstr strCommand.txt,tEntity5.txt,"~",42 +│ + vis tEntity5,1 +│ + } +│ + if(type5.txt=="shutter") +│ + { +│ + vis bUp5,1 +│ + vis bStop5,1 +│ + vis bDown5,1 +│ + vis btOnOff5,0 +│ + vis bText5,0 +│ + vis hSlider5,0 +│ + vis nNum5,0 +│ + // get Button State (optional Value) +│ + spstr strCommand.txt,tId.txt,"~",43 +│ + // up button +│ + spstr tId.txt,tTmp.txt,"|",3 +│ + if(tTmp.txt=="disable") +│ + { +│ + bUp5.pco=27501 +│ + spstr tId.txt,bUp5.txt,"|",0 +│ + tsw bUp5,0 +│ + }else if(tTmp.txt=="enable") +│ + { +│ + bUp5.pco=65535 +│ + spstr tId.txt,bUp5.txt,"|",0 +│ + tsw bUp5,1 +│ + } +│ + // stop button +│ + spstr tId.txt,tTmp.txt,"|",4 +│ + if(tTmp.txt=="disable") +│ + { +│ + bStop5.pco=27501 +│ + spstr tId.txt,bStop5.txt,"|",1 +│ + tsw bStop5,0 +│ + }else if(tTmp.txt=="enable") +│ + { +│ + bStop5.pco=65535 +│ + spstr tId.txt,bStop5.txt,"|",1 +│ + tsw bStop5,1 +│ + } +│ + // down button +│ + spstr tId.txt,tTmp.txt,"|",5 +│ + if(tTmp.txt=="disable") +│ + { +│ + bDown5.pco=27501 +│ + spstr tId.txt,bDown5.txt,"|",2 +│ + tsw bDown5,0 +│ + }else if(tTmp.txt=="enable") +│ + { +│ + bDown5.pco=65535 +│ + spstr tId.txt,bDown5.txt,"|",2 +│ + tsw bDown5,1 +│ + } +│ + } +│ + if(type5.txt=="light"||type5.txt=="switch"||type5.txt=="fan") +│ + { +│ + vis bUp5,0 +│ + vis bStop5,0 +│ + vis bDown5,0 +│ + vis btOnOff5,1 +│ + vis bText5,0 +│ + vis hSlider5,0 +│ + vis nNum5,0 +│ + // get Button State (optional Value) +│ + spstr strCommand.txt,tTmp.txt,"~",43 +│ + covx tTmp.txt,sys0,0,0 +│ + btOnOff5.val=sys0 +│ + } +│ + if(type5.txt=="text"||type5.txt=="timer") +│ + { +│ + vis bUp5,0 +│ + vis bStop5,0 +│ + vis bDown5,0 +│ + vis btOnOff5,0 +│ + vis bText5,1 +│ + tsw bText5,0 +│ + vis hSlider5,0 +│ + vis nNum5,0 +│ + bText5.pco=65535 +│ + bText5.pco2=65535 +│ + // get Text (optional Value) +│ + spstr strCommand.txt,bText5.txt,"~",43 +│ + } +│ + if(type5.txt=="button"||type5.txt=="input_sel") +│ + { +│ + vis bUp5,0 +│ + vis bStop5,0 +│ + vis bDown5,0 +│ + vis btOnOff5,0 +│ + vis bText5,1 +│ + tsw bText5,1 +│ + vis hSlider5,0 +│ + vis nNum5,0 +│ + bText5.pco=1374 +│ + bText5.pco2=1374 +│ + // get Text (optional Value) +│ + spstr strCommand.txt,bText5.txt,"~",43 +│ + } +│ + if(type5.txt=="number") +│ + { +│ + vis bUp5,0 +│ + vis bStop5,0 +│ + vis bDown5,0 +│ + vis btOnOff5,0 +│ + vis bText5,0 +│ + tsw bText5,0 +│ + vis hSlider5,1 +│ + vis nNum5,1 +│ + // get config (optional Value) (use bText as variable) +│ + spstr strCommand.txt,bText5.txt,"~",43 +│ + //first value is current value +│ + spstr bText5.txt,tTmp.txt,"|",0 +│ + covx tTmp.txt,sys0,0,0 +│ + hSlider5.val=sys0 +│ + nNum5.val=sys0 +│ + //second value is min value +│ + spstr bText5.txt,tTmp.txt,"|",1 +│ + covx tTmp.txt,sys0,0,0 +│ + hSlider5.minval=sys0 +│ + //third value is max value +│ + spstr bText5.txt,tTmp.txt,"|",2 +│ + covx tTmp.txt,sys0,0,0 +│ + hSlider5.maxval=sys0 +│ + } +│ + // get Type +│ + spstr strCommand.txt,type6.txt,"~",44 +│ + // get internal name +│ + spstr strCommand.txt,entn6.txt,"~",45 +│ + if(type6.txt=="delete"||type6.txt=="") +│ + { +│ + vis bUp6,0 +│ + vis bStop6,0 +│ + vis bDown6,0 +│ + vis btOnOff6,0 +│ + vis tEntity6,0 +│ + vis tIcon6,0 +│ + vis bText6,0 +│ + vis hSlider6,0 +│ + vis nNum6,0 +│ + }else +│ + { +│ + // change icon +│ + spstr strCommand.txt,tIcon6.txt,"~",46 +│ + vis tIcon6,1 +│ + // change icon color +│ + spstr strCommand.txt,tTmp.txt,"~",47 +│ + covx tTmp.txt,sys0,0,0 +│ + tIcon6.pco=sys0 +│ + // set name +│ + spstr strCommand.txt,tEntity6.txt,"~",48 +│ + vis tEntity6,1 +│ + } +│ + if(type6.txt=="shutter") +│ + { +│ + vis bUp6,1 +│ + vis bStop6,1 +│ + vis bDown6,1 +│ + vis btOnOff6,0 +│ + vis bText6,0 +│ + vis hSlider6,0 +│ + vis nNum6,0 +│ + // get Button State (optional Value) +│ + spstr strCommand.txt,tId.txt,"~",49 +│ + // up button +│ + spstr tId.txt,tTmp.txt,"|",3 +│ + if(tTmp.txt=="disable") +│ + { +│ + bUp6.pco=27501 +│ + spstr tId.txt,bUp6.txt,"|",0 +│ + tsw bUp6,0 +│ + }else if(tTmp.txt=="enable") +│ + { +│ + bUp6.pco=65535 +│ + spstr tId.txt,bUp6.txt,"|",0 +│ + tsw bUp6,1 +│ + } +│ + // stop button +│ + spstr tId.txt,tTmp.txt,"|",4 +│ + if(tTmp.txt=="disable") +│ + { +│ + bStop6.pco=27501 +│ + spstr tId.txt,bStop6.txt,"|",1 +│ + tsw bStop6,0 +│ + }else if(tTmp.txt=="enable") +│ + { +│ + bStop6.pco=65535 +│ + spstr tId.txt,bStop6.txt,"|",1 +│ + tsw bStop6,1 +│ + } +│ + // down button +│ + spstr tId.txt,tTmp.txt,"|",5 +│ + if(tTmp.txt=="disable") +│ + { +│ + bDown6.pco=27501 +│ + spstr tId.txt,bDown6.txt,"|",2 +│ + tsw bDown6,0 +│ + }else if(tTmp.txt=="enable") +│ + { +│ + bDown6.pco=65535 +│ + spstr tId.txt,bDown6.txt,"|",2 +│ + tsw bDown6,1 +│ + } +│ + } +│ + if(type6.txt=="light"||type6.txt=="switch"||type6.txt=="fan") +│ + { +│ + vis bUp6,0 +│ + vis bStop6,0 +│ + vis bDown6,0 +│ + vis btOnOff6,1 +│ + vis bText6,0 +│ + vis hSlider6,0 +│ + vis nNum6,0 +│ + // get Button State (optional Value) +│ + spstr strCommand.txt,tTmp.txt,"~",49 +│ + covx tTmp.txt,sys0,0,0 +│ + btOnOff6.val=sys0 +│ + } +│ + if(type6.txt=="text"||type6.txt=="timer") +│ + { +│ + vis bUp6,0 +│ + vis bStop6,0 +│ + vis bDown6,0 +│ + vis btOnOff6,0 +│ + vis bText6,1 +│ + tsw bText6,0 +│ + vis hSlider6,0 +│ + vis nNum6,0 +│ + bText6.pco=65535 +│ + bText6.pco2=65535 +│ + // get Text (optional Value) +│ + spstr strCommand.txt,bText6.txt,"~",49 +│ + } +│ + if(type6.txt=="button"||type6.txt=="input_sel") +│ + { +│ + vis bUp6,0 +│ + vis bStop6,0 +│ + vis bDown6,0 +│ + vis btOnOff6,0 +│ + vis bText6,1 +│ + tsw bText6,1 +│ + vis hSlider6,0 +│ + vis nNum6,0 +│ + bText6.pco=1374 +│ + bText6.pco2=1374 +│ + // get Text (optional Value) +│ + spstr strCommand.txt,bText6.txt,"~",49 +│ + } +│ + if(type6.txt=="number") +│ + { +│ + vis bUp6,0 +│ + vis bStop6,0 +│ + vis bDown6,0 +│ + vis btOnOff6,0 +│ + vis bText6,0 +│ + tsw bText6,0 +│ + vis hSlider6,1 +│ + vis nNum6,1 +│ + // get config (optional Value) (use bText as variable) +│ + spstr strCommand.txt,bText6.txt,"~",49 +│ + //first value is current value +│ + spstr bText6.txt,tTmp.txt,"|",0 +│ + covx tTmp.txt,sys0,0,0 +│ + hSlider6.val=sys0 +│ + nNum6.val=sys0 +│ + //second value is min value +│ + spstr bText6.txt,tTmp.txt,"|",1 +│ + covx tTmp.txt,sys0,0,0 +│ + hSlider6.minval=sys0 +│ + //third value is max value +│ + spstr bText6.txt,tTmp.txt,"|",2 +│ + covx tTmp.txt,sys0,0,0 +│ + hSlider6.maxval=sys0 +│ + } +│ } +│ if(tInstruction.txt=="pageType") +│ { +│ sleepValue=0 +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ @@ -1885,18 +2665,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardGrid.txt +├── +++ HMI/US/portrait/n2t-out/cardGrid.txt +│ @@ -870,18 +870,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardLChart.txt +├── +++ HMI/US/portrait/n2t-out/cardLChart.txt +│ @@ -616,18 +616,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardMedia.txt +├── +++ HMI/US/portrait/n2t-out/cardMedia.txt +│ @@ -1154,18 +1154,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardPower.txt +├── +++ HMI/US/portrait/n2t-out/cardPower.txt +│ @@ -35,27 +35,27 @@ +│ vis t0Icon,0 +│ vis t1Icon,0 +│ vis t2Icon,0 +│ vis t3Icon,0 +│ vis t4Icon,0 +│ vis t5Icon,0 +│ cardPower.bco=defaultBcoColor +│ - for(sys0=0;sys0<54;sys0++) +│ + for(sys0=0;sys0<48;sys0++) +│ { +│ if(b[sys0].type==98||b[sys0].type==116) +│ { +│ b[sys0].bco=defaultBcoColor +│ b[sys0].pco=defaultFontColor +│ } +│ if(defaultBcoColor==0) +│ { +│ if(b[sys0].type==1) +│ { +│ - b[sys0].pic=21 +│ - b[sys0].pic1=21 +│ + b[sys0].pic=19 +│ + b[sys0].pic1=19 +│ b[sys0].pic2=15 +│ } +│ } +│ } +│ +│ Variable (string) nent1 +│ Attributes +│ @@ -69,46 +69,82 @@ +│ Text : +│ Max. Text Size: 80 +│ +│ Variable (string) strCommand +│ Attributes +│ Scope : local +│ Text : +│ - Max. Text Size: 1000 +│ + Max. Text Size: 275 +│ +│ Variable (int32) t0Speed +│ Attributes +│ Scope: local +│ Value: 0 +│ +│ +Variable (string) t0o +│ + Attributes +│ + Scope : local +│ + Text : +│ + Max. Text Size: 1 +│ + +│ Variable (int32) t1Speed +│ Attributes +│ Scope: local +│ Value: 0 +│ +│ +Variable (string) t1o +│ + Attributes +│ + Scope : local +│ + Text : +│ + Max. Text Size: 1 +│ + +│ Variable (int32) t2Speed +│ Attributes +│ Scope: local +│ Value: 0 +│ +│ +Variable (string) t2o +│ + Attributes +│ + Scope : local +│ + Text : +│ + Max. Text Size: 1 +│ + +│ Variable (int32) t3Speed +│ Attributes +│ Scope: local +│ Value: 0 +│ +│ +Variable (string) t3o +│ + Attributes +│ + Scope : local +│ + Text : +│ + Max. Text Size: 1 +│ + +│ Variable (int32) t4Speed +│ Attributes +│ Scope: local +│ Value: 0 +│ +│ +Variable (string) t4o +│ + Attributes +│ + Scope : local +│ + Text : +│ + Max. Text Size: 1 +│ + +│ Variable (int32) t5Speed +│ Attributes +│ Scope: local +│ Value: 0 +│ +│ +Variable (string) t5o +│ + Attributes +│ + Scope : local +│ + Text : +│ + Max. Text Size: 1 +│ + +│ Variable (string) tId +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 20 +│ +│ Variable (string) tInstruction +│ @@ -135,24 +171,14 @@ +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text :  +│ Max. Text Size : 5 +│ +│ -Text t0o +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Disable release event after dragging: 0 +│ - Send Component ID : disabled +│ - Associated Keyboard : none +│ - Text : +│ - Max. Text Size : 20 +│ - +│ Text t0u +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ @@ -175,24 +201,14 @@ +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text :  +│ Max. Text Size : 5 +│ +│ -Text t1o +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Disable release event after dragging: 0 +│ - Send Component ID : disabled +│ - Associated Keyboard : none +│ - Text : +│ - Max. Text Size : 20 +│ - +│ Text t1u +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ @@ -205,24 +221,14 @@ +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : î ° +│ Max. Text Size : 5 +│ +│ -Text t2o +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Disable release event after dragging: 0 +│ - Send Component ID : disabled +│ - Associated Keyboard : none +│ - Text : +│ - Max. Text Size : 20 +│ - +│ Text t2u +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ @@ -235,24 +241,14 @@ +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : î ° +│ Max. Text Size : 5 +│ +│ -Text t3o +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Disable release event after dragging: 0 +│ - Send Component ID : disabled +│ - Associated Keyboard : none +│ - Text : +│ - Max. Text Size : 20 +│ - +│ Text t3u +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ @@ -265,24 +261,14 @@ +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : î´½ +│ Max. Text Size : 5 +│ +│ -Text t4o +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Disable release event after dragging: 0 +│ - Send Component ID : disabled +│ - Associated Keyboard : none +│ - Text : +│ - Max. Text Size : 20 +│ - +│ Text t4u +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ @@ -295,24 +281,14 @@ +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text :  +│ Max. Text Size : 5 +│ +│ -Text t5o +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Disable release event after dragging: 0 +│ - Send Component ID : disabled +│ - Associated Keyboard : none +│ - Text : +│ - Max. Text Size : 20 +│ - +│ Text t5u +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ @@ -535,85 +511,79 @@ +│ h0.val=h0.minval +│ } +│ if(sys0h1.maxval) +│ { +│ h1.val=h1.minval +│ } +│ if(sys0h2.maxval) +│ { +│ h2.val=h2.minval +│ } +│ if(sys0h3.maxval) +│ { +│ h3.val=h3.minval +│ } +│ if(sys0h4.maxval) +│ { +│ h4.val=h4.minval +│ } +│ if(sys0h5.maxval) +│ { +│ h5.val=h5.minval +│ } +│ if(sys0h1.maxval) ++ { ++ h1.val=h1.minval ++ } ++ if(sys0h2.maxval) ++ { ++ h2.val=h2.minval ++ } ++ if(sys0h3.maxval) ++ { ++ h3.val=h3.minval ++ } ++ if(sys0h4.maxval) ++ { ++ h4.val=h4.minval ++ } ++ if(sys0h5.maxval) ++ { ++ h5.val=h5.minval ++ } ++ if(sys0120) { t0Speed.val=120 @@ -1297,6 +1301,10 @@ Timer tmSerial // speed spstr strCommand.txt,tTmp.txt,"~",41 covx tTmp.txt,t1Speed.val,0,0 + if(p0.h==320) + { + t1Speed.val=t1Speed.val*-1 + } if(t1Speed.val>120) { t1Speed.val=120 @@ -1328,6 +1336,10 @@ Timer tmSerial // speed spstr strCommand.txt,tTmp.txt,"~",48 covx tTmp.txt,t2Speed.val,0,0 + if(p0.h==320) + { + t2Speed.val=t2Speed.val*-1 + } if(t2Speed.val>120) { t2Speed.val=120 @@ -1359,6 +1371,10 @@ Timer tmSerial // speed spstr strCommand.txt,tTmp.txt,"~",55 covx tTmp.txt,t3Speed.val,0,0 + if(p0.h==320) + { + t3Speed.val=t3Speed.val*-1 + } if(t3Speed.val>120) { t3Speed.val=120 @@ -1390,6 +1406,10 @@ Timer tmSerial // speed spstr strCommand.txt,tTmp.txt,"~",62 covx tTmp.txt,t4Speed.val,0,0 + if(p0.h==320) + { + t4Speed.val=t4Speed.val*-1 + } if(t4Speed.val>120) { t4Speed.val=120 @@ -1421,6 +1441,10 @@ Timer tmSerial // speed spstr strCommand.txt,tTmp.txt,"~",69 covx tTmp.txt,t5Speed.val,0,0 + if(p0.h==320) + { + t5Speed.val=t5Speed.val*-1 + } if(t5Speed.val>120) { t5Speed.val=120 @@ -1467,6 +1491,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities 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 f143d85d..b32bd2e3 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 @@ -58,6 +58,10 @@ cardQR 34 Component(s) 402 Line(s) of event code 234 Unique line(s) of event code +cardPower + 54 Component(s) + 517 Line(s) of event code + 339 Unique line(s) of event code cardThermo 57 Component(s) 532 Line(s) of event code @@ -66,10 +70,6 @@ popupTimer 42 Component(s) 512 Line(s) of event code 255 Unique line(s) of event code -cardPower - 54 Component(s) - 489 Line(s) of event code - 330 Unique line(s) of event code screensaver 46 Component(s) 421 Line(s) of event code @@ -90,5 +90,5 @@ cardEntities Total 21 Page(s) 811 Component(s) - 9554 Line(s) of event code - 2447 Unique line(s) of event code + 9582 Line(s) of event code + 2454 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardPower.txt b/HMI/US/portrait/n2t-out/cardPower.txt index 93a427a1..5f219fcc 100644 --- a/HMI/US/portrait/n2t-out/cardPower.txt +++ b/HMI/US/portrait/n2t-out/cardPower.txt @@ -692,6 +692,10 @@ Timer tmSerial // speed spstr strCommand.txt,tTmp.txt,"~",34 covx tTmp.txt,t0Speed.val,0,0 + if(p0.h==320) + { + t0Speed.val=t0Speed.val*-1 + } if(t0Speed.val>120) { t0Speed.val=120 @@ -723,6 +727,10 @@ Timer tmSerial // speed spstr strCommand.txt,tTmp.txt,"~",41 covx tTmp.txt,t1Speed.val,0,0 + if(p0.h==320) + { + t1Speed.val=t1Speed.val*-1 + } if(t1Speed.val>120) { t1Speed.val=120 @@ -754,6 +762,10 @@ Timer tmSerial // speed spstr strCommand.txt,tTmp.txt,"~",48 covx tTmp.txt,t2Speed.val,0,0 + if(p0.h==320) + { + t2Speed.val=t2Speed.val*-1 + } if(t2Speed.val>120) { t2Speed.val=120 @@ -785,6 +797,10 @@ Timer tmSerial // speed spstr strCommand.txt,tTmp.txt,"~",55 covx tTmp.txt,t3Speed.val,0,0 + if(p0.h==320) + { + t3Speed.val=t3Speed.val*-1 + } if(t3Speed.val>120) { t3Speed.val=120 @@ -816,6 +832,10 @@ Timer tmSerial // speed spstr strCommand.txt,tTmp.txt,"~",62 covx tTmp.txt,t4Speed.val,0,0 + if(p0.h==320) + { + t4Speed.val=t4Speed.val*-1 + } if(t4Speed.val>120) { t4Speed.val=120 @@ -847,6 +867,10 @@ Timer tmSerial // speed spstr strCommand.txt,tTmp.txt,"~",69 covx tTmp.txt,t5Speed.val,0,0 + if(p0.h==320) + { + t5Speed.val=t5Speed.val*-1 + } if(t5Speed.val>120) { t5Speed.val=120 @@ -893,6 +917,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out-visual/cardPower.txt b/HMI/n2t-out-visual/cardPower.txt index a37c9a64..9bfb59ab 100644 --- a/HMI/n2t-out-visual/cardPower.txt +++ b/HMI/n2t-out-visual/cardPower.txt @@ -1410,6 +1410,10 @@ Timer tmSerial // speed spstr strCommand.txt,tTmp.txt,"~",34 covx tTmp.txt,t0Speed.val,0,0 + if(p0.h==320) + { + t0Speed.val=t0Speed.val*-1 + } if(t0Speed.val>120) { t0Speed.val=120 @@ -1441,6 +1445,10 @@ Timer tmSerial // speed spstr strCommand.txt,tTmp.txt,"~",41 covx tTmp.txt,t1Speed.val,0,0 + if(p0.h==320) + { + t1Speed.val=t1Speed.val*-1 + } if(t1Speed.val>120) { t1Speed.val=120 @@ -1472,6 +1480,10 @@ Timer tmSerial // speed spstr strCommand.txt,tTmp.txt,"~",48 covx tTmp.txt,t2Speed.val,0,0 + if(p0.h==320) + { + t2Speed.val=t2Speed.val*-1 + } if(t2Speed.val>120) { t2Speed.val=120 @@ -1503,6 +1515,10 @@ Timer tmSerial // speed spstr strCommand.txt,tTmp.txt,"~",55 covx tTmp.txt,t3Speed.val,0,0 + if(p0.h==320) + { + t3Speed.val=t3Speed.val*-1 + } if(t3Speed.val>120) { t3Speed.val=120 @@ -1534,6 +1550,10 @@ Timer tmSerial // speed spstr strCommand.txt,tTmp.txt,"~",62 covx tTmp.txt,t4Speed.val,0,0 + if(p0.h==320) + { + t4Speed.val=t4Speed.val*-1 + } if(t4Speed.val>120) { t4Speed.val=120 @@ -1565,6 +1585,10 @@ Timer tmSerial // speed spstr strCommand.txt,tTmp.txt,"~",69 covx tTmp.txt,t5Speed.val,0,0 + if(p0.h==320) + { + t5Speed.val=t5Speed.val*-1 + } if(t5Speed.val>120) { t5Speed.val=120 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 4ac3cffd..cffb3694 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -50,10 +50,6 @@ cardThermo 57 Component(s) 536 Line(s) of event code 317 Unique line(s) of event code -cardPower - 54 Component(s) - 499 Line(s) of event code - 338 Unique line(s) of event code popupInSel 34 Component(s) 617 Line(s) of event code @@ -74,6 +70,10 @@ screensaver2 59 Component(s) 354 Line(s) of event code 251 Unique line(s) of event code +cardPower + 54 Component(s) + 523 Line(s) of event code + 345 Unique line(s) of event code popupTimer 42 Component(s) 512 Line(s) of event code @@ -90,5 +90,5 @@ cardEntities Total 21 Page(s) 802 Component(s) - 9214 Line(s) of event code - 2333 Unique line(s) of event code + 9238 Line(s) of event code + 2340 Unique line(s) of event code diff --git a/HMI/n2t-out/cardPower.txt b/HMI/n2t-out/cardPower.txt index c74cb351..45911b1e 100644 --- a/HMI/n2t-out/cardPower.txt +++ b/HMI/n2t-out/cardPower.txt @@ -722,6 +722,10 @@ Timer tmSerial // speed spstr strCommand.txt,tTmp.txt,"~",34 covx tTmp.txt,t0Speed.val,0,0 + if(p0.h==320) + { + t0Speed.val=t0Speed.val*-1 + } if(t0Speed.val>120) { t0Speed.val=120 @@ -753,6 +757,10 @@ Timer tmSerial // speed spstr strCommand.txt,tTmp.txt,"~",41 covx tTmp.txt,t1Speed.val,0,0 + if(p0.h==320) + { + t1Speed.val=t1Speed.val*-1 + } if(t1Speed.val>120) { t1Speed.val=120 @@ -784,6 +792,10 @@ Timer tmSerial // speed spstr strCommand.txt,tTmp.txt,"~",48 covx tTmp.txt,t2Speed.val,0,0 + if(p0.h==320) + { + t2Speed.val=t2Speed.val*-1 + } if(t2Speed.val>120) { t2Speed.val=120 @@ -815,6 +827,10 @@ Timer tmSerial // speed spstr strCommand.txt,tTmp.txt,"~",55 covx tTmp.txt,t3Speed.val,0,0 + if(p0.h==320) + { + t3Speed.val=t3Speed.val*-1 + } if(t3Speed.val>120) { t3Speed.val=120 @@ -846,6 +862,10 @@ Timer tmSerial // speed spstr strCommand.txt,tTmp.txt,"~",62 covx tTmp.txt,t4Speed.val,0,0 + if(p0.h==320) + { + t4Speed.val=t4Speed.val*-1 + } if(t4Speed.val>120) { t4Speed.val=120 @@ -877,6 +897,10 @@ Timer tmSerial // speed spstr strCommand.txt,tTmp.txt,"~",69 covx tTmp.txt,t5Speed.val,0,0 + if(p0.h==320) + { + t5Speed.val=t5Speed.val*-1 + } if(t5Speed.val>120) { t5Speed.val=120