From 847d7e5c2abc371d6c722a38538fa3eb90aeb72b Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Thu, 23 Jun 2022 20:59:33 +0000 Subject: [PATCH] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 52 ++++----- HMI/US/portrait/diff-eu-version.txt | 100 +++-------------- HMI/US/portrait/diff-filtered.txt | 102 +++--------------- .../n2t-out-visual/nspanel_US_P_Stats.txt | 14 +-- HMI/US/portrait/n2t-out-visual/popupLight.txt | 19 ++++ .../portrait/n2t-out-visual/popupShutter.txt | 8 +- HMI/US/portrait/n2t-out/popupLight.txt | 19 ++++ HMI/US/portrait/n2t-out/popupShutter.txt | 8 +- 8 files changed, 112 insertions(+), 210 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index cfce9d58..8c6926d3 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-06-23 20:36:03.525115067 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-23 20:36:04.513214585 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-23 20:59:31.468041609 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-23 20:59:32.344046613 +0000 @@ -11,9 +11,4 @@ // dim value int dimValue=40 @@ -12,8 +12,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - 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-06-23 20:36:03.525115067 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-06-23 20:36:04.517214717 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-06-23 20:59:31.468041609 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-06-23 20:59:32.348046636 +0000 @@ -12,21 +12,6 @@ Events @@ -65,8 +65,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-06-23 20:36:03.525115067 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-23 20:36:04.513214585 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-23 20:59:31.468041609 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-23 20:59:32.344046613 +0000 @@ -12,22 +12,6 @@ Events @@ -110,8 +110,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-06-23 20:36:03.525115067 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-23 20:36:04.513214585 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-06-23 20:59:31.468041609 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-23 20:59:32.344046613 +0000 @@ -12,11 +12,6 @@ Events @@ -144,8 +144,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-06-23 20:36:03.525115067 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-23 20:36:04.513214585 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-23 20:59:31.468041609 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-23 20:59:32.344046613 +0000 @@ -12,17 +12,6 @@ Events @@ -184,8 +184,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-06-23 20:36:03.525115067 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-06-23 20:36:04.513214585 +0000 +--- HMI/n2t-out/cardQR.txt 2022-06-23 20:59:31.468041609 +0000 ++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-06-23 20:59:32.344046613 +0000 @@ -12,21 +12,6 @@ Events @@ -228,8 +228,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-06-23 20:36:03.525115067 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-23 20:36:04.517214717 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-06-23 20:59:31.468041609 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-23 20:59:32.348046636 +0000 @@ -12,11 +12,6 @@ Events @@ -262,8 +262,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-06-23 20:36:03.525115067 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-23 20:36:04.513214585 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-23 20:59:31.468041609 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-23 20:59:32.344046613 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -293,8 +293,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt ---- HMI/n2t-out/pageTest.txt 2022-06-23 20:36:03.525115067 +0000 -+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-06-23 20:36:04.513214585 +0000 +--- HMI/n2t-out/pageTest.txt 2022-06-23 20:59:31.468041609 +0000 ++++ HMI/US/landscape/n2t-out/pageTest.txt 2022-06-23 20:59:32.344046613 +0000 @@ -13,46 +13,6 @@ Events Preinitialize Event @@ -343,8 +343,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt Picture p0 Attributes diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-06-23 20:36:03.525115067 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-23 20:36:04.513214585 +0000 +--- HMI/n2t-out/popupLight.txt 2022-06-23 20:59:31.468041609 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-23 20:59:32.344046613 +0000 @@ -12,25 +12,6 @@ Events @@ -391,8 +391,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-06-23 20:36:03.525115067 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-23 20:36:04.513214585 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-06-23 20:59:31.468041609 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-23 20:59:32.344046613 +0000 @@ -12,11 +12,6 @@ Events @@ -425,8 +425,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-06-23 20:36:03.525115067 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-23 20:36:04.513214585 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-06-23 20:59:31.468041609 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-23 20:59:32.344046613 +0000 @@ -12,40 +12,6 @@ Events @@ -576,8 +576,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt if(tInstruction.txt=="time") { diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-06-23 20:36:03.525115067 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-23 20:36:04.517214717 +0000 +--- HMI/n2t-out/screensaver.txt 2022-06-23 20:59:31.468041609 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-23 20:59:32.344046613 +0000 @@ -406,22 +406,10 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 2882282b..547f9bac 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-06-23 20:36:03.525115067 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-23 20:36:04.001164408 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-23 20:59:31.468041609 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-23 20:59:31.892044031 +0000 @@ -14,6 +14,6 @@ //color vars int defaultFontColor=65535 @@ -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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-06-23 20:36:03.525115067 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 20:36:04.001164408 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-06-23 20:59:31.468041609 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 20:59:31.896044054 +0000 @@ -138,7 +138,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt Text tIcon diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-06-23 20:36:03.525115067 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 20:36:04.005164823 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-23 20:59:31.468041609 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 20:59:31.896044054 +0000 @@ -136,6 +136,18 @@ Text : Max. Text Size: 80 @@ -293,8 +293,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Attributes Scope : local diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-06-23 20:36:03.525115067 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 20:36:04.001164408 +0000 +--- HMI/n2t-out/cardQR.txt 2022-06-23 20:59:31.468041609 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 20:59:31.896044054 +0000 @@ -12,21 +12,6 @@ Events @@ -318,8 +318,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt vis p0,0 vis tSend,0 diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-06-23 20:36:03.525115067 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 20:36:04.005164823 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-06-23 20:59:31.468041609 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 20:59:31.896044054 +0000 @@ -12,11 +12,6 @@ Events @@ -333,8 +333,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt vis p0,0 vis tSend,0 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-06-23 20:36:03.525115067 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 20:36:04.001164408 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-23 20:59:31.468041609 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 20:59:31.896044054 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -354,8 +354,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/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt ---- HMI/n2t-out/pageTest.txt 2022-06-23 20:36:03.525115067 +0000 -+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 20:36:04.001164408 +0000 +--- HMI/n2t-out/pageTest.txt 2022-06-23 20:59:31.468041609 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 20:59:31.892044031 +0000 @@ -13,46 +13,6 @@ Events Preinitialize Event @@ -403,38 +403,9 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt Picture p0 Attributes -diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-06-23 20:36:03.525115067 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-23 20:36:04.001164408 +0000 -@@ -12,25 +12,6 @@ - - Events - Preinitialize Event -- for(sys0=0;sys0<40;sys0++) -- { -- b[sys0].bco=defaultBcoColor -- b[sys0].pco=defaultFontColor -- if(b[sys0].type==53&&defaultBcoColor==0) -- { -- b[sys0].pic=10 -- b[sys0].pic2=11 -- } -- } -- if(defaultBcoColor==0) -- { -- hBrightness.pic=14 -- hBrightness.pic1=13 -- hBrightness.pic2=15 -- hTempSlider.pic=16 -- hTempSlider.pic1=17 -- hTempSlider.pic2=15 -- } - dim=dimValueNormal - //get entitiy name - tEntity.txt=pageIcons.tTmp1.txt diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-06-23 20:36:03.525115067 +0000 -+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 20:36:04.001164408 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-06-23 20:59:31.468041609 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 20:59:31.892044031 +0000 @@ -12,11 +12,6 @@ Events @@ -447,42 +418,3 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt dim=dimValueNormal vis p0,0 vis tSend,0 -diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-06-23 20:36:03.525115067 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-23 20:36:04.001164408 +0000 -@@ -215,7 +215,7 @@ - Touch Release Event - // event,buttonPress2,internalNameEntity,positionSlider,50 - //craft command -- tSend.txt="event,buttonPress2,"+entn.txt+",tiltSlider," -+ tSend.txt="event,buttonPress2,"+entn.txt+",positionSlider," - covx hPosition.val,tTmp.txt,0,0 - tSend.txt+=tTmp.txt - //send calc crc -@@ -342,7 +342,7 @@ - - Events - Touch Press Event -- tSend.txt="event,buttonPress2,"+entn.txt+",tiltOpen" -+ tSend.txt="event,buttonPress2,"+entn.txt+",up" - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC -@@ -367,7 +367,7 @@ - - Events - Touch Press Event -- tSend.txt="event,buttonPress2,"+entn.txt+",tiltStop" -+ tSend.txt="event,buttonPress2,"+entn.txt+",stop" - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC -@@ -392,7 +392,7 @@ - - Events - Touch Press Event -- tSend.txt="event,buttonPress2,"+entn.txt+",tiltClose" -+ tSend.txt="event,buttonPress2,"+entn.txt+",down" - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 598bc2c3..e76280f4 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,13 +1,13 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-06-23 20:36:04.017166066 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-06-23 20:36:03.525115067 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-23 20:36:04.001164408 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-06-23 20:59:31.908044123 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-06-23 20:59:31.468041609 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-23 20:59:31.892044031 +0000 +@@ -14,6 +14,6 @@ + //color vars + int defaultFontColor=65535 + int defaultBcoColor=6371 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-06-23 20:36:03.525115067 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 20:36:04.001164408 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-06-23 20:59:31.468041609 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 20:59:31.896044054 +0000 +@@ -138,7 +138,7 @@ + Disable release event after dragging: 0 + Send Component ID : disabled @@ -17,8 +17,8 @@ + Max. Text Size : 10 + + Text tIcon -+--- HMI/n2t-out/cardEntities.txt 2022-06-23 20:36:03.525115067 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 20:36:04.005164823 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-06-23 20:59:31.468041609 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 20:59:31.896044054 +0000 +@@ -136,6 +136,18 @@ +@@ -172,6 +184,15 @@ +@@ -302,6 +323,26 @@ @@ -28,8 +28,8 @@ ++ Max. Text Size : 20 +@@ -986,6 +1155,33 @@ +@@ -1091,6 +1287,28 @@ -+--- HMI/n2t-out/cardQR.txt 2022-06-23 20:36:03.525115067 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 20:36:04.001164408 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-06-23 20:59:31.468041609 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 20:59:31.896044054 +0000 +@@ -12,21 +12,6 @@ + Events + Preinitialize Event @@ -52,8 +52,8 @@ + vis p0,0 + vis tSend,0 +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-06-23 20:36:03.525115067 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 20:36:04.005164823 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-06-23 20:59:31.468041609 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 20:59:31.896044054 +0000 +@@ -12,11 +12,6 @@ + + Events @@ -66,11 +66,11 @@ + dim=dimValueNormal + vis p0,0 + vis tSend,0 -+--- HMI/n2t-out/pageStartup.txt 2022-06-23 20:36:03.525115067 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 20:36:04.001164408 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-06-23 20:59:31.468041609 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 20:59:31.896044054 +0000 +diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt -+--- HMI/n2t-out/pageTest.txt 2022-06-23 20:36:03.525115067 +0000 -++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 20:36:04.001164408 +0000 ++--- HMI/n2t-out/pageTest.txt 2022-06-23 20:59:31.468041609 +0000 +++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 20:59:31.892044031 +0000 +@@ -13,46 +13,6 @@ + Events + Preinitialize Event @@ -118,38 +118,9 @@ + + Picture p0 + Attributes -+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-06-23 20:36:03.525115067 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-23 20:36:04.001164408 +0000 -+@@ -12,25 +12,6 @@ -+ -+ Events -+ Preinitialize Event -+- for(sys0=0;sys0<40;sys0++) -+- { -+- b[sys0].bco=defaultBcoColor -+- b[sys0].pco=defaultFontColor -+- if(b[sys0].type==53&&defaultBcoColor==0) -+- { -+- b[sys0].pic=10 -+- b[sys0].pic2=11 -+- } -+- } -+- if(defaultBcoColor==0) -+- { -+- hBrightness.pic=14 -+- hBrightness.pic1=13 -+- hBrightness.pic2=15 -+- hTempSlider.pic=16 -+- hTempSlider.pic1=17 -+- hTempSlider.pic2=15 -+- } -+ dim=dimValueNormal -+ //get entitiy name -+ tEntity.txt=pageIcons.tTmp1.txt +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt -+--- HMI/n2t-out/popupNotify.txt 2022-06-23 20:36:03.525115067 +0000 -++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 20:36:04.001164408 +0000 ++--- HMI/n2t-out/popupNotify.txt 2022-06-23 20:59:31.468041609 +0000 +++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 20:59:31.892044031 +0000 +@@ -12,11 +12,6 @@ + + Events @@ -162,42 +133,3 @@ + dim=dimValueNormal + vis p0,0 + vis tSend,0 -+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt -+--- HMI/n2t-out/popupShutter.txt 2022-06-23 20:36:03.525115067 +0000 -++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-23 20:36:04.001164408 +0000 -+@@ -215,7 +215,7 @@ -+ Touch Release Event -+ // event,buttonPress2,internalNameEntity,positionSlider,50 -+ //craft command -+- tSend.txt="event,buttonPress2,"+entn.txt+",tiltSlider," -++ tSend.txt="event,buttonPress2,"+entn.txt+",positionSlider," -+ covx hPosition.val,tTmp.txt,0,0 -+ tSend.txt+=tTmp.txt -+ //send calc crc -+@@ -342,7 +342,7 @@ -+ -+ Events -+ Touch Press Event -+- tSend.txt="event,buttonPress2,"+entn.txt+",tiltOpen" -++ tSend.txt="event,buttonPress2,"+entn.txt+",up" -+ //send calc crc -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+@@ -367,7 +367,7 @@ -+ -+ Events -+ Touch Press Event -+- tSend.txt="event,buttonPress2,"+entn.txt+",tiltStop" -++ tSend.txt="event,buttonPress2,"+entn.txt+",stop" -+ //send calc crc -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+@@ -392,7 +392,7 @@ -+ -+ Events -+ Touch Press Event -+- tSend.txt="event,buttonPress2,"+entn.txt+",tiltClose" -++ tSend.txt="event,buttonPress2,"+entn.txt+",down" -+ //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 368c9ce1..4e87fc62 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,14 @@ popupNotify 17 Component(s) 214 Line(s) of event code 132 Unique line(s) of event code +popupLight + 27 Component(s) + 382 Line(s) of event code + 209 Unique line(s) of event code popupShutter 25 Component(s) 388 Line(s) of event code - 207 Unique line(s) of event code + 211 Unique line(s) of event code cardMedia 34 Component(s) 384 Line(s) of event code @@ -26,10 +30,6 @@ cardQR 32 Component(s) 384 Line(s) of event code 223 Unique line(s) of event code -popupLight - 27 Component(s) - 363 Line(s) of event code - 196 Unique line(s) of event code cardAlarm 40 Component(s) 417 Line(s) of event code @@ -58,5 +58,5 @@ cardEntities Total 13 Page(s) 424 Component(s) - 4928 Line(s) of event code - 1302 Unique line(s) of event code + 4947 Line(s) of event code + 1312 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index a885cbd4..8aacae3b 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -20,6 +20,25 @@ Page popupLight Events Preinitialize Event + for(sys0=0;sys0<40;sys0++) + { + b[sys0].bco=defaultBcoColor + b[sys0].pco=defaultFontColor + if(b[sys0].type==53&&defaultBcoColor==0) + { + b[sys0].pic=10 + b[sys0].pic2=11 + } + } + if(defaultBcoColor==0) + { + hBrightness.pic=14 + hBrightness.pic1=13 + hBrightness.pic2=15 + hTempSlider.pic=16 + hTempSlider.pic1=17 + hTempSlider.pic2=15 + } dim=dimValueNormal //get entitiy name tEntity.txt=pageIcons.tTmp1.txt diff --git a/HMI/US/portrait/n2t-out-visual/popupShutter.txt b/HMI/US/portrait/n2t-out-visual/popupShutter.txt index ad3229d9..31ad2399 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt @@ -388,7 +388,7 @@ Slider hTilt Touch Release Event // event,buttonPress2,internalNameEntity,positionSlider,50 //craft command - tSend.txt="event,buttonPress2,"+entn.txt+",positionSlider," + tSend.txt="event,buttonPress2,"+entn.txt+",tiltSlider," covx hPosition.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt //send calc crc @@ -625,7 +625,7 @@ Button bTLeft Events Touch Press Event - tSend.txt="event,buttonPress2,"+entn.txt+",up" + tSend.txt="event,buttonPress2,"+entn.txt+",tiltOpen" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -672,7 +672,7 @@ Button bTStop Events Touch Press Event - tSend.txt="event,buttonPress2,"+entn.txt+",stop" + tSend.txt="event,buttonPress2,"+entn.txt+",tiltStop" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -719,7 +719,7 @@ Button bTRight Events Touch Press Event - tSend.txt="event,buttonPress2,"+entn.txt+",down" + tSend.txt="event,buttonPress2,"+entn.txt+",tiltClose" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index 27367c73..9644f132 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -12,6 +12,25 @@ Page popupLight Events Preinitialize Event + for(sys0=0;sys0<40;sys0++) + { + b[sys0].bco=defaultBcoColor + b[sys0].pco=defaultFontColor + if(b[sys0].type==53&&defaultBcoColor==0) + { + b[sys0].pic=10 + b[sys0].pic2=11 + } + } + if(defaultBcoColor==0) + { + hBrightness.pic=14 + hBrightness.pic1=13 + hBrightness.pic2=15 + hTempSlider.pic=16 + hTempSlider.pic1=17 + hTempSlider.pic2=15 + } dim=dimValueNormal //get entitiy name tEntity.txt=pageIcons.tTmp1.txt diff --git a/HMI/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt index 2220e907..5bf2f282 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/n2t-out/popupShutter.txt @@ -215,7 +215,7 @@ Slider hTilt Touch Release Event // event,buttonPress2,internalNameEntity,positionSlider,50 //craft command - tSend.txt="event,buttonPress2,"+entn.txt+",positionSlider," + tSend.txt="event,buttonPress2,"+entn.txt+",tiltSlider," covx hPosition.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt //send calc crc @@ -342,7 +342,7 @@ Button bTLeft Events Touch Press Event - tSend.txt="event,buttonPress2,"+entn.txt+",up" + tSend.txt="event,buttonPress2,"+entn.txt+",tiltOpen" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -367,7 +367,7 @@ Button bTStop Events Touch Press Event - tSend.txt="event,buttonPress2,"+entn.txt+",stop" + tSend.txt="event,buttonPress2,"+entn.txt+",tiltStop" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -392,7 +392,7 @@ Button bTRight Events Touch Press Event - tSend.txt="event,buttonPress2,"+entn.txt+",down" + tSend.txt="event,buttonPress2,"+entn.txt+",tiltClose" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC