From fa24d04c3deda8445249aba8f09617c23059b4fc Mon Sep 17 00:00:00 2001 From: jmbinette Date: Fri, 6 May 2022 10:59:42 -0400 Subject: [PATCH] Synced US-P (#178) * synced us-p version * synced us-p version (add nextion2text) Co-authored-by: jmbinette --- HMI/US/landscape/diff-eu-version.txt | 8 +- HMI/US/portrait/diff-eu-version.txt | 381 +++--------------- HMI/US/portrait/diff-filtered.txt | 380 +++-------------- HMI/US/portrait/n2t-out-visual/cardAlarm.txt | 4 +- .../portrait/n2t-out-visual/cardEntities.txt | 2 + HMI/US/portrait/n2t-out-visual/cardGrid.txt | 4 +- HMI/US/portrait/n2t-out-visual/cardMedia.txt | 5 +- HMI/US/portrait/n2t-out-visual/cardThermo.txt | 4 +- .../n2t-out-visual/nspanel_US_P_Stats.txt | 42 +- .../portrait/n2t-out-visual/pageStartup.txt | 2 +- HMI/US/portrait/n2t-out-visual/popupLight.txt | 2 +- .../portrait/n2t-out-visual/popupNotify.txt | 6 +- .../portrait/n2t-out-visual/popupShutter.txt | 10 +- .../portrait/n2t-out-visual/screensaver.txt | 88 +++- HMI/US/portrait/n2t-out/cardAlarm.txt | 4 +- HMI/US/portrait/n2t-out/cardEntities.txt | 2 + HMI/US/portrait/n2t-out/cardGrid.txt | 4 +- HMI/US/portrait/n2t-out/cardMedia.txt | 5 +- HMI/US/portrait/n2t-out/cardThermo.txt | 4 +- HMI/US/portrait/n2t-out/pageStartup.txt | 2 +- HMI/US/portrait/n2t-out/popupLight.txt | 2 +- HMI/US/portrait/n2t-out/popupNotify.txt | 6 +- HMI/US/portrait/n2t-out/popupShutter.txt | 10 +- HMI/US/portrait/n2t-out/screensaver.txt | 48 ++- HMI/US/portrait/nspanel_US_P.HMI | Bin 11160448 -> 11161054 bytes HMI/US/portrait/nspanel_US_P.tft | Bin 10179592 -> 10183848 bytes 26 files changed, 339 insertions(+), 686 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 102f8fd7..e645edee 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-06 14:02:52.542818972 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 14:02:53.334821747 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-06 14:54:01.361609612 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 14:54:02.317683797 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-06 14:02:52.546818986 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 14:02:53.338821761 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-06 14:54:01.361609612 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 14:54:02.321684107 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index f9ee3a58..c246267c 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-06 14:02:52.542818972 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 14:02:52.922820303 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-06 14:54:01.361609612 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 14:54:01.817644997 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,18 +11,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + //lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-05-06 14:02:52.546818986 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 14:02:52.926820317 +0000 -@@ -33,8 +33,6 @@ - vis b9,0 - vis b10,0 - vis tCode,0 -- vis bPrev,0 -- vis bNext,0 - - Variable (string) strCommand - Attributes -@@ -46,7 +44,7 @@ +--- HMI/n2t-out/cardAlarm.txt 2022-05-06 14:54:01.365609923 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 14:54:01.817644997 +0000 +@@ -46,7 +46,7 @@ Attributes Scope : local Text : @@ -31,7 +22,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt Variable (string) tSend Attributes -@@ -152,7 +150,7 @@ +@@ -152,7 +152,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -40,7 +31,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -184,7 +182,7 @@ +@@ -184,7 +184,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -49,7 +40,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -367,7 +365,7 @@ +@@ -367,7 +367,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -58,7 +49,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -397,7 +395,7 @@ +@@ -397,7 +397,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -67,7 +58,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -427,7 +425,7 @@ +@@ -427,7 +427,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -76,7 +67,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -457,7 +455,7 @@ +@@ -457,7 +457,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -85,24 +76,13 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -737,7 +735,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-06 14:02:52.546818986 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 14:02:52.926820317 +0000 -@@ -62,8 +62,16 @@ +--- HMI/n2t-out/cardEntities.txt 2022-05-06 14:54:01.365609923 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 14:54:01.817644997 +0000 +@@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 vis nNum4,0 -- vis bPrev,0 -- vis bNext,0 + //ui e5 + vis btOnOff5,0 + vis bUp5,0 @@ -113,10 +93,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis bText5,0 + vis hSlider5,0 + vis nNum5,0 + vis bPrev,0 + vis bNext,0 - Variable (string) strCommand - Attributes -@@ -119,6 +127,18 @@ +@@ -119,6 +129,18 @@ Text : Max. Text Size: 80 @@ -135,7 +115,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Number nNum1 Attributes Scope : local -@@ -155,6 +175,15 @@ +@@ -155,6 +177,15 @@ Associated Keyboard : none Value : 0 @@ -151,7 +131,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Text tHeading Attributes Scope : local -@@ -285,6 +314,26 @@ +@@ -285,6 +316,26 @@ Text : Max. Text Size : 50 @@ -178,7 +158,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Picture p0 Attributes Scope : local -@@ -404,6 +453,34 @@ +@@ -404,6 +455,34 @@ prints tSend.txt,0 prints crcval,2 @@ -213,7 +193,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Button bDown1 Attributes Scope : local -@@ -861,6 +938,106 @@ +@@ -861,6 +940,106 @@ prints tSend.txt,0 prints crcval,2 @@ -320,7 +300,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Dual-state Button btOnOff1 Attributes Scope : local -@@ -969,6 +1146,33 @@ +@@ -969,6 +1148,33 @@ prints tSend.txt,0 prints crcval,2 @@ -354,7 +334,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Hotspot mSpecial Attributes Scope : local -@@ -1074,6 +1278,28 @@ +@@ -1074,6 +1280,28 @@ page popupLight } @@ -383,7 +363,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Timer tmSerial Attributes Scope : local -@@ -1644,6 +1870,128 @@ +@@ -1644,6 +1872,128 @@ covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 } @@ -513,18 +493,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-05-06 14:02:52.546818986 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 14:02:52.926820317 +0000 -@@ -34,8 +34,6 @@ - vis tEntity4,0 - vis tEntity5,0 - vis tEntity6,0 -- vis bPrev,0 -- vis bNext,0 - - Variable (string) strCommand - Attributes -@@ -71,25 +69,25 @@ +--- HMI/n2t-out/cardGrid.txt 2022-05-06 14:54:01.361609612 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 14:54:01.817644997 +0000 +@@ -71,25 +71,25 @@ Attributes Scope : local Text : @@ -554,7 +525,7 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt Variable (string) type5 Attributes -@@ -107,13 +105,13 @@ +@@ -107,13 +107,13 @@ Attributes Scope : local Text : @@ -570,27 +541,10 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt Text tHeading Attributes -@@ -840,7 +838,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-05-06 14:02:52.542818972 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 14:02:52.926820317 +0000 -@@ -18,26 +18,25 @@ - vis tTmp,0 - vis tId,0 - vis t5,0 -- vis bPrev,0 -- vis bNext,0 -+ //vis nPageDisp,0 - - Variable (string) strCommand +--- HMI/n2t-out/cardMedia.txt 2022-05-06 14:54:01.361609612 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 14:54:01.817644997 +0000 +@@ -25,19 +25,19 @@ Attributes Scope : local Text : @@ -613,7 +567,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt Variable (int32) vaSpeakerPos Attributes -@@ -135,7 +134,7 @@ +@@ -135,7 +135,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -622,7 +576,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -164,7 +163,7 @@ +@@ -164,7 +164,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -631,7 +585,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -193,7 +192,7 @@ +@@ -193,7 +193,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -640,7 +594,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -233,7 +232,7 @@ +@@ -233,7 +233,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -649,7 +603,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -263,7 +262,7 @@ +@@ -263,7 +263,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -658,7 +612,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -302,7 +301,7 @@ +@@ -302,7 +302,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -667,7 +621,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -353,7 +352,7 @@ +@@ -353,7 +353,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -676,7 +630,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -391,7 +390,7 @@ +@@ -391,7 +391,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -685,7 +639,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -416,7 +415,7 @@ +@@ -416,7 +416,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -694,7 +648,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -448,7 +447,7 @@ +@@ -448,7 +448,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -703,28 +657,10 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -698,7 +697,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-05-06 14:02:52.546818986 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 14:02:52.926820317 +0000 -@@ -31,8 +31,6 @@ - vis bt6,0 - vis bt7,0 - vis bt8,0 -- vis bPrev,0 -- vis bNext,0 - - Variable (string) strCommand - Attributes -@@ -44,7 +42,7 @@ +--- HMI/n2t-out/cardThermo.txt 2022-05-06 14:54:01.365609923 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 14:54:01.817644997 +0000 +@@ -44,7 +44,7 @@ Attributes Scope : local Text : @@ -733,7 +669,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt Variable (string) va0 Attributes -@@ -239,7 +237,7 @@ +@@ -239,7 +239,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -742,7 +678,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -275,7 +273,7 @@ +@@ -275,7 +275,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -751,7 +687,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -311,7 +309,7 @@ +@@ -311,7 +311,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -760,7 +696,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -343,7 +341,7 @@ +@@ -343,7 +343,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -769,7 +705,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -370,7 +368,7 @@ +@@ -370,7 +370,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -778,7 +714,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -397,7 +395,7 @@ +@@ -397,7 +397,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -787,7 +723,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -424,7 +422,7 @@ +@@ -424,7 +424,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -796,7 +732,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -451,7 +449,7 @@ +@@ -451,7 +451,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -805,7 +741,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -478,7 +476,7 @@ +@@ -478,7 +478,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -814,7 +750,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -505,7 +503,7 @@ +@@ -505,7 +505,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -823,7 +759,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -532,7 +530,7 @@ +@@ -532,7 +532,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -832,7 +768,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -559,7 +557,7 @@ +@@ -559,7 +559,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -841,7 +777,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -586,7 +584,7 @@ +@@ -586,7 +586,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb @@ -850,18 +786,9 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -950,7 +948,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-05-06 14:02:52.542818972 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 14:02:52.922820303 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-05-06 14:54:01.361609612 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 14:54:01.817644997 +0000 @@ -30,7 +30,7 @@ Send Component ID : disabled Associated Keyboard : none @@ -881,8 +808,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt Picture p0 Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-06 14:02:52.546818986 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 14:02:52.922820303 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-06 14:54:01.361609612 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 14:54:01.817644997 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -892,7 +819,7 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt Max. Text Size : 100 Text tVersion -@@ -177,12 +177,12 @@ +@@ -177,7 +177,7 @@ recmod=1 bauds=115200 // startup event @@ -901,24 +828,9 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-05-06 14:02:52.546818986 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 14:02:52.926820317 +0000 -@@ -29,7 +29,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb +--- HMI/n2t-out/popupLight.txt 2022-05-06 14:54:01.365609923 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 14:54:01.817644997 +0000 @@ -59,8 +59,8 @@ Variable (string) entn Attributes @@ -930,48 +842,9 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt Variable (int32) mode Attributes -diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-05-06 14:02:52.546818986 +0000 -+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-06 14:02:52.922820303 +0000 -@@ -120,7 +120,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -147,7 +147,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -174,7 +174,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-05-06 14:02:52.546818986 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 14:02:52.922820303 +0000 -@@ -29,7 +29,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb +--- HMI/n2t-out/popupShutter.txt 2022-05-06 14:54:01.365609923 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 14:54:01.817644997 +0000 @@ -46,8 +46,8 @@ Variable (string) entn Attributes @@ -992,125 +865,3 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -172,7 +172,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -197,7 +197,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -222,7 +222,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -247,7 +247,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-06 14:02:52.546818986 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-06 14:02:52.926820317 +0000 -@@ -17,8 +17,6 @@ - vis tInstruction,0 - vis tTmp,0 - vis p0,0 -- vis tNotifyHead,0 -- vis tNotifyText,0 - //load gloabl time string from pageIcons - //tTime.txt=vaTime.txt - spstr pageIcons.vaTime.txt,tTime.txt,"?",0 -@@ -292,26 +290,6 @@ - Text : - Max. Text Size : 10 - --Text tNotifyHead -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- Associated Keyboard : none -- Text : -- Max. Text Size : 35 -- --Text tNotifyText -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- Associated Keyboard : none -- Text : -- Max. Text Size : 35 -- - Picture p0 - Attributes - Scope : local -@@ -543,20 +521,6 @@ - spstr strCommand.txt,tTmp.txt,"~",23 - covx tTmp.txt,tMR.pco,0,0 - } -- if(tInstruction.txt=="notify") -- { -- spstr strCommand.txt,tNotifyHead.txt,"~",1 -- spstr strCommand.txt,tNotifyText.txt,"~",2 -- if(tNotifyHead.txt!=""||tNotifyText.txt!="") -- { -- vis tNotifyHead,1 -- vis tNotifyText,1 -- }else -- { -- vis tNotifyHead,0 -- vis tNotifyText,0 -- } -- } - if(tInstruction.txt=="pageType") - { - dim=100 -@@ -646,16 +610,6 @@ - - Events - Touch Press Event -- if(tNotifyHead.txt!=""||tNotifyText.txt!="") -- { -- if(dim!=0) -- { -- tNotifyHead.txt="" -- tNotifyText.txt="" -- vis tNotifyHead,0 -- vis tNotifyText,0 -- } -- } - dim=dimValueNormal - vaTap.val+=1 - covx vaTap.val,tTmp.txt,0,0 -@@ -664,7 +618,7 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index c79d71a5..8bcef134 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,19 +1,10 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 14:02:52.938820360 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-06 14:02:52.542818972 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 14:02:52.922820303 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 14:54:01.837646549 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-06 14:54:01.361609612 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 14:54:01.817644997 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-05-06 14:02:52.546818986 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 14:02:52.926820317 +0000 -+@@ -33,8 +33,6 @@ -+ vis b9,0 -+ vis b10,0 -+ vis tCode,0 -+- vis bPrev,0 -+- vis bNext,0 -+ -+ Variable (string) strCommand -+ Attributes -+@@ -46,7 +44,7 @@ ++--- HMI/n2t-out/cardAlarm.txt 2022-05-06 14:54:01.365609923 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 14:54:01.817644997 +0000 ++@@ -46,7 +46,7 @@ + Attributes + Scope : local + Text : @@ -22,7 +13,7 @@ + + Variable (string) tSend + Attributes -+@@ -152,7 +150,7 @@ ++@@ -152,7 +152,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -31,7 +22,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -184,7 +182,7 @@ ++@@ -184,7 +184,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -40,7 +31,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -367,7 +365,7 @@ ++@@ -367,7 +367,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -49,7 +40,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -397,7 +395,7 @@ ++@@ -397,7 +397,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -58,7 +49,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -427,7 +425,7 @@ ++@@ -427,7 +427,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -67,7 +58,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -457,7 +455,7 @@ ++@@ -457,7 +457,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -76,51 +67,33 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -737,7 +735,7 @@ -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+ crcputh 55 bb -+- crcputs sys0,2 -++ crcputs sys0,1 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb -+--- HMI/n2t-out/cardEntities.txt 2022-05-06 14:02:52.546818986 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 14:02:52.926820317 +0000 -+@@ -62,8 +62,16 @@ -+- vis bPrev,0 -+- vis bNext,0 -+@@ -119,6 +127,18 @@ ++--- HMI/n2t-out/cardEntities.txt 2022-05-06 14:54:01.365609923 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 14:54:01.817644997 +0000 ++@@ -62,6 +62,16 @@ ++ vis bPrev,0 ++ vis bNext,0 ++@@ -119,6 +129,18 @@ + Max. Text Size: 80 ++ Max. Text Size: 80 -+@@ -155,6 +175,15 @@ -+@@ -285,6 +314,26 @@ -+@@ -404,6 +453,34 @@ ++@@ -155,6 +177,15 @@ ++@@ -285,6 +316,26 @@ ++@@ -404,6 +455,34 @@ ++ crcputs sys0,2 -+@@ -861,6 +938,106 @@ ++@@ -861,6 +940,106 @@ ++ crcputs sys0,2 ++ crcputs sys0,2 ++ crcputs sys0,2 -+@@ -969,6 +1146,33 @@ ++@@ -969,6 +1148,33 @@ ++ crcputs sys0,2 -+@@ -1074,6 +1278,28 @@ -+@@ -1644,6 +1870,128 @@ ++@@ -1074,6 +1280,28 @@ ++@@ -1644,6 +1872,128 @@ + } + if(tInstruction.txt=="pageType") + { +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt -+--- HMI/n2t-out/cardGrid.txt 2022-05-06 14:02:52.546818986 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 14:02:52.926820317 +0000 -+@@ -34,8 +34,6 @@ -+ vis tEntity4,0 -+ vis tEntity5,0 -+ vis tEntity6,0 -+- vis bPrev,0 -+- vis bNext,0 -+ -+ Variable (string) strCommand -+ Attributes -+@@ -71,25 +69,25 @@ ++--- HMI/n2t-out/cardGrid.txt 2022-05-06 14:54:01.361609612 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 14:54:01.817644997 +0000 ++@@ -71,25 +71,25 @@ + Attributes + Scope : local + Text : @@ -150,7 +123,7 @@ + + Variable (string) type5 + Attributes -+@@ -107,13 +105,13 @@ ++@@ -107,13 +107,13 @@ + Attributes + Scope : local + Text : @@ -166,27 +139,10 @@ + + Text tHeading + Attributes -+@@ -840,7 +838,7 @@ -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+ crcputh 55 bb -+- crcputs sys0,2 -++ crcputs sys0,1 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-05-06 14:02:52.542818972 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 14:02:52.926820317 +0000 -+@@ -18,26 +18,25 @@ -+ vis tTmp,0 -+ vis tId,0 -+ vis t5,0 -+- vis bPrev,0 -+- vis bNext,0 -++ //vis nPageDisp,0 -+ -+ Variable (string) strCommand ++--- HMI/n2t-out/cardMedia.txt 2022-05-06 14:54:01.361609612 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 14:54:01.817644997 +0000 ++@@ -25,19 +25,19 @@ + Attributes + Scope : local + Text : @@ -209,7 +165,7 @@ + + Variable (int32) vaSpeakerPos + Attributes -+@@ -135,7 +134,7 @@ ++@@ -135,7 +135,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -218,7 +174,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -164,7 +163,7 @@ ++@@ -164,7 +164,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -227,7 +183,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -193,7 +192,7 @@ ++@@ -193,7 +193,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -236,7 +192,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -233,7 +232,7 @@ ++@@ -233,7 +233,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -245,7 +201,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -263,7 +262,7 @@ ++@@ -263,7 +263,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -254,7 +210,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -302,7 +301,7 @@ ++@@ -302,7 +302,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -263,7 +219,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -353,7 +352,7 @@ ++@@ -353,7 +353,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -272,7 +228,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -391,7 +390,7 @@ ++@@ -391,7 +391,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -281,7 +237,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -416,7 +415,7 @@ ++@@ -416,7 +416,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -290,7 +246,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -448,7 +447,7 @@ ++@@ -448,7 +448,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -299,28 +255,10 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -698,7 +697,7 @@ -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+ crcputh 55 bb -+- crcputs sys0,2 -++ crcputs sys0,1 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-05-06 14:02:52.546818986 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 14:02:52.926820317 +0000 -+@@ -31,8 +31,6 @@ -+ vis bt6,0 -+ vis bt7,0 -+ vis bt8,0 -+- vis bPrev,0 -+- vis bNext,0 -+ -+ Variable (string) strCommand -+ Attributes -+@@ -44,7 +42,7 @@ ++--- HMI/n2t-out/cardThermo.txt 2022-05-06 14:54:01.365609923 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 14:54:01.817644997 +0000 ++@@ -44,7 +44,7 @@ + Attributes + Scope : local + Text : @@ -329,7 +267,7 @@ + + Variable (string) va0 + Attributes -+@@ -239,7 +237,7 @@ ++@@ -239,7 +239,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -338,7 +276,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -275,7 +273,7 @@ ++@@ -275,7 +275,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -347,7 +285,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -311,7 +309,7 @@ ++@@ -311,7 +311,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -356,7 +294,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -343,7 +341,7 @@ ++@@ -343,7 +343,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -365,7 +303,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -370,7 +368,7 @@ ++@@ -370,7 +370,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -374,7 +312,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -397,7 +395,7 @@ ++@@ -397,7 +397,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -383,7 +321,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -424,7 +422,7 @@ ++@@ -424,7 +424,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -392,7 +330,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -451,7 +449,7 @@ ++@@ -451,7 +451,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -401,7 +339,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -478,7 +476,7 @@ ++@@ -478,7 +478,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -410,7 +348,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -505,7 +503,7 @@ ++@@ -505,7 +505,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -419,7 +357,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -532,7 +530,7 @@ ++@@ -532,7 +532,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -428,7 +366,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -559,7 +557,7 @@ ++@@ -559,7 +559,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -437,7 +375,7 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -586,7 +584,7 @@ ++@@ -586,7 +586,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb @@ -446,18 +384,9 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -950,7 +948,7 @@ -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+ crcputh 55 bb -+- crcputs sys0,2 -++ crcputs sys0,1 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb +diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt -+--- HMI/n2t-out/pageIcons.txt 2022-05-06 14:02:52.542818972 +0000 -++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 14:02:52.922820303 +0000 ++--- HMI/n2t-out/pageIcons.txt 2022-05-06 14:54:01.361609612 +0000 +++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 14:54:01.817644997 +0000 +@@ -30,7 +30,7 @@ + Send Component ID : disabled + Associated Keyboard : none @@ -476,27 +405,11 @@ + + Picture p0 + Attributes -+--- HMI/n2t-out/pageStartup.txt 2022-05-06 14:02:52.546818986 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 14:02:52.922820303 +0000 -+@@ -177,12 +177,12 @@ -+ crcputh 55 bb -+- crcputs sys0,2 -++ crcputs sys0,1 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb ++--- HMI/n2t-out/pageStartup.txt 2022-05-06 14:54:01.361609612 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 14:54:01.817644997 +0000 +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-05-06 14:02:52.546818986 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 14:02:52.926820317 +0000 -+@@ -29,7 +29,7 @@ -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+ crcputh 55 bb -+- crcputs sys0,2 -++ crcputs sys0,1 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb ++--- HMI/n2t-out/popupLight.txt 2022-05-06 14:54:01.365609923 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 14:54:01.817644997 +0000 +@@ -59,8 +59,8 @@ + Variable (string) entn + Attributes @@ -508,48 +421,9 @@ + + Variable (int32) mode + Attributes -+diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt -+--- HMI/n2t-out/popupNotify.txt 2022-05-06 14:02:52.546818986 +0000 -++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-06 14:02:52.922820303 +0000 -+@@ -120,7 +120,7 @@ -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+ crcputh 55 bb -+- crcputs sys0,2 -++ crcputs sys0,1 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb -+@@ -147,7 +147,7 @@ -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+ crcputh 55 bb -+- crcputs sys0,2 -++ crcputs sys0,1 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb -+@@ -174,7 +174,7 @@ -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+ crcputh 55 bb -+- crcputs sys0,2 -++ crcputs sys0,1 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt -+--- HMI/n2t-out/popupShutter.txt 2022-05-06 14:02:52.546818986 +0000 -++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 14:02:52.922820303 +0000 -+@@ -29,7 +29,7 @@ -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+ crcputh 55 bb -+- crcputs sys0,2 -++ crcputs sys0,1 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb ++--- HMI/n2t-out/popupShutter.txt 2022-05-06 14:54:01.365609923 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 14:54:01.817644997 +0000 +@@ -46,8 +46,8 @@ + Variable (string) entn + Attributes @@ -570,125 +444,3 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -172,7 +172,7 @@ -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+ crcputh 55 bb -+- crcputs sys0,2 -++ crcputs sys0,1 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb -+@@ -197,7 +197,7 @@ -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+ crcputh 55 bb -+- crcputs sys0,2 -++ crcputs sys0,1 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb -+@@ -222,7 +222,7 @@ -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+ crcputh 55 bb -+- crcputs sys0,2 -++ crcputs sys0,1 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb -+@@ -247,7 +247,7 @@ -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+ crcputh 55 bb -+- crcputs sys0,2 -++ crcputs sys0,1 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb -+diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt -+--- HMI/n2t-out/screensaver.txt 2022-05-06 14:02:52.546818986 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-06 14:02:52.926820317 +0000 -+@@ -17,8 +17,6 @@ -+ vis tInstruction,0 -+ vis tTmp,0 -+ vis p0,0 -+- vis tNotifyHead,0 -+- vis tNotifyText,0 -+ //load gloabl time string from pageIcons -+ //tTime.txt=vaTime.txt -+ spstr pageIcons.vaTime.txt,tTime.txt,"?",0 -+@@ -292,26 +290,6 @@ -+ Text : -+ Max. Text Size : 10 -+ -+-Text tNotifyHead -+- Attributes -+- Scope : local -+- Dragging : 0 -+- Disable release event after dragging: 0 -+- Send Component ID : disabled -+- Associated Keyboard : none -+- Text : -+- Max. Text Size : 35 -+- -+-Text tNotifyText -+- Attributes -+- Scope : local -+- Dragging : 0 -+- Disable release event after dragging: 0 -+- Send Component ID : disabled -+- Associated Keyboard : none -+- Text : -+- Max. Text Size : 35 -+- -+ Picture p0 -+ Attributes -+ Scope : local -+@@ -543,20 +521,6 @@ -+ spstr strCommand.txt,tTmp.txt,"~",23 -+ covx tTmp.txt,tMR.pco,0,0 -+ } -+- if(tInstruction.txt=="notify") -+- { -+- spstr strCommand.txt,tNotifyHead.txt,"~",1 -+- spstr strCommand.txt,tNotifyText.txt,"~",2 -+- if(tNotifyHead.txt!=""||tNotifyText.txt!="") -+- { -+- vis tNotifyHead,1 -+- vis tNotifyText,1 -+- }else -+- { -+- vis tNotifyHead,0 -+- vis tNotifyText,0 -+- } -+- } -+ if(tInstruction.txt=="pageType") -+ { -+ dim=100 -+@@ -646,16 +610,6 @@ -+ -+ Events -+ Touch Press Event -+- if(tNotifyHead.txt!=""||tNotifyText.txt!="") -+- { -+- if(dim!=0) -+- { -+- tNotifyHead.txt="" -+- tNotifyText.txt="" -+- vis tNotifyHead,0 -+- vis tNotifyText,0 -+- } -+- } -+ dim=dimValueNormal -+ vaTap.val+=1 -+ covx vaTap.val,tTmp.txt,0,0 -+@@ -664,7 +618,7 @@ -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+ crcputh 55 bb -+- crcputs sys0,2 -++ crcputs sys0,1 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb diff --git a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt index b5c4c6fe..7f300874 100644 --- a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt @@ -41,6 +41,8 @@ Page cardAlarm vis b9,0 vis b10,0 vis tCode,0 + vis bPrev,0 + vis bNext,0 Variable (string) strCommand Attributes @@ -1266,7 +1268,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index 32a48dd5..b3e46e95 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -80,6 +80,8 @@ Page cardEntities vis bText5,0 vis hSlider5,0 vis nNum5,0 + vis bPrev,0 + vis bNext,0 Variable (string) strCommand Attributes diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt index 6fea0ea8..ebee2cfe 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt @@ -42,6 +42,8 @@ Page cardGrid vis tEntity4,0 vis tEntity5,0 vis tEntity6,0 + vis bPrev,0 + vis bNext,0 Variable (string) strCommand Attributes @@ -1276,7 +1278,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/portrait/n2t-out-visual/cardMedia.txt b/HMI/US/portrait/n2t-out-visual/cardMedia.txt index 472ed5fa..ff6ec12a 100644 --- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt +++ b/HMI/US/portrait/n2t-out-visual/cardMedia.txt @@ -26,7 +26,8 @@ Page cardMedia vis tTmp,0 vis tId,0 vis t5,0 - //vis nPageDisp,0 + vis bPrev,0 + vis bNext,0 Variable (string) strCommand Attributes @@ -1120,7 +1121,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/portrait/n2t-out-visual/cardThermo.txt b/HMI/US/portrait/n2t-out-visual/cardThermo.txt index 08e213e1..1c09249b 100644 --- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt +++ b/HMI/US/portrait/n2t-out-visual/cardThermo.txt @@ -39,6 +39,8 @@ Page cardThermo vis bt6,0 vis bt7,0 vis bt8,0 + vis bPrev,0 + vis bNext,0 Variable (string) strCommand Attributes @@ -1502,7 +1504,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb 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 6cd0e337..b51a64ce 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 @@ -17,42 +17,42 @@ popupNotify popupShutter 19 Component(s) 191 Line(s) of event code - 107 Unique line(s) of event code + 108 Unique line(s) of event code +popupLight + 27 Component(s) + 338 Line(s) of event code + 182 Unique line(s) of event code pageStartup 19 Component(s) 150 Line(s) of event code 113 Unique line(s) of event code -popupLight - 27 Component(s) - 338 Line(s) of event code - 183 Unique line(s) of event code screensaver - 33 Component(s) - 266 Line(s) of event code - 218 Unique line(s) of event code + 35 Component(s) + 292 Line(s) of event code + 235 Unique line(s) of event code cardMedia 30 Component(s) - 329 Line(s) of event code - 169 Unique line(s) of event code + 331 Line(s) of event code + 171 Unique line(s) of event code cardAlarm 35 Component(s) - 343 Line(s) of event code - 214 Unique line(s) of event code + 345 Line(s) of event code + 216 Unique line(s) of event code cardThermo 41 Component(s) - 442 Line(s) of event code - 247 Unique line(s) of event code + 444 Line(s) of event code + 249 Unique line(s) of event code cardGrid 39 Component(s) - 418 Line(s) of event code - 244 Unique line(s) of event code + 420 Line(s) of event code + 246 Unique line(s) of event code cardEntities 74 Component(s) - 1157 Line(s) of event code - 480 Unique line(s) of event code + 1159 Line(s) of event code + 482 Unique line(s) of event code Total 12 Page(s) - 353 Component(s) - 3853 Line(s) of event code - 1059 Unique line(s) of event code + 355 Component(s) + 3889 Line(s) of event code + 1076 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/pageStartup.txt b/HMI/US/portrait/n2t-out-visual/pageStartup.txt index ac4102a5..9e7214b0 100644 --- a/HMI/US/portrait/n2t-out-visual/pageStartup.txt +++ b/HMI/US/portrait/n2t-out-visual/pageStartup.txt @@ -467,7 +467,7 @@ Button bSendStartup btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index 8406b363..2f6f60a6 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -37,7 +37,7 @@ Page popupLight btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/portrait/n2t-out-visual/popupNotify.txt b/HMI/US/portrait/n2t-out-visual/popupNotify.txt index 2fc44a61..f609307f 100644 --- a/HMI/US/portrait/n2t-out-visual/popupNotify.txt +++ b/HMI/US/portrait/n2t-out-visual/popupNotify.txt @@ -283,7 +283,7 @@ Button b0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -332,7 +332,7 @@ Button b2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -381,7 +381,7 @@ Button b1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/portrait/n2t-out-visual/popupShutter.txt b/HMI/US/portrait/n2t-out-visual/popupShutter.txt index 825708e1..56924e11 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt @@ -37,7 +37,7 @@ Page popupShutter btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -369,7 +369,7 @@ Button b0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -416,7 +416,7 @@ Button bDown1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -463,7 +463,7 @@ Button bStop1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -510,7 +510,7 @@ Button bUp1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt index 1bf27dbb..4b4b1ac3 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -25,6 +25,8 @@ Page screensaver vis tInstruction,0 vis tTmp,0 vis p0,0 + vis tNotifyHead,0 + vis tNotifyText,0 //load gloabl time string from pageIcons //tTime.txt=vaTime.txt spstr pageIcons.vaTime.txt,tTime.txt,"?",0 @@ -763,6 +765,66 @@ Text tMR Horizontal Spacing : 0 Vertical Spacing : 0 +Text tNotifyHead + Attributes + ID : 33 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 240 + Width : 320 + Height : 58 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 3 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 35 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tNotifyText + Attributes + ID : 34 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 298 + Width : 320 + Height : 58 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 3 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 35 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + Picture p0 Attributes ID : 1 @@ -1005,6 +1067,20 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",23 covx tTmp.txt,tMR.pco,0,0 } + if(tInstruction.txt=="notify") + { + spstr strCommand.txt,tNotifyHead.txt,"~",1 + spstr strCommand.txt,tNotifyText.txt,"~",2 + if(tNotifyHead.txt!=""||tNotifyText.txt!="") + { + vis tNotifyHead,1 + vis tNotifyText,1 + }else + { + vis tNotifyHead,0 + vis tNotifyText,0 + } + } if(tInstruction.txt=="pageType") { dim=100 @@ -1096,6 +1172,16 @@ TouchCap tc0 Events Touch Press Event + if(tNotifyHead.txt!=""||tNotifyText.txt!="") + { + if(dim!=0) + { + tNotifyHead.txt="" + tNotifyText.txt="" + vis tNotifyHead,0 + vis tNotifyText,0 + } + } dim=dimValueNormal vaTap.val+=1 covx vaTap.val,tTmp.txt,0,0 @@ -1104,7 +1190,7 @@ TouchCap tc0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/portrait/n2t-out/cardAlarm.txt b/HMI/US/portrait/n2t-out/cardAlarm.txt index 203a993a..0e0ba7bb 100644 --- a/HMI/US/portrait/n2t-out/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out/cardAlarm.txt @@ -33,6 +33,8 @@ Page cardAlarm vis b9,0 vis b10,0 vis tCode,0 + vis bPrev,0 + vis bNext,0 Variable (string) strCommand Attributes @@ -735,7 +737,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 8596171a..9599fe9d 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -72,6 +72,8 @@ Page cardEntities vis bText5,0 vis hSlider5,0 vis nNum5,0 + vis bPrev,0 + vis bNext,0 Variable (string) strCommand Attributes diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index 4b4271ee..24bca37b 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/n2t-out/cardGrid.txt @@ -34,6 +34,8 @@ Page cardGrid vis tEntity4,0 vis tEntity5,0 vis tEntity6,0 + vis bPrev,0 + vis bNext,0 Variable (string) strCommand Attributes @@ -838,7 +840,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/portrait/n2t-out/cardMedia.txt b/HMI/US/portrait/n2t-out/cardMedia.txt index eeb4a70e..948f2dda 100644 --- a/HMI/US/portrait/n2t-out/cardMedia.txt +++ b/HMI/US/portrait/n2t-out/cardMedia.txt @@ -18,7 +18,8 @@ Page cardMedia vis tTmp,0 vis tId,0 vis t5,0 - //vis nPageDisp,0 + vis bPrev,0 + vis bNext,0 Variable (string) strCommand Attributes @@ -697,7 +698,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/portrait/n2t-out/cardThermo.txt b/HMI/US/portrait/n2t-out/cardThermo.txt index 6d8feb21..89f53723 100644 --- a/HMI/US/portrait/n2t-out/cardThermo.txt +++ b/HMI/US/portrait/n2t-out/cardThermo.txt @@ -31,6 +31,8 @@ Page cardThermo vis bt6,0 vis bt7,0 vis bt8,0 + vis bPrev,0 + vis bNext,0 Variable (string) strCommand Attributes @@ -948,7 +950,7 @@ Timer tmSleep btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/portrait/n2t-out/pageStartup.txt b/HMI/US/portrait/n2t-out/pageStartup.txt index 4be017c7..de3aa020 100644 --- a/HMI/US/portrait/n2t-out/pageStartup.txt +++ b/HMI/US/portrait/n2t-out/pageStartup.txt @@ -182,7 +182,7 @@ Button bSendStartup btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index 4bb1a6ad..06dba784 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -29,7 +29,7 @@ Page popupLight btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/portrait/n2t-out/popupNotify.txt b/HMI/US/portrait/n2t-out/popupNotify.txt index 984ad5ee..af719e18 100644 --- a/HMI/US/portrait/n2t-out/popupNotify.txt +++ b/HMI/US/portrait/n2t-out/popupNotify.txt @@ -120,7 +120,7 @@ Button b0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -147,7 +147,7 @@ Button b2 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -174,7 +174,7 @@ Button b1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt index 0c55bb6a..2a5bf808 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/n2t-out/popupShutter.txt @@ -29,7 +29,7 @@ Page popupShutter btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -172,7 +172,7 @@ Button b0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -197,7 +197,7 @@ Button bDown1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -222,7 +222,7 @@ Button bStop1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb @@ -247,7 +247,7 @@ Button bUp1 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index f7600ee3..57c23fe5 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -17,6 +17,8 @@ Page screensaver vis tInstruction,0 vis tTmp,0 vis p0,0 + vis tNotifyHead,0 + vis tNotifyText,0 //load gloabl time string from pageIcons //tTime.txt=vaTime.txt spstr pageIcons.vaTime.txt,tTime.txt,"?",0 @@ -290,6 +292,26 @@ Text tMR Text : Max. Text Size : 10 +Text tNotifyHead + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 35 + +Text tNotifyText + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 35 + Picture p0 Attributes Scope : local @@ -521,6 +543,20 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",23 covx tTmp.txt,tMR.pco,0,0 } + if(tInstruction.txt=="notify") + { + spstr strCommand.txt,tNotifyHead.txt,"~",1 + spstr strCommand.txt,tNotifyText.txt,"~",2 + if(tNotifyHead.txt!=""||tNotifyText.txt!="") + { + vis tNotifyHead,1 + vis tNotifyText,1 + }else + { + vis tNotifyHead,0 + vis tNotifyText,0 + } + } if(tInstruction.txt=="pageType") { dim=100 @@ -610,6 +646,16 @@ TouchCap tc0 Events Touch Press Event + if(tNotifyHead.txt!=""||tNotifyText.txt!="") + { + if(dim!=0) + { + tNotifyHead.txt="" + tNotifyText.txt="" + vis tNotifyHead,0 + vis tNotifyText,0 + } + } dim=dimValueNormal vaTap.val+=1 covx vaTap.val,tTmp.txt,0,0 @@ -618,7 +664,7 @@ TouchCap tc0 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI index 604eb098645329feffadf4c1b3b034ea3478436f..a55cd690713959479b6db7578582c48d795604c5 100644 GIT binary patch delta 6974 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