From 10ca0c2ca311a30627d8d799b69cd98b3dd8b8b2 Mon Sep 17 00:00:00 2001 From: jmbinette Date: Fri, 6 May 2022 10:59:42 -0400 Subject: [PATCH 01/11] 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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 From 5dca539f10206f36191a19956ff702257dae2c5a Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Fri, 6 May 2022 15:00:34 +0000 Subject: [PATCH 02/11] Synced US-P (#178) (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 8 +++--- HMI/US/portrait/diff-eu-version.txt | 40 +++++++++++++------------- HMI/US/portrait/diff-filtered.txt | 42 ++++++++++++++-------------- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index e645edee..c251f132 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:54:01.361609612 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 14:54:02.317683797 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-06 15:00:31.684228675 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 15:00:32.468241140 +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:54:01.361609612 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 14:54:02.321684107 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:00:31.684228675 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 15:00:32.468241140 +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 c246267c..66f3d84f 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:54:01.361609612 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 14:54:01.817644997 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-06 15:00:31.684228675 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:00:32.064234717 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,8 @@ 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:54:01.365609923 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 14:54:01.817644997 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:00:31.684228675 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:00:32.064234717 +0000 @@ -46,7 +46,7 @@ Attributes Scope : local @@ -77,8 +77,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt //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:54:01.365609923 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 14:54:01.817644997 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:00:31.684228675 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:00:32.068234780 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -493,8 +493,8 @@ 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:54:01.361609612 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 14:54:01.817644997 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-05-06 15:00:31.684228675 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:00:32.068234780 +0000 @@ -71,25 +71,25 @@ Attributes Scope : local @@ -542,8 +542,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt Text tHeading Attributes diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- 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 +--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:00:31.684228675 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:00:32.064234717 +0000 @@ -25,19 +25,19 @@ Attributes Scope : local @@ -658,8 +658,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt //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:54:01.365609923 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 14:54:01.817644997 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-06 15:00:31.684228675 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:00:32.064234717 +0000 @@ -44,7 +44,7 @@ Attributes Scope : local @@ -787,8 +787,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt //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:54:01.361609612 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 14:54:01.817644997 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-05-06 15:00:31.684228675 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:00:32.064234717 +0000 @@ -30,7 +30,7 @@ Send Component ID : disabled Associated Keyboard : none @@ -808,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:54:01.361609612 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 14:54:01.817644997 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:00:31.684228675 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:00:32.064234717 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -829,8 +829,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- 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 +--- HMI/n2t-out/popupLight.txt 2022-05-06 15:00:31.684228675 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:00:32.064234717 +0000 @@ -59,8 +59,8 @@ Variable (string) entn Attributes @@ -843,8 +843,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt Variable (int32) mode Attributes diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ---- 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 +--- HMI/n2t-out/popupShutter.txt 2022-05-06 15:00:31.684228675 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 15:00:32.064234717 +0000 @@ -46,8 +46,8 @@ Variable (string) entn Attributes diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 8bcef134..20aa5e5e 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,9 +1,9 @@ -+++ 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 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 15:00:32.080234971 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-06 15:00:31.684228675 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:00:32.064234717 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- 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 ++--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:00:31.684228675 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:00:32.064234717 +0000 +@@ -46,7 +46,7 @@ + Attributes + Scope : local @@ -67,8 +67,8 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+--- 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 ++--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:00:31.684228675 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:00:32.068234780 +0000 +@@ -62,6 +62,16 @@ + vis bPrev,0 + vis bNext,0 @@ -91,8 +91,8 @@ + 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:54:01.361609612 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 14:54:01.817644997 +0000 ++--- HMI/n2t-out/cardGrid.txt 2022-05-06 15:00:31.684228675 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:00:32.068234780 +0000 +@@ -71,25 +71,25 @@ + Attributes + Scope : local @@ -140,8 +140,8 @@ + Text tHeading + Attributes +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- 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 ++--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:00:31.684228675 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:00:32.064234717 +0000 +@@ -25,19 +25,19 @@ + Attributes + Scope : local @@ -256,8 +256,8 @@ + //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:54:01.365609923 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 14:54:01.817644997 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-05-06 15:00:31.684228675 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:00:32.064234717 +0000 +@@ -44,7 +44,7 @@ + Attributes + Scope : local @@ -385,8 +385,8 @@ + //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:54:01.361609612 +0000 -++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 14:54:01.817644997 +0000 ++--- HMI/n2t-out/pageIcons.txt 2022-05-06 15:00:31.684228675 +0000 +++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:00:32.064234717 +0000 +@@ -30,7 +30,7 @@ + Send Component ID : disabled + Associated Keyboard : none @@ -405,11 +405,11 @@ + + Picture p0 + Attributes -+--- 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 ++--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:00:31.684228675 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:00:32.064234717 +0000 +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- 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 ++--- HMI/n2t-out/popupLight.txt 2022-05-06 15:00:31.684228675 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:00:32.064234717 +0000 +@@ -59,8 +59,8 @@ + Variable (string) entn + Attributes @@ -422,8 +422,8 @@ + Variable (int32) mode + Attributes +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt -+--- 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 ++--- HMI/n2t-out/popupShutter.txt 2022-05-06 15:00:31.684228675 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 15:00:32.064234717 +0000 +@@ -46,8 +46,8 @@ + Variable (string) entn + Attributes From 79960ca1cb20da672bf014d54d3a790d3a84fa10 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Fri, 6 May 2022 17:07:05 +0200 Subject: [PATCH 03/11] implemented fan #175 --- apps/nspanel-lovelace-ui/luibackend/controller.py | 5 ++++- apps/nspanel-lovelace-ui/luibackend/icons.py | 2 ++ apps/nspanel-lovelace-ui/luibackend/pages.py | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/nspanel-lovelace-ui/luibackend/controller.py b/apps/nspanel-lovelace-ui/luibackend/controller.py index c71040a0..544f590a 100644 --- a/apps/nspanel-lovelace-ui/luibackend/controller.py +++ b/apps/nspanel-lovelace-ui/luibackend/controller.py @@ -182,7 +182,10 @@ class LuiController(object): self._ha_api.turn_off(entity_id) if button_type == "number-set": - self._ha_api.get_entity(entity_id).call_service("set_value", value=value) + if entity_id.startswith('fan'): + self._ha_api.get_entity(entity_id).call_service("set_percentage", percentage=value) + else: + self._ha_api.get_entity(entity_id).call_service("set_value", value=value) # for shutter / covers if button_type == "up": diff --git a/apps/nspanel-lovelace-ui/luibackend/icons.py b/apps/nspanel-lovelace-ui/luibackend/icons.py index 92882198..849d826e 100644 --- a/apps/nspanel-lovelace-ui/luibackend/icons.py +++ b/apps/nspanel-lovelace-ui/luibackend/icons.py @@ -47,6 +47,8 @@ def map_to_mdi_name(ha_type, state=None, device_class=None): return "ray-vertex" if ha_type == "light": return "lightbulb" + if ha_type == "fan": + return "fan" if ha_type == "input_boolean": return "check-circle-outline" if state == "on" else "close-circle-outline" if ha_type == "cover": diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py index cdd82bab..448feef6 100644 --- a/apps/nspanel-lovelace-ui/luibackend/pages.py +++ b/apps/nspanel-lovelace-ui/luibackend/pages.py @@ -181,6 +181,9 @@ class LuiPagesGen(object): min_v = entity.attributes.get("min", 0) max_v = entity.attributes.get("max", 100) return f"~number~{entityId}~{icon_id}~17299~{name}~{entity.state}|{min_v}|{max_v}" + if entityType == "fan": + icon_id = get_icon_id_ha("fan", overwrite=icon) + return f"~number~{entityId}~{icon_id}~17299~{name}~{entity.percentage}|0|100" if entityType == "input_text": icon_id = get_icon_id_ha("input_text", overwrite=icon) value = entity.state From b6b0a80b35515f33cc13304065f796e46bc114db Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Fri, 6 May 2022 17:08:16 +0200 Subject: [PATCH 04/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index df68bd13..639f2661 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ NsPanel needs to be flashed with Tasmota (or upcoming with ESPHome) ## Features -- Entities Page with support for cover, switch, input_boolean, binary_sensor, sensor, button, number, scenes, script, input_button and light, input_text (read-only), lock +- Entities Page with support for cover, switch, input_boolean, binary_sensor, sensor, button, number, scenes, script, input_button and light, input_text (read-only), lock, fan - Grid Page with support for cover, switch, input_boolean, button, scenes, light and lock - Detail Pages for Lights (Brightness, Temperature and Color of the Light) and for Covers (Position) - Thermostat Page From 21d385982c85b3305144e577976740b07246deac Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Fri, 6 May 2022 17:14:46 +0200 Subject: [PATCH 05/11] synced popup shutter --- HMI/US/portrait/nspanel_US_P.HMI | Bin 11161054 -> 11161054 bytes HMI/US/portrait/nspanel_US_P.tft | Bin 10183848 -> 10183880 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI index a55cd690713959479b6db7578582c48d795604c5..f0beefd460f33886efe7428b241fd53bcfd617f2 100644 GIT binary patch delta 1036 zcmdVU$xjn;7{>A6%yi1Jw3Vq)7b@;cwJxO<5nMn}LD5Rxb=(jU#2p0@1t|(@vC1H* zAZ~Cp9_EB5dh%kACLWreyc#bgp2jbUUi=SylTY6F&678IQ-fn_3h`V?^!hxK^fvrK z_SWmQ4gRuxu&fN< zfAw+9vK+{S)3hv?M^;Pnobj|-7}Ok+BpE-7ath3@e66L@$aH!~jNt)Smf5VjJvJlV zG+Js@^?R~oj;I?`kOd7MOvPlD123jwI%Z%da^b@)lR^ zh5(jh1y*7eg2+b*VXQ_0)}Rn;QG{Zw!+LDMMwFlwn^1;wY{nLBMFlFc4ck$L9oUHo zcA*+k?8YAK#XjuE0UX339EOe~IErI9juWWCNz~#L>TnwMXuugX;w;YLJTBlOF5xno za0OSB8D#9#vOE{2X}D~_Yp@g9w32-c!WL}=*MFWU=UC6 b6wfe(VLZnOUf?BO;Wgf1)O1A0k`uoH6fiim delta 1019 zcmdVU%~wou9LMqBy?5r$$$~UBw=q)V`KhT1nemX4hr*y5#N^?6N=C^;QbaV2XH$bg zQc`H?aL!#}iQ`x}Wn(c5ixze)oMUyp7cBe*ZXh5SLhInn20P)LN;>X#$-&vR7}Hk%)m^{!fedJT;#%oJmkZR0?fmFEI=U^ z!UsPVVKJ6qDT=TR#VEmYlwt)|Vii`S4CPpZwOEG$)?))Uq5_quLJ*s<8Cy_|t=NVT zYOozUuoJtWV>k9-FZN+SYHstGI^ixPhC9p%Yz*;}&k?4idPFd$^BoJU|Z~q8EL5gnm56 R00!{{Pw~tc2@Q?;@f%g@sLcQX diff --git a/HMI/US/portrait/nspanel_US_P.tft b/HMI/US/portrait/nspanel_US_P.tft index 1f4de855a4a6118197bbc5c1c02fbb248543c863..1ba08823e39f8ab8ac09ae5d6f3253f4488a6d82 100644 GIT binary patch delta 5547 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 Qm?%L-#=GWUqED^(FOa0O^#A|> From dea639b15cccf044951feed864fc3db9f0325b3e Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Fri, 6 May 2022 15:15:13 +0000 Subject: [PATCH 06/11] synced popup shutter (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 8 +-- HMI/US/portrait/diff-eu-version.txt | 59 ++++++------------ HMI/US/portrait/diff-filtered.txt | 61 ++++++------------- .../n2t-out-visual/nspanel_US_P_Stats.txt | 2 +- .../portrait/n2t-out-visual/popupShutter.txt | 6 +- HMI/US/portrait/n2t-out/popupShutter.txt | 6 +- 6 files changed, 48 insertions(+), 94 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index c251f132..1af3573b 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 15:00:31.684228675 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 15:00:32.468241140 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-06 15:15:11.662432193 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 15:15:12.706604053 +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 15:00:31.684228675 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 15:00:32.468241140 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:15:11.662432193 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 15:15:12.706604053 +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 66f3d84f..01f7ab5f 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 15:00:31.684228675 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:00:32.064234717 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-06 15:15:11.662432193 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:15:12.138528943 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,8 @@ 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 15:00:31.684228675 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:00:32.064234717 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:15:11.666433006 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:15:12.138528943 +0000 @@ -46,7 +46,7 @@ Attributes Scope : local @@ -77,8 +77,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt //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 15:00:31.684228675 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:00:32.068234780 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:15:11.666433006 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:15:12.138528943 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -493,8 +493,8 @@ 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 15:00:31.684228675 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:00:32.068234780 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-05-06 15:15:11.662432193 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:15:12.138528943 +0000 @@ -71,25 +71,25 @@ Attributes Scope : local @@ -542,8 +542,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt Text tHeading Attributes diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-05-06 15:00:31.684228675 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:00:32.064234717 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:15:11.662432193 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:15:12.138528943 +0000 @@ -25,19 +25,19 @@ Attributes Scope : local @@ -658,8 +658,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt //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 15:00:31.684228675 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:00:32.064234717 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-06 15:15:11.666433006 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:15:12.138528943 +0000 @@ -44,7 +44,7 @@ Attributes Scope : local @@ -787,8 +787,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt //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 15:00:31.684228675 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:00:32.064234717 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-05-06 15:15:11.662432193 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:15:12.138528943 +0000 @@ -30,7 +30,7 @@ Send Component ID : disabled Associated Keyboard : none @@ -808,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 15:00:31.684228675 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:00:32.064234717 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:15:11.662432193 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:15:12.138528943 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -829,8 +829,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-05-06 15:00:31.684228675 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:00:32.064234717 +0000 +--- HMI/n2t-out/popupLight.txt 2022-05-06 15:15:11.662432193 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:15:12.138528943 +0000 @@ -59,8 +59,8 @@ Variable (string) entn Attributes @@ -842,26 +842,3 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt Variable (int32) mode Attributes -diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-05-06 15:00:31.684228675 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 15:00:32.064234717 +0000 -@@ -46,8 +46,8 @@ - Variable (string) entn - Attributes - Scope : local -- Text : -- Max. Text Size: 80 -+ Text : newtxt -+ Max. Text Size: 50 - - Text tEntity - Attributes -@@ -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 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 20aa5e5e..462975f8 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,9 +1,9 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 15:00:32.080234971 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-06 15:00:31.684228675 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:00:32.064234717 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 15:15:12.202541951 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-06 15:15:11.662432193 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:15:12.138528943 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:00:31.684228675 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:00:32.064234717 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:15:11.666433006 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:15:12.138528943 +0000 +@@ -46,7 +46,7 @@ + Attributes + Scope : local @@ -67,8 +67,8 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:00:31.684228675 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:00:32.068234780 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:15:11.666433006 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:15:12.138528943 +0000 +@@ -62,6 +62,16 @@ + vis bPrev,0 + vis bNext,0 @@ -91,8 +91,8 @@ + 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 15:00:31.684228675 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:00:32.068234780 +0000 ++--- HMI/n2t-out/cardGrid.txt 2022-05-06 15:15:11.662432193 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:15:12.138528943 +0000 +@@ -71,25 +71,25 @@ + Attributes + Scope : local @@ -140,8 +140,8 @@ + Text tHeading + Attributes +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:00:31.684228675 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:00:32.064234717 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:15:11.662432193 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:15:12.138528943 +0000 +@@ -25,19 +25,19 @@ + Attributes + Scope : local @@ -256,8 +256,8 @@ + //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 15:00:31.684228675 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:00:32.064234717 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-05-06 15:15:11.666433006 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:15:12.138528943 +0000 +@@ -44,7 +44,7 @@ + Attributes + Scope : local @@ -385,8 +385,8 @@ + //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 15:00:31.684228675 +0000 -++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:00:32.064234717 +0000 ++--- HMI/n2t-out/pageIcons.txt 2022-05-06 15:15:11.662432193 +0000 +++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:15:12.138528943 +0000 +@@ -30,7 +30,7 @@ + Send Component ID : disabled + Associated Keyboard : none @@ -405,11 +405,11 @@ + + Picture p0 + Attributes -+--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:00:31.684228675 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:00:32.064234717 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:15:11.662432193 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:15:12.138528943 +0000 +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-05-06 15:00:31.684228675 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:00:32.064234717 +0000 ++--- HMI/n2t-out/popupLight.txt 2022-05-06 15:15:11.662432193 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:15:12.138528943 +0000 +@@ -59,8 +59,8 @@ + Variable (string) entn + Attributes @@ -421,26 +421,3 @@ + + Variable (int32) mode + Attributes -+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt -+--- HMI/n2t-out/popupShutter.txt 2022-05-06 15:00:31.684228675 +0000 -++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 15:00:32.064234717 +0000 -+@@ -46,8 +46,8 @@ -+ Variable (string) entn -+ Attributes -+ Scope : local -+- Text : -+- Max. Text Size: 80 -++ Text : newtxt -++ Max. Text Size: 50 -+ -+ Text tEntity -+ Attributes -+@@ -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 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 b51a64ce..1637bf62 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,7 +17,7 @@ popupNotify popupShutter 19 Component(s) 191 Line(s) of event code - 108 Unique line(s) of event code + 107 Unique line(s) of event code popupLight 27 Component(s) 338 Line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/popupShutter.txt b/HMI/US/portrait/n2t-out-visual/popupShutter.txt index 56924e11..b867b493 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt @@ -56,8 +56,8 @@ Variable (string) entn Attributes ID : 18 Scope : local - Text : newtxt - Max. Text Size: 50 + Text : + Max. Text Size: 80 Text tEntity Attributes @@ -322,7 +322,7 @@ Slider hPosition 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 2a5bf808..4d5aff2b 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/n2t-out/popupShutter.txt @@ -46,8 +46,8 @@ Variable (string) strCommand Variable (string) entn Attributes Scope : local - Text : newtxt - Max. Text Size: 50 + Text : + Max. Text Size: 80 Text tEntity Attributes @@ -147,7 +147,7 @@ Slider hPosition 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 From 446c056cd222d379c986d97d13ca3cc4e22b54ae Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Fri, 6 May 2022 17:17:54 +0200 Subject: [PATCH 07/11] synced popupShutter, popupLight and pageIcons --- HMI/US/portrait/nspanel_US_P.HMI | Bin 11161054 -> 11161054 bytes HMI/US/portrait/nspanel_US_P.tft | Bin 10183880 -> 10183976 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI index f0beefd460f33886efe7428b241fd53bcfd617f2..d69ae3c4ac0df9ccee196163ccc1f99213dbbbef 100644 GIT binary patch delta 1303 zcmd_n+f$5T9KiAC-BX$(y=gm%98(fmos`PCq_z;PLK{j_Laj=KmZC@&uMQ+R)SV6U zUKkTDTw%B}V@6}9anlVKX~u;a-?UxyH+W_~^ZX9a@0oe#8S3oU4?#+3lj5}Ryd-Dh zJxzU?wWK^UH6u;9R=PzNDH;+Eh?jc9$9A*!UrwnxPZnlRA*A<`MIkp`ErMcE;l&bQ#D)U_Gwa<@@YhNsC9+%n1&=fDZrt;cw_WcgNo!q zN$H*LQ`afi>XHZ|-<32K~#yX8ADM^y}BG%_}A=2~{aY&^QZmxQ0l@Ok; z*klu;MLTh3uttbKLiw2-n5m8p81-e!x9Yx3)g0pY)uWOBhadbAfItLcHi9t+a}k1h zn2!Zmh(%b8P%J?h!m$()ScXU}#|lJYB}`a_Xv82EafruiBp?xMkc4EUU@g{RJvLw? zHeoYTk%lcu$5vz@6J}%~8{4oQJCK8&*o9nJup4>E#~$p(J`});LhQ!@97GX{aR?W*Jh($wI0u{kTRcY<7~!gVj=Fg^>9Z=IC(NiG8l#geJBZJ5?$K(I z)>xA<_o+fOxOmuvy_ZcrnMSit%=(zqgzuDfO89(GzCI2e>UL1=AFVoBt#vj(@@TP* zm|%tlR=8s>_kB?Vl06lmSP!}V+H&XfItKx7$FFS4PjV`RS3swL?9AT zh(-+7AQo|m$6BmI0@foD8?X^cNJa`$k%n|+U=ucD3o?;~Y;46gY)1}qu>(7?3%ikr zJ;+A^3b7aaupdPz#sQR|6bEq#WhlpCRNx4Xq7qd&hU2Kl37o_!oJI|5QHOdopb=-# zgl3$@IkezBT5$nwxQI)*jCORO6IalMZd}DR2wX=GdeMh|+`vr?z>ZrO#BJQcUEITc M45_w};RpRc06OZsRsaA1 diff --git a/HMI/US/portrait/nspanel_US_P.tft b/HMI/US/portrait/nspanel_US_P.tft index 1ba08823e39f8ab8ac09ae5d6f3253f4488a6d82..35df3e06bfe4c7f970a172f924673c771d7ca2a6 100644 GIT binary patch delta 94900 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 Date: Fri, 6 May 2022 15:18:25 +0000 Subject: [PATCH 08/11] synced popupShutter, popupLight and pageIcons (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 8 +-- HMI/US/portrait/diff-eu-version.txt | 63 ++++-------------- HMI/US/portrait/diff-filtered.txt | 65 +++++-------------- HMI/US/portrait/n2t-out-visual/pageIcons.txt | 4 +- HMI/US/portrait/n2t-out-visual/popupLight.txt | 4 +- HMI/US/portrait/n2t-out/pageIcons.txt | 4 +- HMI/US/portrait/n2t-out/popupLight.txt | 4 +- 7 files changed, 41 insertions(+), 111 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 1af3573b..7a448622 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 15:15:11.662432193 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 15:15:12.706604053 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-06 15:18:23.858465659 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 15:18:24.886472251 +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 15:15:11.662432193 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 15:15:12.706604053 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:18:23.862465684 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 15:18:24.886472251 +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 01f7ab5f..6d8584b7 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 15:15:11.662432193 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:15:12.138528943 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-06 15:18:23.858465659 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:18:24.362468867 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,8 @@ 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 15:15:11.666433006 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:15:12.138528943 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:18:23.862465684 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:18:24.362468867 +0000 @@ -46,7 +46,7 @@ Attributes Scope : local @@ -77,8 +77,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt //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 15:15:11.666433006 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:15:12.138528943 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:18:23.862465684 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:18:24.362468867 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -493,8 +493,8 @@ 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 15:15:11.662432193 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:15:12.138528943 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-05-06 15:18:23.862465684 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:18:24.362468867 +0000 @@ -71,25 +71,25 @@ Attributes Scope : local @@ -542,8 +542,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt Text tHeading Attributes diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-05-06 15:15:11.662432193 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:15:12.138528943 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:18:23.862465684 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:18:24.362468867 +0000 @@ -25,19 +25,19 @@ Attributes Scope : local @@ -658,8 +658,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt //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 15:15:11.666433006 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:15:12.138528943 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-06 15:18:23.862465684 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:18:24.362468867 +0000 @@ -44,7 +44,7 @@ Attributes Scope : local @@ -786,30 +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 -diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-05-06 15:15:11.662432193 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:15:12.138528943 +0000 -@@ -30,7 +30,7 @@ - Send Component ID : disabled - Associated Keyboard : none - Text : -- Max. Text Size : 80 -+ Max. Text Size : 50 - - Text tTmp2 - Attributes -@@ -40,7 +40,7 @@ - Send Component ID : disabled - Associated Keyboard : none - Text : -- Max. Text Size : 80 -+ Max. Text Size : 50 - - 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 15:15:11.662432193 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:15:12.138528943 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:18:23.862465684 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:18:24.362468867 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -828,17 +807,3 @@ 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 -diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-05-06 15:15:11.662432193 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:15:12.138528943 +0000 -@@ -59,8 +59,8 @@ - Variable (string) entn - Attributes - Scope : local -- Text : -- Max. Text Size: 80 -+ Text : newtxt -+ Max. Text Size: 50 - - Variable (int32) mode - Attributes diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 462975f8..57ea58b0 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,9 +1,9 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 15:15:12.202541951 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-06 15:15:11.662432193 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:15:12.138528943 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 15:18:24.378468969 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-06 15:18:23.858465659 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:18:24.362468867 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:15:11.666433006 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:15:12.138528943 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:18:23.862465684 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:18:24.362468867 +0000 +@@ -46,7 +46,7 @@ + Attributes + Scope : local @@ -67,8 +67,8 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:15:11.666433006 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:15:12.138528943 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:18:23.862465684 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:18:24.362468867 +0000 +@@ -62,6 +62,16 @@ + vis bPrev,0 + vis bNext,0 @@ -91,8 +91,8 @@ + 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 15:15:11.662432193 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:15:12.138528943 +0000 ++--- HMI/n2t-out/cardGrid.txt 2022-05-06 15:18:23.862465684 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:18:24.362468867 +0000 +@@ -71,25 +71,25 @@ + Attributes + Scope : local @@ -140,8 +140,8 @@ + Text tHeading + Attributes +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:15:11.662432193 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:15:12.138528943 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:18:23.862465684 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:18:24.362468867 +0000 +@@ -25,19 +25,19 @@ + Attributes + Scope : local @@ -256,8 +256,8 @@ + //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 15:15:11.666433006 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:15:12.138528943 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-05-06 15:18:23.862465684 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:18:24.362468867 +0000 +@@ -44,7 +44,7 @@ + Attributes + Scope : local @@ -384,40 +384,5 @@ + 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 15:15:11.662432193 +0000 -++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:15:12.138528943 +0000 -+@@ -30,7 +30,7 @@ -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : -+- Max. Text Size : 80 -++ Max. Text Size : 50 -+ -+ Text tTmp2 -+ Attributes -+@@ -40,7 +40,7 @@ -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : -+- Max. Text Size : 80 -++ Max. Text Size : 50 -+ -+ Picture p0 -+ Attributes -+--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:15:11.662432193 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:15:12.138528943 +0000 -+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-05-06 15:15:11.662432193 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:15:12.138528943 +0000 -+@@ -59,8 +59,8 @@ -+ Variable (string) entn -+ Attributes -+ Scope : local -+- Text : -+- Max. Text Size: 80 -++ Text : newtxt -++ Max. Text Size: 50 -+ -+ Variable (int32) mode -+ Attributes ++--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:18:23.862465684 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:18:24.362468867 +0000 diff --git a/HMI/US/portrait/n2t-out-visual/pageIcons.txt b/HMI/US/portrait/n2t-out-visual/pageIcons.txt index 90aaf938..40ece9c0 100644 --- a/HMI/US/portrait/n2t-out-visual/pageIcons.txt +++ b/HMI/US/portrait/n2t-out-visual/pageIcons.txt @@ -57,7 +57,7 @@ Text tTmp1 Vertical Alignment : center Input Type : character Text : - Max. Text Size : 50 + Max. Text Size : 80 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -87,7 +87,7 @@ Text tTmp2 Vertical Alignment : center Input Type : character Text : - Max. Text Size : 50 + Max. Text Size : 80 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index 2f6f60a6..ecf9a820 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -69,8 +69,8 @@ Variable (string) entn Attributes ID : 21 Scope : local - Text : newtxt - Max. Text Size: 50 + Text : + Max. Text Size: 80 Variable (int32) mode Attributes diff --git a/HMI/US/portrait/n2t-out/pageIcons.txt b/HMI/US/portrait/n2t-out/pageIcons.txt index e5066db4..f6b260cf 100644 --- a/HMI/US/portrait/n2t-out/pageIcons.txt +++ b/HMI/US/portrait/n2t-out/pageIcons.txt @@ -30,7 +30,7 @@ Text tTmp1 Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 50 + Max. Text Size : 80 Text tTmp2 Attributes @@ -40,7 +40,7 @@ Text tTmp2 Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 50 + Max. Text Size : 80 Picture p0 Attributes diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index 06dba784..9cd4e3cd 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -59,8 +59,8 @@ Variable (string) strCommand Variable (string) entn Attributes Scope : local - Text : newtxt - Max. Text Size: 50 + Text : + Max. Text Size: 80 Variable (int32) mode Attributes From 419ed4ae42aefadb64179477ee9c9384ae6c262b Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Fri, 6 May 2022 17:23:28 +0200 Subject: [PATCH 09/11] syned cardThermo --- HMI/US/portrait/nspanel_US_P.HMI | Bin 11161054 -> 11161054 bytes HMI/US/portrait/nspanel_US_P.tft | Bin 10183976 -> 10184008 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI index d69ae3c4ac0df9ccee196163ccc1f99213dbbbef..05449d927dc36da691c96b0dfb2a4156b0e70f3d 100644 GIT binary patch delta 1291 zcmd7RYfQ~?9LMqh>6{KWw&Ud7{;8C^bVWiDLZJ&PkxOpLCFB~p9sM~)(nbALRD{mK zY$pA&vEl*dtXU7tw6z(-0}py)C_v^)BxoXkscf(ONG_ zx)bxjOZ&20y8F#5Q5zMyYn}8*y?EauZEBMwO?$T_J^JeXrZ!0H={*%%=afD~u-4IC zm8JL7<$TU5D6;DvcD)8(&_V}q=vBLZK<@W{bgg1ghAKwIM;WG=6tiMctctBw?uykV z6a_w2U&qQlKEm+UY!`9Qjgg|M!*)ltE|a_BMRtX=QM_^*O=`mhIm+8J)F=X6vPms& zkXvnHaG}#*G<`A-5~f0ysn&0uuv;O$Q-5(8I z{qc60t#7uysxOMpG^2M6nj=5N7sKHPe*|Cz0uh9f7=_UogRvNg@tA;MOhgDm5r%L?AQF=>8B-92sfdQ> z?&+9;7{p>GW+4uBzuxWMTzYA`7dq z8f&l?*;t45*no}LgdA)}F1BDRwqZN+umd}>3;EcMJ=lwV*pCA!z(E{BAr9jRj^Y@O z!;TXuf`XGc1qX^zg3~yIQk+E@&Y>I?s6-XcqZ&03xPV&Jp&l1;2@PmO6E5QlnsF7^ za9zz0X~}HUt$Gmt@UQJTUhtcg+jc%9Q F{uBBe_MHF# delta 910 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 delta 8021 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 From a1da566e6a5c696a560bc2dec497f5a99b926e81 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Fri, 6 May 2022 15:23:54 +0000 Subject: [PATCH 10/11] syned cardThermo (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 8 +- HMI/US/portrait/diff-eu-version.txt | 153 ++--------------- HMI/US/portrait/diff-filtered.txt | 155 ++---------------- HMI/US/portrait/n2t-out-visual/cardThermo.txt | 28 ++-- HMI/US/portrait/n2t-out/cardThermo.txt | 28 ++-- 5 files changed, 57 insertions(+), 315 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 7a448622..35097c32 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 15:18:23.858465659 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 15:18:24.886472251 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-06 15:23:52.653218396 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 15:23:53.445222642 +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 15:18:23.862465684 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 15:18:24.886472251 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:23:52.653218396 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 15:23:53.445222642 +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 6d8584b7..5c3189a0 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 15:18:23.858465659 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:18:24.362468867 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-06 15:23:52.653218396 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:23:53.037220455 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,8 @@ 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 15:18:23.862465684 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:18:24.362468867 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:23:52.653218396 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:23:53.037220455 +0000 @@ -46,7 +46,7 @@ Attributes Scope : local @@ -77,8 +77,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt //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 15:18:23.862465684 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:18:24.362468867 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:23:52.653218396 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:23:53.041220476 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -493,8 +493,8 @@ 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 15:18:23.862465684 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:18:24.362468867 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-05-06 15:23:52.653218396 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:23:53.037220455 +0000 @@ -71,25 +71,25 @@ Attributes Scope : local @@ -542,8 +542,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt Text tHeading Attributes diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-05-06 15:18:23.862465684 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:18:24.362468867 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:23:52.653218396 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:23:53.037220455 +0000 @@ -25,19 +25,19 @@ Attributes Scope : local @@ -653,142 +653,13 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt 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 15:18:23.862465684 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:18:24.362468867 +0000 -@@ -44,7 +44,7 @@ - Attributes - Scope : local - Text : -- Max. Text Size: 80 -+ Max. Text Size: 50 - - Variable (string) va0 - Attributes -@@ -239,7 +239,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 -@@ -275,7 +275,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 -@@ -311,7 +311,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 -@@ -343,7 +343,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 -@@ -370,7 +370,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 -@@ -397,7 +397,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 -@@ -424,7 +424,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 -@@ -451,7 +451,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 -@@ -478,7 +478,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 -@@ -505,7 +505,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 -@@ -532,7 +532,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 -@@ -559,7 +559,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 -@@ -586,7 +586,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/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-06 15:18:23.862465684 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:18:24.362468867 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:23:52.653218396 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:23:53.037220455 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 57ea58b0..e2ba5b74 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,9 +1,9 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 15:18:24.378468969 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-06 15:18:23.858465659 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:18:24.362468867 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 15:23:53.053220541 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-06 15:23:52.653218396 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:23:53.037220455 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:18:23.862465684 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:18:24.362468867 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:23:52.653218396 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:23:53.037220455 +0000 +@@ -46,7 +46,7 @@ + Attributes + Scope : local @@ -67,8 +67,8 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:18:23.862465684 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:18:24.362468867 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:23:52.653218396 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:23:53.041220476 +0000 +@@ -62,6 +62,16 @@ + vis bPrev,0 + vis bNext,0 @@ -91,8 +91,8 @@ + 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 15:18:23.862465684 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:18:24.362468867 +0000 ++--- HMI/n2t-out/cardGrid.txt 2022-05-06 15:23:52.653218396 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:23:53.037220455 +0000 +@@ -71,25 +71,25 @@ + Attributes + Scope : local @@ -140,8 +140,8 @@ + Text tHeading + Attributes +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:18:23.862465684 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:18:24.362468867 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:23:52.653218396 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:23:53.037220455 +0000 +@@ -25,19 +25,19 @@ + Attributes + Scope : local @@ -255,134 +255,5 @@ + 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 15:18:23.862465684 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:18:24.362468867 +0000 -+@@ -44,7 +44,7 @@ -+ Attributes -+ Scope : local -+ Text : -+- Max. Text Size: 80 -++ Max. Text Size: 50 -+ -+ Variable (string) va0 -+ Attributes -+@@ -239,7 +239,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 -+@@ -275,7 +275,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 -+@@ -311,7 +311,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 -+@@ -343,7 +343,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 -+@@ -370,7 +370,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 -+@@ -397,7 +397,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 -+@@ -424,7 +424,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 -+@@ -451,7 +451,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 -+@@ -478,7 +478,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 -+@@ -505,7 +505,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 -+@@ -532,7 +532,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 -+@@ -559,7 +559,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 -+@@ -586,7 +586,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/pageStartup.txt 2022-05-06 15:18:23.862465684 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:18:24.362468867 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:23:52.653218396 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:23:53.037220455 +0000 diff --git a/HMI/US/portrait/n2t-out-visual/cardThermo.txt b/HMI/US/portrait/n2t-out-visual/cardThermo.txt index 1c09249b..ada68fd4 100644 --- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt +++ b/HMI/US/portrait/n2t-out-visual/cardThermo.txt @@ -54,7 +54,7 @@ Variable (string) entn ID : 21 Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 80 Variable (string) va0 Attributes @@ -535,7 +535,7 @@ Button bNext 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 @@ -589,7 +589,7 @@ Button bDown 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 @@ -643,7 +643,7 @@ Button bUp 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 @@ -697,7 +697,7 @@ Button bPrev 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 @@ -746,7 +746,7 @@ Dual-state Button bt0 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 @@ -795,7 +795,7 @@ Dual-state Button bt1 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 @@ -844,7 +844,7 @@ Dual-state Button bt2 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 @@ -893,7 +893,7 @@ Dual-state Button bt3 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 @@ -942,7 +942,7 @@ Dual-state Button bt4 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 @@ -991,7 +991,7 @@ Dual-state Button bt5 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 @@ -1040,7 +1040,7 @@ Dual-state Button bt6 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 @@ -1089,7 +1089,7 @@ Dual-state Button bt7 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 @@ -1138,7 +1138,7 @@ Dual-state Button bt8 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 89f53723..b43c969e 100644 --- a/HMI/US/portrait/n2t-out/cardThermo.txt +++ b/HMI/US/portrait/n2t-out/cardThermo.txt @@ -44,7 +44,7 @@ Variable (string) entn Attributes Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 80 Variable (string) va0 Attributes @@ -239,7 +239,7 @@ Button bNext 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 @@ -275,7 +275,7 @@ Button bDown 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 @@ -311,7 +311,7 @@ Button bUp 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 @@ -343,7 +343,7 @@ Button bPrev 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 @@ -370,7 +370,7 @@ Dual-state Button bt0 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 @@ -397,7 +397,7 @@ Dual-state Button bt1 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 @@ -424,7 +424,7 @@ Dual-state Button bt2 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 @@ -451,7 +451,7 @@ Dual-state Button bt3 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 @@ -478,7 +478,7 @@ Dual-state Button bt4 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 @@ -505,7 +505,7 @@ Dual-state Button bt5 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 @@ -532,7 +532,7 @@ Dual-state Button bt6 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 @@ -559,7 +559,7 @@ Dual-state Button bt7 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 @@ -586,7 +586,7 @@ Dual-state Button bt8 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 From c282cde38f57da5fe178107a7e5033dd6dca0d2f Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Fri, 6 May 2022 17:41:02 +0200 Subject: [PATCH 11/11] add text for addional info on popupShutter #145 --- HMI/nspanel.HMI | Bin 11234328 -> 11234328 bytes HMI/nspanel.tft | Bin 10156380 -> 10158064 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index 0d2be96ee08e564f4f538f80031a06a2a4e939da..f857559de8a9e4de767ce6327c067d4614115ade 100644 GIT binary patch delta 2028 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 Xx;v1{pBJ1taQ(hE+O?woXP^EL^FeC_ delta 23614 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