diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index fd6d7964..bbc71f8b 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,6 +1,7 @@ --- HMI/n2t-out +++ HMI/US/landscape/n2t-out -├── Program.s.txt +│ --- HMI/n2t-out/Program.s.txt +├── +++ HMI/US/landscape/n2t-out/Program.s.txt │ @@ -10,10 +10,7 @@ │ int sleepValue=0 │ // dim value @@ -12,7 +13,8 @@ │ - // fix touch offset │ - lcd_dev fffb 0002 0000 0020 │ - page pageStartup -├── cardChart.txt +│ --- HMI/n2t-out/cardChart.txt +├── +++ HMI/US/landscape/n2t-out/cardChart.txt │ @@ -175,16 +175,16 @@ │ Send Component ID : disabled │ State : unpressed @@ -49,7 +51,28 @@ │ { │ tSend.txt+="bPrev" │ } -├── cardMedia.txt +│ --- HMI/n2t-out/cardGrid.txt +├── +++ HMI/US/landscape/n2t-out/cardGrid.txt +│ @@ -609,14 +609,18 @@ +│ { +│ page popupLight +│ } +│ if(tTmp.txt=="fan") +│ { +│ page popupFan +│ } +│ + if(tTmp.txt=="input_sel") +│ + { +│ + page popupInSel +│ + } +│ +│ Timer tmSerial +│ Attributes +│ Scope : local +│ Period (ms): 50 +│ Enabled : yes +│ --- HMI/n2t-out/cardMedia.txt +├── +++ HMI/US/landscape/n2t-out/cardMedia.txt │ @@ -15,15 +15,14 @@ │ dim=dimValueNormal │ vis p0,0 @@ -238,7 +261,8 @@ │ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 │ } │ if(tInstruction.txt=="date") -├── pageStartup.txt +│ --- HMI/n2t-out/pageStartup.txt +├── +++ HMI/US/landscape/n2t-out/pageStartup.txt │ @@ -173,15 +173,15 @@ │ Max. Text Size : 10 │ @@ -256,7 +280,8 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd -├── popupFan.txt +│ --- HMI/n2t-out/popupFan.txt +├── +++ HMI/US/landscape/n2t-out/popupFan.txt │ @@ -619,14 +619,18 @@ │ { │ page cardQR @@ -276,7 +301,8 @@ │ } │ } │ } -├── popupInSel.txt +│ --- HMI/n2t-out/popupInSel.txt +├── +++ HMI/US/landscape/n2t-out/popupInSel.txt │ @@ -893,14 +893,18 @@ │ { │ page cardQR @@ -296,7 +322,8 @@ │ } │ } │ } -├── popupLight.txt +│ --- HMI/n2t-out/popupLight.txt +├── +++ HMI/US/landscape/n2t-out/popupLight.txt │ @@ -682,14 +682,18 @@ │ { │ page cardQR @@ -316,7 +343,8 @@ │ } │ } │ } -├── popupNotify.txt +│ --- HMI/n2t-out/popupNotify.txt +├── +++ HMI/US/landscape/n2t-out/popupNotify.txt │ @@ -437,14 +437,18 @@ │ { │ page cardQR @@ -336,7 +364,8 @@ │ } │ } │ } -├── popupShutter.txt +│ --- HMI/n2t-out/popupShutter.txt +├── +++ HMI/US/landscape/n2t-out/popupShutter.txt │ @@ -671,14 +671,18 @@ │ { │ page cardQR @@ -356,7 +385,8 @@ │ } │ } │ } -├── popupThermo.txt +│ --- HMI/n2t-out/popupThermo.txt +├── +++ HMI/US/landscape/n2t-out/popupThermo.txt │ @@ -942,14 +942,18 @@ │ { │ page cardQR @@ -376,7 +406,8 @@ │ } │ } │ } -├── screensaver.txt +│ --- HMI/n2t-out/screensaver.txt +├── +++ HMI/US/landscape/n2t-out/screensaver.txt │ @@ -351,15 +351,15 @@ │ Text tTime │ Attributes diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index 51d11a30..938530de 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -25,7 +25,7 @@ Page cardEntities //remove background & activate reparse mode vis p0,0 recmod=1 - bauds=115200 + baud=115200 //debug stuff vis tTmp,0 vis tSend,0 diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt index 2afb72a5..3b4992f1 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt +++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt @@ -24,7 +24,7 @@ Page cardGrid //remove background & activate reparse mode vis p0,0 recmod=1 - bauds=115200 + baud=115200 //debug stuff vis tTmp,0 vis tSend,0 @@ -512,6 +512,10 @@ Button bEntity1 { page popupShutter } + if(type1.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -571,6 +575,10 @@ Button bEntity2 { page popupShutter } + if(type2.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -630,6 +638,10 @@ Button bEntity3 { page popupShutter } + if(type3.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -689,6 +701,10 @@ Button bEntity4 { page popupShutter } + if(type4.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -748,6 +764,10 @@ Button bEntity5 { page popupShutter } + if(type5.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -807,6 +827,10 @@ Button bEntity6 { page popupShutter } + if(type6.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index d245471e..170ee582 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -26,6 +26,10 @@ popupNotify 19 Component(s) 257 Line(s) of event code 166 Unique line(s) of event code +screensaver + 45 Component(s) + 400 Line(s) of event code + 296 Unique line(s) of event code popupLight 28 Component(s) 408 Line(s) of event code @@ -50,10 +54,10 @@ popupInSel 34 Component(s) 533 Line(s) of event code 259 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 @@ -66,17 +70,13 @@ popupThermo 44 Component(s) 519 Line(s) of event code 274 Unique line(s) of event code -screensaver - 45 Component(s) - 400 Line(s) of event code - 296 Unique line(s) of event code -cardEntities - 65 Component(s) - 1169 Line(s) of event code - 532 Unique line(s) of event code +cardGrid + 42 Component(s) + 518 Line(s) of event code + 294 Unique line(s) of event code Total 18 Page(s) 603 Component(s) - 7532 Line(s) of event code - 1938 Unique line(s) of event code + 7556 Line(s) of event code + 1941 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/screensaver.txt b/HMI/US/landscape/n2t-out-visual/screensaver.txt index 7ee5bae3..423dfad6 100644 --- a/HMI/US/landscape/n2t-out-visual/screensaver.txt +++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt @@ -21,7 +21,7 @@ Page screensaver Events Preinitialize Event recmod=1 - bauds=115200 + baud=115200 vis tInstruction,0 vis tTmp,0 vis p0,0 diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index 4562d181..7b4d272b 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -17,7 +17,7 @@ Page cardEntities //remove background & activate reparse mode vis p0,0 recmod=1 - bauds=115200 + baud=115200 //debug stuff vis tTmp,0 vis tSend,0 diff --git a/HMI/US/landscape/n2t-out/cardGrid.txt b/HMI/US/landscape/n2t-out/cardGrid.txt index 7c959fd6..6ce43ce9 100644 --- a/HMI/US/landscape/n2t-out/cardGrid.txt +++ b/HMI/US/landscape/n2t-out/cardGrid.txt @@ -16,7 +16,7 @@ Page cardGrid //remove background & activate reparse mode vis p0,0 recmod=1 - bauds=115200 + baud=115200 //debug stuff vis tTmp,0 vis tSend,0 @@ -258,6 +258,10 @@ Button bEntity1 { page popupShutter } + if(type1.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -295,6 +299,10 @@ Button bEntity2 { page popupShutter } + if(type2.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -332,6 +340,10 @@ Button bEntity3 { page popupShutter } + if(type3.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -369,6 +381,10 @@ Button bEntity4 { page popupShutter } + if(type4.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -406,6 +422,10 @@ Button bEntity5 { page popupShutter } + if(type5.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -443,6 +463,10 @@ Button bEntity6 { page popupShutter } + if(type6.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 diff --git a/HMI/US/landscape/n2t-out/screensaver.txt b/HMI/US/landscape/n2t-out/screensaver.txt index 4e40c722..c04d751d 100644 --- a/HMI/US/landscape/n2t-out/screensaver.txt +++ b/HMI/US/landscape/n2t-out/screensaver.txt @@ -13,7 +13,7 @@ Page screensaver Events Preinitialize Event recmod=1 - bauds=115200 + baud=115200 vis tInstruction,0 vis tTmp,0 vis p0,0 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 7b16b20c..42c3e9f3 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,6 +1,7 @@ --- HMI/n2t-out +++ HMI/US/portrait/n2t-out -├── Program.s.txt +│ --- HMI/n2t-out/Program.s.txt +├── +++ HMI/US/portrait/n2t-out/Program.s.txt │ @@ -10,10 +10,10 @@ │ int sleepValue=0 │ // dim value @@ -14,7 +15,8 @@ │ + // fix touch offset (Removed for US version) │ + //lcd_dev fffb 0002 0000 0020 │ page pageStartup -├── cardChart.txt +│ --- HMI/n2t-out/cardChart.txt +├── +++ HMI/US/portrait/n2t-out/cardChart.txt │ @@ -175,16 +175,16 @@ │ Send Component ID : disabled │ State : unpressed @@ -76,7 +78,8 @@ │ Dragging : 0 │ Disable release event after dragging: 0 │ Send Component ID : disabled -├── cardEntities.txt +│ --- HMI/n2t-out/cardEntities.txt +├── +++ HMI/US/portrait/n2t-out/cardEntities.txt │ @@ -61,14 +61,24 @@ │ vis tIcon4,0 │ vis tEntity4,0 @@ -673,7 +676,28 @@ │ //command format pageType,specialPageName │ //write name of speical page to tId │ spstr strCommand.txt,tId.txt,"~",1 -├── cardMedia.txt +│ --- HMI/n2t-out/cardGrid.txt +├── +++ HMI/US/portrait/n2t-out/cardGrid.txt +│ @@ -609,14 +609,18 @@ +│ { +│ page popupLight +│ } +│ if(tTmp.txt=="fan") +│ { +│ page popupFan +│ } +│ + if(tTmp.txt=="input_sel") +│ + { +│ + page popupInSel +│ + } +│ +│ Timer tmSerial +│ Attributes +│ Scope : local +│ Period (ms): 50 +│ Enabled : yes +│ --- HMI/n2t-out/cardMedia.txt +├── +++ HMI/US/portrait/n2t-out/cardMedia.txt │ @@ -15,15 +15,14 @@ │ dim=dimValueNormal │ vis p0,0 @@ -862,7 +886,8 @@ │ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 │ } │ if(tInstruction.txt=="date") -├── pageStartup.txt +│ --- HMI/n2t-out/pageStartup.txt +├── +++ HMI/US/portrait/n2t-out/pageStartup.txt │ @@ -118,15 +118,15 @@ │ Text tMsg3 │ Attributes @@ -897,7 +922,8 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd -├── popupFan.txt +│ --- HMI/n2t-out/popupFan.txt +├── +++ HMI/US/portrait/n2t-out/popupFan.txt │ @@ -619,14 +619,18 @@ │ { │ page cardQR @@ -917,7 +943,8 @@ │ } │ } │ } -├── popupInSel.txt +│ --- HMI/n2t-out/popupInSel.txt +├── +++ HMI/US/portrait/n2t-out/popupInSel.txt │ @@ -893,14 +893,18 @@ │ { │ page cardQR @@ -937,7 +964,8 @@ │ } │ } │ } -├── popupLight.txt +│ --- HMI/n2t-out/popupLight.txt +├── +++ HMI/US/portrait/n2t-out/popupLight.txt │ @@ -682,14 +682,18 @@ │ { │ page cardQR @@ -957,7 +985,8 @@ │ } │ } │ } -├── popupNotify.txt +│ --- HMI/n2t-out/popupNotify.txt +├── +++ HMI/US/portrait/n2t-out/popupNotify.txt │ @@ -437,14 +437,18 @@ │ { │ page cardQR @@ -977,7 +1006,8 @@ │ } │ } │ } -├── popupShutter.txt +│ --- HMI/n2t-out/popupShutter.txt +├── +++ HMI/US/portrait/n2t-out/popupShutter.txt │ @@ -671,14 +671,18 @@ │ { │ page cardQR @@ -997,7 +1027,8 @@ │ } │ } │ } -├── popupThermo.txt +│ --- HMI/n2t-out/popupThermo.txt +├── +++ HMI/US/portrait/n2t-out/popupThermo.txt │ @@ -942,14 +942,18 @@ │ { │ page cardQR diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index b0ec5b2a..b6313577 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,5 +1,8 @@ -+++ /dev/fd/62 2022-11-27 12:27:00.567901800 +0000 -+rdChart.txt ++++ /dev/fd/62 2022-11-30 16:01:08.850583062 +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 @@ + Send Component ID : disabled + State : unpressed @@ -61,7 +64,30 @@ + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled -+rdMedia.txt ++I/n2t-out/cardEntities.txt +++ HMI/US/portrait/n2t-out/cardEntities.txt ++I/n2t-out/cardGrid.txt +++ HMI/US/portrait/n2t-out/cardGrid.txt ++14 +609,18 @@ ++ { ++ page popupLight ++ } ++ if(tTmp.txt=="fan") ++ { ++ page popupFan ++ } ++ if(tTmp.txt=="input_sel") ++ { ++ page popupInSel ++ } ++ ++mSerial ++ributes ++ Scope : local ++ Period (ms): 50 ++ Enabled : yes ++I/n2t-out/cardMedia.txt +++ HMI/US/portrait/n2t-out/cardMedia.txt +5 +15,14 @@ + dim=dimValueNormal + vis p0,0 @@ -250,7 +276,10 @@ + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + } + if(tInstruction.txt=="date") -+pupFan.txt ++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 @@ -270,7 +299,8 @@ + } + } + } -+pupInSel.txt ++I/n2t-out/popupInSel.txt +++ HMI/US/portrait/n2t-out/popupInSel.txt +14 +893,18 @@ + { + page cardQR @@ -290,7 +320,8 @@ + } + } + } -+pupLight.txt ++I/n2t-out/popupLight.txt +++ HMI/US/portrait/n2t-out/popupLight.txt +14 +682,18 @@ + { + page cardQR @@ -310,7 +341,8 @@ + } + } + } -+pupNotify.txt ++I/n2t-out/popupNotify.txt +++ HMI/US/portrait/n2t-out/popupNotify.txt +14 +437,18 @@ + { + page cardQR @@ -330,7 +362,8 @@ + } + } + } -+pupShutter.txt ++I/n2t-out/popupShutter.txt +++ HMI/US/portrait/n2t-out/popupShutter.txt +14 +671,18 @@ + { + page cardQR @@ -350,7 +383,8 @@ + } + } + } -+pupThermo.txt ++I/n2t-out/popupThermo.txt +++ HMI/US/portrait/n2t-out/popupThermo.txt +14 +942,18 @@ + { + page cardQR diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index a79ad9e9..ae01290d 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -25,7 +25,7 @@ Page cardEntities //remove background & activate reparse mode vis p0,0 recmod=1 - bauds=115200 + baud=115200 //debug stuff vis tTmp,0 vis tSend,0 diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt index 527e873f..a8b24eb3 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt @@ -24,7 +24,7 @@ Page cardGrid //remove background & activate reparse mode vis p0,0 recmod=1 - bauds=115200 + baud=115200 //debug stuff vis tTmp,0 vis tSend,0 @@ -512,6 +512,10 @@ Button bEntity1 { page popupShutter } + if(type1.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -571,6 +575,10 @@ Button bEntity2 { page popupShutter } + if(type2.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -630,6 +638,10 @@ Button bEntity3 { page popupShutter } + if(type3.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -689,6 +701,10 @@ Button bEntity4 { page popupShutter } + if(type4.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -748,6 +764,10 @@ Button bEntity5 { page popupShutter } + if(type5.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -807,6 +827,10 @@ Button bEntity6 { page popupShutter } + if(type6.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 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 211cf320..613fa30b 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 @@ -58,14 +58,14 @@ cardAlarm 40 Component(s) 443 Line(s) of event code 263 Unique line(s) of event code +cardGrid + 42 Component(s) + 518 Line(s) of event code + 294 Unique line(s) of event code screensaver 45 Component(s) 400 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 cardQR 32 Component(s) 425 Line(s) of event code @@ -78,5 +78,5 @@ cardEntities Total 18 Page(s) 615 Component(s) - 7759 Line(s) of event code - 2012 Unique line(s) of event code + 7783 Line(s) of event code + 2014 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt index 0c9e486d..34183850 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -21,7 +21,7 @@ Page screensaver Events Preinitialize Event recmod=1 - bauds=115200 + baud=115200 vis tInstruction,0 vis tTmp,0 vis p0,0 diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 1e04ef3b..2ba0c865 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -17,7 +17,7 @@ Page cardEntities //remove background & activate reparse mode vis p0,0 recmod=1 - bauds=115200 + baud=115200 //debug stuff vis tTmp,0 vis tSend,0 diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index 7c959fd6..6ce43ce9 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/n2t-out/cardGrid.txt @@ -16,7 +16,7 @@ Page cardGrid //remove background & activate reparse mode vis p0,0 recmod=1 - bauds=115200 + baud=115200 //debug stuff vis tTmp,0 vis tSend,0 @@ -258,6 +258,10 @@ Button bEntity1 { page popupShutter } + if(type1.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -295,6 +299,10 @@ Button bEntity2 { page popupShutter } + if(type2.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -332,6 +340,10 @@ Button bEntity3 { page popupShutter } + if(type3.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -369,6 +381,10 @@ Button bEntity4 { page popupShutter } + if(type4.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -406,6 +422,10 @@ Button bEntity5 { page popupShutter } + if(type5.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -443,6 +463,10 @@ Button bEntity6 { page popupShutter } + if(type6.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index cf6b593f..6558ae41 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -13,7 +13,7 @@ Page screensaver Events Preinitialize Event recmod=1 - bauds=115200 + baud=115200 vis tInstruction,0 vis tTmp,0 vis p0,0 diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index c0a5787f..f057719c 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -25,7 +25,7 @@ Page cardEntities //remove background & activate reparse mode vis p0,0 recmod=1 - bauds=115200 + baud=115200 //debug stuff vis tTmp,0 vis tSend,0 diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index 33482191..f3f0252e 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/n2t-out-visual/cardGrid.txt @@ -24,7 +24,7 @@ Page cardGrid //remove background & activate reparse mode vis p0,0 recmod=1 - bauds=115200 + baud=115200 //debug stuff vis tTmp,0 vis tSend,0 @@ -512,6 +512,10 @@ Button bEntity1 { page popupShutter } + if(type1.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -571,6 +575,10 @@ Button bEntity2 { page popupShutter } + if(type2.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -630,6 +638,10 @@ Button bEntity3 { page popupShutter } + if(type3.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -689,6 +701,10 @@ Button bEntity4 { page popupShutter } + if(type4.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -748,6 +764,10 @@ Button bEntity5 { page popupShutter } + if(type5.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -807,6 +827,10 @@ Button bEntity6 { page popupShutter } + if(type6.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -1034,10 +1058,6 @@ Timer tmLP { page popupFan } - if(tTmp.txt=="input_sel") - { - page popupInSel - } Timer tmSerial Attributes diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index b3d385c0..b62a174b 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -14,10 +14,6 @@ popupLight 28 Component(s) 404 Line(s) of event code 223 Unique line(s) of event code -pageTest - 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 @@ -26,18 +22,22 @@ pageStartup 19 Component(s) 181 Line(s) of event code 129 Unique line(s) of event code +pageTest + 21 Component(s) + 66 Line(s) of event code + 64 Unique line(s) of event code +popupInSel + 34 Component(s) + 529 Line(s) of event code + 257 Unique line(s) of event code cardChart 31 Component(s) 452 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 + 514 Line(s) of event code + 293 Unique line(s) of event code cardPower 43 Component(s) 439 Line(s) of event code @@ -62,10 +62,6 @@ 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 @@ -74,9 +70,13 @@ screensaver 45 Component(s) 400 Line(s) of event code 296 Unique line(s) of event code +cardEntities + 65 Component(s) + 1169 Line(s) of event code + 532 Unique line(s) of event code Total 18 Page(s) 610 Component(s) - 7583 Line(s) of event code - 1959 Unique line(s) of event code + 7603 Line(s) of event code + 1961 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/pageTest.txt b/HMI/n2t-out-visual/pageTest.txt index b1b82cf2..e21730a7 100644 --- a/HMI/n2t-out-visual/pageTest.txt +++ b/HMI/n2t-out-visual/pageTest.txt @@ -22,7 +22,7 @@ Page pageTest Preinitialize Event vis p0,0 recmod=1 - bauds=115200 + baud=115200 Variable (string) strCommand Attributes diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index 49299a48..3ad373ed 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -21,7 +21,7 @@ Page screensaver Events Preinitialize Event recmod=1 - bauds=115200 + baud=115200 vis tInstruction,0 vis tTmp,0 vis p0,0 diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 4562d181..7b4d272b 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -17,7 +17,7 @@ Page cardEntities //remove background & activate reparse mode vis p0,0 recmod=1 - bauds=115200 + baud=115200 //debug stuff vis tTmp,0 vis tSend,0 diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index 7c959fd6..2244d8ee 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -16,7 +16,7 @@ Page cardGrid //remove background & activate reparse mode vis p0,0 recmod=1 - bauds=115200 + baud=115200 //debug stuff vis tTmp,0 vis tSend,0 @@ -258,6 +258,10 @@ Button bEntity1 { page popupShutter } + if(type1.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -295,6 +299,10 @@ Button bEntity2 { page popupShutter } + if(type2.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -332,6 +340,10 @@ Button bEntity3 { page popupShutter } + if(type3.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -369,6 +381,10 @@ Button bEntity4 { page popupShutter } + if(type4.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -406,6 +422,10 @@ Button bEntity5 { page popupShutter } + if(type5.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -443,6 +463,10 @@ Button bEntity6 { page popupShutter } + if(type6.txt=="input_sel") + { + page popupInSel + } Touch Release Event tmLP.en=0 @@ -589,10 +613,6 @@ Timer tmLP { page popupFan } - if(tTmp.txt=="input_sel") - { - page popupInSel - } Timer tmSerial Attributes diff --git a/HMI/n2t-out/pageTest.txt b/HMI/n2t-out/pageTest.txt index b1d140fc..e4adc142 100644 --- a/HMI/n2t-out/pageTest.txt +++ b/HMI/n2t-out/pageTest.txt @@ -14,7 +14,7 @@ Page pageTest Preinitialize Event vis p0,0 recmod=1 - bauds=115200 + baud=115200 Variable (string) strCommand Attributes diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index cf6b593f..6558ae41 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -13,7 +13,7 @@ Page screensaver Events Preinitialize Event recmod=1 - bauds=115200 + baud=115200 vis tInstruction,0 vis tTmp,0 vis p0,0