From 1abe6eed6b79ca4e293bb9e3f6347280ac6e0474 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Fri, 27 May 2022 19:16:50 +0000 Subject: [PATCH] add status icons (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 100 ++++++++++++- HMI/US/portrait/diff-eu-version.txt | 103 +++++++++++-- HMI/US/portrait/diff-filtered.txt | 104 ++++++++++++-- HMI/n2t-out-visual/nspanel_Stats.txt | 18 +-- HMI/n2t-out-visual/popupLight.txt | 3 + HMI/n2t-out-visual/screensaver.txt | 207 ++++++++++++++++----------- HMI/n2t-out/popupLight.txt | 3 + HMI/n2t-out/screensaver.txt | 44 ++++-- 8 files changed, 454 insertions(+), 128 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 70fd020c..5a691be7 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-05-27 14:55:07.299628243 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-27 14:55:08.183641171 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-27 19:16:48.789764560 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-27 19:16:49.553773382 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -9,8 +9,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/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-27 14:55:07.299628243 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-27 14:55:08.183641171 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-27 19:16:48.789764560 +0000 ++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-27 19:16:49.553773382 +0000 @@ -34,7 +34,7 @@ Attributes Scope : local @@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt Variable (string) entn Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-27 14:55:07.299628243 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-27 14:55:08.183641171 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-27 19:16:48.789764560 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-27 19:16:49.553773382 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -32,3 +32,91 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC +diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt +--- HMI/n2t-out/popupLight.txt 2022-05-27 19:16:48.789764560 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-27 19:16:49.553773382 +0000 +@@ -209,9 +209,6 @@ + sys0=sys0-pColorWheel.y + covx sys0,tTmp.txt,0,0 + tSend.txt+=tTmp.txt +- tSend.txt+="|" +- covx pColorWheel.h,tTmp.txt,0,0 +- tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC +diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt +--- HMI/n2t-out/screensaver.txt 2022-05-27 19:16:48.789764560 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-27 19:16:49.553773382 +0000 +@@ -62,12 +62,6 @@ + Text : + Max. Text Size: 50 + +-Variable (string) tSend +- Attributes +- Scope : local +- Text : +- Max. Text Size: 50 +- + Text tTime + Attributes + Scope : local +@@ -88,6 +82,16 @@ + Text : Tuesday, 08. March 2022 + Max. Text Size : 35 + ++Text tSend ++ Attributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 50 ++ + Text tMainIcon + Attributes + Scope : local +@@ -308,26 +312,6 @@ + Text : + Max. Text Size : 35 + +-Text tIcon1 +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Text : +- Max. Text Size : 5 +- +-Text tIcon2 +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Text : +- Max. Text Size : 5 +- + Picture p0 + Attributes + Scope : local +@@ -490,14 +474,6 @@ + } + //tMR + spstr strCommand.txt,tMR.txt,"~",16 +- //statusIcon1 +- spstr strCommand.txt,tIcon1.txt,"~",17 +- spstr strCommand.txt,tTmp.txt,"~",18 +- covx tTmp.txt,tIcon1.pco,0,0 +- //statusIcon2 +- spstr strCommand.txt,tIcon2.txt,"~",19 +- spstr strCommand.txt,tTmp.txt,"~",20 +- covx tTmp.txt,tIcon2.pco,0,0 + } + if(tInstruction.txt=="color") + { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 8fb16697..7f66f8af 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-05-27 14:55:07.299628243 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 14:55:07.731634352 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-27 19:16:48.789764560 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 19:16:49.157768810 +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-05-27 14:55:07.303628300 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 14:55:07.731634352 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-27 19:16:48.789764560 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 19:16:49.157768810 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -468,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-27 14:55:07.299628243 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 14:55:07.731634352 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-27 19:16:48.789764560 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 19:16:49.157768810 +0000 @@ -34,7 +34,7 @@ Attributes Scope : local @@ -480,8 +480,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt Variable (string) entn Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-27 14:55:07.299628243 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 14:55:07.731634352 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-27 19:16:48.789764560 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 19:16:49.157768810 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -500,10 +500,80 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt +--- HMI/n2t-out/popupLight.txt 2022-05-27 19:16:48.789764560 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-27 19:16:49.157768810 +0000 +@@ -209,9 +209,6 @@ + sys0=sys0-pColorWheel.y + covx sys0,tTmp.txt,0,0 + tSend.txt+=tTmp.txt +- tSend.txt+="|" +- covx pColorWheel.h,tTmp.txt,0,0 +- tSend.txt+=tTmp.txt + //send calc crc + 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-05-27 14:55:07.299628243 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 14:55:07.731634352 +0000 -@@ -455,22 +455,6 @@ +--- HMI/n2t-out/screensaver.txt 2022-05-27 19:16:48.789764560 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 19:16:49.157768810 +0000 +@@ -62,12 +62,6 @@ + Text : + Max. Text Size: 50 + +-Variable (string) tSend +- Attributes +- Scope : local +- Text : +- Max. Text Size: 50 +- + Text tTime + Attributes + Scope : local +@@ -88,6 +82,16 @@ + Text : Tuesday, 08. March 2022 + Max. Text Size : 35 + ++Text tSend ++ Attributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 50 ++ + Text tMainIcon + Attributes + Scope : local +@@ -308,26 +312,6 @@ + Text : + Max. Text Size : 35 + +-Text tIcon1 +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Text : +- Max. Text Size : 5 +- +-Text tIcon2 +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Text : +- Max. Text Size : 5 +- + Picture p0 + Attributes + Scope : local +@@ -471,33 +455,9 @@ vis tMainIconAlt,1 vis tMRIcon,1 vis tMR,1 @@ -526,3 +596,14 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt } //tMR spstr strCommand.txt,tMR.txt,"~",16 +- //statusIcon1 +- spstr strCommand.txt,tIcon1.txt,"~",17 +- spstr strCommand.txt,tTmp.txt,"~",18 +- covx tTmp.txt,tIcon1.pco,0,0 +- //statusIcon2 +- spstr strCommand.txt,tIcon2.txt,"~",19 +- spstr strCommand.txt,tTmp.txt,"~",20 +- covx tTmp.txt,tIcon2.pco,0,0 + } + if(tInstruction.txt=="color") + { diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index c01c9856..3a184a87 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,11 +1,93 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-27 14:55:07.791635235 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-27 14:55:07.299628243 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 14:55:07.731634352 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-27 14:55:07.303628300 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 14:55:07.731634352 +0000 -+--- HMI/n2t-out/cardQR.txt 2022-05-27 14:55:07.299628243 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 14:55:07.731634352 +0000 -+--- HMI/n2t-out/pageStartup.txt 2022-05-27 14:55:07.299628243 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 14:55:07.731634352 +0000 -+--- HMI/n2t-out/screensaver.txt 2022-05-27 14:55:07.299628243 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 14:55:07.731634352 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-27 19:16:49.169768948 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-27 19:16:48.789764560 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 19:16:49.157768810 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-27 19:16:48.789764560 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 19:16:49.157768810 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-05-27 19:16:48.789764560 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 19:16:49.157768810 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-27 19:16:48.789764560 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 19:16:49.157768810 +0000 ++diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ++--- HMI/n2t-out/popupLight.txt 2022-05-27 19:16:48.789764560 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-27 19:16:49.157768810 +0000 ++@@ -209,9 +209,6 @@ ++ sys0=sys0-pColorWheel.y ++ covx sys0,tTmp.txt,0,0 ++ tSend.txt+=tTmp.txt ++- tSend.txt+="|" ++- covx pColorWheel.h,tTmp.txt,0,0 ++- tSend.txt+=tTmp.txt ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++--- HMI/n2t-out/screensaver.txt 2022-05-27 19:16:48.789764560 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 19:16:49.157768810 +0000 ++@@ -62,12 +62,6 @@ ++ Text : ++ Max. Text Size: 50 ++ ++-Variable (string) tSend ++- Attributes ++- Scope : local ++- Text : ++- Max. Text Size: 50 ++- ++ Text tTime ++ Attributes ++ Scope : local ++@@ -88,6 +82,16 @@ ++ Text : Tuesday, 08. March 2022 ++ Max. Text Size : 35 ++ +++Text tSend +++ Attributes +++ Scope : local +++ Dragging : 0 +++ Disable release event after dragging: 0 +++ Send Component ID : disabled +++ Associated Keyboard : none +++ Text : +++ Max. Text Size : 50 +++ ++ Text tMainIcon ++ Attributes ++ Scope : local ++@@ -308,26 +312,6 @@ ++ Text : ++ Max. Text Size : 35 ++ ++-Text tIcon1 ++- Attributes ++- Scope : local ++- Dragging : 0 ++- Disable release event after dragging: 0 ++- Send Component ID : disabled ++- Associated Keyboard : none ++- Text : ++- Max. Text Size : 5 ++- ++-Text tIcon2 ++- Attributes ++- Scope : local ++- Dragging : 0 ++- Disable release event after dragging: 0 ++- Send Component ID : disabled ++- Associated Keyboard : none ++- Text : ++- Max. Text Size : 5 ++- ++ Picture p0 ++ Attributes ++ Scope : local ++@@ -471,33 +455,9 @@ ++- //statusIcon1 ++- spstr strCommand.txt,tIcon1.txt,"~",17 ++- spstr strCommand.txt,tTmp.txt,"~",18 ++- covx tTmp.txt,tIcon1.pco,0,0 ++- //statusIcon2 ++- spstr strCommand.txt,tIcon2.txt,"~",19 ++- spstr strCommand.txt,tTmp.txt,"~",20 ++- covx tTmp.txt,tIcon2.pco,0,0 ++ } ++ if(tInstruction.txt=="color") ++ { diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 87d137c8..3873cf4a 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -22,14 +22,14 @@ popupNotify 17 Component(s) 200 Line(s) of event code 125 Unique line(s) of event code -screensaver - 35 Component(s) - 297 Line(s) of event code - 238 Unique line(s) of event code popupLight 27 Component(s) - 345 Line(s) of event code - 187 Unique line(s) of event code + 348 Line(s) of event code + 188 Unique line(s) of event code +screensaver + 37 Component(s) + 303 Line(s) of event code + 242 Unique line(s) of event code cardQR 30 Component(s) 363 Line(s) of event code @@ -57,6 +57,6 @@ cardEntities Total 13 Page(s) - 402 Component(s) - 4460 Line(s) of event code - 1169 Unique line(s) of event code + 404 Component(s) + 4469 Line(s) of event code + 1174 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index 62a672ea..40635f18 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -461,6 +461,9 @@ Picture pColorWheel sys0=sys0-pColorWheel.y covx sys0,tTmp.txt,0,0 tSend.txt+=tTmp.txt + tSend.txt+="|" + covx pColorWheel.h,tTmp.txt,0,0 + tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index a74fe18d..3f07bc08 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -50,27 +50,34 @@ Variable (string) strCommand Variable (string) tId Attributes - ID : 17 + ID : 16 Scope : local Text : Max. Text Size: 25 Variable (int32) vaTap Attributes - ID : 25 + ID : 24 Scope: local Value: 0 Variable (string) tInstruction Attributes - ID : 31 + ID : 30 Scope : local Text : Max. Text Size: 50 Variable (string) tTmp Attributes - ID : 32 + ID : 31 + Scope : local + Text : + Max. Text Size: 50 + +Variable (string) tSend + Attributes + ID : 34 Scope : local Text : Max. Text Size: 50 @@ -84,7 +91,7 @@ Text tTime Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 0 + y coordinate : 4 Width : 451 Height : 150 Effect : load @@ -114,7 +121,7 @@ Text tDate Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 150 + y coordinate : 154 Width : 451 Height : 38 Effect : load @@ -135,7 +142,7 @@ Text tDate Horizontal Spacing : 0 Vertical Spacing : 0 -Text tSend +Text tMainIcon Attributes ID : 7 Scope : local @@ -143,38 +150,8 @@ Text tSend Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 405 - y coordinate : 2 - Width : 29 - 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 : 50 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tMainIcon - Attributes - ID : 8 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 x coordinate : 26 - y coordinate : 202 + y coordinate : 206 Width : 70 Height : 66 Effect : load @@ -197,14 +174,14 @@ Text tMainIcon Text tMainText Attributes - ID : 9 + ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 7 - y coordinate : 267 + y coordinate : 271 Width : 110 Height : 43 Effect : load @@ -227,14 +204,14 @@ Text tMainText Text tForecast1 Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 128 - y coordinate : 210 + y coordinate : 214 Width : 72 Height : 26 Effect : load @@ -257,14 +234,14 @@ Text tForecast1 Text tForecast1Val Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 125 - y coordinate : 276 + y coordinate : 280 Width : 71 Height : 25 Effect : load @@ -287,14 +264,14 @@ Text tForecast1Val Text tF1Icon Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 146 - y coordinate : 239 + y coordinate : 243 Width : 40 Height : 35 Effect : load @@ -317,14 +294,14 @@ Text tF1Icon Text tForecast2 Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 212 - y coordinate : 210 + y coordinate : 214 Width : 72 Height : 25 Effect : load @@ -347,14 +324,14 @@ Text tForecast2 Text tF2Icon Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 228 - y coordinate : 239 + y coordinate : 243 Width : 40 Height : 35 Effect : load @@ -377,14 +354,14 @@ Text tF2Icon Text tForecast2Val Attributes - ID : 15 + ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 212 - y coordinate : 277 + y coordinate : 281 Width : 72 Height : 25 Effect : load @@ -407,14 +384,14 @@ Text tForecast2Val Text t10 Attributes - ID : 16 + ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 46 - y coordinate : 195 + y coordinate : 199 Width : 360 Height : 2 Effect : load @@ -437,14 +414,14 @@ Text t10 Text tAMPM Attributes - ID : 18 + ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 343 - y coordinate : 48 + y coordinate : 52 Width : 104 Height : 57 Effect : load @@ -467,14 +444,14 @@ Text tAMPM Text tForecast3Val Attributes - ID : 19 + ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 292 - y coordinate : 277 + y coordinate : 281 Width : 71 Height : 25 Effect : load @@ -497,14 +474,14 @@ Text tForecast3Val Text tF3Icon Attributes - ID : 20 + ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 309 - y coordinate : 239 + y coordinate : 243 Width : 40 Height : 35 Effect : load @@ -527,14 +504,14 @@ Text tF3Icon Text tForecast3 Attributes - ID : 21 + ID : 20 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 293 - y coordinate : 210 + y coordinate : 214 Width : 72 Height : 25 Effect : load @@ -557,14 +534,14 @@ Text tForecast3 Text tForecast4 Attributes - ID : 22 + ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 374 - y coordinate : 210 + y coordinate : 214 Width : 72 Height : 25 Effect : load @@ -587,14 +564,14 @@ Text tForecast4 Text tF4Icon Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 390 - y coordinate : 239 + y coordinate : 243 Width : 40 Height : 35 Effect : load @@ -617,14 +594,14 @@ Text tF4Icon Text tForecast4Val Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 374 - y coordinate : 277 + y coordinate : 281 Width : 72 Height : 25 Effect : load @@ -647,14 +624,14 @@ Text tForecast4Val Text tMainTextAlt Attributes - ID : 27 + ID : 26 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 104 - y coordinate : 210 + y coordinate : 214 Width : 106 Height : 42 Effect : load @@ -677,14 +654,14 @@ Text tMainTextAlt Text tMainIconAlt Attributes - ID : 28 + ID : 27 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 221 + y coordinate : 225 Width : 100 Height : 66 Effect : load @@ -707,14 +684,14 @@ Text tMainIconAlt Text tMRIcon Attributes - ID : 29 + ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 101 - y coordinate : 266 + y coordinate : 270 Width : 40 Height : 35 Effect : load @@ -737,14 +714,14 @@ Text tMRIcon Text tMR Attributes - ID : 30 + ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 144 - y coordinate : 270 + y coordinate : 274 Width : 62 Height : 21 Effect : load @@ -767,14 +744,14 @@ Text tMR Text tNotifyHead Attributes - ID : 33 + ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 201 + y coordinate : 205 Width : 450 Height : 58 Effect : load @@ -797,14 +774,14 @@ Text tNotifyHead Text tNotifyText Attributes - ID : 34 + ID : 33 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 258 + y coordinate : 262 Width : 450 Height : 47 Effect : load @@ -825,6 +802,66 @@ Text tNotifyText Horizontal Spacing : 0 Vertical Spacing : 0 +Text tIcon1 + Attributes + ID : 35 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 344 + y coordinate : 2 + Width : 50 + Height : 45 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 0 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tIcon2 + Attributes + ID : 36 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 400 + y coordinate : 2 + Width : 45 + Height : 45 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 0 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + Picture p0 Attributes ID : 1 @@ -998,6 +1035,14 @@ Timer tmSerial } //tMR spstr strCommand.txt,tMR.txt,"~",16 + //statusIcon1 + spstr strCommand.txt,tIcon1.txt,"~",17 + spstr strCommand.txt,tTmp.txt,"~",18 + covx tTmp.txt,tIcon1.pco,0,0 + //statusIcon2 + spstr strCommand.txt,tIcon2.txt,"~",19 + spstr strCommand.txt,tTmp.txt,"~",20 + covx tTmp.txt,tIcon2.pco,0,0 } if(tInstruction.txt=="color") { @@ -1151,7 +1196,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 26 + ID : 25 Scope : local Period (ms): 1000 Enabled : yes diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 3e3da25b..4c4b5703 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -209,6 +209,9 @@ Picture pColorWheel sys0=sys0-pColorWheel.y covx sys0,tTmp.txt,0,0 tSend.txt+=tTmp.txt + tSend.txt+="|" + covx pColorWheel.h,tTmp.txt,0,0 + tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 04c7b2c5..42a6eb9a 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -62,6 +62,12 @@ Variable (string) tTmp Text : Max. Text Size: 50 +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 50 + Text tTime Attributes Scope : local @@ -82,16 +88,6 @@ Text tDate Text : Tuesday, 08. March 2022 Max. Text Size : 35 -Text tSend - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 50 - Text tMainIcon Attributes Scope : local @@ -312,6 +308,26 @@ Text tNotifyText Text : Max. Text Size : 35 +Text tIcon1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 5 + +Text tIcon2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 5 + Picture p0 Attributes Scope : local @@ -474,6 +490,14 @@ Timer tmSerial } //tMR spstr strCommand.txt,tMR.txt,"~",16 + //statusIcon1 + spstr strCommand.txt,tIcon1.txt,"~",17 + spstr strCommand.txt,tTmp.txt,"~",18 + covx tTmp.txt,tIcon1.pco,0,0 + //statusIcon2 + spstr strCommand.txt,tIcon2.txt,"~",19 + spstr strCommand.txt,tTmp.txt,"~",20 + covx tTmp.txt,tIcon2.pco,0,0 } if(tInstruction.txt=="color") {