From f5d1a93eb28d45510ed9686a75fba49b15dc285d Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Thu, 3 Nov 2022 17:14:14 +0000 Subject: [PATCH] sync (add nextion2text) --- HMI/US/portrait/diff-eu-version.txt | 235 +-------------- HMI/US/portrait/diff-filtered.txt | 267 ++---------------- HMI/US/portrait/n2t-out-visual/arm1.txt | 14 +- HMI/US/portrait/n2t-out-visual/bDown1.txt | 14 +- HMI/US/portrait/n2t-out-visual/bDown2.txt | 14 +- HMI/US/portrait/n2t-out-visual/bEntity1.txt | 14 +- HMI/US/portrait/n2t-out-visual/bNext.txt | 14 +- .../n2t-out-visual/nspanel_US_P_Stats.txt | 28 +- HMI/US/portrait/n2t-out/arm1.txt | 14 +- HMI/US/portrait/n2t-out/bDown1.txt | 14 +- HMI/US/portrait/n2t-out/bDown2.txt | 14 +- HMI/US/portrait/n2t-out/bEntity1.txt | 14 +- HMI/US/portrait/n2t-out/bNext.txt | 14 +- 13 files changed, 181 insertions(+), 489 deletions(-) diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index eef1d3b2..4b50ef0b 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -14,51 +14,6 @@ │ + // fix touch offset (Removed for US version) │ + //lcd_dev fffb 0002 0000 0020 │ page pageStartup -├── arm1.txt -│ @@ -478,22 +478,15 @@ -│ Send Component ID : disabled -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ - tSend.txt="event,buttonPress2,cardAlarm," -│ - if(bPrev.txt=="") -│ - { -│ - tSend.txt+="bHome" -│ - }else -│ - { -│ - tSend.txt+="bNext" -│ - } -│ + tSend.txt="event,buttonPress2,cardAlarm,bNext" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ crcputh 55 bb -│ crcputs sys0,2 -│ crcputs tSend.txt,0 -│ //send cmd -│ @@ -671,19 +664,14 @@ -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ bNext.txt="" -│ } -│ - if(tTmp.txt=="2") -│ - { -│ - vis bNext,1 -│ - bNext.txt="" -│ - } -│ //text arm1 -│ spstr strCommand.txt,arm1.txt,"~",3 -│ if(arm1.txt!="") -│ { -│ vis arm1,1 -│ } -│ //id arm1 ├── b0.txt │ @@ -1,8 +1,8 @@ │ -Page popupThermo @@ -1031,7 +986,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ State : unpressed -│ @@ -517,34 +596,52 @@ +│ @@ -517,14 +596,39 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -1071,28 +1026,7 @@ │ 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(bPrev.txt=="") -│ - { -│ - tSend.txt+="bHome" -│ - }else -│ - { -│ - tSend.txt+="bNext" -│ - } -│ + tSend.txt="event,buttonPress2,cardEntities,bNext" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ crcputh 55 bb -│ crcputs sys0,2 -│ crcputs tSend.txt,0 -│ //send cmd -│ @@ -681,14 +778,39 @@ +│ @@ -681,14 +785,39 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -1132,7 +1066,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ State : unpressed -│ @@ -781,14 +903,39 @@ +│ @@ -781,14 +910,39 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -1172,7 +1106,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ State : unpressed -│ @@ -881,14 +1028,39 @@ +│ @@ -881,14 +1035,39 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -1212,7 +1146,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ State : unpressed -│ @@ -989,14 +1161,41 @@ +│ @@ -989,14 +1168,41 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -1254,7 +1188,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ -│ @@ -1113,14 +1312,45 @@ +│ @@ -1113,14 +1319,45 @@ │ page popupFan │ } │ if(type4.txt=="input_sel") @@ -1300,27 +1234,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ -│ @@ -1253,19 +1483,14 @@ -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ bNext.txt="" -│ } -│ - if(tTmp.txt=="2") -│ - { -│ - vis bNext,1 -│ - 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=="") -│ { -│ vis bUp1,0 -│ @@ -1854,14 +2079,163 @@ +│ @@ -1854,14 +2091,163 @@ │ covx tTmp.txt,sys0,0,0 │ hSlider4.minval=sys0 │ //third value is max value @@ -1484,141 +1398,6 @@ │ //command format pageType,specialPageName │ //write name of speical page to tId │ spstr strCommand.txt,tId.txt,"~",1 -├── bDown2.txt -│ @@ -290,22 +290,15 @@ -│ Send Component ID : disabled -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ - tSend.txt="event,buttonPress2,cardThermo," -│ - if(bPrev.txt=="") -│ - { -│ - tSend.txt+="bHome" -│ - }else -│ - { -│ - tSend.txt+="bNext" -│ - } -│ + tSend.txt="event,buttonPress2,cardThermo,bNext" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ crcputh 55 bb -│ crcputs sys0,2 -│ crcputs tSend.txt,0 -│ //send cmd -│ @@ -925,19 +918,14 @@ -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ bNext.txt="" -│ } -│ - if(tTmp.txt=="2") -│ - { -│ - vis bNext,1 -│ - bNext.txt="" -│ - } -│ //entity name -│ spstr strCommand.txt,entn.txt,"~",3 -│ //currentTemp -│ spstr strCommand.txt,tCurTemp.txt,"~",4 -│ //dstTemp -│ spstr strCommand.txt,tTmp.txt,"~",5 -│ covx tTmp.txt,xTempDest1.val,0,0 -├── bEntity1.txt -│ @@ -467,22 +467,15 @@ -│ Send Component ID : disabled -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ - tSend.txt="event,buttonPress2,cardGrid," -│ - if(bPrev.txt=="") -│ - { -│ - tSend.txt+="bHome" -│ - }else -│ - { -│ - tSend.txt+="bNext" -│ - } -│ + tSend.txt="event,buttonPress2,cardGrid,bNext" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ crcputh 55 bb -│ crcputs sys0,2 -│ crcputs tSend.txt,0 -│ //send cmd -│ @@ -680,19 +673,14 @@ -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ bNext.txt="" -│ } -│ - if(tTmp.txt=="2") -│ - { -│ - vis bNext,1 -│ - 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=="") -│ { -│ vis tEntity1,0 -├── bNext.txt -│ @@ -443,22 +443,15 @@ -│ Send Component ID : disabled -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ - tSend.txt="event,buttonPress2,cardMedia," -│ - if(bPrev.txt=="") -│ - { -│ - tSend.txt+="bHome" -│ - }else -│ - { -│ - tSend.txt+="bNext" -│ - } -│ + tSend.txt="event,buttonPress2,cardMedia,bNext" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ crcputh 55 bb -│ crcputs sys0,2 -│ crcputs tSend.txt,0 -│ //send cmd -│ @@ -628,19 +621,14 @@ -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ bNext.txt="" -│ } -│ - if(tTmp.txt=="2") -│ - { -│ - vis bNext,1 -│ - bNext.txt="" -│ - } -│ //entity name -│ spstr strCommand.txt,entn.txt,"~",3 -│ //icon -│ spstr strCommand.txt,tIcon.txt,"~",4 -│ //title -│ spstr strCommand.txt,tTitle.txt,"~",5 -│ //author ├── bSendStartup.txt │ @@ -118,15 +118,15 @@ │ Text tMsg3 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 0a27823e..d88c8c2e 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,49 +1,4 @@ -+++ /dev/fd/62 2022-11-03 17:05:36.052771693 +0000 -+m1.txt -+22 +478,15 @@ -+ Send Component ID : disabled -+ State : unpressed -+ Text :  -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tSend.txt="event,buttonPress2,cardAlarm," -+ if(bPrev.txt=="") -+ { -+ tSend.txt+="bHome" -+ }else -+ { -+ tSend.txt+="bNext" -+ } -+ tSend.txt="event,buttonPress2,cardAlarm,bNext" -+ //send calc crc -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+ crcputh 55 bb -+ crcputs sys0,2 -+ crcputs tSend.txt,0 -+ //send cmd -+19 +664,14 @@ -+ } -+ if(tTmp.txt=="1") -+ { -+ vis bNext,1 -+ tsw mSwipeNext,1 -+ bNext.txt="" -+ } -+ if(tTmp.txt=="2") -+ { -+ vis bNext,1 -+ bNext.txt="" -+ } -+ //text arm1 -+ spstr strCommand.txt,arm1.txt,"~",3 -+ if(arm1.txt!="") -+ { -+ vis arm1,1 -+ } -+ //id arm1 ++++ /dev/fd/62 2022-11-03 17:14:06.344831301 +0000 +.txt ++1,8 @@ +pupThermo @@ -872,35 +827,12 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none -+34 +596,52 @@ ++14 +596,39 @@ +bDown5 + Text :  + tSend.txt="event,buttonPress2,"+entn5.txt+",down" +bNext -+ Text :  -+ tSend.txt="event,buttonPress2,cardEntities," -+ if(bPrev.txt=="") -+ { -+ tSend.txt+="bHome" -+ }else -+ { -+ tSend.txt+="bNext" -+ } -+ tSend.txt="event,buttonPress2,cardEntities,bNext" -+14 +778,39 @@ -+ crcputs tSend.txt,0 -+ //send cmd -+bStop5 -+ Text :  -+ tSend.txt="event,buttonPress2,"+entn5.txt+",stop" -+bText1 -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+14 +903,39 @@ ++14 +785,39 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -908,14 +840,36 @@ + prints tSend.txt,0 + prints crcval,2 + -+bUp1 ++bStop5 +ributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed -+14 +1028,39 @@ ++ Text :  ++ tSend.txt="event,buttonPress2,"+entn5.txt+",stop" ++bText1 ++14 +910,39 @@ ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++ prints sys0,2 ++ prints tSend.txt,0 ++ prints crcval,2 ++ ++bText5 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++ Text : ++ Max. Text Size : 45 ++ tSend.txt="event,buttonPress2,"+entn5.txt+",button" ++bUp1 ++14 +1035,39 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -932,24 +886,10 @@ + State : unpressed + Text :  + Max. Text Size : 10 -+ -+nts -+ Touch Press Event + tSend.txt="event,buttonPress2,"+entn5.txt+",up" -+ //send calc crc -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+ crcputh 55 bb -+ crcputs sys0,2 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb -+ prints sys0,2 -+ prints tSend.txt,0 -+ prints crcval,2 -+ ++14 +1168,41 @@ + m0 -+,14 +1312,45 @@ ++,14 +1319,45 @@ + page popupFan + if(type4.txt=="input_sel") + page popupInSel @@ -958,155 +898,8 @@ + page popupInSel + } + mSpecial -+,19 +1483,14 @@ -+ } -+ if(tTmp.txt=="1") -+ { -+ vis bNext,1 -+ tsw mSwipeNext,1 -+ bNext.txt="" -+ } -+ if(tTmp.txt=="2") -+ { -+ vis bNext,1 -+ 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=="") -+ { -+ vis bUp1,0 -+,14 +2079,163 @@ ++,14 +2091,163 @@ + if(type5.txt=="button"||type5.txt=="input_sel") -+own2.txt -+22 +290,15 @@ -+ State : unpressed -+ Text :  -+ tSend.txt="event,buttonPress2,cardThermo," -+ if(bPrev.txt=="") -+ { -+ tSend.txt+="bHome" -+ }else -+ { -+ tSend.txt+="bNext" -+ } -+ tSend.txt="event,buttonPress2,cardThermo,bNext" -+19 +918,14 @@ -+ } -+ if(tTmp.txt=="1") -+ { -+ vis bNext,1 -+ tsw mSwipeNext,1 -+ bNext.txt="" -+ } -+ if(tTmp.txt=="2") -+ { -+ vis bNext,1 -+ bNext.txt="" -+ } -+ //entity name -+ spstr strCommand.txt,entn.txt,"~",3 -+ //currentTemp -+ spstr strCommand.txt,tCurTemp.txt,"~",4 -+ //dstTemp -+ spstr strCommand.txt,tTmp.txt,"~",5 -+ covx tTmp.txt,xTempDest1.val,0,0 -+ntity1.txt -+22 +467,15 @@ -+ Send Component ID : disabled -+ State : unpressed -+ Text :  -+ Max. Text Size : 10 -+nts -+ Touch Press Event -+ tSend.txt="event,buttonPress2,cardGrid," -+ if(bPrev.txt=="") -+ { -+ tSend.txt+="bHome" -+ }else -+ { -+ tSend.txt+="bNext" -+ } -+ tSend.txt="event,buttonPress2,cardGrid,bNext" -+ //send calc crc -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+ crcputh 55 bb -+ crcputs sys0,2 -+19 +673,14 @@ -+ } -+ if(tTmp.txt=="1") -+ { -+ vis bNext,1 -+ tsw mSwipeNext,1 -+ bNext.txt="" -+ } -+ if(tTmp.txt=="2") -+ { -+ vis bNext,1 -+ 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=="") -+ { -+ vis tEntity1,0 -+ext.txt -+22 +443,15 @@ -+ Text :  -+ Max. Text Size : 10 -+ tSend.txt="event,buttonPress2,cardMedia," -+ if(bPrev.txt=="") -+ { -+ tSend.txt+="bHome" -+ }else -+ { -+ tSend.txt+="bNext" -+ } -+ tSend.txt="event,buttonPress2,cardMedia,bNext" -+19 +621,14 @@ -+ } -+ if(tTmp.txt=="1") -+ { -+ vis bNext,1 -+ tsw mSwipeNext,1 -+ bNext.txt="" -+ } -+ if(tTmp.txt=="2") -+ { -+ vis bNext,1 -+ bNext.txt="" -+ } -+ //entity name -+ spstr strCommand.txt,entn.txt,"~",3 -+ //icon -+ spstr strCommand.txt,tIcon.txt,"~",4 -+ //title -+ spstr strCommand.txt,tTitle.txt,"~",5 -+ //author +endStartup.txt +15 +118,15 @@ -+sg3 -+ Associated Keyboard : none -+ Text : please check your backend configuration -+ Text : pls check your backend configuration -+ Max. Text Size : 100 -+ +end -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+15 +173,15 @@ -+ Max. Text Size : 10 -+ recmod=1 -+ bauds=115200 -+ // startup event -+ tSend.txt="event,startup,"+tVersion.txt+",eu" -+ tSend.txt="event,startup,"+tVersion.txt+",us-p" -+ crcputs tSend.txt,0 -+ //send cmd diff --git a/HMI/US/portrait/n2t-out-visual/arm1.txt b/HMI/US/portrait/n2t-out-visual/arm1.txt index cf3f15e5..524a0641 100644 --- a/HMI/US/portrait/n2t-out-visual/arm1.txt +++ b/HMI/US/portrait/n2t-out-visual/arm1.txt @@ -1014,7 +1014,14 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardAlarm,bNext" + tSend.txt="event,buttonPress2,cardAlarm," + if(bPrev.txt=="") + { + tSend.txt+="bHome" + }else + { + tSend.txt+="bNext" + } //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1251,6 +1258,11 @@ Timer tmSerial tsw mSwipeNext,1 bNext.txt="" } + if(tTmp.txt=="2") + { + vis bNext,1 + bNext.txt="" + } //text arm1 spstr strCommand.txt,arm1.txt,"~",3 if(arm1.txt!="") diff --git a/HMI/US/portrait/n2t-out-visual/bDown1.txt b/HMI/US/portrait/n2t-out-visual/bDown1.txt index c97eb4a1..6b0e1941 100644 --- a/HMI/US/portrait/n2t-out-visual/bDown1.txt +++ b/HMI/US/portrait/n2t-out-visual/bDown1.txt @@ -1259,7 +1259,14 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardEntities,bNext" + tSend.txt="event,buttonPress2,cardEntities," + if(bPrev.txt=="") + { + tSend.txt+="bHome" + }else + { + tSend.txt+="bNext" + } //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -2633,6 +2640,11 @@ Timer tmSerial tsw mSwipeNext,1 bNext.txt="" } + if(tTmp.txt=="2") + { + vis bNext,1 + bNext.txt="" + } // get Type spstr strCommand.txt,type1.txt,"~",3 // get internal name diff --git a/HMI/US/portrait/n2t-out-visual/bDown2.txt b/HMI/US/portrait/n2t-out-visual/bDown2.txt index 94fae6d8..6a2a37e7 100644 --- a/HMI/US/portrait/n2t-out-visual/bDown2.txt +++ b/HMI/US/portrait/n2t-out-visual/bDown2.txt @@ -634,7 +634,14 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardThermo,bNext" + tSend.txt="event,buttonPress2,cardThermo," + if(bPrev.txt=="") + { + tSend.txt+="bHome" + }else + { + tSend.txt+="bNext" + } //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1642,6 +1649,11 @@ Timer tmSerial tsw mSwipeNext,1 bNext.txt="" } + if(tTmp.txt=="2") + { + vis bNext,1 + bNext.txt="" + } //entity name spstr strCommand.txt,entn.txt,"~",3 //currentTemp diff --git a/HMI/US/portrait/n2t-out-visual/bEntity1.txt b/HMI/US/portrait/n2t-out-visual/bEntity1.txt index dd4ec2dc..3e27b3b5 100644 --- a/HMI/US/portrait/n2t-out-visual/bEntity1.txt +++ b/HMI/US/portrait/n2t-out-visual/bEntity1.txt @@ -857,7 +857,14 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardGrid,bNext" + tSend.txt="event,buttonPress2,cardGrid," + if(bPrev.txt=="") + { + tSend.txt+="bHome" + }else + { + tSend.txt+="bNext" + } //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1123,6 +1130,11 @@ Timer tmSerial tsw mSwipeNext,1 bNext.txt="" } + if(tTmp.txt=="2") + { + vis bNext,1 + bNext.txt="" + } // get Type spstr strCommand.txt,type1.txt,"~",3 // get internal name diff --git a/HMI/US/portrait/n2t-out-visual/bNext.txt b/HMI/US/portrait/n2t-out-visual/bNext.txt index e2b705bc..62bb0795 100644 --- a/HMI/US/portrait/n2t-out-visual/bNext.txt +++ b/HMI/US/portrait/n2t-out-visual/bNext.txt @@ -828,7 +828,14 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardMedia,bNext" + tSend.txt="event,buttonPress2,cardMedia," + if(bPrev.txt=="") + { + tSend.txt+="bHome" + }else + { + tSend.txt+="bNext" + } //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1057,6 +1064,11 @@ Timer tmSerial tsw mSwipeNext,1 bNext.txt="" } + if(tTmp.txt=="2") + { + vis bNext,1 + bNext.txt="" + } //entity name spstr strCommand.txt,entn.txt,"~",3 //icon diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index df78bc5d..1a19d0f2 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -12,31 +12,31 @@ b0 202 Unique line(s) of event code bNext 34 Component(s) - 394 Line(s) of event code - 213 Unique line(s) of event code + 406 Line(s) of event code + 216 Unique line(s) of event code +arm1 + 40 Component(s) + 439 Line(s) of event code + 261 Unique line(s) of event code bSendStartup 19 Component(s) 172 Line(s) of event code 125 Unique line(s) of event code bEntity1 42 Component(s) - 478 Line(s) of event code - 283 Unique line(s) of event code -arm1 - 40 Component(s) - 427 Line(s) of event code - 258 Unique line(s) of event code + 490 Line(s) of event code + 286 Unique line(s) of event code bDown2 53 Component(s) - 596 Line(s) of event code - 313 Unique line(s) of event code + 608 Line(s) of event code + 316 Unique line(s) of event code bDown1 77 Component(s) - 1379 Line(s) of event code - 614 Unique line(s) of event code + 1391 Line(s) of event code + 617 Unique line(s) of event code Total 17 Page(s) 337 Component(s) - 4194 Line(s) of event code - 1292 Unique line(s) of event code + 4254 Line(s) of event code + 1291 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/arm1.txt b/HMI/US/portrait/n2t-out/arm1.txt index a0666aa5..2ecbfcd8 100644 --- a/HMI/US/portrait/n2t-out/arm1.txt +++ b/HMI/US/portrait/n2t-out/arm1.txt @@ -482,7 +482,14 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardAlarm,bNext" + tSend.txt="event,buttonPress2,cardAlarm," + if(bPrev.txt=="") + { + tSend.txt+="bHome" + }else + { + tSend.txt+="bNext" + } //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -668,6 +675,11 @@ Timer tmSerial tsw mSwipeNext,1 bNext.txt="" } + if(tTmp.txt=="2") + { + vis bNext,1 + bNext.txt="" + } //text arm1 spstr strCommand.txt,arm1.txt,"~",3 if(arm1.txt!="") diff --git a/HMI/US/portrait/n2t-out/bDown1.txt b/HMI/US/portrait/n2t-out/bDown1.txt index 56031198..6916d4ea 100644 --- a/HMI/US/portrait/n2t-out/bDown1.txt +++ b/HMI/US/portrait/n2t-out/bDown1.txt @@ -637,7 +637,14 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardEntities,bNext" + tSend.txt="event,buttonPress2,cardEntities," + if(bPrev.txt=="") + { + tSend.txt+="bHome" + }else + { + tSend.txt+="bNext" + } //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1487,6 +1494,11 @@ Timer tmSerial tsw mSwipeNext,1 bNext.txt="" } + if(tTmp.txt=="2") + { + vis bNext,1 + bNext.txt="" + } // get Type spstr strCommand.txt,type1.txt,"~",3 // get internal name diff --git a/HMI/US/portrait/n2t-out/bDown2.txt b/HMI/US/portrait/n2t-out/bDown2.txt index b3197c5b..40da416f 100644 --- a/HMI/US/portrait/n2t-out/bDown2.txt +++ b/HMI/US/portrait/n2t-out/bDown2.txt @@ -294,7 +294,14 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardThermo,bNext" + tSend.txt="event,buttonPress2,cardThermo," + if(bPrev.txt=="") + { + tSend.txt+="bHome" + }else + { + tSend.txt+="bNext" + } //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -922,6 +929,11 @@ Timer tmSerial tsw mSwipeNext,1 bNext.txt="" } + if(tTmp.txt=="2") + { + vis bNext,1 + bNext.txt="" + } //entity name spstr strCommand.txt,entn.txt,"~",3 //currentTemp diff --git a/HMI/US/portrait/n2t-out/bEntity1.txt b/HMI/US/portrait/n2t-out/bEntity1.txt index f1b4f83c..ed39cfd5 100644 --- a/HMI/US/portrait/n2t-out/bEntity1.txt +++ b/HMI/US/portrait/n2t-out/bEntity1.txt @@ -471,7 +471,14 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardGrid,bNext" + tSend.txt="event,buttonPress2,cardGrid," + if(bPrev.txt=="") + { + tSend.txt+="bHome" + }else + { + tSend.txt+="bNext" + } //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -677,6 +684,11 @@ Timer tmSerial tsw mSwipeNext,1 bNext.txt="" } + if(tTmp.txt=="2") + { + vis bNext,1 + bNext.txt="" + } // get Type spstr strCommand.txt,type1.txt,"~",3 // get internal name diff --git a/HMI/US/portrait/n2t-out/bNext.txt b/HMI/US/portrait/n2t-out/bNext.txt index 4d285d2a..01368924 100644 --- a/HMI/US/portrait/n2t-out/bNext.txt +++ b/HMI/US/portrait/n2t-out/bNext.txt @@ -447,7 +447,14 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardMedia,bNext" + tSend.txt="event,buttonPress2,cardMedia," + if(bPrev.txt=="") + { + tSend.txt+="bHome" + }else + { + tSend.txt+="bNext" + } //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -625,6 +632,11 @@ Timer tmSerial tsw mSwipeNext,1 bNext.txt="" } + if(tTmp.txt=="2") + { + vis bNext,1 + bNext.txt="" + } //entity name spstr strCommand.txt,entn.txt,"~",3 //icon