From a0e574391b9f2281a7f909187fabbb51452be506 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sun, 25 Feb 2024 10:48:07 +0000 Subject: [PATCH] implemented #1178 (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 22 +++++++++++++++++ HMI/US/portrait/diff-eu-version.txt | 20 ++++++++++++++++ HMI/US/portrait/diff-filtered.txt | 36 +++++++++++++++++++++------- HMI/n2t-out-visual/nspanel_Stats.txt | 10 ++++---- HMI/n2t-out-visual/popupLight.txt | 5 ++++ HMI/n2t-out/popupLight.txt | 5 ++++ 6 files changed, 85 insertions(+), 13 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 7c050052..26794cc3 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -102,6 +102,28 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd +│ --- HMI/n2t-out/popupLight.txt +├── +++ HMI/US/landscape/n2t-out/popupLight.txt +│ @@ -453,19 +453,14 @@ +│ ucopy strCommand.txt,4,payloadLength-5,0 +│ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) +│ spstr strCommand.txt,tInstruction.txt,"~",0 +│ spstr strCommand.txt,tTmp.txt,"~",1 +│ if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt) +│ { +│ // change icon +│ - spstr strCommand.txt,tTmp.txt,"~",2 +│ - if(tTmp.txt!="") +│ - { +│ - tIcon1.txt=tTmp.txt +│ - } +│ //spstr strCommand.txt,tIcon1.txt,"~",2 +│ vis tIcon1,1 +│ // change icon color +│ spstr strCommand.txt,tTmp.txt,"~",3 +│ covx tTmp.txt,sys0,0,0 +│ tIcon1.pco=sys0 +│ // get Button State │ --- HMI/n2t-out/popupNotify.txt ├── +++ HMI/US/landscape/n2t-out/popupNotify.txt │ @@ -439,18 +439,14 @@ diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 99be6093..95a3919c 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1985,6 +1985,26 @@ │ Variable (string) entn │ Attributes │ Scope : local +│ @@ -453,19 +453,14 @@ +│ ucopy strCommand.txt,4,payloadLength-5,0 +│ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) +│ spstr strCommand.txt,tInstruction.txt,"~",0 +│ spstr strCommand.txt,tTmp.txt,"~",1 +│ if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt) +│ { +│ // change icon +│ - spstr strCommand.txt,tTmp.txt,"~",2 +│ - if(tTmp.txt!="") +│ - { +│ - tIcon1.txt=tTmp.txt +│ - } +│ //spstr strCommand.txt,tIcon1.txt,"~",2 +│ vis tIcon1,1 +│ // change icon color +│ spstr strCommand.txt,tTmp.txt,"~",3 +│ covx tTmp.txt,sys0,0,0 +│ tIcon1.pco=sys0 +│ // get Button State │ --- HMI/n2t-out/popupNotify.txt ├── +++ HMI/US/portrait/n2t-out/popupNotify.txt │ @@ -348,15 +348,15 @@ diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index daae5b80..dea1f8ea 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2024-01-20 23:31:31.560618969 +0000 ++++ /dev/fd/62 2024-02-25 10:48:00.364779879 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +1 +12,11 @@ @@ -686,6 +686,13 @@ + covx tTmp.txt,sys0,0,0 + hSlider6.maxval=sys0 + } ++ } ++ if(tInstruction.txt=="pageType") ++ { ++ sleepValue=0 ++ //command format pageType,specialPageName ++ //write name of speical page to tId ++ spstr strCommand.txt,tId.txt,"~",1 +I/n2t-out/cardGrid.txt ++ HMI/US/portrait/n2t-out/cardGrid.txt + +7,14 @@ @@ -939,13 +946,6 @@ + spstr strCommand.txt,tEntity9.txt,"~",66 + vis tEntity9,1 + } -+ } -+ if(tInstruction.txt=="pageType") -+ { -+ sleepValue=0 -+ //command format pageType,specialPageName -+ //write name of speical page to tId -+ spstr strCommand.txt,tId.txt,"~",1 +I/n2t-out/cardLChart.txt ++ HMI/US/portrait/n2t-out/cardLChart.txt + +7,14 @@ @@ -1527,6 +1527,26 @@ +e (string) entn +ributes + Scope : local ++19 +453,14 @@ ++ ucopy strCommand.txt,4,payloadLength-5,0 ++ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) ++ spstr strCommand.txt,tInstruction.txt,"~",0 ++ spstr strCommand.txt,tTmp.txt,"~",1 ++ if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt) ++ { ++ // change icon ++ spstr strCommand.txt,tTmp.txt,"~",2 ++ if(tTmp.txt!="") ++ { ++ tIcon1.txt=tTmp.txt ++ } ++ //spstr strCommand.txt,tIcon1.txt,"~",2 ++ vis tIcon1,1 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",3 ++ covx tTmp.txt,sys0,0,0 ++ tIcon1.pco=sys0 ++ // get Button State +I/n2t-out/popupNotify.txt ++ HMI/US/portrait/n2t-out/popupNotify.txt +15 +348,15 @@ diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 67fe25b5..4d04ffa5 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -30,6 +30,10 @@ popupLightNew 23 Component(s) 412 Line(s) of event code 209 Unique line(s) of event code +popupLight + 28 Component(s) + 417 Line(s) of event code + 228 Unique line(s) of event code cardGrid2 52 Component(s) 703 Line(s) of event code @@ -54,10 +58,6 @@ cardLChart 33 Component(s) 412 Line(s) of event code 267 Unique line(s) of event code -popupLight - 28 Component(s) - 412 Line(s) of event code - 227 Unique line(s) of event code cardPower 54 Component(s) 541 Line(s) of event code @@ -98,5 +98,5 @@ cardEntities Total 23 Page(s) 881 Component(s) - 10769 Line(s) of event code + 10774 Line(s) of event code 2466 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index c13b0a12..31ff9e79 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -806,6 +806,11 @@ Timer tmSerial if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt) { // change icon + spstr strCommand.txt,tTmp.txt,"~",2 + if(tTmp.txt!="") + { + tIcon1.txt=tTmp.txt + } //spstr strCommand.txt,tIcon1.txt,"~",2 vis tIcon1,1 // change icon color diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 98f66dfc..8e8dfa74 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -457,6 +457,11 @@ Timer tmSerial if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt) { // change icon + spstr strCommand.txt,tTmp.txt,"~",2 + if(tTmp.txt!="") + { + tIcon1.txt=tTmp.txt + } //spstr strCommand.txt,tIcon1.txt,"~",2 vis tIcon1,1 // change icon color