From ef024faa431c68d65810eca16ce384f8482ba633 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Thu, 31 Mar 2022 21:43:27 +0000 Subject: [PATCH] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 16 +-- HMI/US/portrait/diff-eu-version.txt | 113 +++--------------- HMI/US/portrait/n2t-out-visual/cardGrid.txt | 34 +++++- HMI/US/portrait/n2t-out-visual/cardMedia.txt | 7 +- HMI/US/portrait/n2t-out-visual/cardThermo.txt | 7 +- .../n2t-out-visual/nspanel_US_P_Stats.txt | 30 ++--- HMI/US/portrait/n2t-out/cardGrid.txt | 34 +++++- HMI/US/portrait/n2t-out/cardMedia.txt | 7 +- HMI/US/portrait/n2t-out/cardThermo.txt | 7 +- 9 files changed, 130 insertions(+), 125 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index d37e548a..7b17d90b 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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-03-31 21:37:33.333044369 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 21:37:34.337049641 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-03-31 21:43:25.747084511 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 21:43:26.723167180 +0000 @@ -17,6 +17,7 @@ vis tInstruction,0 vis tTmp,0 @@ -10,8 +10,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt vis arm2,0 vis arm3,0 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-03-31 21:37:33.333044369 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 21:37:34.341049662 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-31 21:43:25.751084850 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 21:43:26.723167180 +0000 @@ -1125,33 +1125,6 @@ { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 @@ -47,8 +47,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt spstr strCommand.txt,type1.txt,",",3 // get internal name diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-03-31 21:37:33.337044390 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 21:37:34.341049662 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-03-31 21:43:25.751084850 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 21:43:26.723167180 +0000 @@ -12,28 +12,307 @@ Events @@ -408,8 +408,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt spstr strCommand.txt,type1.txt,",",3 // get internal name diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-03-31 21:37:33.333044369 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 21:37:34.337049641 +0000 +--- HMI/n2t-out/screensaver.txt 2022-03-31 21:43:25.747084511 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 21:43:26.723167180 +0000 @@ -30,6 +30,26 @@ vis tSend,0 //page open event diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index e00b017c..06aaf431 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-03-31 21:37:33.333044369 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 21:37:33.841047037 +0000 +--- HMI/n2t-out/Program.s.txt 2022-03-31 21:43:25.747084511 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 21:43:26.243126523 +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-03-31 21:37:33.333044369 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 21:37:33.845047058 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-31 21:43:25.751084850 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 21:43:26.243126523 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -780,75 +780,10 @@ 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-03-31 21:37:33.337044390 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-31 21:37:33.845047058 +0000 -@@ -242,12 +242,7 @@ - - Events - Touch Press Event -- tSend.txt="event,buttonPress2,cardGrid," -- if(bPrev.txt=="") -- { -- tSend.txt+="bUp" -- } -- tSend.txt+="bPrev" -+ tSend.txt="event,buttonPress2,cardGrid,bPrev" - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC -@@ -573,33 +568,6 @@ - { - // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 - spstr strCommand.txt,tHeading.txt,",",1 -- // navigation icons -- spstr strCommand.txt,tId.txt,",",2 -- spstr tId.txt,tTmp.txt,"|",0 -- if(tTmp.txt=="0") -- { -- vis bPrev,0 -- } -- if(tTmp.txt=="1") -- { -- vis bPrev,1 -- bPrev.txt="" -- } -- if(tTmp.txt=="2") -- { -- vis bPrev,1 -- bPrev.txt="" -- } -- spstr tId.txt,tTmp.txt,"|",1 -- if(tTmp.txt=="0") -- { -- vis bNext,0 -- } -- if(tTmp.txt=="1") -- { -- vis bPrev,1 -- bNext.txt="" -- } - // get Type - spstr strCommand.txt,type1.txt,",",3 - // get internal name diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-03-31 21:37:33.333044369 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-31 21:37:33.845047058 +0000 -@@ -435,12 +435,7 @@ - - Events - Touch Press Event -- tSend.txt="event,buttonPress2,cardMedia," -- if(bPrev.txt=="") -- { -- tSend.txt+="bUp" -- } -- tSend.txt+="bPrev" -+ tSend.txt="event,buttonPress2,cardMedia,bPrev" - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC -@@ -506,55 +501,28 @@ +--- HMI/n2t-out/cardMedia.txt 2022-03-31 21:43:25.747084511 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-31 21:43:26.243126523 +0000 +@@ -506,55 +506,28 @@ spstr strCommand.txt,tInstruction.txt,",",0 if(tInstruction.txt=="entityUpd") { @@ -913,7 +848,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt if(tSpeaker.txt!="") { tSpeaker.pco=1374 -@@ -563,14 +531,14 @@ +@@ -563,14 +536,14 @@ tSpeaker.pco=65535 } //speaker list @@ -931,23 +866,9 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt { vis t5,0 diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-03-31 21:37:33.337044390 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 21:37:33.845047058 +0000 -@@ -329,12 +329,7 @@ - - Events - Touch Press Event -- tSend.txt="event,buttonPress2,cardThermo," -- if(bPrev.txt=="") -- { -- tSend.txt+="bUp" -- } -- tSend.txt+="bPrev" -+ tSend.txt="event,buttonPress2,cardThermo,bPrev" - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC -@@ -643,53 +638,26 @@ +--- HMI/n2t-out/cardThermo.txt 2022-03-31 21:43:25.751084850 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 21:43:26.243126523 +0000 +@@ -643,53 +643,26 @@ spstr strCommand.txt,tInstruction.txt,",",0 if(tInstruction.txt=="entityUpd") { @@ -1010,7 +931,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt covx tTmp.txt,xTempStep.val,0,0 // disable all buttons vis bt0,0 -@@ -702,160 +670,190 @@ +@@ -702,160 +675,190 @@ vis bt7,0 vis bt8,0 //bt0 @@ -1245,7 +1166,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt if(tInstruction.txt=="pageType") { //command format pageType,specialPageName -@@ -911,28 +909,6 @@ +@@ -911,28 +914,6 @@ page cardAlarm } } @@ -1275,8 +1196,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt udelete payloadLength-1 bufferPos=0 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-03-31 21:37:33.333044369 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 21:37:33.845047058 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-03-31 21:43:25.747084511 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 21:43:26.243126523 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -1296,8 +1217,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-03-31 21:37:33.333044369 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-31 21:37:33.845047058 +0000 +--- HMI/n2t-out/screensaver.txt 2022-03-31 21:43:25.747084511 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-31 21:43:26.243126523 +0000 @@ -30,6 +30,26 @@ vis tSend,0 //page open event diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt index e6ac464c..7361a042 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt @@ -515,7 +515,12 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardGrid,bPrev" + tSend.txt="event,buttonPress2,cardGrid," + if(bPrev.txt=="") + { + tSend.txt+="bUp" + } + tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1005,6 +1010,33 @@ Timer tmSerial { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 spstr strCommand.txt,tHeading.txt,",",1 + // navigation icons + spstr strCommand.txt,tId.txt,",",2 + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="0") + { + vis bPrev,0 + } + if(tTmp.txt=="1") + { + vis bPrev,1 + bPrev.txt="" + } + if(tTmp.txt=="2") + { + vis bPrev,1 + bPrev.txt="" + } + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="0") + { + vis bNext,0 + } + if(tTmp.txt=="1") + { + vis bPrev,1 + bNext.txt="" + } // get Type spstr strCommand.txt,type1.txt,",",3 // get internal name diff --git a/HMI/US/portrait/n2t-out-visual/cardMedia.txt b/HMI/US/portrait/n2t-out-visual/cardMedia.txt index a13fec9a..bc16136a 100644 --- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt +++ b/HMI/US/portrait/n2t-out-visual/cardMedia.txt @@ -856,7 +856,12 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardMedia,bPrev" + tSend.txt="event,buttonPress2,cardMedia," + if(bPrev.txt=="") + { + tSend.txt+="bUp" + } + tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/n2t-out-visual/cardThermo.txt b/HMI/US/portrait/n2t-out-visual/cardThermo.txt index f3d07b1e..ec6ea2ea 100644 --- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt +++ b/HMI/US/portrait/n2t-out-visual/cardThermo.txt @@ -683,7 +683,12 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardThermo,bPrev" + tSend.txt="event,buttonPress2,cardThermo," + if(bPrev.txt=="") + { + tSend.txt+="bUp" + } + tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index dd7fb83c..06f42dc7 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -14,10 +14,6 @@ popupNotify 17 Component(s) 178 Line(s) of event code 117 Unique line(s) of event code -cardAlarm - 35 Component(s) - 343 Line(s) of event code - 214 Unique line(s) of event code pageTest 13 Component(s) 13 Line(s) of event code @@ -32,12 +28,8 @@ popupShutter 101 Unique line(s) of event code cardMedia 30 Component(s) - 300 Line(s) of event code - 154 Unique line(s) of event code -cardGrid - 39 Component(s) - 397 Line(s) of event code - 233 Unique line(s) of event code + 305 Line(s) of event code + 157 Unique line(s) of event code screensaver 29 Component(s) 182 Line(s) of event code @@ -46,17 +38,25 @@ popupLight 27 Component(s) 322 Line(s) of event code 173 Unique line(s) of event code -cardThermo - 41 Component(s) - 427 Line(s) of event code - 232 Unique line(s) of event code +cardAlarm + 35 Component(s) + 343 Line(s) of event code + 214 Unique line(s) of event code cardEntities 86 Component(s) 1360 Line(s) of event code 552 Unique line(s) of event code +cardGrid + 39 Component(s) + 428 Line(s) of event code + 248 Unique line(s) of event code +cardThermo + 41 Component(s) + 432 Line(s) of event code + 235 Unique line(s) of event code Total 13 Page(s) 375 Component(s) - 3908 Line(s) of event code + 3949 Line(s) of event code 1061 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index 736e5972..e19d2127 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/n2t-out/cardGrid.txt @@ -242,7 +242,12 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardGrid,bPrev" + tSend.txt="event,buttonPress2,cardGrid," + if(bPrev.txt=="") + { + tSend.txt+="bUp" + } + tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -568,6 +573,33 @@ Timer tmSerial { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 spstr strCommand.txt,tHeading.txt,",",1 + // navigation icons + spstr strCommand.txt,tId.txt,",",2 + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="0") + { + vis bPrev,0 + } + if(tTmp.txt=="1") + { + vis bPrev,1 + bPrev.txt="" + } + if(tTmp.txt=="2") + { + vis bPrev,1 + bPrev.txt="" + } + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="0") + { + vis bNext,0 + } + if(tTmp.txt=="1") + { + vis bPrev,1 + bNext.txt="" + } // get Type spstr strCommand.txt,type1.txt,",",3 // get internal name diff --git a/HMI/US/portrait/n2t-out/cardMedia.txt b/HMI/US/portrait/n2t-out/cardMedia.txt index ba1ea1b7..9e5183d0 100644 --- a/HMI/US/portrait/n2t-out/cardMedia.txt +++ b/HMI/US/portrait/n2t-out/cardMedia.txt @@ -435,7 +435,12 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardMedia,bPrev" + tSend.txt="event,buttonPress2,cardMedia," + if(bPrev.txt=="") + { + tSend.txt+="bUp" + } + tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/n2t-out/cardThermo.txt b/HMI/US/portrait/n2t-out/cardThermo.txt index 1a64d489..dbdf993a 100644 --- a/HMI/US/portrait/n2t-out/cardThermo.txt +++ b/HMI/US/portrait/n2t-out/cardThermo.txt @@ -329,7 +329,12 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardThermo,bPrev" + tSend.txt="event,buttonPress2,cardThermo," + if(bPrev.txt=="") + { + tSend.txt+="bUp" + } + tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC