diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 44730e29..3d0cb8c7 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -13,25 +13,6 @@ │ - // fix touch offset │ - lcd_dev fffb 0002 0000 0020 │ - page pageStartup -│ --- HMI/n2t-out/cardAlarm.txt -├── +++ HMI/US/landscape/n2t-out/cardAlarm.txt -│ @@ -39,15 +39,15 @@ -│ vis bNext,0 -│ cardAlarm.bco=defaultBcoColor -│ for(sys0=0;sys0<40;sys0++) -│ { -│ if(b[sys0].type==98||b[sys0].type==116) -│ { -│ b[sys0].bco=defaultBcoColor -│ - //b[sys0].pco=defaultFontColor -│ + b[sys0].pco=defaultFontColor -│ } -│ } -│ if(defaultBcoColor==0) -│ { -│ tCode.bco=6371 -│ tCode.pco=40179 -│ } │ --- HMI/n2t-out/pageStartup.txt ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt │ @@ -173,15 +173,15 @@ diff --git a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt index f79a3c92..1a28cab4 100644 --- a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt @@ -51,7 +51,7 @@ Page cardAlarm if(b[sys0].type==98||b[sys0].type==116) { b[sys0].bco=defaultBcoColor - b[sys0].pco=defaultFontColor + //b[sys0].pco=defaultFontColor } } if(defaultBcoColor==0) 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 d9a6ffe2..f338c38e 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 @@ -54,14 +54,14 @@ screensaver 45 Component(s) 410 Line(s) of event code 298 Unique line(s) of event code +cardAlarm + 40 Component(s) + 442 Line(s) of event code + 262 Unique line(s) of event code cardPower 43 Component(s) 439 Line(s) of event code 299 Unique line(s) of event code -cardAlarm - 40 Component(s) - 443 Line(s) of event code - 263 Unique line(s) of event code popupThermo 44 Component(s) 519 Line(s) of event code @@ -82,5 +82,5 @@ cardThermo Total 19 Page(s) 670 Component(s) - 8376 Line(s) of event code + 8375 Line(s) of event code 2116 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out/cardAlarm.txt b/HMI/US/landscape/n2t-out/cardAlarm.txt index 92ae3d32..c67f148a 100644 --- a/HMI/US/landscape/n2t-out/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out/cardAlarm.txt @@ -43,7 +43,7 @@ Page cardAlarm if(b[sys0].type==98||b[sys0].type==116) { b[sys0].bco=defaultBcoColor - b[sys0].pco=defaultFontColor + //b[sys0].pco=defaultFontColor } } if(defaultBcoColor==0) diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 393d202e..67deed92 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -17,65 +17,23 @@ │ page pageStartup │ --- HMI/n2t-out/cardChart.txt ├── +++ HMI/US/portrait/n2t-out/cardChart.txt -│ @@ -175,15 +175,15 @@ +│ @@ -168,15 +168,15 @@ │ Send Component ID : disabled +│ +│ Button bNext +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ - Send Component ID : disabled +│ + Send Component ID : on press │ State : unpressed │ Text :  │ Max. Text Size : 10 │ │ Events │ Touch Press Event -│ - tSend.txt="event,buttonPress2,cardChart," -│ + tSend.txt="event,buttonPress2,cardPower," -│ if(bNext.txt=="") -│ { -│ tSend.txt+="bHome" -│ }else -│ { -│ tSend.txt+="bNext" -│ } -│ @@ -207,15 +207,15 @@ -│ Send Component ID : disabled -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ - tSend.txt="event,buttonPress2,cardChart," -│ + tSend.txt="event,buttonPress2,cardAlarm," -│ if(bPrev.txt=="") -│ { -│ tSend.txt+="bUp" -│ }else -│ { -│ tSend.txt+="bPrev" -│ } -│ @@ -309,14 +309,25 @@ -│ } -│ }else -│ { -│ vis x0,0 -│ vaLast.val=-1 -│ } -│ -│ +Hotspot m1 -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + -│ + Events -│ + Touch Press Event -│ + click bPrev,1 -│ + -│ Hotspot mSwipeNext -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled +│ tSend.txt="event,buttonPress2,cardChart," │ --- HMI/n2t-out/cardEntities.txt ├── +++ HMI/US/portrait/n2t-out/cardEntities.txt │ @@ -61,14 +61,24 @@ @@ -745,74 +703,6 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ -│ @@ -1367,15 +1839,15 @@ -│ vis hSlider1,0 -│ vis nNum1,0 -│ // get Button State (optional Value) -│ spstr strCommand.txt,tTmp.txt,"~",8 -│ covx tTmp.txt,sys0,0,0 -│ btOnOff1.val=sys0 -│ } -│ - if(type1.txt=="text"||type1.txt=="timer") -│ + if(type1.txt=="text") -│ { -│ vis bUp1,0 -│ vis bStop1,0 -│ vis bDown1,0 -│ vis btOnOff1,0 -│ vis bText1,1 -│ tsw bText1,0 -│ @@ -1516,15 +1988,15 @@ -│ vis hSlider2,0 -│ vis nNum2,0 -│ // get Button State (optional Value) -│ spstr strCommand.txt,tTmp.txt,"~",14 -│ covx tTmp.txt,sys0,0,0 -│ btOnOff2.val=sys0 -│ } -│ - if(type2.txt=="text"||type2.txt=="timer") -│ + if(type2.txt=="text") -│ { -│ vis bUp2,0 -│ vis bStop2,0 -│ vis bDown2,0 -│ vis btOnOff2,0 -│ vis bText2,1 -│ tsw bText2,0 -│ @@ -1665,15 +2137,15 @@ -│ vis hSlider3,0 -│ vis nNum3,0 -│ // get Button State (optional Value) -│ spstr strCommand.txt,tTmp.txt,"~",20 -│ covx tTmp.txt,sys0,0,0 -│ btOnOff3.val=sys0 -│ } -│ - if(type3.txt=="text"||type3.txt=="timer") -│ + if(type3.txt=="text") -│ { -│ vis bUp3,0 -│ vis bStop3,0 -│ vis bDown3,0 -│ vis btOnOff3,0 -│ vis bText3,1 -│ tsw bText3,0 -│ @@ -1814,15 +2286,15 @@ -│ vis hSlider4,0 -│ vis nNum4,0 -│ // get Button State (optional Value) -│ spstr strCommand.txt,tTmp.txt,"~",26 -│ covx tTmp.txt,sys0,0,0 -│ btOnOff4.val=sys0 -│ } -│ - if(type4.txt=="text"||type4.txt=="timer") -│ + if(type4.txt=="text") -│ { -│ vis bUp4,0 -│ vis bStop4,0 -│ vis bDown4,0 -│ vis btOnOff4,0 -│ vis bText4,1 -│ tsw bText4,0 │ @@ -1870,14 +2342,312 @@ │ covx tTmp.txt,sys0,0,0 │ hSlider4.minval=sys0 @@ -914,1038 +804,6 @@ │ + covx tTmp.txt,sys0,0,0 │ + btOnOff5.val=sys0 │ + } -│ + if(type5.txt=="text") -│ + { -│ + 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,"~",32 -│ + } -│ + 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,"~",32 -│ + } -│ + 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,"~",32 -│ + //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,"~",33 -│ + // get internal name -│ + spstr strCommand.txt,entn6.txt,"~",34 -│ + 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,"~",35 -│ + vis tIcon6,1 -│ + // change icon color -│ + spstr strCommand.txt,tTmp.txt,"~",36 -│ + covx tTmp.txt,sys0,0,0 -│ + tIcon6.pco=sys0 -│ + // set name -│ + spstr strCommand.txt,tEntity6.txt,"~",37 -│ + 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,"~",38 -│ + // 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,"~",38 -│ + covx tTmp.txt,sys0,0,0 -│ + btOnOff6.val=sys0 -│ + } -│ + if(type6.txt=="text") -│ + { -│ + 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,"~",38 -│ + } -│ + 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,"~",38 -│ + } -│ + 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,"~",38 -│ + //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 -│ @@ -1935,18 +2705,14 @@ -│ { -│ page cardQR -│ } -│ if(tId.txt=="cardPower") -│ { -│ page cardPower -│ } -│ - if(tId.txt=="cardChart") -│ - { -│ - page cardChart -│ - } -│ } -│ if(tInstruction.txt=="time") -│ { -│ // get set time to global variable -│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -│ } -│ if(tInstruction.txt=="date") -│ @@ -1998,33 +2764,1112 @@ -│ Attributes -│ Scope : local -│ Period (ms): 1000 -│ Enabled : yes -│ -│ Events -│ Timer Event -│ - if(sleepTimeout!=0&&dimValue!=dim) -│ + // data available -│ + if(usize>1) -│ { -│ - sleepValue+=1 -│ - if(sleepTimeout<=sleepValue) -│ + bufferPos=0 -│ + while(bufferPos1) -+ { -+ sleepValue+=1 -+ if(sleepTimeout<=sleepValue) -+ bufferPos=0 -+ while(bufferPos1) - { - bufferPos=0 - while(bufferPos1) - { - bufferPos=0 - while(bufferPos