diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index aabbc5e4..79988f43 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -13,25 +13,6 @@ │ - // fix touch offset │ - lcd_dev fffb 0002 0000 0020 │ - page pageStartup -│ --- HMI/n2t-out/cardChart.txt -├── +++ HMI/US/landscape/n2t-out/cardChart.txt -│ @@ -176,15 +176,15 @@ -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,cardChart," -│ - if(bPrev.txt=="") -│ + if(bNext.txt=="") -│ { -│ tSend.txt+="bHome" -│ }else -│ { -│ tSend.txt+="bNext" -│ } -│ //send calc crc │ --- HMI/n2t-out/pageStartup.txt ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt │ @@ -173,15 +173,15 @@ @@ -51,132 +32,6 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd -│ --- HMI/n2t-out/popupFan.txt -├── +++ HMI/US/landscape/n2t-out/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 -│ } -│ } -│ } -│ --- HMI/n2t-out/popupInSel.txt -├── +++ HMI/US/landscape/n2t-out/popupInSel.txt -│ @@ -977,14 +977,18 @@ -│ { -│ page cardQR -│ } -│ if(tId.txt=="cardPower") -│ { -│ page cardPower -│ } -│ + if(tId.txt=="cardChart") -│ + { -│ + page cardChart -│ + } -│ } -│ // end of user code -│ udelete payloadLength-1 -│ bufferPos=0 -│ } -│ } -│ } -│ --- HMI/n2t-out/popupLight.txt -├── +++ HMI/US/landscape/n2t-out/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 -│ } -│ } -│ } -│ --- HMI/n2t-out/popupNotify.txt -├── +++ HMI/US/landscape/n2t-out/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 -│ } -│ } -│ } -│ --- HMI/n2t-out/popupShutter.txt -├── +++ HMI/US/landscape/n2t-out/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 -│ } -│ } -│ } -│ --- HMI/n2t-out/popupThermo.txt -├── +++ HMI/US/landscape/n2t-out/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 -│ } -│ } -│ } │ --- HMI/n2t-out/screensaver.txt ├── +++ HMI/US/landscape/n2t-out/screensaver.txt │ @@ -29,29 +29,20 @@ diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 405472fb..8c21bd0f 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -17,7 +17,7 @@ │ page pageStartup │ --- HMI/n2t-out/cardChart.txt ├── +++ HMI/US/portrait/n2t-out/cardChart.txt -│ @@ -175,16 +175,16 @@ +│ @@ -175,15 +175,15 @@ │ Send Component ID : disabled │ State : unpressed │ Text :  @@ -26,16 +26,14 @@ │ Events │ Touch Press Event │ - tSend.txt="event,buttonPress2,cardChart," -│ - if(bPrev.txt=="") │ + tSend.txt="event,buttonPress2,cardPower," -│ + if(bNext.txt=="") +│ if(bNext.txt=="") │ { │ tSend.txt+="bHome" │ }else │ { │ tSend.txt+="bNext" │ } -│ //send calc crc │ @@ -207,15 +207,15 @@ │ Send Component ID : disabled │ State : unpressed @@ -732,27 +730,6 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd -│ --- HMI/n2t-out/popupFan.txt -├── +++ HMI/US/portrait/n2t-out/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 -│ } -│ } -│ } │ --- HMI/n2t-out/popupInSel.txt ├── +++ HMI/US/portrait/n2t-out/popupInSel.txt │ @@ -632,98 +632,14 @@ @@ -853,110 +830,6 @@ │ Scope : local │ Period (ms): 100 │ Enabled : no -│ -│ @@ -977,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 -│ } -│ } -│ } -│ --- HMI/n2t-out/popupLight.txt -├── +++ HMI/US/portrait/n2t-out/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 -│ } -│ } -│ } -│ --- HMI/n2t-out/popupNotify.txt -├── +++ HMI/US/portrait/n2t-out/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 -│ } -│ } -│ } -│ --- HMI/n2t-out/popupShutter.txt -├── +++ HMI/US/portrait/n2t-out/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 -│ } -│ } -│ } -│ --- HMI/n2t-out/popupThermo.txt -├── +++ HMI/US/portrait/n2t-out/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 -│ } -│ } -│ } │ --- HMI/n2t-out/screensaver.txt ├── +++ HMI/US/portrait/n2t-out/screensaver.txt │ @@ -29,29 +29,20 @@ diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 6231ed80..3a215dd2 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,9 +1,9 @@ -+++ /dev/fd/62 2022-12-09 23:39:29.754086326 +0000 ++++ /dev/fd/62 2022-12-10 08:03:16.022725697 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardChart.txt ++ HMI/US/portrait/n2t-out/cardChart.txt -+16 +175,16 @@ ++15 +175,15 @@ + Send Component ID : disabled + State : unpressed + Text :  @@ -12,7 +12,6 @@ +nts + Touch Press Event + tSend.txt="event,buttonPress2,cardChart," -+ if(bPrev.txt=="") + tSend.txt="event,buttonPress2,cardPower," + if(bNext.txt=="") + { @@ -21,7 +20,6 @@ + { + tSend.txt+="bNext" + } -+ //send calc crc +15 +207,15 @@ + Send Component ID : disabled + State : unpressed @@ -88,27 +86,6 @@ + Enabled : yes +I/n2t-out/pageStartup.txt ++ HMI/US/portrait/n2t-out/pageStartup.txt -+I/n2t-out/popupFan.txt -++ HMI/US/portrait/n2t-out/popupFan.txt -+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 -+ } -+ } -+ } +I/n2t-out/popupInSel.txt ++ HMI/US/portrait/n2t-out/popupInSel.txt +98 +632,14 @@ @@ -209,110 +186,6 @@ + Scope : local + Period (ms): 100 + Enabled : no -+ -+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 -+ } -+ } -+ } -+I/n2t-out/popupLight.txt -++ HMI/US/portrait/n2t-out/popupLight.txt -+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 -+ } -+ } -+ } -+I/n2t-out/popupNotify.txt -++ HMI/US/portrait/n2t-out/popupNotify.txt -+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 -+ } -+ } -+ } -+I/n2t-out/popupShutter.txt -++ HMI/US/portrait/n2t-out/popupShutter.txt -+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 -+ } -+ } -+ } -+I/n2t-out/popupThermo.txt -++ HMI/US/portrait/n2t-out/popupThermo.txt -+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 -+ } -+ } -+ } +I/n2t-out/screensaver.txt ++ HMI/US/portrait/n2t-out/screensaver.txt +9 +29,20 @@ diff --git a/HMI/n2t-out-visual/cardChart.txt b/HMI/n2t-out-visual/cardChart.txt index 9ef752a0..2a714277 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(bNext.txt=="") { tSend.txt+="bHome" }else diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index c79c64e2..1bcf59ef 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -6,18 +6,18 @@ 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) - 404 Line(s) of event code - 223 Unique line(s) of event code +popupThermo + 44 Component(s) + 519 Line(s) of event code + 274 Unique line(s) of event code popupNotify 19 Component(s) - 253 Line(s) of event code - 164 Unique line(s) of event code + 257 Line(s) of event code + 166 Unique line(s) of event code +cardChart + 31 Component(s) + 452 Line(s) of event code + 296 Unique line(s) of event code pageStartup 19 Component(s) 181 Line(s) of event code @@ -26,14 +26,22 @@ pageTest 23 Component(s) 73 Line(s) of event code 69 Unique line(s) of event code -cardChart - 31 Component(s) - 452 Line(s) of event code - 296 Unique line(s) of event code +popupFan + 27 Component(s) + 351 Line(s) of event code + 204 Unique line(s) of event code popupInSel 34 Component(s) - 613 Line(s) of event code - 293 Unique line(s) of event code + 617 Line(s) of event code + 295 Unique line(s) of event code +popupLight + 28 Component(s) + 408 Line(s) of event code + 225 Unique line(s) of event code +popupShutter + 25 Component(s) + 398 Line(s) of event code + 218 Unique line(s) of event code cardGrid 42 Component(s) 514 Line(s) of event code @@ -42,10 +50,6 @@ cardPower 43 Component(s) 439 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 @@ -58,10 +62,6 @@ screensaver 47 Component(s) 402 Line(s) of event code 298 Unique line(s) of event code -popupThermo - 44 Component(s) - 515 Line(s) of event code - 272 Unique line(s) of event code cardThermo 53 Component(s) 612 Line(s) of event code @@ -78,5 +78,5 @@ cardEntities Total 18 Page(s) 636 Component(s) - 7909 Line(s) of event code - 2009 Unique line(s) of event code + 7933 Line(s) of event code + 2008 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupFan.txt b/HMI/n2t-out-visual/popupFan.txt index 9b214b96..c3654ad2 100644 --- a/HMI/n2t-out-visual/popupFan.txt +++ b/HMI/n2t-out-visual/popupFan.txt @@ -914,6 +914,10 @@ 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 360dd007..ffd5150e 100644 --- a/HMI/n2t-out-visual/popupInSel.txt +++ b/HMI/n2t-out-visual/popupInSel.txt @@ -1361,6 +1361,10 @@ 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 351c08be..875d5298 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -1035,6 +1035,10 @@ 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 b4ea9d1d..0145e1b9 100644 --- a/HMI/n2t-out-visual/popupNotify.txt +++ b/HMI/n2t-out-visual/popupNotify.txt @@ -670,6 +670,10 @@ 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 dcb43077..86833bac 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -984,6 +984,10 @@ 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 df2b6004..56e4b68e 100644 --- a/HMI/n2t-out-visual/popupThermo.txt +++ b/HMI/n2t-out-visual/popupThermo.txt @@ -1372,6 +1372,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/cardChart.txt b/HMI/n2t-out/cardChart.txt index a0687e4d..9de54bcd 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(bNext.txt=="") { tSend.txt+="bHome" }else diff --git a/HMI/n2t-out/popupFan.txt b/HMI/n2t-out/popupFan.txt index 1241982e..6a557672 100644 --- a/HMI/n2t-out/popupFan.txt +++ b/HMI/n2t-out/popupFan.txt @@ -623,6 +623,10 @@ 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 848b0860..e826acbd 100644 --- a/HMI/n2t-out/popupInSel.txt +++ b/HMI/n2t-out/popupInSel.txt @@ -981,6 +981,10 @@ 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 91ddd9cc..62684594 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -686,6 +686,10 @@ 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 a137ef6e..554a90ca 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -441,6 +441,10 @@ 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 9fdce22d..b56fc209 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -675,6 +675,10 @@ 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 878a8ae8..8a3616fb 100644 --- a/HMI/n2t-out/popupThermo.txt +++ b/HMI/n2t-out/popupThermo.txt @@ -946,6 +946,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1