diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 2a66e46f..5008bf0d 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -12,85 +12,6 @@ │ - // fix touch offset │ - lcd_dev fffb 0002 0000 0020 │ - page pageStartup -├── cardAlarm.txt -│ @@ -479,15 +479,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardAlarm," -│ - if(bNext.txt=="?") -│ + if(bNext.txt=="") -│ { -│ tSend.txt+="bHome" -│ }else -│ { -│ tSend.txt+="bNext" -│ } -│ //send calc crc -│ @@ -511,15 +511,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardAlarm," -│ - if(bPrev.txt=="?") -│ + if(bPrev.txt=="") -│ { -│ tSend.txt+="bUp" -│ }else -│ { -│ tSend.txt+="bPrev" -│ } -│ //send calc crc -│ @@ -650,39 +650,39 @@ -│ tsw mSwipeUp,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,1 -│ tsw mSwipeUp,0 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,0 -│ tsw mSwipeUp,1 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ spstr tId.txt,tTmp.txt,"|",1 -│ if(tTmp.txt=="0") -│ { -│ vis bNext,0 -│ tsw mSwipeNext,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ //text arm1 -│ spstr strCommand.txt,arm1.txt,"~",3 -│ if(arm1.txt!="") -│ { -│ vis arm1,1 -│ } ├── cardChart.txt │ @@ -175,16 +175,16 @@ │ Send Component ID : disabled @@ -101,7 +22,7 @@ │ Events │ Touch Press Event │ - tSend.txt="event,buttonPress2,cardChart," -│ - if(bPrev.txt=="?") +│ - if(bPrev.txt=="") │ + tSend.txt="event,buttonPress2,cardPower," │ + if(bNext.txt=="") │ { @@ -111,7 +32,7 @@ │ tSend.txt+="bNext" │ } │ //send calc crc -│ @@ -207,16 +207,16 @@ +│ @@ -207,15 +207,15 @@ │ Send Component ID : disabled │ State : unpressed │ Text :  @@ -120,534 +41,14 @@ │ Events │ Touch Press Event │ - tSend.txt="event,buttonPress2,cardChart," -│ - if(bPrev.txt=="?") │ + tSend.txt="event,buttonPress2,cardAlarm," -│ + if(bPrev.txt=="") +│ if(bPrev.txt=="") │ { │ tSend.txt+="bUp" │ }else │ { │ tSend.txt+="bPrev" │ } -│ //send calc crc -│ @@ -409,39 +409,39 @@ -│ tsw mSwipeUp,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,1 -│ tsw mSwipeUp,0 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,0 -│ tsw mSwipeUp,1 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ spstr tId.txt,tTmp.txt,"|",1 -│ if(tTmp.txt=="0") -│ { -│ vis bNext,0 -│ tsw mSwipeNext,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ // extract color -│ spstr strCommand.txt,tTmp.txt,"~",3 -│ covx tTmp.txt,vaColorL.val,0,0 -│ // prepare dark color -│ sys0=vaColorL.val>>11 // red -│ vaColorD.val=sys0*8/10<<11 // store and shift -├── cardEntities.txt -│ @@ -530,15 +530,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardEntities," -│ - if(bNext.txt=="?") -│ + if(bNext.txt=="") -│ { -│ tSend.txt+="bHome" -│ }else -│ { -│ tSend.txt+="bNext" -│ } -│ //send calc crc -│ @@ -562,15 +562,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardEntities," -│ - if(bPrev.txt=="?") -│ + if(bPrev.txt=="") -│ { -│ tSend.txt+="bUp" -│ }else -│ { -│ tSend.txt+="bPrev" -│ } -│ //send calc crc -│ @@ -1232,39 +1232,39 @@ -│ tsw mSwipeUp,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,1 -│ tsw mSwipeUp,0 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,0 -│ tsw mSwipeUp,1 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ spstr tId.txt,tTmp.txt,"|",1 -│ if(tTmp.txt=="0") -│ { -│ vis bNext,0 -│ tsw mSwipeNext,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ // get Type -│ spstr strCommand.txt,type1.txt,"~",3 -│ // get internal name -│ spstr strCommand.txt,entn1.txt,"~",4 -│ if(type1.txt=="delete"||type1.txt=="") -│ { -├── cardGrid.txt -│ @@ -468,15 +468,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardGrid," -│ - if(bNext.txt=="?") -│ + if(bNext.txt=="") -│ { -│ tSend.txt+="bHome" -│ }else -│ { -│ tSend.txt+="bNext" -│ } -│ //send calc crc -│ @@ -500,15 +500,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardGrid," -│ - if(bPrev.txt=="?") -│ + if(bPrev.txt=="") -│ { -│ tSend.txt+="bUp" -│ }else -│ { -│ tSend.txt+="bPrev" -│ } -│ //send calc crc -│ @@ -659,39 +659,39 @@ -│ tsw mSwipeUp,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,1 -│ tsw mSwipeUp,0 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,0 -│ tsw mSwipeUp,1 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ spstr tId.txt,tTmp.txt,"|",1 -│ if(tTmp.txt=="0") -│ { -│ vis bNext,0 -│ tsw mSwipeNext,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ // get Type -│ spstr strCommand.txt,type1.txt,"~",3 -│ // get internal name -│ spstr strCommand.txt,entn1.txt,"~",4 -│ if(type1.txt=="delete"||type1.txt=="") -│ { -├── cardMedia.txt -│ @@ -444,15 +444,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardMedia," -│ - if(bNext.txt=="?") -│ + if(bNext.txt=="") -│ { -│ tSend.txt+="bHome" -│ }else -│ { -│ tSend.txt+="bNext" -│ } -│ //send calc crc -│ @@ -476,15 +476,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardMedia," -│ - if(bPrev.txt=="?") -│ + if(bPrev.txt=="") -│ { -│ tSend.txt+="bUp" -│ }else -│ { -│ tSend.txt+="bPrev" -│ } -│ //send calc crc -│ @@ -607,39 +607,39 @@ -│ tsw mSwipeUp,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,1 -│ tsw mSwipeUp,0 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,0 -│ tsw mSwipeUp,1 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ spstr tId.txt,tTmp.txt,"|",1 -│ if(tTmp.txt=="0") -│ { -│ vis bNext,0 -│ tsw mSwipeNext,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ //entity name -│ spstr strCommand.txt,entn.txt,"~",3 -│ //icon -│ spstr strCommand.txt,tIcon.txt,"~",4 -│ //icon farbe -│ spstr strCommand.txt,tTmp.txt,"~",5 -├── cardPower.txt -│ @@ -343,15 +343,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardPower," -│ - if(bNext.txt=="?") -│ + if(bNext.txt=="") -│ { -│ tSend.txt+="bHome" -│ }else -│ { -│ tSend.txt+="bNext" -│ } -│ //send calc crc -│ @@ -375,15 +375,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardAlarm," -│ - if(bPrev.txt=="?") -│ + if(bPrev.txt=="") -│ { -│ tSend.txt+="bUp" -│ }else -│ { -│ tSend.txt+="bPrev" -│ } -│ //send calc crc -│ @@ -565,39 +565,39 @@ -│ tsw mSwipeUp,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,1 -│ tsw mSwipeUp,0 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,0 -│ tsw mSwipeUp,1 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ spstr tId.txt,tTmp.txt,"|",1 -│ if(tTmp.txt=="0") -│ { -│ vis bNext,0 -│ tsw mSwipeNext,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ // icon color home -│ spstr strCommand.txt,tTmp.txt,"~",3 -│ covx tTmp.txt,t1.pco,0,0 -│ // icon home -│ spstr strCommand.txt,t1.txt,"~",4 -│ // text home -├── cardQR.txt -│ @@ -184,15 +184,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardQR," -│ - if(bNext.txt=="?") -│ + if(bNext.txt=="") -│ { -│ tSend.txt+="bHome" -│ }else -│ { -│ tSend.txt+="bNext" -│ } -│ //send calc crc -│ @@ -216,15 +216,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardAlarm," -│ - if(bPrev.txt=="?") -│ + if(bPrev.txt=="") -│ { -│ tSend.txt+="bUp" -│ }else -│ { -│ tSend.txt+="bPrev" -│ } -│ //send calc crc -│ @@ -456,39 +456,39 @@ -│ tsw mSwipeUp,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,1 -│ tsw mSwipeUp,0 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,0 -│ tsw mSwipeUp,1 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ spstr tId.txt,tTmp.txt,"|",1 -│ if(tTmp.txt=="0") -│ { -│ vis bNext,0 -│ tsw mSwipeNext,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ //text qrcode -│ spstr strCommand.txt,vaQR.txt,"~",3 -│ // get Type -│ spstr strCommand.txt,type1.txt,"~",4 -│ // get internal name -│ spstr strCommand.txt,entn1.txt,"~",5 -├── cardThermo.txt -│ @@ -291,15 +291,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardThermo," -│ - if(bNext.txt=="?") -│ + if(bNext.txt=="") -│ { -│ tSend.txt+="bHome" -│ }else -│ { -│ tSend.txt+="bNext" -│ } -│ //send calc crc -│ @@ -323,15 +323,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardThermo," -│ - if(bPrev.txt=="?") -│ + if(bPrev.txt=="") -│ { -│ tSend.txt+="bUp" -│ }else -│ { -│ tSend.txt+="bPrev" -│ } -│ //send calc crc -│ @@ -904,39 +904,39 @@ -│ tsw mSwipeUp,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,1 -│ tsw mSwipeUp,0 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,0 -│ tsw mSwipeUp,1 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ spstr tId.txt,tTmp.txt,"|",1 -│ if(tTmp.txt=="0") -│ { -│ vis bNext,0 -│ tsw mSwipeNext,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ //entity name -│ spstr strCommand.txt,entn.txt,"~",3 -│ //currentTemp -│ spstr strCommand.txt,tCurTemp.txt,"~",4 -│ //dstTemp -│ spstr strCommand.txt,tTmp.txt,"~",5 ├── pageStartup.txt │ @@ -173,15 +173,15 @@ │ Max. Text Size : 10 @@ -666,6 +67,126 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd +├── popupFan.txt +│ @@ -619,14 +619,18 @@ +│ { +│ page cardQR +│ } +│ if(tId.txt=="cardPower") +│ { +│ page cardPower +│ } +│ + if(tId.txt=="cardChart") +│ + { +│ + page cardChart +│ + } +│ } +│ // end of user code +│ udelete payloadLength-1 +│ bufferPos=0 +│ } +│ } +│ } +├── popupInSel.txt +│ @@ -893,14 +893,18 @@ +│ { +│ page cardQR +│ } +│ if(tId.txt=="cardPower") +│ { +│ page cardPower +│ } +│ + if(tId.txt=="cardChart") +│ + { +│ + page cardChart +│ + } +│ } +│ // end of user code +│ udelete payloadLength-1 +│ bufferPos=0 +│ } +│ } +│ } +├── popupLight.txt +│ @@ -682,14 +682,18 @@ +│ { +│ page cardQR +│ } +│ if(tId.txt=="cardPower") +│ { +│ page cardPower +│ } +│ + if(tId.txt=="cardChart") +│ + { +│ + page cardChart +│ + } +│ } +│ // end of user code +│ udelete payloadLength-1 +│ bufferPos=0 +│ } +│ } +│ } +├── popupNotify.txt +│ @@ -437,14 +437,18 @@ +│ { +│ page cardQR +│ } +│ if(tId.txt=="cardPower") +│ { +│ page cardPower +│ } +│ + if(tId.txt=="cardChart") +│ + { +│ + page cardChart +│ + } +│ } +│ // end of user code +│ udelete payloadLength-1 +│ bufferPos=0 +│ } +│ } +│ } +├── popupShutter.txt +│ @@ -671,14 +671,18 @@ +│ { +│ page cardQR +│ } +│ if(tId.txt=="cardPower") +│ { +│ page cardPower +│ } +│ + if(tId.txt=="cardChart") +│ + { +│ + page cardChart +│ + } +│ } +│ // end of user code +│ udelete payloadLength-1 +│ bufferPos=0 +│ } +│ } +│ } +├── popupThermo.txt +│ @@ -942,14 +942,18 @@ +│ { +│ page cardQR +│ } +│ if(tId.txt=="cardPower") +│ { +│ page cardPower +│ } +│ + if(tId.txt=="cardChart") +│ + { +│ + page cardChart +│ + } +│ } +│ // end of user code +│ udelete payloadLength-1 +│ bufferPos=0 +│ } +│ } +│ } ├── screensaver.txt │ @@ -351,15 +351,15 @@ │ Text tTime diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 3450793a..ca469c47 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -14,85 +14,6 @@ │ + // fix touch offset (Removed for US version) │ + //lcd_dev fffb 0002 0000 0020 │ page pageStartup -├── cardAlarm.txt -│ @@ -479,15 +479,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardAlarm," -│ - if(bNext.txt=="?") -│ + if(bNext.txt=="") -│ { -│ tSend.txt+="bHome" -│ }else -│ { -│ tSend.txt+="bNext" -│ } -│ //send calc crc -│ @@ -511,15 +511,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardAlarm," -│ - if(bPrev.txt=="?") -│ + if(bPrev.txt=="") -│ { -│ tSend.txt+="bUp" -│ }else -│ { -│ tSend.txt+="bPrev" -│ } -│ //send calc crc -│ @@ -650,39 +650,39 @@ -│ tsw mSwipeUp,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,1 -│ tsw mSwipeUp,0 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,0 -│ tsw mSwipeUp,1 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ spstr tId.txt,tTmp.txt,"|",1 -│ if(tTmp.txt=="0") -│ { -│ vis bNext,0 -│ tsw mSwipeNext,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ //text arm1 -│ spstr strCommand.txt,arm1.txt,"~",3 -│ if(arm1.txt!="") -│ { -│ vis arm1,1 -│ } ├── cardChart.txt │ @@ -175,16 +175,16 @@ │ Send Component ID : disabled @@ -103,7 +24,7 @@ │ Events │ Touch Press Event │ - tSend.txt="event,buttonPress2,cardChart," -│ - if(bPrev.txt=="?") +│ - if(bPrev.txt=="") │ + tSend.txt="event,buttonPress2,cardPower," │ + if(bNext.txt=="") │ { @@ -113,7 +34,7 @@ │ tSend.txt+="bNext" │ } │ //send calc crc -│ @@ -207,16 +207,16 @@ +│ @@ -207,15 +207,15 @@ │ Send Component ID : disabled │ State : unpressed │ Text :  @@ -122,16 +43,14 @@ │ Events │ Touch Press Event │ - tSend.txt="event,buttonPress2,cardChart," -│ - if(bPrev.txt=="?") │ + tSend.txt="event,buttonPress2,cardAlarm," -│ + if(bPrev.txt=="") +│ if(bPrev.txt=="") │ { │ tSend.txt+="bUp" │ }else │ { │ tSend.txt+="bPrev" │ } -│ //send calc crc │ @@ -309,14 +309,25 @@ │ } │ }else @@ -157,51 +76,6 @@ │ Dragging : 0 │ Disable release event after dragging: 0 │ Send Component ID : disabled -│ -│ @@ -409,39 +420,39 @@ -│ tsw mSwipeUp,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,1 -│ tsw mSwipeUp,0 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,0 -│ tsw mSwipeUp,1 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ spstr tId.txt,tTmp.txt,"|",1 -│ if(tTmp.txt=="0") -│ { -│ vis bNext,0 -│ tsw mSwipeNext,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ // extract color -│ spstr strCommand.txt,tTmp.txt,"~",3 -│ covx tTmp.txt,vaColorL.val,0,0 -│ // prepare dark color -│ sys0=vaColorL.val>>11 // red -│ vaColorD.val=sys0*8/10<<11 // store and shift ├── cardEntities.txt │ @@ -61,14 +61,24 @@ │ vis tIcon4,0 @@ -387,7 +261,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ State : unpressed -│ @@ -517,28 +596,53 @@ +│ @@ -517,14 +596,39 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -427,38 +301,6 @@ │ 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,cardEntities," -│ - if(bNext.txt=="?") -│ + if(bNext.txt=="") -│ { -│ tSend.txt+="bHome" -│ }else -│ { -│ tSend.txt+="bNext" -│ } -│ //send calc crc -│ @@ -562,15 +666,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardEntities," -│ - if(bPrev.txt=="?") -│ + if(bPrev.txt=="") -│ { -│ tSend.txt+="bUp" -│ }else -│ { -│ tSend.txt+="bPrev" -│ } -│ //send calc crc │ @@ -681,14 +785,39 @@ │ crcputs tSend.txt,0 │ //send cmd @@ -667,50 +509,6 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ -│ @@ -1232,39 +1469,39 @@ -│ tsw mSwipeUp,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,1 -│ tsw mSwipeUp,0 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,0 -│ tsw mSwipeUp,1 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ spstr tId.txt,tTmp.txt,"|",1 -│ if(tTmp.txt=="0") -│ { -│ vis bNext,0 -│ tsw mSwipeNext,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ // get Type -│ spstr strCommand.txt,type1.txt,"~",3 -│ // get internal name -│ spstr strCommand.txt,entn1.txt,"~",4 -│ if(type1.txt=="delete"||type1.txt=="") -│ { │ @@ -1854,14 +2091,163 @@ │ covx tTmp.txt,sys0,0,0 │ hSlider4.minval=sys0 @@ -875,401 +673,6 @@ │ //command format pageType,specialPageName │ //write name of speical page to tId │ spstr strCommand.txt,tId.txt,"~",1 -├── cardGrid.txt -│ @@ -468,15 +468,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardGrid," -│ - if(bNext.txt=="?") -│ + if(bNext.txt=="") -│ { -│ tSend.txt+="bHome" -│ }else -│ { -│ tSend.txt+="bNext" -│ } -│ //send calc crc -│ @@ -500,15 +500,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardGrid," -│ - if(bPrev.txt=="?") -│ + if(bPrev.txt=="") -│ { -│ tSend.txt+="bUp" -│ }else -│ { -│ tSend.txt+="bPrev" -│ } -│ //send calc crc -│ @@ -659,39 +659,39 @@ -│ tsw mSwipeUp,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,1 -│ tsw mSwipeUp,0 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,0 -│ tsw mSwipeUp,1 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ spstr tId.txt,tTmp.txt,"|",1 -│ if(tTmp.txt=="0") -│ { -│ vis bNext,0 -│ tsw mSwipeNext,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ // get Type -│ spstr strCommand.txt,type1.txt,"~",3 -│ // get internal name -│ spstr strCommand.txt,entn1.txt,"~",4 -│ if(type1.txt=="delete"||type1.txt=="") -│ { -├── cardMedia.txt -│ @@ -444,15 +444,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardMedia," -│ - if(bNext.txt=="?") -│ + if(bNext.txt=="") -│ { -│ tSend.txt+="bHome" -│ }else -│ { -│ tSend.txt+="bNext" -│ } -│ //send calc crc -│ @@ -476,15 +476,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardMedia," -│ - if(bPrev.txt=="?") -│ + if(bPrev.txt=="") -│ { -│ tSend.txt+="bUp" -│ }else -│ { -│ tSend.txt+="bPrev" -│ } -│ //send calc crc -│ @@ -607,39 +607,39 @@ -│ tsw mSwipeUp,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,1 -│ tsw mSwipeUp,0 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,0 -│ tsw mSwipeUp,1 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ spstr tId.txt,tTmp.txt,"|",1 -│ if(tTmp.txt=="0") -│ { -│ vis bNext,0 -│ tsw mSwipeNext,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ //entity name -│ spstr strCommand.txt,entn.txt,"~",3 -│ //icon -│ spstr strCommand.txt,tIcon.txt,"~",4 -│ //icon farbe -│ spstr strCommand.txt,tTmp.txt,"~",5 -├── cardPower.txt -│ @@ -343,15 +343,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardPower," -│ - if(bNext.txt=="?") -│ + if(bNext.txt=="") -│ { -│ tSend.txt+="bHome" -│ }else -│ { -│ tSend.txt+="bNext" -│ } -│ //send calc crc -│ @@ -375,15 +375,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardAlarm," -│ - if(bPrev.txt=="?") -│ + if(bPrev.txt=="") -│ { -│ tSend.txt+="bUp" -│ }else -│ { -│ tSend.txt+="bPrev" -│ } -│ //send calc crc -│ @@ -565,39 +565,39 @@ -│ tsw mSwipeUp,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,1 -│ tsw mSwipeUp,0 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,0 -│ tsw mSwipeUp,1 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ spstr tId.txt,tTmp.txt,"|",1 -│ if(tTmp.txt=="0") -│ { -│ vis bNext,0 -│ tsw mSwipeNext,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ // icon color home -│ spstr strCommand.txt,tTmp.txt,"~",3 -│ covx tTmp.txt,t1.pco,0,0 -│ // icon home -│ spstr strCommand.txt,t1.txt,"~",4 -│ // text home -├── cardQR.txt -│ @@ -184,15 +184,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardQR," -│ - if(bNext.txt=="?") -│ + if(bNext.txt=="") -│ { -│ tSend.txt+="bHome" -│ }else -│ { -│ tSend.txt+="bNext" -│ } -│ //send calc crc -│ @@ -216,15 +216,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardAlarm," -│ - if(bPrev.txt=="?") -│ + if(bPrev.txt=="") -│ { -│ tSend.txt+="bUp" -│ }else -│ { -│ tSend.txt+="bPrev" -│ } -│ //send calc crc -│ @@ -456,39 +456,39 @@ -│ tsw mSwipeUp,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,1 -│ tsw mSwipeUp,0 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,0 -│ tsw mSwipeUp,1 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ spstr tId.txt,tTmp.txt,"|",1 -│ if(tTmp.txt=="0") -│ { -│ vis bNext,0 -│ tsw mSwipeNext,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ //text qrcode -│ spstr strCommand.txt,vaQR.txt,"~",3 -│ // get Type -│ spstr strCommand.txt,type1.txt,"~",4 -│ // get internal name -│ spstr strCommand.txt,entn1.txt,"~",5 -├── cardThermo.txt -│ @@ -291,15 +291,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardThermo," -│ - if(bNext.txt=="?") -│ + if(bNext.txt=="") -│ { -│ tSend.txt+="bHome" -│ }else -│ { -│ tSend.txt+="bNext" -│ } -│ //send calc crc -│ @@ -323,15 +323,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardThermo," -│ - if(bPrev.txt=="?") -│ + if(bPrev.txt=="") -│ { -│ tSend.txt+="bUp" -│ }else -│ { -│ tSend.txt+="bPrev" -│ } -│ //send calc crc -│ @@ -904,39 +904,39 @@ -│ tsw mSwipeUp,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,1 -│ tsw mSwipeUp,0 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bPrev,1 -│ tsw mSwipePrev,0 -│ tsw mSwipeUp,1 -│ - bPrev.txt="?" -│ + bPrev.txt="" -│ } -│ spstr tId.txt,tTmp.txt,"|",1 -│ if(tTmp.txt=="0") -│ { -│ vis bNext,0 -│ tsw mSwipeNext,0 -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ if(tTmp.txt=="2") -│ { -│ vis bNext,1 -│ - bNext.txt="?" -│ + bNext.txt="" -│ } -│ //entity name -│ spstr strCommand.txt,entn.txt,"~",3 -│ //currentTemp -│ spstr strCommand.txt,tCurTemp.txt,"~",4 -│ //dstTemp -│ spstr strCommand.txt,tTmp.txt,"~",5 ├── pageStartup.txt │ @@ -118,15 +118,15 @@ │ Text tMsg3 @@ -1305,3 +708,123 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd +├── popupFan.txt +│ @@ -619,14 +619,18 @@ +│ { +│ page cardQR +│ } +│ if(tId.txt=="cardPower") +│ { +│ page cardPower +│ } +│ + if(tId.txt=="cardChart") +│ + { +│ + page cardChart +│ + } +│ } +│ // end of user code +│ udelete payloadLength-1 +│ bufferPos=0 +│ } +│ } +│ } +├── popupInSel.txt +│ @@ -893,14 +893,18 @@ +│ { +│ page cardQR +│ } +│ if(tId.txt=="cardPower") +│ { +│ page cardPower +│ } +│ + if(tId.txt=="cardChart") +│ + { +│ + page cardChart +│ + } +│ } +│ // end of user code +│ udelete payloadLength-1 +│ bufferPos=0 +│ } +│ } +│ } +├── popupLight.txt +│ @@ -682,14 +682,18 @@ +│ { +│ page cardQR +│ } +│ if(tId.txt=="cardPower") +│ { +│ page cardPower +│ } +│ + if(tId.txt=="cardChart") +│ + { +│ + page cardChart +│ + } +│ } +│ // end of user code +│ udelete payloadLength-1 +│ bufferPos=0 +│ } +│ } +│ } +├── popupNotify.txt +│ @@ -437,14 +437,18 @@ +│ { +│ page cardQR +│ } +│ if(tId.txt=="cardPower") +│ { +│ page cardPower +│ } +│ + if(tId.txt=="cardChart") +│ + { +│ + page cardChart +│ + } +│ } +│ // end of user code +│ udelete payloadLength-1 +│ bufferPos=0 +│ } +│ } +│ } +├── popupShutter.txt +│ @@ -671,14 +671,18 @@ +│ { +│ page cardQR +│ } +│ if(tId.txt=="cardPower") +│ { +│ page cardPower +│ } +│ + if(tId.txt=="cardChart") +│ + { +│ + page cardChart +│ + } +│ } +│ // end of user code +│ udelete payloadLength-1 +│ bufferPos=0 +│ } +│ } +│ } +├── popupThermo.txt +│ @@ -942,14 +942,18 @@ +│ { +│ page cardQR +│ } +│ if(tId.txt=="cardPower") +│ { +│ page cardPower +│ } +│ + if(tId.txt=="cardChart") +│ + { +│ + page cardChart +│ + } +│ } +│ // end of user code +│ udelete payloadLength-1 +│ bufferPos=0 +│ } +│ } +│ } diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index bb567b56..59978782 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,83 +1,4 @@ -+++ /dev/fd/62 2022-11-23 21:49:00.416099064 +0000 -+rdAlarm.txt -+15 +479,15 @@ -+ State : unpressed -+ Text :  -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tSend.txt="event,buttonPress2,cardAlarm," -+ if(bNext.txt=="?") -+ if(bNext.txt=="") -+ { -+ tSend.txt+="bHome" -+ }else -+ { -+ tSend.txt+="bNext" -+ } -+ //send calc crc -+15 +511,15 @@ -+ State : unpressed -+ Text :  -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tSend.txt="event,buttonPress2,cardAlarm," -+ if(bPrev.txt=="?") -+ if(bPrev.txt=="") -+ { -+ tSend.txt+="bUp" -+ }else -+ { -+ tSend.txt+="bPrev" -+ } -+ //send calc crc -+39 +650,39 @@ -+ tsw mSwipeUp,0 -+ } -+ if(tTmp.txt=="1") -+ { -+ vis bPrev,1 -+ tsw mSwipePrev,1 -+ tsw mSwipeUp,0 -+ bPrev.txt="?" -+ bPrev.txt="" -+ } -+ if(tTmp.txt=="2") -+ { -+ vis bPrev,1 -+ tsw mSwipePrev,0 -+ tsw mSwipeUp,1 -+ bPrev.txt="?" -+ bPrev.txt="" -+ } -+ spstr tId.txt,tTmp.txt,"|",1 -+ if(tTmp.txt=="0") -+ { -+ vis bNext,0 -+ tsw mSwipeNext,0 -+ } -+ if(tTmp.txt=="1") -+ { -+ vis bNext,1 -+ tsw mSwipeNext,1 -+ bNext.txt="?" -+ bNext.txt="" -+ } -+ if(tTmp.txt=="2") -+ { -+ vis bNext,1 -+ bNext.txt="?" -+ bNext.txt="" -+ } -+ //text arm1 -+ spstr strCommand.txt,arm1.txt,"~",3 -+ if(arm1.txt!="") -+ { -+ vis arm1,1 -+ } ++++ /dev/fd/62 2022-11-26 21:54:17.076103274 +0000 +rdChart.txt +16 +175,16 @@ + Send Component ID : disabled @@ -88,7 +9,7 @@ +nts + Touch Press Event + tSend.txt="event,buttonPress2,cardChart," -+ if(bPrev.txt=="?") ++ if(bPrev.txt=="") + tSend.txt="event,buttonPress2,cardPower," + if(bNext.txt=="") + { @@ -98,7 +19,7 @@ + tSend.txt+="bNext" + } + //send calc crc -+16 +207,16 @@ ++15 +207,15 @@ + Send Component ID : disabled + State : unpressed + Text :  @@ -107,7 +28,6 @@ +nts + Touch Press Event + tSend.txt="event,buttonPress2,cardChart," -+ if(bPrev.txt=="?") + tSend.txt="event,buttonPress2,cardAlarm," + if(bPrev.txt=="") + { @@ -116,7 +36,6 @@ + { + tSend.txt+="bPrev" + } -+ //send calc crc +14 +309,25 @@ + } + }else @@ -142,520 +61,123 @@ + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled -+ -+39 +420,39 @@ -+ tsw mSwipeUp,0 -+ } -+ if(tTmp.txt=="1") ++pupFan.txt ++14 +619,18 @@ + { -+ vis bPrev,1 -+ tsw mSwipePrev,1 -+ tsw mSwipeUp,0 -+ bPrev.txt="?" -+ bPrev.txt="" ++ page cardQR + } -+ if(tTmp.txt=="2") ++ if(tId.txt=="cardPower") + { -+ vis bPrev,1 -+ tsw mSwipePrev,0 -+ tsw mSwipeUp,1 -+ bPrev.txt="?" -+ bPrev.txt="" ++ page cardPower + } -+ spstr tId.txt,tTmp.txt,"|",1 -+ if(tTmp.txt=="0") ++ if(tId.txt=="cardChart") + { -+ vis bNext,0 -+ tsw mSwipeNext,0 ++ page cardChart + } -+ if(tTmp.txt=="1") ++ } ++ // end of user code ++ udelete payloadLength-1 ++ bufferPos=0 ++ } ++ } ++ } ++pupInSel.txt ++14 +893,18 @@ + { -+ vis bNext,1 -+ tsw mSwipeNext,1 -+ bNext.txt="?" -+ bNext.txt="" ++ page cardQR + } -+ if(tTmp.txt=="2") ++ if(tId.txt=="cardPower") + { -+ vis bNext,1 -+ bNext.txt="?" -+ bNext.txt="" ++ page cardPower + } -+ // extract color -+ spstr strCommand.txt,tTmp.txt,"~",3 -+ covx tTmp.txt,vaColorL.val,0,0 -+ // prepare dark color -+ sys0=vaColorL.val>>11 // red -+ vaColorD.val=sys0*8/10<<11 // store and shift -+28 +596,53 @@ -+ Text :  -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tSend.txt="event,buttonPress2,cardEntities," -+ if(bNext.txt=="?") -+ if(bNext.txt=="") -+ { -+ tSend.txt+="bHome" -+ }else -+ { -+ tSend.txt+="bNext" -+ } -+ //send calc crc -+15 +666,15 @@ -+ State : unpressed -+ Text :  -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tSend.txt="event,buttonPress2,cardEntities," -+ if(bPrev.txt=="?") -+ if(bPrev.txt=="") -+ { -+ tSend.txt+="bUp" -+ }else -+ { -+ tSend.txt+="bPrev" -+ } -+ //send calc crc -+,39 +1469,39 @@ -+ tsw mSwipeUp,0 -+ } -+ if(tTmp.txt=="1") ++ if(tId.txt=="cardChart") + { -+ vis bPrev,1 -+ tsw mSwipePrev,1 -+ tsw mSwipeUp,0 -+ bPrev.txt="?" -+ bPrev.txt="" ++ page cardChart + } -+ if(tTmp.txt=="2") ++ } ++ // end of user code ++ udelete payloadLength-1 ++ bufferPos=0 ++ } ++ } ++ } ++pupLight.txt ++14 +682,18 @@ + { -+ vis bPrev,1 -+ tsw mSwipePrev,0 -+ tsw mSwipeUp,1 -+ bPrev.txt="?" -+ bPrev.txt="" ++ page cardQR + } -+ spstr tId.txt,tTmp.txt,"|",1 -+ if(tTmp.txt=="0") ++ if(tId.txt=="cardPower") + { -+ vis bNext,0 -+ tsw mSwipeNext,0 ++ page cardPower + } -+ if(tTmp.txt=="1") ++ if(tId.txt=="cardChart") + { -+ vis bNext,1 -+ tsw mSwipeNext,1 -+ bNext.txt="?" -+ bNext.txt="" ++ page cardChart + } -+ if(tTmp.txt=="2") ++ } ++ // end of user code ++ udelete payloadLength-1 ++ bufferPos=0 ++ } ++ } ++ } ++pupNotify.txt ++14 +437,18 @@ + { -+ vis bNext,1 -+ bNext.txt="?" -+ bNext.txt="" ++ page cardQR + } -+ // get Type -+ spstr strCommand.txt,type1.txt,"~",3 -+ // get internal name -+ spstr strCommand.txt,entn1.txt,"~",4 -+ if(type1.txt=="delete"||type1.txt=="") ++ if(tId.txt=="cardPower") + { -+rdGrid.txt -+15 +468,15 @@ -+ State : unpressed -+ Text :  -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tSend.txt="event,buttonPress2,cardGrid," -+ if(bNext.txt=="?") -+ if(bNext.txt=="") -+ { -+ tSend.txt+="bHome" -+ }else -+ { -+ tSend.txt+="bNext" -+ } -+ //send calc crc -+15 +500,15 @@ -+ State : unpressed -+ Text :  -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tSend.txt="event,buttonPress2,cardGrid," -+ if(bPrev.txt=="?") -+ if(bPrev.txt=="") -+ { -+ tSend.txt+="bUp" -+ }else -+ { -+ tSend.txt+="bPrev" -+ } -+ //send calc crc -+39 +659,39 @@ -+ tsw mSwipeUp,0 ++ page cardPower + } -+ if(tTmp.txt=="1") ++ if(tId.txt=="cardChart") + { -+ vis bPrev,1 -+ tsw mSwipePrev,1 -+ tsw mSwipeUp,0 -+ bPrev.txt="?" -+ bPrev.txt="" ++ page cardChart + } -+ if(tTmp.txt=="2") ++ } ++ // end of user code ++ udelete payloadLength-1 ++ bufferPos=0 ++ } ++ } ++ } ++pupShutter.txt ++14 +671,18 @@ + { -+ vis bPrev,1 -+ tsw mSwipePrev,0 -+ tsw mSwipeUp,1 -+ bPrev.txt="?" -+ bPrev.txt="" ++ page cardQR + } -+ spstr tId.txt,tTmp.txt,"|",1 -+ if(tTmp.txt=="0") ++ if(tId.txt=="cardPower") + { -+ vis bNext,0 -+ tsw mSwipeNext,0 ++ page cardPower + } -+ if(tTmp.txt=="1") ++ if(tId.txt=="cardChart") + { -+ vis bNext,1 -+ tsw mSwipeNext,1 -+ bNext.txt="?" -+ bNext.txt="" ++ page cardChart + } -+ if(tTmp.txt=="2") ++ } ++ // end of user code ++ udelete payloadLength-1 ++ bufferPos=0 ++ } ++ } ++ } ++pupThermo.txt ++14 +942,18 @@ + { -+ vis bNext,1 -+ bNext.txt="?" -+ bNext.txt="" ++ page cardQR + } -+ // get Type -+ spstr strCommand.txt,type1.txt,"~",3 -+ // get internal name -+ spstr strCommand.txt,entn1.txt,"~",4 -+ if(type1.txt=="delete"||type1.txt=="") ++ if(tId.txt=="cardPower") + { -+rdMedia.txt -+15 +444,15 @@ -+ State : unpressed -+ Text :  -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tSend.txt="event,buttonPress2,cardMedia," -+ if(bNext.txt=="?") -+ if(bNext.txt=="") -+ { -+ tSend.txt+="bHome" -+ }else -+ { -+ tSend.txt+="bNext" -+ } -+ //send calc crc -+15 +476,15 @@ -+ State : unpressed -+ Text :  -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tSend.txt="event,buttonPress2,cardMedia," -+ if(bPrev.txt=="?") -+ if(bPrev.txt=="") -+ { -+ tSend.txt+="bUp" -+ }else -+ { -+ tSend.txt+="bPrev" -+ } -+ //send calc crc -+39 +607,39 @@ -+ tsw mSwipeUp,0 ++ page cardPower + } -+ if(tTmp.txt=="1") ++ if(tId.txt=="cardChart") + { -+ vis bPrev,1 -+ tsw mSwipePrev,1 -+ tsw mSwipeUp,0 -+ bPrev.txt="?" -+ bPrev.txt="" ++ page cardChart + } -+ if(tTmp.txt=="2") -+ { -+ vis bPrev,1 -+ tsw mSwipePrev,0 -+ tsw mSwipeUp,1 -+ bPrev.txt="?" -+ bPrev.txt="" -+ } -+ spstr tId.txt,tTmp.txt,"|",1 -+ if(tTmp.txt=="0") -+ { -+ vis bNext,0 -+ tsw mSwipeNext,0 -+ } -+ if(tTmp.txt=="1") -+ { -+ vis bNext,1 -+ tsw mSwipeNext,1 -+ bNext.txt="?" -+ bNext.txt="" -+ } -+ if(tTmp.txt=="2") -+ { -+ vis bNext,1 -+ bNext.txt="?" -+ bNext.txt="" -+ } -+ //entity name -+ spstr strCommand.txt,entn.txt,"~",3 -+ //icon -+ spstr strCommand.txt,tIcon.txt,"~",4 -+ //icon farbe -+ spstr strCommand.txt,tTmp.txt,"~",5 -+rdPower.txt -+15 +343,15 @@ -+ State : unpressed -+ Text :  -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tSend.txt="event,buttonPress2,cardPower," -+ if(bNext.txt=="?") -+ if(bNext.txt=="") -+ { -+ tSend.txt+="bHome" -+ }else -+ { -+ tSend.txt+="bNext" -+ } -+ //send calc crc -+15 +375,15 @@ -+ State : unpressed -+ Text :  -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tSend.txt="event,buttonPress2,cardAlarm," -+ if(bPrev.txt=="?") -+ if(bPrev.txt=="") -+ { -+ tSend.txt+="bUp" -+ }else -+ { -+ tSend.txt+="bPrev" -+ } -+ //send calc crc -+39 +565,39 @@ -+ tsw mSwipeUp,0 -+ } -+ if(tTmp.txt=="1") -+ { -+ vis bPrev,1 -+ tsw mSwipePrev,1 -+ tsw mSwipeUp,0 -+ bPrev.txt="?" -+ bPrev.txt="" -+ } -+ if(tTmp.txt=="2") -+ { -+ vis bPrev,1 -+ tsw mSwipePrev,0 -+ tsw mSwipeUp,1 -+ bPrev.txt="?" -+ bPrev.txt="" -+ } -+ spstr tId.txt,tTmp.txt,"|",1 -+ if(tTmp.txt=="0") -+ { -+ vis bNext,0 -+ tsw mSwipeNext,0 -+ } -+ if(tTmp.txt=="1") -+ { -+ vis bNext,1 -+ tsw mSwipeNext,1 -+ bNext.txt="?" -+ bNext.txt="" -+ } -+ if(tTmp.txt=="2") -+ { -+ vis bNext,1 -+ bNext.txt="?" -+ bNext.txt="" -+ } -+ // icon color home -+ spstr strCommand.txt,tTmp.txt,"~",3 -+ covx tTmp.txt,t1.pco,0,0 -+ // icon home -+ spstr strCommand.txt,t1.txt,"~",4 -+ // text home -+rdQR.txt -+15 +184,15 @@ -+ State : unpressed -+ Text :  -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tSend.txt="event,buttonPress2,cardQR," -+ if(bNext.txt=="?") -+ if(bNext.txt=="") -+ { -+ tSend.txt+="bHome" -+ }else -+ { -+ tSend.txt+="bNext" -+ } -+ //send calc crc -+15 +216,15 @@ -+ State : unpressed -+ Text :  -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tSend.txt="event,buttonPress2,cardAlarm," -+ if(bPrev.txt=="?") -+ if(bPrev.txt=="") -+ { -+ tSend.txt+="bUp" -+ }else -+ { -+ tSend.txt+="bPrev" -+ } -+ //send calc crc -+39 +456,39 @@ -+ tsw mSwipeUp,0 -+ } -+ if(tTmp.txt=="1") -+ { -+ vis bPrev,1 -+ tsw mSwipePrev,1 -+ tsw mSwipeUp,0 -+ bPrev.txt="?" -+ bPrev.txt="" -+ } -+ if(tTmp.txt=="2") -+ { -+ vis bPrev,1 -+ tsw mSwipePrev,0 -+ tsw mSwipeUp,1 -+ bPrev.txt="?" -+ bPrev.txt="" -+ } -+ spstr tId.txt,tTmp.txt,"|",1 -+ if(tTmp.txt=="0") -+ { -+ vis bNext,0 -+ tsw mSwipeNext,0 -+ } -+ if(tTmp.txt=="1") -+ { -+ vis bNext,1 -+ tsw mSwipeNext,1 -+ bNext.txt="?" -+ bNext.txt="" -+ } -+ if(tTmp.txt=="2") -+ { -+ vis bNext,1 -+ bNext.txt="?" -+ bNext.txt="" -+ } -+ //text qrcode -+ spstr strCommand.txt,vaQR.txt,"~",3 -+ // get Type -+ spstr strCommand.txt,type1.txt,"~",4 -+ // get internal name -+ spstr strCommand.txt,entn1.txt,"~",5 -+rdThermo.txt -+15 +291,15 @@ -+ State : unpressed -+ Text :  -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tSend.txt="event,buttonPress2,cardThermo," -+ if(bNext.txt=="?") -+ if(bNext.txt=="") -+ { -+ tSend.txt+="bHome" -+ }else -+ { -+ tSend.txt+="bNext" -+ } -+ //send calc crc -+15 +323,15 @@ -+ State : unpressed -+ Text :  -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tSend.txt="event,buttonPress2,cardThermo," -+ if(bPrev.txt=="?") -+ if(bPrev.txt=="") -+ { -+ tSend.txt+="bUp" -+ }else -+ { -+ tSend.txt+="bPrev" -+ } -+ //send calc crc -+39 +904,39 @@ -+ tsw mSwipeUp,0 -+ } -+ if(tTmp.txt=="1") -+ { -+ vis bPrev,1 -+ tsw mSwipePrev,1 -+ tsw mSwipeUp,0 -+ bPrev.txt="?" -+ bPrev.txt="" -+ } -+ if(tTmp.txt=="2") -+ { -+ vis bPrev,1 -+ tsw mSwipePrev,0 -+ tsw mSwipeUp,1 -+ bPrev.txt="?" -+ bPrev.txt="" -+ } -+ spstr tId.txt,tTmp.txt,"|",1 -+ if(tTmp.txt=="0") -+ { -+ vis bNext,0 -+ tsw mSwipeNext,0 -+ } -+ if(tTmp.txt=="1") -+ { -+ vis bNext,1 -+ tsw mSwipeNext,1 -+ bNext.txt="?" -+ bNext.txt="" -+ } -+ if(tTmp.txt=="2") -+ { -+ vis bNext,1 -+ bNext.txt="?" -+ bNext.txt="" -+ } -+ //entity name -+ spstr strCommand.txt,entn.txt,"~",3 -+ //currentTemp -+ spstr strCommand.txt,tCurTemp.txt,"~",4 -+ //dstTemp -+ spstr strCommand.txt,tTmp.txt,"~",5 ++ } ++ // end of user code ++ udelete payloadLength-1 ++ bufferPos=0 ++ } ++ } ++ } diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index 8bfd3fee..f73b3c4d 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -1015,7 +1015,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardAlarm," - if(bNext.txt=="?") + if(bNext.txt=="") { tSend.txt+="bHome" }else @@ -1069,7 +1069,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardAlarm," - if(bPrev.txt=="?") + if(bPrev.txt=="") { tSend.txt+="bUp" }else @@ -1237,14 +1237,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="?" + bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="?" + bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -1256,12 +1256,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="?" + bNext.txt="" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="?" + bNext.txt="" } //text arm1 spstr strCommand.txt,arm1.txt,"~",3 diff --git a/HMI/n2t-out-visual/cardChart.txt b/HMI/n2t-out-visual/cardChart.txt index 70b1ed1a..9ef752a0 100644 --- a/HMI/n2t-out-visual/cardChart.txt +++ b/HMI/n2t-out-visual/cardChart.txt @@ -281,7 +281,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardChart," - if(bPrev.txt=="?") + if(bPrev.txt=="") { tSend.txt+="bHome" }else @@ -335,7 +335,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardChart," - if(bPrev.txt=="?") + if(bPrev.txt=="") { tSend.txt+="bUp" }else @@ -573,14 +573,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="?" + bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="?" + bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -592,12 +592,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="?" + bNext.txt="" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="?" + bNext.txt="" } // extract color spstr strCommand.txt,tTmp.txt,"~",3 diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index 576c63e8..c0a5787f 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -1056,7 +1056,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardEntities," - if(bNext.txt=="?") + if(bNext.txt=="") { tSend.txt+="bHome" }else @@ -1110,7 +1110,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardEntities," - if(bPrev.txt=="?") + if(bPrev.txt=="") { tSend.txt+="bUp" }else @@ -2189,14 +2189,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="?" + bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="?" + bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -2208,12 +2208,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="?" + bNext.txt="" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="?" + bNext.txt="" } // get Type spstr strCommand.txt,type1.txt,"~",3 diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index bdd46057..33482191 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/n2t-out-visual/cardGrid.txt @@ -858,7 +858,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardGrid," - if(bNext.txt=="?") + if(bNext.txt=="") { tSend.txt+="bHome" }else @@ -912,7 +912,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardGrid," - if(bPrev.txt=="?") + if(bPrev.txt=="") { tSend.txt+="bUp" }else @@ -1109,14 +1109,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="?" + bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="?" + bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -1128,12 +1128,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="?" + bNext.txt="" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="?" + bNext.txt="" } // get Type spstr strCommand.txt,type1.txt,"~",3 diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index 05c99be3..ca9e7280 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -829,7 +829,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardMedia," - if(bNext.txt=="?") + if(bNext.txt=="") { tSend.txt+="bHome" }else @@ -883,7 +883,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardMedia," - if(bPrev.txt=="?") + if(bPrev.txt=="") { tSend.txt+="bUp" }else @@ -1043,14 +1043,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="?" + bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="?" + bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -1062,12 +1062,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="?" + bNext.txt="" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="?" + bNext.txt="" } //entity name spstr strCommand.txt,entn.txt,"~",3 diff --git a/HMI/n2t-out-visual/cardPower.txt b/HMI/n2t-out-visual/cardPower.txt index 0c565e9a..c82688c6 100644 --- a/HMI/n2t-out-visual/cardPower.txt +++ b/HMI/n2t-out-visual/cardPower.txt @@ -802,7 +802,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardPower," - if(bNext.txt=="?") + if(bNext.txt=="") { tSend.txt+="bHome" }else @@ -856,7 +856,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardAlarm," - if(bPrev.txt=="?") + if(bPrev.txt=="") { tSend.txt+="bUp" }else @@ -1075,14 +1075,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="?" + bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="?" + bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -1094,12 +1094,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="?" + bNext.txt="" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="?" + bNext.txt="" } // icon color home spstr strCommand.txt,tTmp.txt,"~",3 diff --git a/HMI/n2t-out-visual/cardQR.txt b/HMI/n2t-out-visual/cardQR.txt index 21095f23..f4cb0679 100644 --- a/HMI/n2t-out-visual/cardQR.txt +++ b/HMI/n2t-out-visual/cardQR.txt @@ -339,7 +339,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardQR," - if(bNext.txt=="?") + if(bNext.txt=="") { tSend.txt+="bHome" }else @@ -393,7 +393,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardAlarm," - if(bPrev.txt=="?") + if(bPrev.txt=="") { tSend.txt+="bUp" }else @@ -759,14 +759,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="?" + bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="?" + bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -778,12 +778,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="?" + bNext.txt="" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="?" + bNext.txt="" } //text qrcode spstr strCommand.txt,vaQR.txt,"~",3 diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index b912e07d..010e4c21 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -635,7 +635,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardThermo," - if(bNext.txt=="?") + if(bNext.txt=="") { tSend.txt+="bHome" }else @@ -689,7 +689,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardThermo," - if(bPrev.txt=="?") + if(bPrev.txt=="") { tSend.txt+="bUp" }else @@ -1628,14 +1628,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="?" + bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="?" + bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -1647,12 +1647,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="?" + bNext.txt="" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="?" + bNext.txt="" } //entity name spstr strCommand.txt,entn.txt,"~",3 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index eeefdeba..d711a2bc 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -6,77 +6,77 @@ pageIcons 7 Component(s) 0 Line(s) of event code 0 Unique line(s) of event code +popupShutter + 25 Component(s) + 394 Line(s) of event code + 216 Unique line(s) of event code popupLight 28 Component(s) - 408 Line(s) of event code - 225 Unique line(s) of event code -cardGrid - 42 Component(s) - 494 Line(s) of event code - 286 Unique line(s) of event code + 404 Line(s) of event code + 223 Unique line(s) of event code pageTest - 22 Component(s) - 67 Line(s) of event code - 64 Unique line(s) of event code + 21 Component(s) + 66 Line(s) of event code + 63 Unique line(s) of event code +popupNotify + 19 Component(s) + 253 Line(s) of event code + 164 Unique line(s) of event code pageStartup 19 Component(s) 181 Line(s) of event code 129 Unique line(s) of event code -popupNotify - 19 Component(s) - 257 Line(s) of event code - 166 Unique line(s) of event code cardChart 31 Component(s) 452 Line(s) of event code - 293 Unique line(s) of event code -popupInSel - 34 Component(s) - 533 Line(s) of event code - 259 Unique line(s) of event code -popupFan - 27 Component(s) - 351 Line(s) of event code - 204 Unique line(s) of event code -popupShutter - 25 Component(s) - 398 Line(s) of event code - 218 Unique line(s) of event code + 296 Unique line(s) of event code +cardGrid + 42 Component(s) + 494 Line(s) of event code + 288 Unique line(s) of event code +cardEntities + 65 Component(s) + 1169 Line(s) of event code + 532 Unique line(s) of event code cardPower 43 Component(s) 439 Line(s) of event code - 297 Unique line(s) of event code + 299 Unique line(s) of event code +popupFan + 27 Component(s) + 347 Line(s) of event code + 202 Unique line(s) of event code +cardQR + 32 Component(s) + 425 Line(s) of event code + 244 Unique line(s) of event code +cardAlarm + 40 Component(s) + 443 Line(s) of event code + 263 Unique line(s) of event code +cardMedia + 34 Component(s) + 425 Line(s) of event code + 224 Unique line(s) of event code +popupThermo + 44 Component(s) + 515 Line(s) of event code + 272 Unique line(s) of event code +popupInSel + 34 Component(s) + 529 Line(s) of event code + 257 Unique line(s) of event code +cardThermo + 53 Component(s) + 612 Line(s) of event code + 318 Unique line(s) of event code screensaver 45 Component(s) 400 Line(s) of event code 296 Unique line(s) of event code -cardQR - 32 Component(s) - 425 Line(s) of event code - 242 Unique line(s) of event code -cardAlarm - 40 Component(s) - 443 Line(s) of event code - 261 Unique line(s) of event code -cardMedia - 34 Component(s) - 425 Line(s) of event code - 222 Unique line(s) of event code -popupThermo - 44 Component(s) - 519 Line(s) of event code - 274 Unique line(s) of event code -cardThermo - 53 Component(s) - 612 Line(s) of event code - 316 Unique line(s) of event code -cardEntities - 65 Component(s) - 1169 Line(s) of event code - 530 Unique line(s) of event code Total 18 Page(s) - 610 Component(s) - 7586 Line(s) of event code - 1952 Unique line(s) of event code + 609 Component(s) + 7561 Line(s) of event code + 1954 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/pageTest.txt b/HMI/n2t-out-visual/pageTest.txt index d373f86d..b1b82cf2 100644 --- a/HMI/n2t-out-visual/pageTest.txt +++ b/HMI/n2t-out-visual/pageTest.txt @@ -280,8 +280,8 @@ Button b13 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 215 - y coordinate : 243 + x coordinate : 129 + y coordinate : 216 Width : 100 Height : 50 Effect : load @@ -308,42 +308,6 @@ Button b13 Touch Press Event page popupThermo -Button b14 - Attributes - ID : 21 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 100 - y coordinate : 193 - Width : 100 - Height : 50 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : 3D auto - Font ID : 1 - Back. Color : 50712 - Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 - Font Color (Unpressed) : 0 - Font Color (Pressed) : 65535 - Horizontal Alignment : center - Vertical Alignment : center - State : unpressed - Text : chart - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - - Events - Touch Press Event - page cardChart - Button b2 Attributes ID : 13 diff --git a/HMI/n2t-out-visual/popupFan.txt b/HMI/n2t-out-visual/popupFan.txt index c3654ad2..9b214b96 100644 --- a/HMI/n2t-out-visual/popupFan.txt +++ b/HMI/n2t-out-visual/popupFan.txt @@ -914,10 +914,6 @@ Timer tmSerial { page cardPower } - if(tId.txt=="cardChart") - { - page cardChart - } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out-visual/popupInSel.txt b/HMI/n2t-out-visual/popupInSel.txt index 96f81fa9..35b11a78 100644 --- a/HMI/n2t-out-visual/popupInSel.txt +++ b/HMI/n2t-out-visual/popupInSel.txt @@ -1277,10 +1277,6 @@ Timer tmSerial { page cardPower } - if(tId.txt=="cardChart") - { - page cardChart - } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index 875d5298..351c08be 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -1035,10 +1035,6 @@ Timer tmSerial { page cardPower } - if(tId.txt=="cardChart") - { - page cardChart - } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out-visual/popupNotify.txt b/HMI/n2t-out-visual/popupNotify.txt index 0145e1b9..b4ea9d1d 100644 --- a/HMI/n2t-out-visual/popupNotify.txt +++ b/HMI/n2t-out-visual/popupNotify.txt @@ -670,10 +670,6 @@ Timer tmSerial { page cardPower } - if(tId.txt=="cardChart") - { - page cardChart - } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index 86833bac..dcb43077 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -984,10 +984,6 @@ Timer tmSerial { page cardPower } - if(tId.txt=="cardChart") - { - page cardChart - } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out-visual/popupThermo.txt b/HMI/n2t-out-visual/popupThermo.txt index 56e4b68e..df2b6004 100644 --- a/HMI/n2t-out-visual/popupThermo.txt +++ b/HMI/n2t-out-visual/popupThermo.txt @@ -1372,10 +1372,6 @@ Timer tmSerial { page cardPower } - if(tId.txt=="cardChart") - { - page cardChart - } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index 242eb6b2..92ae3d32 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -483,7 +483,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardAlarm," - if(bNext.txt=="?") + if(bNext.txt=="") { tSend.txt+="bHome" }else @@ -515,7 +515,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardAlarm," - if(bPrev.txt=="?") + if(bPrev.txt=="") { tSend.txt+="bUp" }else @@ -654,14 +654,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="?" + bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="?" + bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -673,12 +673,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="?" + bNext.txt="" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="?" + bNext.txt="" } //text arm1 spstr strCommand.txt,arm1.txt,"~",3 diff --git a/HMI/n2t-out/cardChart.txt b/HMI/n2t-out/cardChart.txt index a2cb965b..a0687e4d 100644 --- a/HMI/n2t-out/cardChart.txt +++ b/HMI/n2t-out/cardChart.txt @@ -180,7 +180,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardChart," - if(bPrev.txt=="?") + if(bPrev.txt=="") { tSend.txt+="bHome" }else @@ -212,7 +212,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardChart," - if(bPrev.txt=="?") + if(bPrev.txt=="") { tSend.txt+="bUp" }else @@ -413,14 +413,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="?" + bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="?" + bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -432,12 +432,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="?" + bNext.txt="" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="?" + bNext.txt="" } // extract color spstr strCommand.txt,tTmp.txt,"~",3 diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 5417ae6b..4562d181 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -534,7 +534,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardEntities," - if(bNext.txt=="?") + if(bNext.txt=="") { tSend.txt+="bHome" }else @@ -566,7 +566,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardEntities," - if(bPrev.txt=="?") + if(bPrev.txt=="") { tSend.txt+="bUp" }else @@ -1236,14 +1236,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="?" + bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="?" + bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -1255,12 +1255,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="?" + bNext.txt="" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="?" + bNext.txt="" } // get Type spstr strCommand.txt,type1.txt,"~",3 diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index 2eb4f153..7c959fd6 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -472,7 +472,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardGrid," - if(bNext.txt=="?") + if(bNext.txt=="") { tSend.txt+="bHome" }else @@ -504,7 +504,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardGrid," - if(bPrev.txt=="?") + if(bPrev.txt=="") { tSend.txt+="bUp" }else @@ -663,14 +663,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="?" + bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="?" + bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -682,12 +682,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="?" + bNext.txt="" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="?" + bNext.txt="" } // get Type spstr strCommand.txt,type1.txt,"~",3 diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index 79face53..a99fab40 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -448,7 +448,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardMedia," - if(bNext.txt=="?") + if(bNext.txt=="") { tSend.txt+="bHome" }else @@ -480,7 +480,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardMedia," - if(bPrev.txt=="?") + if(bPrev.txt=="") { tSend.txt+="bUp" }else @@ -611,14 +611,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="?" + bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="?" + bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -630,12 +630,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="?" + bNext.txt="" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="?" + bNext.txt="" } //entity name spstr strCommand.txt,entn.txt,"~",3 diff --git a/HMI/n2t-out/cardPower.txt b/HMI/n2t-out/cardPower.txt index 2cadfaaa..cfc75293 100644 --- a/HMI/n2t-out/cardPower.txt +++ b/HMI/n2t-out/cardPower.txt @@ -347,7 +347,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardPower," - if(bNext.txt=="?") + if(bNext.txt=="") { tSend.txt+="bHome" }else @@ -379,7 +379,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardAlarm," - if(bPrev.txt=="?") + if(bPrev.txt=="") { tSend.txt+="bUp" }else @@ -569,14 +569,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="?" + bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="?" + bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -588,12 +588,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="?" + bNext.txt="" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="?" + bNext.txt="" } // icon color home spstr strCommand.txt,tTmp.txt,"~",3 diff --git a/HMI/n2t-out/cardQR.txt b/HMI/n2t-out/cardQR.txt index bb217968..9b3e879a 100644 --- a/HMI/n2t-out/cardQR.txt +++ b/HMI/n2t-out/cardQR.txt @@ -188,7 +188,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardQR," - if(bNext.txt=="?") + if(bNext.txt=="") { tSend.txt+="bHome" }else @@ -220,7 +220,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardAlarm," - if(bPrev.txt=="?") + if(bPrev.txt=="") { tSend.txt+="bUp" }else @@ -460,14 +460,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="?" + bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="?" + bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -479,12 +479,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="?" + bNext.txt="" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="?" + bNext.txt="" } //text qrcode spstr strCommand.txt,vaQR.txt,"~",3 diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index b202c349..1ff706bb 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -295,7 +295,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardThermo," - if(bNext.txt=="?") + if(bNext.txt=="") { tSend.txt+="bHome" }else @@ -327,7 +327,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardThermo," - if(bPrev.txt=="?") + if(bPrev.txt=="") { tSend.txt+="bUp" }else @@ -908,14 +908,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="?" + bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="?" + bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -927,12 +927,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="?" + bNext.txt="" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="?" + bNext.txt="" } //entity name spstr strCommand.txt,entn.txt,"~",3 diff --git a/HMI/n2t-out/pageTest.txt b/HMI/n2t-out/pageTest.txt index ba9dc59a..b1d140fc 100644 --- a/HMI/n2t-out/pageTest.txt +++ b/HMI/n2t-out/pageTest.txt @@ -135,20 +135,6 @@ Button b13 Touch Press Event page popupThermo -Button b14 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed - Text : chart - Max. Text Size : 10 - - Events - Touch Press Event - page cardChart - Button b2 Attributes Scope : local diff --git a/HMI/n2t-out/popupFan.txt b/HMI/n2t-out/popupFan.txt index 6a557672..1241982e 100644 --- a/HMI/n2t-out/popupFan.txt +++ b/HMI/n2t-out/popupFan.txt @@ -623,10 +623,6 @@ Timer tmSerial { page cardPower } - if(tId.txt=="cardChart") - { - page cardChart - } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/popupInSel.txt b/HMI/n2t-out/popupInSel.txt index d984cb27..37f29287 100644 --- a/HMI/n2t-out/popupInSel.txt +++ b/HMI/n2t-out/popupInSel.txt @@ -897,10 +897,6 @@ Timer tmSerial { page cardPower } - if(tId.txt=="cardChart") - { - page cardChart - } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 62684594..91ddd9cc 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -686,10 +686,6 @@ Timer tmSerial { page cardPower } - if(tId.txt=="cardChart") - { - page cardChart - } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index 554a90ca..a137ef6e 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -441,10 +441,6 @@ Timer tmSerial { page cardPower } - if(tId.txt=="cardChart") - { - page cardChart - } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index b56fc209..9fdce22d 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -675,10 +675,6 @@ Timer tmSerial { page cardPower } - if(tId.txt=="cardChart") - { - page cardChart - } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/popupThermo.txt b/HMI/n2t-out/popupThermo.txt index 8a3616fb..878a8ae8 100644 --- a/HMI/n2t-out/popupThermo.txt +++ b/HMI/n2t-out/popupThermo.txt @@ -946,10 +946,6 @@ Timer tmSerial { page cardPower } - if(tId.txt=="cardChart") - { - page cardChart - } } // end of user code udelete payloadLength-1