diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 064824eb..1ee22b4a 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-07 08:40:23.298285970 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 08:40:24.122300547 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-07 09:49:49.312383427 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 09:49:50.284371694 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -8,3 +8,15 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - // fix touch offset - 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-07 09:49:49.312383427 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 09:49:50.284371694 +0000 +@@ -177,7 +177,7 @@ + recmod=1 + bauds=115200 + // startup event +- tSend.txt="event,startup,"+tVersion.txt+",eu" ++ tSend.txt="event,startup,"+tVersion.txt+",us-l" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out-visual/pageStartup.txt b/HMI/US/landscape/n2t-out-visual/pageStartup.txt index 56882932..52643470 100644 --- a/HMI/US/landscape/n2t-out-visual/pageStartup.txt +++ b/HMI/US/landscape/n2t-out-visual/pageStartup.txt @@ -462,7 +462,7 @@ Button bSendStartup recmod=1 bauds=115200 // startup event - tSend.txt="event,startup,"+tVersion.txt+",eu" + tSend.txt="event,startup,"+tVersion.txt+",us-l" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out/pageStartup.txt b/HMI/US/landscape/n2t-out/pageStartup.txt index 08cfb05d..e801ff3c 100644 --- a/HMI/US/landscape/n2t-out/pageStartup.txt +++ b/HMI/US/landscape/n2t-out/pageStartup.txt @@ -177,7 +177,7 @@ Button bSendStartup recmod=1 bauds=115200 // startup event - tSend.txt="event,startup,"+tVersion.txt+",eu" + tSend.txt="event,startup,"+tVersion.txt+",us-l" //send calc crc 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 17a4a5f9..0add9fb0 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-07 08:40:23.298285970 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 08:40:23.678292692 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-07 09:49:49.312383427 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 09:49:49.792377633 +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/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-07 08:40:23.298285970 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 08:40:23.682292763 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-07 09:49:49.316383378 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 09:49:49.792377633 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -427,8 +427,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-07 08:40:23.298285970 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 08:40:23.678292692 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-07 09:49:49.312383427 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 09:49:49.792377633 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 9d8caabb..5904100d 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,7 +1,7 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 08:40:23.730293612 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-07 08:40:23.298285970 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 08:40:23.678292692 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-07 08:40:23.298285970 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 08:40:23.682292763 +0000 -+--- HMI/n2t-out/pageStartup.txt 2022-05-07 08:40:23.298285970 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 08:40:23.678292692 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 09:49:49.808377439 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-07 09:49:49.312383427 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 09:49:49.792377633 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-07 09:49:49.316383378 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 09:49:49.792377633 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-07 09:49:49.312383427 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 09:49:49.792377633 +0000