diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index f199ab0c..34b1ebe7 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:08:01.265315504 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-22 17:08:02.141326557 +0000 +--- 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 @@ -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:08:01.265315504 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-22 17:08:02.145326608 +0000 +--- 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 @@ -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:08:01.265315504 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-22 17:08:02.145326608 +0000 +--- 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 @@ -310,7 +310,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -118,6 +118,33 @@ 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 +@@ -444,7 +444,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 +@@ -469,7 +469,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 +@@ -494,7 +494,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 @@ -127,6 +154,24 @@ 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 +@@ -544,7 +544,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 +@@ -569,7 +569,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 @@ -136,6 +181,24 @@ 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 +@@ -619,7 +619,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 +@@ -644,7 +644,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 @@ -145,6 +208,15 @@ 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 +@@ -694,7 +694,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 @@ -163,6 +235,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 +@@ -776,7 +776,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 +@@ -801,7 +801,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 +@@ -826,7 +826,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 +@@ -851,7 +851,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 @@ -177,8 +285,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:08:01.265315504 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-22 17:08:02.141326557 +0000 +--- 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 @@ -254,7 +254,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -261,8 +369,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:08:01.265315504 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-22 17:08:02.145326608 +0000 +--- 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 @@ -24,7 +24,7 @@ Attributes Scope : local @@ -340,6 +448,15 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/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 +@@ -390,7 +390,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 @@ -372,8 +489,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:08:01.265315504 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-04-22 17:08:02.145326608 +0000 +--- 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 @@ -237,7 +237,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -501,9 +618,9 @@ 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:08:01.265315504 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-22 17:08:02.145326608 +0000 -@@ -177,7 +177,7 @@ +--- 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 +@@ -177,12 +177,12 @@ recmod=1 bauds=115200 // startup event @@ -512,9 +629,15 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/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/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-22 17:08:01.265315504 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-22 17:08:02.145326608 +0000 +--- 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 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -570,8 +693,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:08:01.265315504 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-04-22 17:08:02.145326608 +0000 +--- 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 @@ -120,7 +120,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -600,8 +723,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:08:01.265315504 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-22 17:08:02.145326608 +0000 +--- 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 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -657,8 +780,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:08:01.265315504 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-22 17:08:02.145326608 +0000 +--- 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 @@ -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 0d14d583..648ed345 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:08:01.265315504 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:08:01.645320299 +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 @@ -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:08:01.265315504 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:08:01.645320299 +0000 +--- 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 @@ -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:08:01.265315504 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:08:01.649320349 +0000 +--- 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 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -259,6 +259,33 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/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 +@@ -444,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 +@@ -469,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 +@@ -494,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 @@ -268,6 +295,24 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/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 +@@ -544,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 +@@ -569,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 @@ -277,6 +322,24 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/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 +@@ -619,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 +@@ -644,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 @@ -286,6 +349,15 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/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 +@@ -694,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 @@ -308,10 +380,46 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt crcputs tSend.txt,0 //send cmd printh 55 bb -@@ -859,6 +938,106 @@ - prints tSend.txt,0 - prints crcval,2 - +@@ -776,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 +@@ -801,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 +@@ -826,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 +@@ -851,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 ++ +Button bStop5 + Attributes + Scope : local @@ -405,16 +513,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 -+ - Dual-state Button btOnOff1 - Attributes - Scope : local + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -967,6 +1146,33 @@ prints tSend.txt,0 prints crcval,2 @@ -617,8 +718,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:08:01.265315504 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:08:01.645320299 +0000 +--- 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 @@ -69,25 +69,25 @@ Attributes Scope : local @@ -747,8 +848,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:08:01.265315504 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:08:01.645320299 +0000 +--- 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 @@ -24,19 +24,19 @@ Attributes Scope : local @@ -831,6 +932,15 @@ 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 +@@ -390,7 +390,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 @@ -863,8 +973,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:08:01.265315504 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:08:01.649320349 +0000 +--- 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 @@ -42,7 +42,7 @@ Attributes Scope : local @@ -1001,8 +1111,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:08:01.265315504 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:08:01.645320299 +0000 +--- 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 @@ -30,7 +30,7 @@ Send Component ID : disabled Associated Keyboard : none @@ -1022,8 +1132,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:08:01.265315504 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:08:01.645320299 +0000 +--- 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 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -1033,7 +1143,7 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt Max. Text Size : 100 Text tVersion -@@ -177,7 +177,7 @@ +@@ -177,12 +177,12 @@ recmod=1 bauds=115200 // startup event @@ -1042,9 +1152,15 @@ 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-04-22 17:08:01.265315504 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:08:01.645320299 +0000 +--- 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 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1111,8 +1227,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:08:01.265315504 +0000 -+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:08:01.645320299 +0000 +--- 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 @@ -120,7 +120,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1141,8 +1257,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:08:01.265315504 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:08:01.645320299 +0000 +--- 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 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1209,8 +1325,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:08:01.265315504 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:08:01.645320299 +0000 +--- 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 @@ -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 417d3515..1f3ad619 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:08:01.749321611 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-04-22 17:08:01.265315504 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:08:01.645320299 +0000 ++++ 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 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:08:01.265315504 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:08:01.645320299 +0000 ++--- 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 +@@ -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:08:01.265315504 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:08:01.649320349 +0000 ++--- 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 +@@ -62,6 +62,16 @@ +@@ -97,25 +107,37 @@ + Attributes @@ -89,13 +89,13 @@ + Variable (string) entn2 + Attributes + Scope : local -+ 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 @@ -160,6 +160,33 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb ++@@ -444,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 ++@@ -469,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 ++@@ -494,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 +@@ -519,7 +598,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -169,6 +196,24 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb ++@@ -544,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 ++@@ -569,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 +@@ -594,7 +673,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -178,6 +223,24 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb ++@@ -619,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 ++@@ -644,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 +@@ -669,7 +748,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -187,6 +250,15 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb ++@@ -694,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 +@@ -726,7 +805,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -205,7 +277,42 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+@@ -859,6 +938,106 @@ ++@@ -776,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 ++@@ -801,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 ++@@ -826,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 ++@@ -851,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 +@@ -967,6 +1146,33 @@ +@@ -1072,6 +1278,28 @@ +@@ -1642,6 +1870,128 @@ @@ -222,8 +329,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:08:01.265315504 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:08:01.645320299 +0000 ++--- 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 +@@ -69,25 +69,25 @@ + Attributes + Scope : local @@ -352,8 +459,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:08:01.265315504 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:08:01.645320299 +0000 ++--- 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 +@@ -24,19 +24,19 @@ + Attributes + Scope : local @@ -440,6 +547,15 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb ++@@ -390,7 +390,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 +@@ -415,7 +415,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -468,8 +584,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:08:01.265315504 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:08:01.649320349 +0000 ++--- 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 +@@ -42,7 +42,7 @@ + Attributes + Scope : local @@ -606,8 +722,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:08:01.265315504 +0000 -++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:08:01.645320299 +0000 ++--- 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 +@@ -30,7 +30,7 @@ + Send Component ID : disabled + Associated Keyboard : none @@ -626,11 +742,18 @@ + + Picture p0 + Attributes -+--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:08:01.265315504 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:08:01.645320299 +0000 ++--- 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 ++@@ -177,12 +177,12 @@ ++ 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-04-22 17:08:01.265315504 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:08:01.645320299 +0000 ++--- 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 +@@ -29,7 +29,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -697,8 +820,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:08:01.265315504 +0000 -++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:08:01.645320299 +0000 ++--- 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 +@@ -120,7 +120,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -727,8 +850,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:08:01.265315504 +0000 -++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:08:01.645320299 +0000 ++--- 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 +@@ -29,7 +29,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -795,8 +918,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:08:01.265315504 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:08:01.645320299 +0000 ++--- 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 +@@ -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 1caca43e..e4977f8f 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -919,7 +919,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 @@ -966,7 +966,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 @@ -1013,7 +1013,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 @@ -1107,7 +1107,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 @@ -1154,7 +1154,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 @@ -1248,7 +1248,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 @@ -1295,7 +1295,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 @@ -1389,7 +1389,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 @@ -1537,7 +1537,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 @@ -1584,7 +1584,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 @@ -1631,7 +1631,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 @@ -1678,7 +1678,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 diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index 8bc46421..10741cbb 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -767,7 +767,7 @@ Slider hVolume 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 4612d5e2..6b07fa90 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -14,18 +14,14 @@ cardGrid 39 Component(s) 418 Line(s) of event code 244 Unique line(s) of event code -screensaver - 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 - 170 Unique line(s) of event code pageStartup 19 Component(s) 150 Line(s) of event code 113 Unique line(s) of event code +screensaver + 35 Component(s) + 292 Line(s) of event code + 235 Unique line(s) of event code popupNotify 17 Component(s) 196 Line(s) of event code @@ -42,6 +38,10 @@ cardAlarm 35 Component(s) 343 Line(s) of event code 214 Unique line(s) of event code +cardMedia + 30 Component(s) + 329 Line(s) of event code + 169 Unique line(s) of event code cardThermo 41 Component(s) 442 Line(s) of event code diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index c1e9b71e..33ba1163 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/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/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 0dea8316..4d3a6e12 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -444,7 +444,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 @@ -469,7 +469,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 @@ -494,7 +494,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 @@ -544,7 +544,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 @@ -569,7 +569,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 @@ -619,7 +619,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 @@ -644,7 +644,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 @@ -694,7 +694,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 @@ -776,7 +776,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 @@ -801,7 +801,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 @@ -826,7 +826,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 @@ -851,7 +851,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 diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index 280f853a..c5514cbc 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -390,7 +390,7 @@ Slider hVolume 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/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index b8a4c0bb..5edf638f 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/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