From fcaa4faae77f3d064b8333a83492201fe3879f8a Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sun, 10 Apr 2022 11:19:06 +0000 Subject: [PATCH] fix nav button in eu version (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 68 ++++++++++++++++++++++++-- HMI/US/portrait/diff-eu-version.txt | 73 +++++++++++++++++++++++++--- HMI/n2t-out-visual/cardAlarm.txt | 2 +- HMI/n2t-out-visual/cardEntities.txt | 2 +- HMI/n2t-out-visual/cardGrid.txt | 2 +- HMI/n2t-out-visual/cardMedia.txt | 2 +- HMI/n2t-out-visual/cardThermo.txt | 2 +- HMI/n2t-out-visual/nspanel_Stats.txt | 24 ++++----- HMI/n2t-out/cardAlarm.txt | 2 +- HMI/n2t-out/cardEntities.txt | 2 +- HMI/n2t-out/cardGrid.txt | 2 +- HMI/n2t-out/cardMedia.txt | 2 +- HMI/n2t-out/cardThermo.txt | 2 +- 13 files changed, 151 insertions(+), 34 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 71f3dde5..cf4ba88b 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-08 20:30:53.290164509 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-08 20:30:54.170202708 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-10 11:19:04.736144327 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-10 11:19:05.732151037 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -10,9 +10,69 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt + // fix touch offset (Removed for US version) + //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-10 11:19:04.736144327 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-10 11:19:05.732151037 +0000 +@@ -543,7 +543,7 @@ + } + if(tTmp.txt=="1") + { +- vis bNext,1 ++ vis bPrev,1 + bNext.txt="" + } + //text arm1 +diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt +--- HMI/n2t-out/cardEntities.txt 2022-04-10 11:19:04.740144354 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-10 11:19:05.732151037 +0000 +@@ -1151,7 +1151,7 @@ + } + if(tTmp.txt=="1") + { +- vis bNext,1 ++ vis bPrev,1 + bNext.txt="" + } + // get Type +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt +--- HMI/n2t-out/cardGrid.txt 2022-04-10 11:19:04.736144327 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-10 11:19:05.732151037 +0000 +@@ -599,7 +599,7 @@ + } + if(tTmp.txt=="1") + { +- vis bNext,1 ++ vis bPrev,1 + bNext.txt="" + } + // get Type +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt +--- HMI/n2t-out/cardMedia.txt 2022-04-10 11:19:04.736144327 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-10 11:19:05.732151037 +0000 +@@ -534,7 +534,7 @@ + } + if(tTmp.txt=="1") + { +- vis bNext,1 ++ vis bPrev,1 + bNext.txt="" + } + //entity name +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt +--- HMI/n2t-out/cardThermo.txt 2022-04-10 11:19:04.736144327 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-04-10 11:19:05.732151037 +0000 +@@ -671,7 +671,7 @@ + } + if(tTmp.txt=="1") + { +- vis bNext,1 ++ vis bPrev,1 + bNext.txt="" + } + //entity name diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-08 20:30:53.290164509 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-08 20:30:54.174202881 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-10 11:19:04.736144327 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-10 11:19:05.732151037 +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 b255ea31..37e41987 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-08 20:30:53.290164509 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-08 20:30:53.734183782 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-10 11:19:04.736144327 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-10 11:19:05.244147749 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -10,9 +10,21 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + // fix touch offset (Removed for US version) + //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-10 11:19:04.736144327 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-10 11:19:05.248147776 +0000 +@@ -543,7 +543,7 @@ + } + if(tTmp.txt=="1") + { +- vis bNext,1 ++ vis bPrev,1 + bNext.txt="" + } + //text arm1 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-08 20:30:53.290164509 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-08 20:30:53.738183956 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-10 11:19:04.740144354 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-10 11:19:05.244147749 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -525,6 +537,15 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Timer tmSerial Attributes Scope : local +@@ -1151,7 +1607,7 @@ + } + if(tTmp.txt=="1") + { +- vis bNext,1 ++ vis bPrev,1 + bNext.txt="" + } + // get Type @@ -1642,6 +2098,250 @@ covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 @@ -776,9 +797,45 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(tInstruction.txt=="pageType") { +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt +--- HMI/n2t-out/cardGrid.txt 2022-04-10 11:19:04.736144327 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-10 11:19:05.248147776 +0000 +@@ -599,7 +599,7 @@ + } + if(tTmp.txt=="1") + { +- vis bNext,1 ++ vis bPrev,1 + bNext.txt="" + } + // get Type +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt +--- HMI/n2t-out/cardMedia.txt 2022-04-10 11:19:04.736144327 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-10 11:19:05.244147749 +0000 +@@ -534,7 +534,7 @@ + } + if(tTmp.txt=="1") + { +- vis bNext,1 ++ vis bPrev,1 + bNext.txt="" + } + //entity name +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt +--- HMI/n2t-out/cardThermo.txt 2022-04-10 11:19:04.736144327 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-10 11:19:05.248147776 +0000 +@@ -671,7 +671,7 @@ + } + if(tTmp.txt=="1") + { +- vis bNext,1 ++ vis bPrev,1 + bNext.txt="" + } + //entity name diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-08 20:30:53.290164509 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-08 20:30:53.734183782 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-10 11:19:04.736144327 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-10 11:19:05.244147749 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -798,8 +855,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-08 20:30:53.290164509 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-08 20:30:53.738183956 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-10 11:19:04.736144327 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-10 11:19:05.244147749 +0000 @@ -48,6 +48,26 @@ Scope: local Value: 0 diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index 353d3364..72a3a6d3 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -1073,7 +1073,7 @@ Timer tmSerial } if(tTmp.txt=="1") { - vis bPrev,1 + vis bNext,1 bNext.txt="" } //text arm1 diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index 7d05dcf6..b8a2a8f8 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -2096,7 +2096,7 @@ Timer tmSerial } if(tTmp.txt=="1") { - vis bPrev,1 + vis bNext,1 bNext.txt="" } // get Type diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index 254ec40b..b69b9112 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/n2t-out-visual/cardGrid.txt @@ -1036,7 +1036,7 @@ Timer tmSerial } if(tTmp.txt=="1") { - vis bPrev,1 + vis bNext,1 bNext.txt="" } // get Type diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index d7528248..ffb5bb6d 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -956,7 +956,7 @@ Timer tmSerial } if(tTmp.txt=="1") { - vis bPrev,1 + vis bNext,1 bNext.txt="" } //entity name diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index c1236bac..42751b15 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -1224,7 +1224,7 @@ Timer tmSerial } if(tTmp.txt=="1") { - vis bPrev,1 + vis bNext,1 bNext.txt="" } //entity name diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 1ee1958d..bf6e85cd 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -18,10 +18,6 @@ pageStartup 19 Component(s) 150 Line(s) of event code 113 Unique line(s) of event code -cardGrid - 39 Component(s) - 418 Line(s) of event code - 243 Unique line(s) of event code popupLight 27 Component(s) 320 Line(s) of event code @@ -33,26 +29,30 @@ popupShutter cardMedia 30 Component(s) 329 Line(s) of event code - 168 Unique line(s) of event code -cardAlarm - 35 Component(s) - 343 Line(s) of event code - 213 Unique line(s) of event code + 169 Unique line(s) of event code cardThermo 41 Component(s) 442 Line(s) of event code - 246 Unique line(s) of event code + 247 Unique line(s) of event code +cardGrid + 39 Component(s) + 418 Line(s) of event code + 244 Unique line(s) of event code screensaver 33 Component(s) 195 Line(s) of event code 152 Unique line(s) of event code +cardAlarm + 35 Component(s) + 343 Line(s) of event code + 214 Unique line(s) of event code cardEntities 62 Component(s) 964 Line(s) of event code - 409 Unique line(s) of event code + 410 Unique line(s) of event code Total 12 Page(s) 341 Component(s) 3541 Line(s) of event code - 947 Unique line(s) of event code + 948 Unique line(s) of event code diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index c3a47e14..203a993a 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -543,7 +543,7 @@ Timer tmSerial } if(tTmp.txt=="1") { - vis bPrev,1 + vis bNext,1 bNext.txt="" } //text arm1 diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 257b03c8..4addeb52 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -1151,7 +1151,7 @@ Timer tmSerial } if(tTmp.txt=="1") { - vis bPrev,1 + vis bNext,1 bNext.txt="" } // get Type diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index 55efe635..a25bf882 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -599,7 +599,7 @@ Timer tmSerial } if(tTmp.txt=="1") { - vis bPrev,1 + vis bNext,1 bNext.txt="" } // get Type diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index 1ba5607f..eeb4a70e 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -534,7 +534,7 @@ Timer tmSerial } if(tTmp.txt=="1") { - vis bPrev,1 + vis bNext,1 bNext.txt="" } //entity name diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index e019043b..6d8feb21 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -671,7 +671,7 @@ Timer tmSerial } if(tTmp.txt=="1") { - vis bPrev,1 + vis bNext,1 bNext.txt="" } //entity name