diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index c95ce627..03337f12 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -14,6 +14,94 @@ │ + //lcd_dev fffb 0002 0000 0020 │ printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port │ page pageStartup +│ --- HMI/n2t-out/cardGrid2.txt +├── +++ HMI/US/landscape/n2t-out/cardGrid2.txt +│ @@ -555,34 +555,34 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tmLP.en=1 +│ - tTmp.txt=type7.txt +│ - pageIcons.tTmp1.txt=tEntity7.txt +│ - pageIcons.tTmp2.txt=entn7.txt +│ - pageIcons.tTmp3.txt=bEntity7.txt +│ - if(type7.txt=="shutter") +│ + tTmp.txt=type6.txt +│ + pageIcons.tTmp1.txt=tEntity6.txt +│ + pageIcons.tTmp2.txt=entn6.txt +│ + pageIcons.tTmp3.txt=bEntity6.txt +│ + if(type6.txt=="shutter") +│ { +│ page popupShutter +│ } +│ - if(type7.txt=="input_sel") +│ + if(type6.txt=="input_sel") +│ { +│ page popupInSel +│ } +│ - if(type7.txt=="timer") +│ + if(type6.txt=="timer") +│ { +│ page popupTimer +│ } +│ +│ Touch Release Event +│ tmLP.en=0 +│ - tSend.txt="event,buttonPress2,"+entn7.txt+",button" +│ + 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 +│ @@ -599,34 +599,34 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tmLP.en=1 +│ - tTmp.txt=type8.txt +│ - pageIcons.tTmp1.txt=tEntity8.txt +│ - pageIcons.tTmp2.txt=entn8.txt +│ - pageIcons.tTmp3.txt=bEntity8.txt +│ - if(type8.txt=="shutter") +│ + tTmp.txt=type6.txt +│ + pageIcons.tTmp1.txt=tEntity6.txt +│ + pageIcons.tTmp2.txt=entn6.txt +│ + pageIcons.tTmp3.txt=bEntity6.txt +│ + if(type6.txt=="shutter") +│ { +│ page popupShutter +│ } +│ - if(type8.txt=="input_sel") +│ + if(type6.txt=="input_sel") +│ { +│ page popupInSel +│ } +│ - if(type8.txt=="timer") +│ + if(type6.txt=="timer") +│ { +│ page popupTimer +│ } +│ +│ Touch Release Event +│ tmLP.en=0 +│ - tSend.txt="event,buttonPress2,"+entn8.txt+",button" +│ + 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 │ --- HMI/n2t-out/cardPower.txt ├── +++ HMI/US/landscape/n2t-out/cardPower.txt │ @@ -960,18 +960,14 @@ diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index d3d027d1..5c337b29 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1126,7 +1126,7 @@ │ Send Component ID : disabled │ Associated Keyboard: none │ Text : -│ @@ -555,14 +578,58 @@ +│ @@ -555,34 +578,34 @@ │ State : unpressed │ Text :  │ Max. Text Size : 10 @@ -1134,26 +1134,74 @@ │ Events │ Touch Press Event │ tmLP.en=1 +│ - tTmp.txt=type7.txt +│ - pageIcons.tTmp1.txt=tEntity7.txt +│ - pageIcons.tTmp2.txt=entn7.txt +│ - pageIcons.tTmp3.txt=bEntity7.txt +│ - if(type7.txt=="shutter") │ + tTmp.txt=type2.txt │ + pageIcons.tTmp1.txt=tEntity2.txt │ + pageIcons.tTmp2.txt=entn2.txt │ + pageIcons.tTmp3.txt=bEntity2.txt │ + if(type2.txt=="shutter") +│ { +│ page popupShutter +│ } +│ - if(type7.txt=="input_sel") +│ + if(type2.txt=="input_sel") +│ { +│ page popupInSel +│ } +│ - if(type7.txt=="timer") +│ + if(type2.txt=="timer") +│ { +│ page popupTimer +│ } +│ +│ Touch Release Event +│ tmLP.en=0 +│ - tSend.txt="event,buttonPress2,"+entn7.txt+",button" +│ + tSend.txt="event,buttonPress2,"+entn2.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 +│ @@ -599,34 +622,78 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tmLP.en=1 +│ - tTmp.txt=type8.txt +│ - pageIcons.tTmp1.txt=tEntity8.txt +│ - pageIcons.tTmp2.txt=entn8.txt +│ - pageIcons.tTmp3.txt=bEntity8.txt +│ - if(type8.txt=="shutter") +│ + tTmp.txt=type6.txt +│ + pageIcons.tTmp1.txt=tEntity6.txt +│ + pageIcons.tTmp2.txt=entn6.txt +│ + pageIcons.tTmp3.txt=bEntity6.txt +│ + if(type6.txt=="shutter") │ + { │ + page popupShutter │ + } -│ + if(type2.txt=="input_sel") +│ + if(type6.txt=="input_sel") │ + { │ + page popupInSel │ + } -│ + if(type2.txt=="timer") +│ + if(type6.txt=="timer") │ + { │ + page popupTimer │ + } │ + │ + Touch Release Event │ + tmLP.en=0 -│ + tSend.txt="event,buttonPress2,"+entn2.txt+",button" +│ + tSend.txt="event,buttonPress2,"+entn6.txt+",button" │ + //send calc crc │ + btlen tSend.txt,sys0 │ + crcrest 1,0xffff // reset CRC @@ -1166,7 +1214,7 @@ │ + prints tSend.txt,0 │ + prints crcval,2 │ + -│ +Button bEntity8 +│ +Button bEntity9 │ + Attributes │ + Scope : local │ + Dragging : 0 @@ -1178,30 +1226,36 @@ │ + Events │ + Touch Press Event │ + tmLP.en=1 -│ tTmp.txt=type6.txt -│ pageIcons.tTmp1.txt=tEntity6.txt -│ pageIcons.tTmp2.txt=entn6.txt -│ pageIcons.tTmp3.txt=bEntity6.txt -│ if(type6.txt=="shutter") +│ + tTmp.txt=type6.txt +│ + pageIcons.tTmp1.txt=tEntity6.txt +│ + pageIcons.tTmp2.txt=entn6.txt +│ + pageIcons.tTmp3.txt=bEntity6.txt +│ + if(type6.txt=="shutter") │ { │ page popupShutter -│ @@ -587,15 +654,15 @@ +│ } +│ - if(type8.txt=="input_sel") +│ + if(type6.txt=="input_sel") +│ { +│ page popupInSel +│ } +│ - if(type8.txt=="timer") +│ + if(type6.txt=="timer") +│ { +│ page popupTimer +│ } +│ +│ Touch Release Event +│ tmLP.en=0 +│ - tSend.txt="event,buttonPress2,"+entn8.txt+",button" +│ + 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 bEntity8 -│ +Button bEntity9 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Send Component ID: disabled -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 │ @@ -999,14 +1066,35 @@ │ spstr strCommand.txt,tTmp.txt,"~",59 │ covx tTmp.txt,sys0,0,0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 602881c5..ebb8a9ec 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-05-23 19:25:50.449149755 +0000 ++++ /dev/fd/62 2023-06-01 14:52:47.691403479 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +1 +10,11 @@ @@ -57,13 +57,13 @@ +ributes + Scope : local + Text : -+ Max. Text Size: 80 + Max. Text Size: 40 + +e (string) nent2 +ributes + Scope : local + Text : ++ Max. Text Size: 80 + Max. Text Size: 40 +14 +185,26 @@ +e (string) type6 @@ -586,6 +586,13 @@ + 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 +I/n2t-out/cardGrid2.txt ++ HMI/US/portrait/n2t-out/cardGrid2.txt +6 +25,28 @@ @@ -684,7 +691,7 @@ + Send Component ID : disabled + Associated Keyboard: none + Text : -+14 +578,58 @@ ++34 +578,34 @@ + State : unpressed + Text :  + Max. Text Size : 10 @@ -692,6 +699,11 @@ +nts + Touch Press Event + tmLP.en=1 ++ tTmp.txt=type7.txt ++ pageIcons.tTmp1.txt=tEntity7.txt ++ pageIcons.tTmp2.txt=entn7.txt ++ pageIcons.tTmp3.txt=bEntity7.txt ++ if(type7.txt=="shutter") + tTmp.txt=type2.txt + pageIcons.tTmp1.txt=tEntity2.txt + pageIcons.tTmp2.txt=entn2.txt @@ -700,10 +712,12 @@ + { + page popupShutter + } ++ if(type7.txt=="input_sel") + if(type2.txt=="input_sel") + { + page popupInSel + } ++ if(type7.txt=="timer") + if(type2.txt=="timer") + { + page popupTimer @@ -711,6 +725,7 @@ + + Touch Release Event + tmLP.en=0 ++ tSend.txt="event,buttonPress2,"+entn7.txt+",button" + tSend.txt="event,buttonPress2,"+entn2.txt+",button" + //send calc crc + btlen tSend.txt,sys0 @@ -719,12 +734,52 @@ + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd ++34 +622,78 @@ ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tmLP.en=1 ++ tTmp.txt=type8.txt ++ pageIcons.tTmp1.txt=tEntity8.txt ++ pageIcons.tTmp2.txt=entn8.txt ++ pageIcons.tTmp3.txt=bEntity8.txt ++ if(type8.txt=="shutter") ++ tTmp.txt=type6.txt ++ pageIcons.tTmp1.txt=tEntity6.txt ++ pageIcons.tTmp2.txt=entn6.txt ++ pageIcons.tTmp3.txt=bEntity6.txt ++ if(type6.txt=="shutter") ++ { ++ page popupShutter ++ } ++ if(type6.txt=="input_sel") ++ { ++ page popupInSel ++ } ++ if(type6.txt=="timer") ++ { ++ page popupTimer ++ } ++ ++ Touch Release Event ++ tmLP.en=0 ++ 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 + -+bEntity8 ++bEntity9 +ributes + Scope : local + Dragging : 0 @@ -743,23 +798,29 @@ + if(type6.txt=="shutter") + { + page popupShutter -+15 +654,15 @@ ++ } ++ if(type8.txt=="input_sel") ++ if(type6.txt=="input_sel") ++ { ++ page popupInSel ++ } ++ if(type8.txt=="timer") ++ if(type6.txt=="timer") ++ { ++ page popupTimer ++ } ++ ++ Touch Release Event ++ tmLP.en=0 ++ tSend.txt="event,buttonPress2,"+entn8.txt+",button" ++ 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 -+ -+bEntity8 -+bEntity9 -+ributes -+ Scope : local -+ Dragging : 0 -+ Send Component ID: disabled -+ State : unpressed -+ Text :  -+ Max. Text Size : 10 +14 +1066,35 @@ + spstr strCommand.txt,tTmp.txt,"~",59 + covx tTmp.txt,sys0,0,0 @@ -789,13 +850,6 @@ + spstr strCommand.txt,tEntity9.txt,"~",66 + vis tEntity9,1 + } -+ } -+ if(tInstruction.txt=="pageType") -+ { -+ sleepValue=0 -+ //command format pageType,specialPageName -+ //write name of speical page to tId -+ spstr strCommand.txt,tId.txt,"~",1 +I/n2t-out/cardPower.txt ++ HMI/US/portrait/n2t-out/cardPower.txt +6 +45,16 @@ diff --git a/HMI/n2t-out-visual/cardGrid2.txt b/HMI/n2t-out-visual/cardGrid2.txt index 4643921c..7039d771 100644 --- a/HMI/n2t-out-visual/cardGrid2.txt +++ b/HMI/n2t-out-visual/cardGrid2.txt @@ -991,26 +991,26 @@ Button bEntity7 Events Touch Press Event tmLP.en=1 - tTmp.txt=type6.txt - pageIcons.tTmp1.txt=tEntity6.txt - pageIcons.tTmp2.txt=entn6.txt - pageIcons.tTmp3.txt=bEntity6.txt - if(type6.txt=="shutter") + tTmp.txt=type7.txt + pageIcons.tTmp1.txt=tEntity7.txt + pageIcons.tTmp2.txt=entn7.txt + pageIcons.tTmp3.txt=bEntity7.txt + if(type7.txt=="shutter") { page popupShutter } - if(type6.txt=="input_sel") + if(type7.txt=="input_sel") { page popupInSel } - if(type6.txt=="timer") + if(type7.txt=="timer") { page popupTimer } Touch Release Event tmLP.en=0 - tSend.txt="event,buttonPress2,"+entn6.txt+",button" + tSend.txt="event,buttonPress2,"+entn7.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1057,26 +1057,26 @@ Button bEntity8 Events Touch Press Event tmLP.en=1 - tTmp.txt=type6.txt - pageIcons.tTmp1.txt=tEntity6.txt - pageIcons.tTmp2.txt=entn6.txt - pageIcons.tTmp3.txt=bEntity6.txt - if(type6.txt=="shutter") + tTmp.txt=type8.txt + pageIcons.tTmp1.txt=tEntity8.txt + pageIcons.tTmp2.txt=entn8.txt + pageIcons.tTmp3.txt=bEntity8.txt + if(type8.txt=="shutter") { page popupShutter } - if(type6.txt=="input_sel") + if(type8.txt=="input_sel") { page popupInSel } - if(type6.txt=="timer") + if(type8.txt=="timer") { page popupTimer } Touch Release Event tmLP.en=0 - tSend.txt="event,buttonPress2,"+entn6.txt+",button" + tSend.txt="event,buttonPress2,"+entn8.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 08b4616e..f6315820 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -34,6 +34,10 @@ popupNotify 19 Component(s) 267 Line(s) of event code 172 Unique line(s) of event code +cardGrid2 + 52 Component(s) + 611 Line(s) of event code + 335 Unique line(s) of event code pageStartup 20 Component(s) 193 Line(s) of event code @@ -70,10 +74,6 @@ popupInSel 34 Component(s) 621 Line(s) of event code 297 Unique line(s) of event code -cardGrid2 - 52 Component(s) - 611 Line(s) of event code - 319 Unique line(s) of event code cardPower 54 Component(s) 531 Line(s) of event code @@ -95,4 +95,4 @@ Total 22 Page(s) 850 Component(s) 9944 Line(s) of event code - 2369 Unique line(s) of event code + 2385 Unique line(s) of event code diff --git a/HMI/n2t-out/cardGrid2.txt b/HMI/n2t-out/cardGrid2.txt index b98ced5d..3d594abf 100644 --- a/HMI/n2t-out/cardGrid2.txt +++ b/HMI/n2t-out/cardGrid2.txt @@ -559,26 +559,26 @@ Button bEntity7 Events Touch Press Event tmLP.en=1 - tTmp.txt=type6.txt - pageIcons.tTmp1.txt=tEntity6.txt - pageIcons.tTmp2.txt=entn6.txt - pageIcons.tTmp3.txt=bEntity6.txt - if(type6.txt=="shutter") + tTmp.txt=type7.txt + pageIcons.tTmp1.txt=tEntity7.txt + pageIcons.tTmp2.txt=entn7.txt + pageIcons.tTmp3.txt=bEntity7.txt + if(type7.txt=="shutter") { page popupShutter } - if(type6.txt=="input_sel") + if(type7.txt=="input_sel") { page popupInSel } - if(type6.txt=="timer") + if(type7.txt=="timer") { page popupTimer } Touch Release Event tmLP.en=0 - tSend.txt="event,buttonPress2,"+entn6.txt+",button" + tSend.txt="event,buttonPress2,"+entn7.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -603,26 +603,26 @@ Button bEntity8 Events Touch Press Event tmLP.en=1 - tTmp.txt=type6.txt - pageIcons.tTmp1.txt=tEntity6.txt - pageIcons.tTmp2.txt=entn6.txt - pageIcons.tTmp3.txt=bEntity6.txt - if(type6.txt=="shutter") + tTmp.txt=type8.txt + pageIcons.tTmp1.txt=tEntity8.txt + pageIcons.tTmp2.txt=entn8.txt + pageIcons.tTmp3.txt=bEntity8.txt + if(type8.txt=="shutter") { page popupShutter } - if(type6.txt=="input_sel") + if(type8.txt=="input_sel") { page popupInSel } - if(type6.txt=="timer") + if(type8.txt=="timer") { page popupTimer } Touch Release Event tmLP.en=0 - tSend.txt="event,buttonPress2,"+entn6.txt+",button" + tSend.txt="event,buttonPress2,"+entn8.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC