From e830b46b49450f9d286e7b1db82f87de1e1e6d0f Mon Sep 17 00:00:00 2001 From: joBr99 Date: Fri, 6 May 2022 13:54:07 +0000 Subject: [PATCH] fix some of the crc erros in us-p version (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 8 +- HMI/US/portrait/diff-eu-version.txt | 332 ++++-------------- HMI/US/portrait/diff-filtered.txt | 294 ++-------------- .../portrait/n2t-out-visual/cardEntities.txt | 60 ++-- .../n2t-out-visual/nspanel_US_P_Stats.txt | 4 +- HMI/US/portrait/n2t-out/cardEntities.txt | 60 ++-- 6 files changed, 165 insertions(+), 593 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 85dfb846..11b509d7 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 06:40:59.685379956 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 06:41:00.601384867 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-06 13:54:05.816712383 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 13:54:06.744713559 +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 06:40:59.685379956 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 06:41:00.601384867 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-06 13:54:05.816712383 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 13:54:06.748713565 +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 e7ae83e8..0da210de 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 06:40:59.685379956 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 06:41:00.069382015 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-06 13:54:05.816712383 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 13:54:06.240712836 +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 06:40:59.685379956 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 06:41:00.069382015 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-06 13:54:05.816712383 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 13:54:06.240712836 +0000 @@ -33,8 +33,6 @@ vis b9,0 vis b10,0 @@ -95,8 +95,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 06:40:59.685379956 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 06:41:00.069382015 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-06 13:54:05.816712383 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 13:54:06.240712836 +0000 @@ -62,8 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -201,46 +201,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Picture p0 Attributes Scope : local -@@ -312,7 +361,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 -@@ -340,7 +389,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 -@@ -368,7 +417,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 -@@ -396,7 +445,35 @@ - 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 -+ prints sys0,2 -+ prints tSend.txt,0 -+ prints crcval,2 -+ +@@ -404,6 +453,34 @@ + prints tSend.txt,0 + prints crcval,2 + +Slider hSlider5 + Attributes + Scope : local @@ -261,118 +225,17 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -421,7 +498,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 -@@ -446,7 +523,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 -@@ -471,7 +548,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 -@@ -496,7 +573,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 -@@ -521,7 +598,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 -@@ -546,7 +623,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 -@@ -571,7 +648,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 -@@ -596,7 +673,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 -@@ -621,7 +698,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 -@@ -646,7 +723,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 -@@ -671,7 +748,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 -@@ -696,7 +773,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 ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++ prints sys0,2 ++ prints tSend.txt,0 ++ prints crcval,2 ++ + Button bDown1 + Attributes + Scope : local @@ -728,7 +805,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -391,46 +254,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -778,7 +855,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 -@@ -803,7 +880,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 -@@ -828,7 +905,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 -@@ -853,7 +930,107 @@ - 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 -+ prints sys0,2 -+ prints tSend.txt,0 -+ prints crcval,2 -+ +@@ -861,6 +938,106 @@ + prints tSend.txt,0 + prints crcval,2 + +Button bStop5 + Attributes + Scope : local @@ -448,7 +275,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + 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 @@ -473,7 +300,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + 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 @@ -498,7 +325,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + 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 @@ -523,42 +350,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb -@@ -880,7 +1057,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 -@@ -907,7 +1084,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 -@@ -934,7 +1111,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 -@@ -961,7 +1138,34 @@ - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb -- crcputs sys0,2 + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd @@ -567,6 +358,13 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + prints tSend.txt,0 + prints crcval,2 + + Dual-state Button btOnOff1 + Attributes + Scope : local +@@ -969,6 +1146,33 @@ + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button btOnOff5 + Attributes + Scope : local @@ -586,10 +384,17 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb -+ crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++ prints sys0,2 ++ prints tSend.txt,0 ++ prints crcval,2 ++ + Hotspot mSpecial + Attributes + Scope : local @@ -1074,6 +1278,28 @@ page popupLight } @@ -748,18 +553,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(tInstruction.txt=="pageType") { -@@ -1754,7 +2102,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/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-05-06 06:40:59.685379956 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 06:41:00.069382015 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-05-06 13:54:05.816712383 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 13:54:06.240712836 +0000 @@ -34,8 +34,6 @@ vis tEntity4,0 vis tEntity5,0 @@ -897,8 +693,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt //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 06:40:59.685379956 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 06:41:00.069382015 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-05-06 13:54:05.816712383 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 13:54:06.240712836 +0000 @@ -18,26 +18,25 @@ vis tTmp,0 vis tId,0 @@ -1030,8 +826,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 06:40:59.685379956 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 06:41:00.069382015 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-06 13:54:05.816712383 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 13:54:06.240712836 +0000 @@ -31,8 +31,6 @@ vis bt6,0 vis bt7,0 @@ -1177,8 +973,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 06:40:59.685379956 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 06:41:00.069382015 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-05-06 13:54:05.816712383 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 13:54:06.240712836 +0000 @@ -30,7 +30,7 @@ Send Component ID : disabled Associated Keyboard : none @@ -1198,8 +994,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 06:40:59.685379956 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 06:41:00.069382015 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-06 13:54:05.816712383 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 13:54:06.240712836 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -1225,8 +1021,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt //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 06:40:59.685379956 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 06:41:00.069382015 +0000 +--- HMI/n2t-out/popupLight.txt 2022-05-06 13:54:05.816712383 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 13:54:06.240712836 +0000 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1293,8 +1089,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-05-06 06:40:59.685379956 +0000 -+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-06 06:41:00.069382015 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-05-06 13:54:05.816712383 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-06 13:54:06.240712836 +0000 @@ -120,7 +120,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1323,8 +1119,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt //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 06:40:59.685379956 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 06:41:00.069382015 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-05-06 13:54:05.816712383 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 13:54:06.240712836 +0000 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1391,8 +1187,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt //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 06:40:59.685379956 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-06 06:41:00.069382015 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-06 13:54:05.816712383 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-06 13:54:06.240712836 +0000 @@ -17,8 +17,6 @@ vis tInstruction,0 vis tTmp,0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index cf6e7366..b5ee0f4b 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 06:41:00.209382765 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-06 06:40:59.685379956 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 06:41:00.069382015 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 13:54:06.292712891 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-06 13:54:05.816712383 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 13:54:06.240712836 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-05-06 06:40:59.685379956 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 06:41:00.069382015 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-05-06 13:54:05.816712383 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 13:54:06.240712836 +0000 +@@ -33,8 +33,6 @@ + vis b9,0 + vis b10,0 @@ -85,15 +85,14 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+--- HMI/n2t-out/cardEntities.txt 2022-05-06 06:40:59.685379956 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 06:41:00.069382015 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-06 13:54:05.816712383 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 13:54:06.240712836 +0000 +@@ -62,8 +62,16 @@ +- vis bPrev,0 +- vis bNext,0 +@@ -99,25 +107,37 @@ + Attributes + Scope : local -+ Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 + @@ -103,12 +102,13 @@ + Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 -+ + Variable (string) entn3 + Attributes + Scope : local ++ Text : +- Max. Text Size: 80 ++ Max. Text Size: 70 ++ + Variable (string) entn4 + Attributes + Scope : local @@ -119,157 +119,8 @@ + +@@ -155,6 +175,15 @@ +@@ -285,6 +314,26 @@ -+@@ -312,7 +361,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 -+@@ -340,7 +389,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 -+@@ -368,7 +417,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 -+@@ -396,7 +445,35 @@ -+ 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 -++ prints sys0,2 -++ prints tSend.txt,0 -++ prints crcval,2 -++ -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb -+@@ -421,7 +498,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 -+@@ -446,7 +523,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 -+@@ -471,7 +548,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 -+@@ -496,7 +573,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 -+@@ -521,7 +598,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 -+@@ -546,7 +623,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 -+@@ -571,7 +648,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 -+@@ -596,7 +673,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 -+@@ -621,7 +698,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 -+@@ -646,7 +723,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 -+@@ -671,7 +748,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 -+@@ -696,7 +773,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 ++@@ -404,6 +453,34 @@ +++ crcputs sys0,2 +@@ -728,7 +805,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -288,95 +139,20 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -778,7 +855,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 -+@@ -803,7 +880,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 -+@@ -828,7 +905,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 -+@@ -853,7 +930,107 @@ -+ 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 -+@@ -880,7 +1057,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 -+@@ -907,7 +1084,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 -+@@ -934,7 +1111,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 -+@@ -961,7 +1138,34 @@ -+ 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 ++@@ -861,6 +938,106 @@ +++ crcputs sys0,2 +++ crcputs sys0,2 +++ crcputs sys0,2 ++@@ -969,6 +1146,33 @@ +++ crcputs sys0,2 +@@ -1074,6 +1278,28 @@ +@@ -1644,6 +1870,128 @@ + } + if(tInstruction.txt=="pageType") + { -+@@ -1754,7 +2102,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/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt -+--- HMI/n2t-out/cardGrid.txt 2022-05-06 06:40:59.685379956 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 06:41:00.069382015 +0000 ++--- HMI/n2t-out/cardGrid.txt 2022-05-06 13:54:05.816712383 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 13:54:06.240712836 +0000 +@@ -34,8 +34,6 @@ + vis tEntity4,0 + vis tEntity5,0 @@ -514,8 +290,8 @@ + //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 06:40:59.685379956 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 06:41:00.069382015 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-05-06 13:54:05.816712383 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 13:54:06.240712836 +0000 +@@ -18,26 +18,25 @@ + vis tTmp,0 + vis tId,0 @@ -647,8 +423,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 06:40:59.685379956 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 06:41:00.069382015 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-05-06 13:54:05.816712383 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 13:54:06.240712836 +0000 +@@ -31,8 +31,6 @@ + vis bt6,0 + vis bt7,0 @@ -794,8 +570,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 06:40:59.685379956 +0000 -++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 06:41:00.069382015 +0000 ++--- HMI/n2t-out/pageIcons.txt 2022-05-06 13:54:05.816712383 +0000 +++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 13:54:06.240712836 +0000 +@@ -30,7 +30,7 @@ + Send Component ID : disabled + Associated Keyboard : none @@ -814,8 +590,8 @@ + + Picture p0 + Attributes -+--- HMI/n2t-out/pageStartup.txt 2022-05-06 06:40:59.685379956 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 06:41:00.069382015 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-06 13:54:05.816712383 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 13:54:06.240712836 +0000 +@@ -177,12 +177,12 @@ + crcputh 55 bb +- crcputs sys0,2 @@ -824,8 +600,8 @@ + //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 06:40:59.685379956 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 06:41:00.069382015 +0000 ++--- HMI/n2t-out/popupLight.txt 2022-05-06 13:54:05.816712383 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 13:54:06.240712836 +0000 +@@ -29,7 +29,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -892,8 +668,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt -+--- HMI/n2t-out/popupNotify.txt 2022-05-06 06:40:59.685379956 +0000 -++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-06 06:41:00.069382015 +0000 ++--- HMI/n2t-out/popupNotify.txt 2022-05-06 13:54:05.816712383 +0000 +++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-06 13:54:06.240712836 +0000 +@@ -120,7 +120,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -922,8 +698,8 @@ + //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 06:40:59.685379956 +0000 -++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 06:41:00.069382015 +0000 ++--- HMI/n2t-out/popupShutter.txt 2022-05-06 13:54:05.816712383 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 13:54:06.240712836 +0000 +@@ -29,7 +29,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -990,8 +766,8 @@ + //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 06:40:59.685379956 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-06 06:41:00.069382015 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-05-06 13:54:05.816712383 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-06 13:54:06.240712836 +0000 +@@ -17,8 +17,6 @@ + vis tInstruction,0 + vis tTmp,0 diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index 3dfe765b..f380e1f9 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -810,7 +810,7 @@ Slider hSlider1 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 @@ -853,7 +853,7 @@ Slider hSlider2 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 @@ -896,7 +896,7 @@ Slider hSlider3 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 @@ -939,7 +939,7 @@ Slider hSlider4 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 @@ -982,7 +982,7 @@ Slider hSlider5 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 @@ -1029,7 +1029,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 @@ -1076,7 +1076,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 @@ -1123,7 +1123,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 @@ -1170,7 +1170,7 @@ Button bStop2 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 @@ -1217,7 +1217,7 @@ Button bDown2 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 @@ -1264,7 +1264,7 @@ Button bUp2 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 @@ -1311,7 +1311,7 @@ Button bStop3 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 @@ -1358,7 +1358,7 @@ Button bDown3 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 @@ -1405,7 +1405,7 @@ Button bUp3 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 @@ -1452,7 +1452,7 @@ Button bStop4 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 @@ -1499,7 +1499,7 @@ Button bDown4 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 @@ -1546,7 +1546,7 @@ Button bUp4 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 @@ -1694,7 +1694,7 @@ Button bText1 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 @@ -1741,7 +1741,7 @@ Button bText2 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 @@ -1788,7 +1788,7 @@ Button bText3 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 @@ -1835,7 +1835,7 @@ Button bText4 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 @@ -1882,7 +1882,7 @@ Button bStop5 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 @@ -1929,7 +1929,7 @@ Button bDown5 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 @@ -1976,7 +1976,7 @@ Button bUp5 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 @@ -2068,7 +2068,7 @@ Dual-state Button btOnOff1 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 @@ -2113,7 +2113,7 @@ Dual-state Button btOnOff2 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 @@ -2158,7 +2158,7 @@ Dual-state Button btOnOff3 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 @@ -2203,7 +2203,7 @@ Dual-state Button btOnOff4 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 @@ -2248,7 +2248,7 @@ Dual-state Button btOnOff5 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 @@ -3241,7 +3241,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 7c344530..9cd5d190 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 @@ -49,10 +49,10 @@ cardThermo cardEntities 74 Component(s) 1157 Line(s) of event code - 479 Unique line(s) of event code + 480 Unique line(s) of event code Total 12 Page(s) 353 Component(s) 3853 Line(s) of event code - 1057 Unique line(s) of event code + 1059 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 1d952abf..eb5aca14 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -361,7 +361,7 @@ Slider hSlider1 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 @@ -389,7 +389,7 @@ Slider hSlider2 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 @@ -417,7 +417,7 @@ Slider hSlider3 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 @@ -445,7 +445,7 @@ Slider hSlider4 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 @@ -473,7 +473,7 @@ Slider hSlider5 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 @@ -498,7 +498,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 @@ -523,7 +523,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 @@ -548,7 +548,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 @@ -573,7 +573,7 @@ Button bStop2 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 @@ -598,7 +598,7 @@ Button bDown2 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 @@ -623,7 +623,7 @@ Button bUp2 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 @@ -648,7 +648,7 @@ Button bStop3 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 @@ -673,7 +673,7 @@ Button bDown3 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 @@ -698,7 +698,7 @@ Button bUp3 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 @@ -723,7 +723,7 @@ Button bStop4 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 @@ -748,7 +748,7 @@ Button bDown4 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 @@ -773,7 +773,7 @@ Button bUp4 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 @@ -855,7 +855,7 @@ Button bText1 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 @@ -880,7 +880,7 @@ Button bText2 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 @@ -905,7 +905,7 @@ Button bText3 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 @@ -930,7 +930,7 @@ Button bText4 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 @@ -955,7 +955,7 @@ Button bStop5 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 @@ -980,7 +980,7 @@ Button bDown5 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 @@ -1005,7 +1005,7 @@ Button bUp5 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 @@ -1057,7 +1057,7 @@ Dual-state Button btOnOff1 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 @@ -1084,7 +1084,7 @@ Dual-state Button btOnOff2 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 @@ -1111,7 +1111,7 @@ Dual-state Button btOnOff3 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 btOnOff4 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 @@ -1165,7 +1165,7 @@ Dual-state Button btOnOff5 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 @@ -2102,7 +2102,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