diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index 6d612123..ba246587 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -632,14 +632,7 @@ Button bEntity1 Touch Release Event tmLP.en=0 - // event,1,tHeading,tEntityName,1,up - //craft command - // convert pageNumber and write to tTmp - covx nPage,tTmp.txt,0,0 - tSend.txt="event,buttonPress,"+tTmp.txt+"," - tSend.txt+=tHeading.txt+"," - tSend.txt+=entn1.txt+"," - tSend.txt+="1,button" + tSend.txt="event,buttonPress2,"+entn1.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -697,14 +690,7 @@ Button bEntity2 Touch Release Event tmLP.en=0 - // event,1,tHeading,tEntityName,1,up - //craft command - // convert pageNumber and write to tTmp - covx nPage,tTmp.txt,0,0 - tSend.txt="event,buttonPress,"+tTmp.txt+"," - tSend.txt+=tHeading.txt+"," - tSend.txt+=entn2.txt+"," - tSend.txt+="1,button" + tSend.txt="event,buttonPress2,"+entn2.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -762,14 +748,7 @@ Button bEntity3 Touch Release Event tmLP.en=0 - // event,1,tHeading,tEntityName,1,up - //craft command - // convert pageNumber and write to tTmp - covx nPage,tTmp.txt,0,0 - tSend.txt="event,buttonPress,"+tTmp.txt+"," - tSend.txt+=tHeading.txt+"," - tSend.txt+=entn3.txt+"," - tSend.txt+="1,button" + tSend.txt="event,buttonPress2,"+entn3.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -827,14 +806,7 @@ Button bEntity4 Touch Release Event tmLP.en=0 - // event,1,tHeading,tEntityName,1,up - //craft command - // convert pageNumber and write to tTmp - covx nPage,tTmp.txt,0,0 - tSend.txt="event,buttonPress,"+tTmp.txt+"," - tSend.txt+=tHeading.txt+"," - tSend.txt+=entn4.txt+"," - tSend.txt+="1,button" + tSend.txt="event,buttonPress2,"+entn4.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -892,14 +864,7 @@ Button bEntity5 Touch Release Event tmLP.en=0 - // event,1,tHeading,tEntityName,1,up - //craft command - // convert pageNumber and write to tTmp - covx nPage,tTmp.txt,0,0 - tSend.txt="event,buttonPress,"+tTmp.txt+"," - tSend.txt+=tHeading.txt+"," - tSend.txt+=entn5.txt+"," - tSend.txt+="1,button" + tSend.txt="event,buttonPress2,"+entn5.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -957,14 +922,7 @@ Button bEntity6 Touch Release Event tmLP.en=0 - // event,1,tHeading,tEntityName,1,up - //craft command - // convert pageNumber and write to tTmp - covx nPage,tTmp.txt,0,0 - tSend.txt="event,buttonPress,"+tTmp.txt+"," - tSend.txt+=tHeading.txt+"," - tSend.txt+=entn6.txt+"," - tSend.txt+="1,button" + tSend.txt="event,buttonPress2,"+entn6.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out/nspanel_Stats.txt b/HMI/n2t-out/nspanel_Stats.txt index 86e5a297..70f24132 100644 --- a/HMI/n2t-out/nspanel_Stats.txt +++ b/HMI/n2t-out/nspanel_Stats.txt @@ -10,14 +10,14 @@ pageSerialTest 13 Component(s) 48 Line(s) of event code 43 Unique line(s) of event code -popupShutter - 19 Component(s) - 195 Line(s) of event code - 107 Unique line(s) of event code popupNotify 17 Component(s) 180 Line(s) of event code 119 Unique line(s) of event code +popupShutter + 19 Component(s) + 180 Line(s) of event code + 103 Unique line(s) of event code cardMedia 22 Component(s) 200 Line(s) of event code @@ -26,10 +26,6 @@ pageSwipeTest 18 Component(s) 62 Line(s) of event code 44 Unique line(s) of event code -popupLight - 26 Component(s) - 352 Line(s) of event code - 170 Unique line(s) of event code pageTest 14 Component(s) 14 Line(s) of event code @@ -38,18 +34,22 @@ pageStartup 19 Component(s) 146 Line(s) of event code 111 Unique line(s) of event code +popupLight + 26 Component(s) + 304 Line(s) of event code + 167 Unique line(s) of event code screensaver 25 Component(s) 173 Line(s) of event code 124 Unique line(s) of event code -cardGrid - 39 Component(s) - 406 Line(s) of event code - 224 Unique line(s) of event code cardThermo 42 Component(s) 412 Line(s) of event code 221 Unique line(s) of event code +cardGrid + 39 Component(s) + 382 Line(s) of event code + 221 Unique line(s) of event code cardEntities 54 Component(s) 808 Line(s) of event code @@ -62,5 +62,5 @@ cardAlarm Total 14 Page(s) 349 Component(s) - 3272 Line(s) of event code - 828 Unique line(s) of event code + 3185 Line(s) of event code + 834 Unique line(s) of event code diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 34a84b87..b1fb9057 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -450,12 +450,8 @@ Picture pColorWheel Events Touch Press Event - // event,buttonPress,D,nameEntity,internalNameEntity,1,brightnessSlider,50 //craft command - tSend.txt="event,buttonPress,D," - tSend.txt+=tEntity.txt+"," - tSend.txt+=entn.txt+"," - tSend.txt+="1,colorWheel," + tSend.txt="event,buttonPress2,"+entn.txt+",colorWheel," sys0=tch0 sys0=sys0-pColorWheel.x covx sys0,tTmp.txt,0,0 @@ -503,34 +499,9 @@ Slider hBrightness Lower range limit : 0 Events - Touch Press Event - // event,buttonPress,D,nameEntity,internalNameEntity,1,brightnessSlider,50 - //craft command - tSend.txt="event,buttonPress,D," - tSend.txt+=tEntity.txt+"," - tSend.txt+=entn.txt+"," - tSend.txt+="1,brightnessSlider," - covx hBrightness.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,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 - Touch Release Event - // event,buttonPress,D,nameEntity,internalNameEntity,1,brightnessSlider,50 //craft command - tSend.txt="event,buttonPress,D," - tSend.txt+=tEntity.txt+"," - tSend.txt+=entn.txt+"," - tSend.txt+="1,brightnessSlider," + tSend.txt="event,buttonPress2,"+entn.txt+",brightnessSlider," covx hBrightness.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt //send calc crc @@ -571,34 +542,9 @@ Slider hTempSlider Lower range limit : 0 Events - Touch Press Event - // event,buttonPress,D,nameEntity,internalNameEntity,1,colorTempSlider,50 - //craft command - tSend.txt="event,buttonPress,D," - tSend.txt+=tEntity.txt+"," - tSend.txt+=entn.txt+"," - tSend.txt+="1,colorTempSlider," - covx hTempSlider.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,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 - Touch Release Event - // event,buttonPress,D,nameEntity,internalNameEntity,1,colorTempSlider,50 //craft command - tSend.txt="event,buttonPress,D," - tSend.txt+=tEntity.txt+"," - tSend.txt+=entn.txt+"," - tSend.txt+="1,colorTempSlider," + tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider," covx hTempSlider.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt //send calc crc @@ -752,12 +698,8 @@ Dual-state Button btOnOff1 Events Touch Press Event - // event,buttonPress,D,nameEntity,internalNameEntity,1,OnOff,1 //craft command - tSend.txt="event,buttonPress,D," - tSend.txt+=tEntity.txt+"," - tSend.txt+=entn.txt+"," - tSend.txt+="1,OnOff," + tSend.txt="event,buttonPress2,"+entn.txt+","+"OnOff," covx btOnOff1.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt //send calc crc diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index f9a52be4..092fb756 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -332,7 +332,7 @@ Button b2 Touch Press Event sleepTimeout=vaOldSleepT.val //craft command - tSend.txt="event,buttonPress,D,D,"+entn.txt+",1,notifyAction,yes" + tSend.txt="event,buttonPress2,"+entn.txt+",notifyAction,yes" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -381,7 +381,7 @@ Button b1 Touch Press Event sleepTimeout=vaOldSleepT.val //craft command - tSend.txt="event,buttonPress,D,D,"+entn.txt+",1,notifyAction,no" + tSend.txt="event,buttonPress2,"+entn.txt+",notifyAction,no" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index 406d734c..949fdc59 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -313,12 +313,9 @@ Slider hPosition Events Touch Release Event - // event,buttonPress,D,nameEntity,internalNameEntity,1,positionSlider,50 + // event,buttonPress,internalNameEntity,positionSlider,50 //craft command - tSend.txt="event,buttonPress,D," - tSend.txt+=tEntity.txt+"," - tSend.txt+=entn.txt+"," - tSend.txt+="1,positionSlider," + tSend.txt="event,buttonPress2,"+entn.txt+",positionSlider," covx hPosition.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt //send calc crc @@ -419,14 +416,7 @@ Button bDown1 Events Touch Press Event - // event,1,tHeading,tEntityName,1,up - //craft command - // convert pageNumber and write to tTmp - covx nPage,tTmp.txt,0,0 - tSend.txt="event,buttonPress,"+tTmp.txt+"," - tSend.txt+=tEntity.txt+"," - tSend.txt+=entn.txt+"," - tSend.txt+="1,down" + tSend.txt="event,buttonPress2,"+entn.txt+",down" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -473,14 +463,7 @@ Button bStop1 Events Touch Press Event - // event,1,tHeading,tEntityName,1,up - //craft command - // convert pageNumber and write to tTmp - covx nPage,tTmp.txt,0,0 - tSend.txt="event,buttonPress,"+tTmp.txt+"," - tSend.txt+=tEntity.txt+"," - tSend.txt+=entn.txt+"," - tSend.txt+="1,stop" + tSend.txt="event,buttonPress2,"+entn.txt+",stop" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -527,14 +510,7 @@ Button bUp1 Events Touch Press Event - // event,1,tHeading,tEntityName,1,up - //craft command - // convert pageNumber and write to tTmp - covx nPage,tTmp.txt,0,0 - tSend.txt="event,buttonPress,"+tTmp.txt+"," - tSend.txt+=tEntity.txt+"," - tSend.txt+=entn.txt+"," - tSend.txt+="1,up" + tSend.txt="event,buttonPress2,"+entn.txt+",up" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC