From 6fb86d8bb06be2f0ea286ce3a0f83d8e9f99abba Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sun, 13 Mar 2022 09:16:22 +0000 Subject: [PATCH] fixed pageType command for popupLight page (add nextion2text) --- HMI/n2t-out/cardEntities.txt | 2 ++ HMI/n2t-out/cardMedia.txt | 9 +++++++++ HMI/n2t-out/cardThermo.txt | 2 ++ HMI/n2t-out/nspanel_Stats.txt | 36 +++++++++++++++++------------------ HMI/n2t-out/pageStartup.txt | 2 ++ HMI/n2t-out/screensaver.txt | 2 ++ 6 files changed, 35 insertions(+), 18 deletions(-) diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 1c00816a..65123a53 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -2326,6 +2326,8 @@ Timer tmSerial spstr strCommand.txt,tId.txt,",",1 //save second arg if there's one spstr strCommand.txt,tTmp.txt,",",2 + //save third arg if there's one + spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 if(tId.txt=="cardEntities") { //yay, we are already on the correct page diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index d64e0282..8138193f 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -764,6 +764,10 @@ Timer tmSerial //command format pageType,specialPageName //write name of speical page to tId spstr strCommand.txt,tId.txt,",",1 + //save second arg if there's one + spstr strCommand.txt,tTmp.txt,",",2 + //save third arg if there's one + spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 if(tId.txt=="cardMedia") { //yay, we are already on the correct page @@ -773,6 +777,11 @@ Timer tmSerial udelete payloadLength-1 bufferPos=0 } + if(tId.txt=="popupLight") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupLight + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index dc6e48ef..396c368b 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -889,6 +889,8 @@ Timer tmSerial spstr strCommand.txt,tId.txt,",",1 //save second arg if there's one spstr strCommand.txt,tTmp.txt,",",2 + //save third arg if there's one + spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 if(tId.txt=="cardThermo") { //yay, we are already on the correct page diff --git a/HMI/n2t-out/nspanel_Stats.txt b/HMI/n2t-out/nspanel_Stats.txt index cdb51210..5b3ac63c 100644 --- a/HMI/n2t-out/nspanel_Stats.txt +++ b/HMI/n2t-out/nspanel_Stats.txt @@ -14,6 +14,10 @@ pageTest 12 Component(s) 12 Line(s) of event code 12 Unique line(s) of event code +screensaver + 25 Component(s) + 146 Line(s) of event code + 116 Unique line(s) of event code pageSwipeTest 18 Component(s) 62 Line(s) of event code @@ -22,18 +26,14 @@ popupNotify 15 Component(s) 143 Line(s) of event code 95 Unique line(s) of event code -screensaver - 25 Component(s) - 145 Line(s) of event code - 115 Unique line(s) of event code -cardThermo - 27 Component(s) - 200 Line(s) of event code - 119 Unique line(s) of event code +cardMedia + 22 Component(s) + 219 Line(s) of event code + 114 Unique line(s) of event code pageStartup 19 Component(s) - 134 Line(s) of event code - 104 Unique line(s) of event code + 135 Line(s) of event code + 105 Unique line(s) of event code popupLight 27 Component(s) 296 Line(s) of event code @@ -42,17 +42,17 @@ popupShutter 19 Component(s) 148 Line(s) of event code 84 Unique line(s) of event code -cardMedia - 22 Component(s) - 212 Line(s) of event code - 109 Unique line(s) of event code +cardThermo + 27 Component(s) + 201 Line(s) of event code + 120 Unique line(s) of event code cardEntities 55 Component(s) - 823 Line(s) of event code - 312 Unique line(s) of event code + 824 Line(s) of event code + 313 Unique line(s) of event code Total 12 Page(s) 258 Component(s) - 2240 Line(s) of event code - 577 Unique line(s) of event code + 2251 Line(s) of event code + 578 Unique line(s) of event code diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 3462756d..f44f769b 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -581,6 +581,8 @@ Timer tmSerial spstr strCommand.txt,tId.txt,",",1 //save second arg if there's one spstr strCommand.txt,tTmp.txt,",",2 + //save third arg if there's one + spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index a15e3395..c1f54319 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -732,6 +732,8 @@ Timer tmSerial spstr strCommand.txt,tId.txt,",",1 //save second arg if there's one spstr strCommand.txt,tTmp.txt,",",2 + //save third arg if there's one + spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete u[2]+3 bufferPos=0