diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 34b1ebe7..ed445a86 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-04-22 17:14:36.690197362 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-22 17:14:37.446210456 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-22 17:18:23.266179428 +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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-22 17:14:37.446210456 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-22 17:18:23.266179428 +0000 @@ -150,7 +150,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -75,8 +75,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-22 17:14:37.446210456 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:18:22.490187960 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-22 17:18:23.266179428 +0000 @@ -310,7 +310,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -271,6 +271,42 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,2 ++ crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb +@@ -878,7 +878,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 +@@ -905,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 +@@ -932,7 +932,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 +@@ -959,7 +959,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 @@ -285,8 +321,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-22 17:14:37.446210456 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-22 17:18:23.266179428 +0000 @@ -254,7 +254,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -369,8 +405,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-22 17:14:37.446210456 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-04-22 17:18:22.490187960 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-22 17:18:23.266179428 +0000 @@ -24,7 +24,7 @@ Attributes Scope : local @@ -489,8 +525,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-04-22 17:14:37.446210456 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-04-22 17:18:22.490187960 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-04-22 17:18:23.266179428 +0000 @@ -237,7 +237,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -618,8 +654,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-22 17:14:37.446210456 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-22 17:18:23.266179428 +0000 @@ -177,12 +177,12 @@ recmod=1 bauds=115200 @@ -636,8 +672,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-22 17:14:37.446210456 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-22 17:18:23.266179428 +0000 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -693,8 +729,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-04-22 17:14:37.446210456 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-04-22 17:18:23.266179428 +0000 @@ -120,7 +120,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -723,8 +759,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-22 17:14:37.446210456 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-22 17:18:23.266179428 +0000 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -780,8 +816,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-22 17:14:36.690197362 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-22 17:14:37.446210456 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-22 17:18:23.266179428 +0000 @@ -664,7 +664,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 648ed345..0623f083 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-04-22 17:14:36.690197362 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:14:37.038203389 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:18:22.862183870 +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-04-22 17:14:36.690197362 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:14:37.038203389 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:18:22.866183826 +0000 @@ -44,7 +44,7 @@ Attributes Scope : local @@ -86,8 +86,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-04-22 17:14:36.690197362 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:14:37.038203389 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:18:22.490187960 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:18:22.866183826 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -516,10 +516,46 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -967,6 +1146,33 @@ - prints tSend.txt,0 - prints crcval,2 - +@@ -878,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 +@@ -905,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 +@@ -932,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 +@@ -959,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 ++ prints sys0,2 ++ prints tSend.txt,0 ++ prints crcval,2 ++ +Dual-state Button btOnOff5 + Attributes + Scope : local @@ -540,16 +576,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb -+ prints sys0,2 -+ prints tSend.txt,0 -+ prints crcval,2 -+ - Hotspot mSpecial - Attributes - Scope : local + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -1072,6 +1278,28 @@ page popupLight } @@ -718,8 +747,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt //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-04-22 17:14:36.690197362 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:14:37.038203389 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:18:22.866183826 +0000 @@ -69,25 +69,25 @@ Attributes Scope : local @@ -848,8 +877,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-04-22 17:14:36.690197362 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:14:37.038203389 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-04-22 17:18:22.490187960 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:18:22.866183826 +0000 @@ -24,19 +24,19 @@ Attributes Scope : local @@ -973,8 +1002,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-04-22 17:14:36.690197362 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:14:37.038203389 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-04-22 17:18:22.490187960 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:18:22.866183826 +0000 @@ -42,7 +42,7 @@ Attributes Scope : local @@ -1111,8 +1140,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-04-22 17:14:36.690197362 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:14:37.038203389 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:18:22.862183870 +0000 @@ -30,7 +30,7 @@ Send Component ID : disabled Associated Keyboard : none @@ -1132,8 +1161,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-04-22 17:14:36.690197362 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:14:37.038203389 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:18:22.866183826 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -1159,8 +1188,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-04-22 17:14:36.690197362 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:14:37.038203389 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:18:22.866183826 +0000 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1227,8 +1256,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-04-22 17:14:36.690197362 +0000 -+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:14:37.038203389 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:18:22.862183870 +0000 @@ -120,7 +120,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1257,8 +1286,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-04-22 17:14:36.690197362 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:14:37.038203389 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:18:22.862183870 +0000 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1325,8 +1354,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-04-22 17:14:36.690197362 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:14:37.038203389 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-22 17:18:22.486188004 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:18:22.866183826 +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 1f3ad619..aaf9956e 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-04-22 17:14:37.050203597 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-04-22 17:14:36.690197362 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:14:37.038203389 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-04-22 17:18:22.878183694 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-04-22 17:18:22.486188004 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:18:22.862183870 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:14:36.690197362 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:14:37.038203389 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:18:22.486188004 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:18:22.866183826 +0000 +@@ -44,7 +44,7 @@ + Attributes + Scope : local @@ -76,8 +76,8 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:14:36.690197362 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:14:37.038203389 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:18:22.490187960 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:18:22.866183826 +0000 +@@ -62,6 +62,16 @@ +@@ -97,25 +107,37 @@ + Attributes @@ -91,13 +91,13 @@ + Scope : local +- 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 @@ -313,7 +313,42 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -967,6 +1146,33 @@ ++@@ -878,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 ++@@ -905,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 ++@@ -932,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 ++@@ -959,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 +@@ -1072,6 +1278,28 @@ +@@ -1642,6 +1870,128 @@ + } @@ -329,8 +364,8 @@ + //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-04-22 17:14:36.690197362 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:14:37.038203389 +0000 ++--- HMI/n2t-out/cardGrid.txt 2022-04-22 17:18:22.486188004 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:18:22.866183826 +0000 +@@ -69,25 +69,25 @@ + Attributes + Scope : local @@ -459,8 +494,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-04-22 17:14:36.690197362 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:14:37.038203389 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-04-22 17:18:22.490187960 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:18:22.866183826 +0000 +@@ -24,19 +24,19 @@ + Attributes + Scope : local @@ -584,8 +619,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-04-22 17:14:36.690197362 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:14:37.038203389 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-04-22 17:18:22.490187960 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:18:22.866183826 +0000 +@@ -42,7 +42,7 @@ + Attributes + Scope : local @@ -722,8 +757,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-04-22 17:14:36.690197362 +0000 -++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:14:37.038203389 +0000 ++--- HMI/n2t-out/pageIcons.txt 2022-04-22 17:18:22.486188004 +0000 +++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:18:22.862183870 +0000 +@@ -30,7 +30,7 @@ + Send Component ID : disabled + Associated Keyboard : none @@ -742,8 +777,8 @@ + + Picture p0 + Attributes -+--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:14:36.690197362 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:14:37.038203389 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:18:22.486188004 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:18:22.866183826 +0000 +@@ -177,12 +177,12 @@ + crcputh 55 bb +- crcputs sys0,2 @@ -752,8 +787,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-04-22 17:14:36.690197362 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:14:37.038203389 +0000 ++--- HMI/n2t-out/popupLight.txt 2022-04-22 17:18:22.486188004 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:18:22.866183826 +0000 +@@ -29,7 +29,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -820,8 +855,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-04-22 17:14:36.690197362 +0000 -++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:14:37.038203389 +0000 ++--- HMI/n2t-out/popupNotify.txt 2022-04-22 17:18:22.486188004 +0000 +++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:18:22.862183870 +0000 +@@ -120,7 +120,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -850,8 +885,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-04-22 17:14:36.690197362 +0000 -++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:14:37.038203389 +0000 ++--- HMI/n2t-out/popupShutter.txt 2022-04-22 17:18:22.486188004 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:18:22.862183870 +0000 +@@ -29,7 +29,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -918,8 +953,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-04-22 17:14:36.690197362 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:14:37.038203389 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-04-22 17:18:22.486188004 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:18:22.866183826 +0000 +@@ -17,8 +17,6 @@ + vis tInstruction,0 + vis tTmp,0 diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index e4977f8f..29475549 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -1723,7 +1723,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 @@ -1768,7 +1768,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 @@ -1813,7 +1813,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 @@ -1858,7 +1858,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 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 6b07fa90..aa5ddb7c 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -49,10 +49,10 @@ cardThermo cardEntities 62 Component(s) 964 Line(s) of event code - 411 Unique line(s) of event code + 410 Unique line(s) of event code Total 12 Page(s) 343 Component(s) 3687 Line(s) of event code - 1019 Unique line(s) of event code + 1018 Unique line(s) of event code diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 4d3a6e12..ebed5804 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -878,7 +878,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 @@ -905,7 +905,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 @@ -932,7 +932,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 @@ -959,7 +959,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