diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 94104924..56c7a94a 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-06-08 20:00:07.004980492 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-08 20:00:08.089056883 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-11 16:39:28.495786817 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-11 16:39:29.571843283 +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-06-08 20:00:07.004980492 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-08 20:00:08.089056883 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-11 16:39:28.495786817 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-11 16:39:29.571843283 +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 f82ff3a5..28ea4187 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-06-08 20:00:07.004980492 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-08 20:00:07.521016838 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-11 16:39:28.495786817 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-11 16:39:29.003813476 +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-06-08 20:00:07.004980492 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-08 20:00:07.521016838 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-11 16:39:28.495786817 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-11 16:39:29.003813476 +0000 @@ -63,6 +63,16 @@ vis bText4,0 vis hSlider4,0 @@ -468,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-06-08 20:00:07.004980492 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-08 20:00:07.521016838 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-11 16:39:28.495786817 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-11 16:39:29.003813476 +0000 @@ -45,12 +45,6 @@ Scope: local Value: 0 @@ -518,8 +518,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt if(tInstruction.txt=="time") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-06-08 20:00:07.004980492 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-08 20:00:07.525017120 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-11 16:39:28.495786817 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-11 16:39:29.003813476 +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 c9c00a94..21a7b219 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,8 +1,8 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-06-08 20:00:07.557019374 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-06-08 20:00:07.004980492 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-08 20:00:07.521016838 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-06-08 20:00:07.004980492 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-08 20:00:07.521016838 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-06-11 16:39:29.019814315 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-06-11 16:39:28.495786817 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-11 16:39:29.003813476 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-06-11 16:39:28.495786817 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-11 16:39:29.003813476 +0000 +@@ -63,6 +63,16 @@ +@@ -120,6 +130,18 @@ +@@ -156,6 +178,15 @@ @@ -13,8 +13,8 @@ +@@ -1075,6 +1281,28 @@ +@@ -1850,6 +2078,169 @@ +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-06-08 20:00:07.004980492 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-08 20:00:07.521016838 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-06-11 16:39:28.495786817 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-11 16:39:29.003813476 +0000 +@@ -45,12 +45,6 @@ + Scope: local + Value: 0 @@ -59,5 +59,5 @@ + } + if(tInstruction.txt=="time") + { -+--- HMI/n2t-out/pageStartup.txt 2022-06-08 20:00:07.004980492 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-08 20:00:07.525017120 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-06-11 16:39:28.495786817 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-11 16:39:29.003813476 +0000 diff --git a/ignore-id.py b/ignore-id.py deleted file mode 100644 index 10c2646b..00000000 --- a/ignore-id.py +++ /dev/null @@ -1,7 +0,0 @@ -attributes = { - "id": { - "ignore": True, - "name": "ID", - "struct": "i", - } -} \ No newline at end of file