From d403656c35ab07bf1455dba7c9971eb1ca447f0d Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sun, 23 Oct 2022 18:52:07 +0000 Subject: [PATCH] add parameter to hide detail page button (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 25 +++++++++++++++++++++++++ HMI/US/portrait/diff-eu-version.txt | 25 +++++++++++++++++++++++++ HMI/US/portrait/diff-filtered.txt | 27 ++++++++++++++++++++++++++- HMI/n2t-out-visual/cardThermo.txt | 9 +++++++++ HMI/n2t-out-visual/nspanel_Stats.txt | 16 ++++++++-------- HMI/n2t-out/cardThermo.txt | 9 +++++++++ 6 files changed, 102 insertions(+), 9 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 9acb5b36..56508708 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -82,6 +82,31 @@ │ Dragging : 0 │ Disable release event after dragging: 0 │ Send Component ID : disabled +│ +│ @@ -1094,23 +1078,14 @@ +│ vis btDown1,1 +│ vis tCF1,1 +│ vis bUp2,1 +│ vis xTempDest2,1 +│ vis bDown2,1 +│ vis tCF2,1 +│ } +│ - //Show btDetail +│ - spstr strCommand.txt,tTmp.txt,"~",47 +│ - if(tTmp.txt!="1") +│ - { +│ - vis btDetail,1 +│ - }else +│ - { +│ - vis btDetail,0 +│ - } +│ } +│ if(tInstruction.txt=="pageType") +│ { +│ sleepValue=0 +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 ├── pageStartup.txt │ @@ -173,15 +173,15 @@ │ Max. Text Size : 10 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index d1b31119..e2757612 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -574,6 +574,31 @@ │ Dragging : 0 │ Disable release event after dragging: 0 │ Send Component ID : disabled +│ +│ @@ -1094,23 +1078,14 @@ +│ vis btDown1,1 +│ vis tCF1,1 +│ vis bUp2,1 +│ vis xTempDest2,1 +│ vis bDown2,1 +│ vis tCF2,1 +│ } +│ - //Show btDetail +│ - spstr strCommand.txt,tTmp.txt,"~",47 +│ - if(tTmp.txt!="1") +│ - { +│ - vis btDetail,1 +│ - }else +│ - { +│ - vis btDetail,0 +│ - } +│ } +│ if(tInstruction.txt=="pageType") +│ { +│ sleepValue=0 +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 ├── pageIcons.txt │ @@ -15,15 +15,15 @@ │ Scope : global diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index fb67b0f6..3d231053 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-10-23 17:50:22.699416515 +0000 ++++ /dev/fd/62 2022-10-23 18:52:01.421240024 +0000 ++9,8 @@ +tify.txt +utter.txt @@ -35,6 +35,31 @@ + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled ++ ++,23 +1078,14 @@ ++ vis btDown1,1 ++ vis tCF1,1 ++ vis bUp2,1 ++ vis xTempDest2,1 ++ vis bDown2,1 ++ vis tCF2,1 ++ } ++ //Show btDetail ++ spstr strCommand.txt,tTmp.txt,"~",47 ++ if(tTmp.txt!="1") ++ { ++ vis btDetail,1 ++ }else ++ { ++ vis btDetail,0 ++ } ++ } ++ if(tInstruction.txt=="pageType") ++ { ++ sleepValue=0 ++ //command format pageType,specialPageName ++ //write name of speical page to tId ++ spstr strCommand.txt,tId.txt,"~",1 +geIcons.txt +5 +15,15 @@ + Scope : global diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index 1be84a2c..00b47453 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -1818,6 +1818,15 @@ Timer tmSerial vis bDown2,1 vis tCF2,1 } + //Show btDetail + spstr strCommand.txt,tTmp.txt,"~",47 + if(tTmp.txt!="1") + { + vis btDetail,1 + }else + { + vis btDetail,0 + } } if(tInstruction.txt=="pageType") { diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 93a151a4..ea894cb2 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -42,18 +42,18 @@ cardMedia 34 Component(s) 394 Line(s) of event code 213 Unique line(s) of event code -screensaver - 38 Component(s) - 350 Line(s) of event code - 266 Unique line(s) of event code cardThermo 53 Component(s) - 588 Line(s) of event code - 309 Unique line(s) of event code + 596 Line(s) of event code + 314 Unique line(s) of event code popupFan 27 Component(s) 347 Line(s) of event code 202 Unique line(s) of event code +screensaver + 38 Component(s) + 350 Line(s) of event code + 266 Unique line(s) of event code cardAlarm 40 Component(s) 427 Line(s) of event code @@ -70,5 +70,5 @@ cardPower Total 16 Page(s) 535 Component(s) - 6352 Line(s) of event code - 1688 Unique line(s) of event code + 6360 Line(s) of event code + 1692 Unique line(s) of event code diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index a8f61d30..302cfea3 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -1098,6 +1098,15 @@ Timer tmSerial vis bDown2,1 vis tCF2,1 } + //Show btDetail + spstr strCommand.txt,tTmp.txt,"~",47 + if(tTmp.txt!="1") + { + vis btDetail,1 + }else + { + vis btDetail,0 + } } if(tInstruction.txt=="pageType") {