From 707a64de6a8de2e2bed73df939c409b250412db8 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Tue, 28 Jun 2022 19:11:06 +0000 Subject: [PATCH] start implementing detail page for fans (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 142 ++++-- HMI/US/portrait/diff-eu-version.txt | 121 +++-- HMI/US/portrait/diff-filtered.txt | 119 +++-- HMI/n2t-out-visual/cardEntities.txt | 16 + HMI/n2t-out-visual/cardGrid.txt | 4 + HMI/n2t-out-visual/nspanel_Stats.txt | 32 +- HMI/n2t-out-visual/popupFan.txt | 691 +++++++++++++++++++++++++++ HMI/n2t-out-visual/popupNotify.txt | 16 +- HMI/n2t-out/cardEntities.txt | 16 + HMI/n2t-out/cardGrid.txt | 4 + HMI/n2t-out/popupFan.txt | 470 ++++++++++++++++++ HMI/n2t-out/popupNotify.txt | 16 +- 12 files changed, 1520 insertions(+), 127 deletions(-) create mode 100644 HMI/n2t-out-visual/popupFan.txt create mode 100644 HMI/n2t-out/popupFan.txt diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 9b245ad5..5544b8ac 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-25 19:33:02.213732211 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-25 19:33:03.053725892 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-28 19:11:03.434183841 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-28 19:11:04.446197053 +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-25 19:33:02.213732211 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-06-25 19:33:03.053725892 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-06-28 19:11:03.434183841 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-06-28 19:11:04.450197106 +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-25 19:33:02.217732181 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-25 19:33:03.053725892 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-28 19:11:03.438183894 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-28 19:11:04.450197106 +0000 @@ -12,22 +12,6 @@ Events @@ -90,7 +90,51 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt dim=dimValueNormal //wup=cardEntities //remove background & activate reparse mode -@@ -1945,18 +1929,6 @@ +@@ -1024,10 +1008,6 @@ + //popupLight.tEntity.txt=tEntity3.txt + page popupLight + } +- if(type3.txt=="fan") +- { +- page popupFan +- } + + Hotspot m1 + Attributes +@@ -1050,10 +1030,6 @@ + //popupLight.tEntity.txt=tEntity2.txt + page popupLight + } +- if(type2.txt=="fan") +- { +- page popupFan +- } + + Hotspot m0 + Attributes +@@ -1076,10 +1052,6 @@ + //popupLight.tEntity.txt=tEntity1.txt + page popupLight + } +- if(type1.txt=="fan") +- { +- page popupFan +- } + + Hotspot m3 + Attributes +@@ -1102,10 +1074,6 @@ + //popupLight.tEntity.txt=tEntity4.txt + page popupLight + } +- if(type4.txt=="fan") +- { +- page popupFan +- } + + Hotspot mSwipeNext + Attributes +@@ -1961,18 +1929,6 @@ spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal @@ -110,8 +154,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-25 19:33:02.213732211 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-25 19:33:03.053725892 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-06-28 19:11:03.438183894 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-28 19:11:04.446197053 +0000 @@ -12,11 +12,6 @@ Events @@ -143,9 +187,20 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt } if(tInstruction.txt=="timeout") { +@@ -928,10 +911,6 @@ + { + page popupLight + } +- if(tTmp.txt=="fan") +- { +- page popupFan +- } + + TouchCap tc0 + Attributes diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-06-25 19:33:02.213732211 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-25 19:33:03.053725892 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-28 19:11:03.434183841 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-28 19:11:04.446197053 +0000 @@ -12,17 +12,6 @@ Events @@ -184,8 +239,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-25 19:33:02.213732211 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-06-25 19:33:03.053725892 +0000 +--- HMI/n2t-out/cardQR.txt 2022-06-28 19:11:03.434183841 +0000 ++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-06-28 19:11:04.446197053 +0000 @@ -12,21 +12,6 @@ Events @@ -228,8 +283,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-25 19:33:02.213732211 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-25 19:33:03.053725892 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-06-28 19:11:03.438183894 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-28 19:11:04.450197106 +0000 @@ -12,11 +12,6 @@ Events @@ -262,8 +317,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-25 19:33:02.213732211 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-25 19:33:03.053725892 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-28 19:11:03.434183841 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-28 19:11:04.446197053 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -293,8 +348,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-25 19:33:02.213732211 +0000 -+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-06-25 19:33:03.053725892 +0000 +--- HMI/n2t-out/pageTest.txt 2022-06-28 19:11:03.434183841 +0000 ++++ HMI/US/landscape/n2t-out/pageTest.txt 2022-06-28 19:11:04.446197053 +0000 @@ -13,46 +13,6 @@ Events Preinitialize Event @@ -342,9 +397,10 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt Picture p0 Attributes +Only in HMI/n2t-out: popupFan.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-06-25 19:33:02.213732211 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-25 19:33:03.053725892 +0000 +--- HMI/n2t-out/popupLight.txt 2022-06-28 19:11:03.434183841 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-28 19:11:04.446197053 +0000 @@ -12,25 +12,6 @@ Events @@ -391,21 +447,27 @@ 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-25 19:33:02.213732211 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-25 19:33:03.053725892 +0000 -@@ -12,11 +12,6 @@ - - Events - Preinitialize Event -- for(sys0=0;sys0<40;sys0++) -- { -- b[sys0].bco=defaultBcoColor -- b[sys0].pco=defaultFontColor -- } - dim=dimValueNormal - vis p0,0 - vis tSend,0 -@@ -320,18 +315,6 @@ +--- HMI/n2t-out/popupNotify.txt 2022-06-28 19:11:03.434183841 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-28 19:11:04.446197053 +0000 +@@ -18,17 +18,6 @@ + vis tTmp,0 + vis tInstruction,0 + vis tId,0 +- popupNotify.bco=defaultBcoColor +- tHeading.bco=defaultBcoColor +- b0.bco=defaultBcoColor +- tText.bco=defaultBcoColor +- b1.bco=defaultBcoColor +- b2.bco=defaultBcoColor +- tHeading.pco=defaultFontColor +- b0.pco=defaultFontColor +- tText.pco=defaultFontColor +- b1.pco=defaultFontColor +- b2.pco=defaultFontColor + + Variable (string) strCommand + Attributes +@@ -326,18 +315,6 @@ spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,dimValueNormal,0,0 dim=dimValueNormal @@ -425,8 +487,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-25 19:33:02.213732211 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-25 19:33:03.053725892 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-06-28 19:11:03.434183841 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-28 19:11:04.446197053 +0000 @@ -12,40 +12,6 @@ Events @@ -576,8 +638,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-25 19:33:02.213732211 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-25 19:33:03.053725892 +0000 +--- HMI/n2t-out/screensaver.txt 2022-06-28 19:11:03.434183841 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-28 19:11:04.450197106 +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 4c8dae57..0eadecf3 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-25 19:33:02.213732211 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-25 19:33:02.625729111 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-28 19:11:03.434183841 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-28 19:11:03.922190212 +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-25 19:33:02.213732211 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-25 19:33:02.625729111 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-06-28 19:11:03.434183841 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-28 19:11:03.922190212 +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-25 19:33:02.217732181 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-25 19:33:02.629729081 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-28 19:11:03.438183894 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-28 19:11:03.926190265 +0000 @@ -81,6 +81,18 @@ vis nNum4,0 vis bPrev,0 @@ -282,10 +282,45 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Hotspot mSpecial Attributes Scope : local -@@ -1091,6 +1299,28 @@ +@@ -1024,10 +1232,6 @@ + //popupLight.tEntity.txt=tEntity3.txt page popupLight } +- if(type3.txt=="fan") +- { +- page popupFan +- } + Hotspot m1 + Attributes +@@ -1050,10 +1254,6 @@ + //popupLight.tEntity.txt=tEntity2.txt + page popupLight + } +- if(type2.txt=="fan") +- { +- page popupFan +- } + + Hotspot m0 + Attributes +@@ -1076,10 +1276,6 @@ + //popupLight.tEntity.txt=tEntity1.txt + page popupLight + } +- if(type1.txt=="fan") +- { +- page popupFan +- } + + Hotspot m3 + Attributes +@@ -1102,9 +1298,27 @@ + //popupLight.tEntity.txt=tEntity4.txt + page popupLight + } +- if(type4.txt=="fan") ++ +Hotspot m4 + Attributes + Scope : local @@ -303,17 +338,30 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + page popupShutter + } + if(type5.txt=="light") -+ { + { +- page popupFan + //popupLight.tEntity.txt=tEntity5.txt + page popupLight -+ } -+ + } + Hotspot mSwipeNext +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt +--- HMI/n2t-out/cardGrid.txt 2022-06-28 19:11:03.438183894 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-06-28 19:11:03.922190212 +0000 +@@ -928,10 +928,6 @@ + { + page popupLight + } +- if(tTmp.txt=="fan") +- { +- page popupFan +- } + + TouchCap tc0 Attributes - Scope : local diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-06-25 19:33:02.213732211 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-25 19:33:02.625729111 +0000 +--- HMI/n2t-out/cardQR.txt 2022-06-28 19:11:03.434183841 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-28 19:11:03.922190212 +0000 @@ -12,21 +12,6 @@ Events @@ -337,8 +385,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-25 19:33:02.213732211 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-25 19:33:02.625729111 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-06-28 19:11:03.438183894 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-28 19:11:03.922190212 +0000 @@ -12,11 +12,6 @@ Events @@ -352,8 +400,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-25 19:33:02.213732211 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-25 19:33:02.625729111 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-28 19:11:03.434183841 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-28 19:11:03.922190212 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -373,8 +421,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-25 19:33:02.213732211 +0000 -+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-25 19:33:02.625729111 +0000 +--- HMI/n2t-out/pageTest.txt 2022-06-28 19:11:03.434183841 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-28 19:11:03.922190212 +0000 @@ -13,46 +13,6 @@ Events Preinitialize Event @@ -422,18 +470,25 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt Picture p0 Attributes +Only in HMI/n2t-out: popupFan.txt diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-06-25 19:33:02.213732211 +0000 -+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-25 19:33:02.625729111 +0000 -@@ -12,11 +12,6 @@ - - Events - Preinitialize Event -- for(sys0=0;sys0<40;sys0++) -- { -- b[sys0].bco=defaultBcoColor -- b[sys0].pco=defaultFontColor -- } - dim=dimValueNormal - vis p0,0 - vis tSend,0 +--- HMI/n2t-out/popupNotify.txt 2022-06-28 19:11:03.434183841 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-28 19:11:03.922190212 +0000 +@@ -18,17 +18,6 @@ + vis tTmp,0 + vis tInstruction,0 + vis tId,0 +- popupNotify.bco=defaultBcoColor +- tHeading.bco=defaultBcoColor +- b0.bco=defaultBcoColor +- tText.bco=defaultBcoColor +- b1.bco=defaultBcoColor +- b2.bco=defaultBcoColor +- tHeading.pco=defaultFontColor +- b0.pco=defaultFontColor +- tText.pco=defaultFontColor +- b1.pco=defaultFontColor +- b2.pco=defaultFontColor + + Variable (string) strCommand + Attributes diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index cb15f5d7..57de86e7 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-25 19:33:02.641728991 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-06-25 19:33:02.213732211 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-25 19:33:02.625729111 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-06-28 19:11:03.938190421 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-06-28 19:11:03.434183841 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-28 19:11:03.922190212 +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-25 19:33:02.213732211 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-25 19:33:02.625729111 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-06-28 19:11:03.434183841 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-28 19:11:03.922190212 +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-25 19:33:02.217732181 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-25 19:33:02.629729081 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-06-28 19:11:03.438183894 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-28 19:11:03.926190265 +0000 +@@ -81,6 +81,18 @@ + vis bPrev,0 + vis bNext,0 @@ -34,9 +34,61 @@ ++ Text : ++ Max. Text Size : 20 +@@ -986,6 +1167,33 @@ -+@@ -1091,6 +1299,28 @@ -+--- HMI/n2t-out/cardQR.txt 2022-06-25 19:33:02.213732211 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-25 19:33:02.625729111 +0000 ++@@ -1024,10 +1232,6 @@ ++ //popupLight.tEntity.txt=tEntity3.txt ++ page popupLight ++ } ++- if(type3.txt=="fan") ++- { ++- page popupFan ++- } ++ ++ Hotspot m1 ++ Attributes ++@@ -1050,10 +1254,6 @@ ++ //popupLight.tEntity.txt=tEntity2.txt ++- if(type2.txt=="fan") ++- { ++- page popupFan ++- } ++ Hotspot m0 ++ Attributes ++@@ -1076,10 +1276,6 @@ ++ //popupLight.tEntity.txt=tEntity1.txt ++ page popupLight ++ } ++- if(type1.txt=="fan") ++- { ++- page popupFan ++- } ++ ++ Hotspot m3 ++ Attributes ++@@ -1102,9 +1298,27 @@ ++ //popupLight.tEntity.txt=tEntity4.txt ++ page popupLight ++ } ++- if(type4.txt=="fan") +++ ++ { ++- page popupFan ++ } ++ ++diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ++--- HMI/n2t-out/cardGrid.txt 2022-06-28 19:11:03.438183894 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-06-28 19:11:03.922190212 +0000 ++@@ -928,10 +928,6 @@ ++ { ++ page popupLight ++ } ++- if(tTmp.txt=="fan") ++- { ++- page popupFan ++- } ++ ++ TouchCap tc0 ++--- HMI/n2t-out/cardQR.txt 2022-06-28 19:11:03.434183841 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-28 19:11:03.922190212 +0000 +@@ -12,21 +12,6 @@ + Events + Preinitialize Event @@ -59,8 +111,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-25 19:33:02.213732211 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-25 19:33:02.625729111 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-06-28 19:11:03.438183894 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-28 19:11:03.922190212 +0000 +@@ -12,11 +12,6 @@ + + Events @@ -73,11 +125,11 @@ + dim=dimValueNormal + vis p0,0 + vis tSend,0 -+--- HMI/n2t-out/pageStartup.txt 2022-06-25 19:33:02.213732211 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-25 19:33:02.625729111 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-06-28 19:11:03.434183841 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-28 19:11:03.922190212 +0000 +diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt -+--- HMI/n2t-out/pageTest.txt 2022-06-25 19:33:02.213732211 +0000 -++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-25 19:33:02.625729111 +0000 ++--- HMI/n2t-out/pageTest.txt 2022-06-28 19:11:03.434183841 +0000 +++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-28 19:11:03.922190212 +0000 +@@ -13,46 +13,6 @@ + Events + Preinitialize Event @@ -125,18 +177,25 @@ + + Picture p0 + Attributes ++Only in HMI/n2t-out: popupFan.txt +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt -+--- HMI/n2t-out/popupNotify.txt 2022-06-25 19:33:02.213732211 +0000 -++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-25 19:33:02.625729111 +0000 -+@@ -12,11 +12,6 @@ -+ -+ Events -+ Preinitialize Event -+- for(sys0=0;sys0<40;sys0++) -+- { -+- b[sys0].bco=defaultBcoColor -+- b[sys0].pco=defaultFontColor -+- } -+ dim=dimValueNormal -+ vis p0,0 -+ vis tSend,0 ++--- HMI/n2t-out/popupNotify.txt 2022-06-28 19:11:03.434183841 +0000 +++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-28 19:11:03.922190212 +0000 ++@@ -18,17 +18,6 @@ ++ vis tTmp,0 ++ vis tInstruction,0 ++ vis tId,0 ++- popupNotify.bco=defaultBcoColor ++- tHeading.bco=defaultBcoColor ++- b0.bco=defaultBcoColor ++- tText.bco=defaultBcoColor ++- b1.bco=defaultBcoColor ++- b2.bco=defaultBcoColor ++- tHeading.pco=defaultFontColor ++- b0.pco=defaultFontColor ++- tText.pco=defaultFontColor ++- b1.pco=defaultFontColor ++- b2.pco=defaultFontColor ++ ++ Variable (string) strCommand ++ Attributes diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index 2ca651e7..617b681d 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -1941,6 +1941,10 @@ Hotspot m2 //popupLight.tEntity.txt=tEntity3.txt page popupLight } + if(type3.txt=="fan") + { + page popupFan + } Hotspot m1 Attributes @@ -1972,6 +1976,10 @@ Hotspot m1 //popupLight.tEntity.txt=tEntity2.txt page popupLight } + if(type2.txt=="fan") + { + page popupFan + } Hotspot m0 Attributes @@ -2003,6 +2011,10 @@ Hotspot m0 //popupLight.tEntity.txt=tEntity1.txt page popupLight } + if(type1.txt=="fan") + { + page popupFan + } Hotspot m3 Attributes @@ -2034,6 +2046,10 @@ Hotspot m3 //popupLight.tEntity.txt=tEntity4.txt page popupLight } + if(type4.txt=="fan") + { + page popupFan + } Hotspot mSwipeNext Attributes diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index 4c2feb6b..2a6472b5 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/n2t-out-visual/cardGrid.txt @@ -1394,6 +1394,10 @@ Timer tmLP { page popupLight } + if(tTmp.txt=="fan") + { + page popupFan + } TouchCap tc0 Attributes diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index c0f360c9..6b645d13 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -14,6 +14,10 @@ pageStartup 19 Component(s) 167 Line(s) of event code 122 Unique line(s) of event code +popupNotify + 17 Component(s) + 225 Line(s) of event code + 143 Unique line(s) of event code popupLight 27 Component(s) 382 Line(s) of event code @@ -22,10 +26,10 @@ screensaver 38 Component(s) 332 Line(s) of event code 257 Unique line(s) of event code -popupNotify - 17 Component(s) - 219 Line(s) of event code - 135 Unique line(s) of event code +popupFan + 20 Component(s) + 230 Line(s) of event code + 146 Unique line(s) of event code cardQR 32 Component(s) 399 Line(s) of event code @@ -34,10 +38,6 @@ cardMedia 34 Component(s) 384 Line(s) of event code 207 Unique line(s) of event code -cardGrid - 42 Component(s) - 454 Line(s) of event code - 267 Unique line(s) of event code popupShutter 25 Component(s) 388 Line(s) of event code @@ -50,13 +50,17 @@ cardThermo 53 Component(s) 570 Line(s) of event code 299 Unique line(s) of event code +cardGrid + 42 Component(s) + 458 Line(s) of event code + 269 Unique line(s) of event code cardEntities 65 Component(s) - 1159 Line(s) of event code - 511 Unique line(s) of event code + 1175 Line(s) of event code + 516 Unique line(s) of event code Total - 13 Page(s) - 416 Component(s) - 4900 Line(s) of event code - 1310 Unique line(s) of event code + 14 Page(s) + 436 Component(s) + 5156 Line(s) of event code + 1335 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupFan.txt b/HMI/n2t-out-visual/popupFan.txt new file mode 100644 index 00000000..fec0e642 --- /dev/null +++ b/HMI/n2t-out-visual/popupFan.txt @@ -0,0 +1,691 @@ +Page popupFan + Attributes + ID : 0 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + Width : 480 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID : disabled + Fill : solid color + Back. Color : 6371 + + 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) + { + hSpeed.pic=14 + hSpeed.pic1=13 + hSpeed.pic2=15 + } + dim=dimValueNormal + //get entitiy name + tEntity.txt=pageIcons.tTmp1.txt + //get entity id + entn.txt=pageIcons.tTmp2.txt + vis p0,0 + vis tSend,0 + vis tTmp,0 + vis tInstruction,0 + vis tId,0 + //page open event + // event,pageOpenDetail,typeOfPage,tEntityName + // craft command + tSend.txt="event,pageOpenDetail,popupLight,"+entn.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + vis hSpeed,0 + +Variable (string) strCommand + Attributes + ID : 13 + Scope : local + Text : + Max. Text Size: 500 + +Variable (string) entn + Attributes + ID : 16 + Scope : local + Text : + Max. Text Size: 80 + +Variable (int32) mode + Attributes + ID : 17 + Scope: local + Value: 1 + +Variable (int32) mode_temp + Attributes + ID : 18 + Scope: local + Value: 0 + +Text tEntity + Attributes + ID : 2 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 92 + y coordinate : 21 + Width : 263 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : left + Vertical Alignment : center + Input Type : character + Text : tEntity1 + Max. Text Size : 25 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tIcon1 + Attributes + ID : 3 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 11 + y coordinate : 21 + Width : 45 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 6371 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t1 + Attributes + ID : 5 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 43 + y coordinate : 104 + Width : 211 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : left + Vertical Alignment : center + Input Type : character + Text : Speed + Max. Text Size : 50 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tSend + Attributes + ID : 8 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 0 + Width : 348 + Height : 7 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 65535 + Font Color : 0 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : newtxt + Max. Text Size : 100 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tTmp + Attributes + ID : 9 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 406 + y coordinate : 277 + Width : 34 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 65535 + Font Color : 0 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 80 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tInstruction + Attributes + ID : 14 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 290 + Width : 100 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 65535 + Font Color : 0 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tId + Attributes + ID : 15 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 100 + y coordinate : 290 + Width : 100 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 65535 + Font Color : 0 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Picture p0 + Attributes + ID : 1 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 0 + Width : 480 + Height : 320 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Picture ID : 0 + +Slider hSpeed + Attributes + ID : 6 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 44 + y coordinate : 139 + Width : 335 + Height : 43 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Direction : horizontal + Fill : image + Cursor width : auto + Cursor height : 255 + Back. Picture ID : 5 + Slided Back. Picture ID : 4 + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + + Events + Touch Release Event + tmCooldown.en=1 + tmCooldown.tim=2500 + //craft command + tSend.txt="event,buttonPress2,"+entn.txt+",number-set," + covx hSpeed.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button b0 + Attributes + ID : 4 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 397 + y coordinate : 8 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 1 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,popupLight,bExit" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button btOnOff1 + Attributes + ID : 7 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 370 + y coordinate : 79 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : image + Font ID : 0 + Background Picture ID (Unpressed) : 1 + Back. Picture ID (Pressed) : 2 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2,"+entn.txt+","+"OnOff," + covx btOnOff1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Timer tmSleep + Attributes + ID : 11 + Scope : local + Period (ms): 1000 + Enabled : yes + + Events + Timer Event + if(sleepTimeout!=0) + { + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { + sleepValue=0 + click b0,1 + click b0,0 + } + } + +Timer tmSerial + Attributes + ID : 12 + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPos1) + { + bufferPos=0 + while(bufferPos