From 84291e0c4fee8229783bacd09f0e3b360deee028 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sun, 17 Apr 2022 18:33:13 +0000 Subject: [PATCH] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 93 +++++++++++++++++++--------- HMI/US/portrait/diff-eu-version.txt | 72 +++++++++++++++++++-- HMI/US/portrait/diff-filtered.txt | 74 +++++++++++++++++++--- HMI/n2t-out-visual/nspanel_Stats.txt | 14 ++--- HMI/n2t-out-visual/screensaver.txt | 76 +++++++++++++++++++++++ HMI/n2t-out/screensaver.txt | 36 +++++++++++ 6 files changed, 315 insertions(+), 50 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index ea0692ec..f7d51f9e 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-04-15 16:21:24.696789846 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-15 16:21:25.464799585 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-17 18:33:11.488952559 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-17 18:33:12.456957856 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,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/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-15 16:21:24.696789846 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-15 16:21:25.464799585 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-17 18:33:11.492952581 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-17 18:33:12.460957878 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt 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-04-15 16:21:24.696789846 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-15 16:21:25.464799585 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-17 18:33:11.492952581 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-17 18:33:12.460957878 +0000 @@ -570,43 +570,25 @@ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 @@ -76,9 +76,18 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt if(tId.txt=="cardAlarm") { diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-15 16:21:24.696789846 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-15 16:21:25.464799585 +0000 -@@ -48,18 +48,6 @@ +--- HMI/n2t-out/screensaver.txt 2022-04-17 18:33:11.492952581 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-17 18:33:12.460957878 +0000 +@@ -17,8 +17,6 @@ + vis tInstruction,0 + vis tTmp,0 + vis p0,0 +- vis tNotifyHead,0 +- vis tNotifyText,0 + //load gloabl time string from pageIcons + //tTime.txt=vaTime.txt + spstr pageIcons.vaTime.txt,tTime.txt,"?",0 +@@ -50,18 +48,6 @@ Scope: local Value: 0 @@ -97,30 +106,54 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt Text tTime Attributes Scope : local -@@ -290,6 +278,26 @@ +@@ -292,7 +278,7 @@ Text : Max. Text Size : 10 +-Text tNotifyHead +Text tTmp -+ Attributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : -+ Max. Text Size : 50 -+ -+Text tInstruction -+ Attributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : -+ Max. Text Size : 50 -+ - Picture p0 Attributes Scope : local + Dragging : 0 +@@ -300,9 +286,9 @@ + Send Component ID : disabled + Associated Keyboard : none + Text : +- Max. Text Size : 35 ++ Max. Text Size : 50 + +-Text tNotifyText ++Text tInstruction + Attributes + Scope : local + Dragging : 0 +@@ -310,7 +296,7 @@ + Send Component ID : disabled + Associated Keyboard : none + Text : +- Max. Text Size : 35 ++ Max. Text Size : 50 + + Picture p0 + Attributes +@@ -543,20 +529,6 @@ + spstr strCommand.txt,tTmp.txt,"~",23 + covx tTmp.txt,tMR.pco,0,0 + } +- if(tInstruction.txt=="notify") +- { +- spstr strCommand.txt,tNotifyHead.txt,"~",1 +- spstr strCommand.txt,tNotifyText.txt,"~",2 +- if(tNotifyHead.txt!=""||tNotifyText.txt!="") +- { +- vis tNotifyHead,1 +- vis tNotifyText,1 +- }else +- { +- vis tNotifyHead,0 +- vis tNotifyText,0 +- } +- } + if(tInstruction.txt=="pageType") + { + dim=100 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 154a8027..901cd2f3 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-04-15 16:21:24.696789846 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-15 16:21:25.032794102 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-17 18:33:11.488952559 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-17 18:33:11.968955186 +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-04-15 16:21:24.696789846 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-15 16:21:25.032794102 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-17 18:33:11.492952581 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-17 18:33:11.968955186 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -427,8 +427,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-15 16:21:24.696789846 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-15 16:21:25.032794102 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-17 18:33:11.492952581 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-17 18:33:11.968955186 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -447,3 +447,63 @@ 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/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt +--- HMI/n2t-out/screensaver.txt 2022-04-17 18:33:11.492952581 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-17 18:33:11.968955186 +0000 +@@ -17,8 +17,6 @@ + vis tInstruction,0 + vis tTmp,0 + vis p0,0 +- vis tNotifyHead,0 +- vis tNotifyText,0 + //load gloabl time string from pageIcons + //tTime.txt=vaTime.txt + spstr pageIcons.vaTime.txt,tTime.txt,"?",0 +@@ -292,26 +290,6 @@ + Text : + Max. Text Size : 10 + +-Text tNotifyHead +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Text : +- Max. Text Size : 35 +- +-Text tNotifyText +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Text : +- Max. Text Size : 35 +- + Picture p0 + Attributes + Scope : local +@@ -543,20 +521,6 @@ + spstr strCommand.txt,tTmp.txt,"~",23 + covx tTmp.txt,tMR.pco,0,0 + } +- if(tInstruction.txt=="notify") +- { +- spstr strCommand.txt,tNotifyHead.txt,"~",1 +- spstr strCommand.txt,tNotifyText.txt,"~",2 +- if(tNotifyHead.txt!=""||tNotifyText.txt!="") +- { +- vis tNotifyHead,1 +- vis tNotifyText,1 +- }else +- { +- vis tNotifyHead,0 +- vis tNotifyText,0 +- } +- } + if(tInstruction.txt=="pageType") + { + dim=100 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index a1fd52af..9deaff8f 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,8 +1,8 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-04-15 16:21:25.068794558 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-04-15 16:21:24.696789846 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-15 16:21:25.032794102 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-04-15 16:21:24.696789846 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-15 16:21:25.032794102 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-04-17 18:33:11.980955251 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-04-17 18:33:11.488952559 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-17 18:33:11.968955186 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-04-17 18:33:11.492952581 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-17 18:33:11.968955186 +0000 +@@ -62,6 +62,16 @@ +@@ -117,6 +127,18 @@ +@@ -153,6 +175,15 @@ @@ -15,5 +15,65 @@ + } + if(tInstruction.txt=="pageType") + { -+--- HMI/n2t-out/pageStartup.txt 2022-04-15 16:21:24.696789846 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-15 16:21:25.032794102 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-04-17 18:33:11.492952581 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-17 18:33:11.968955186 +0000 ++diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ++--- HMI/n2t-out/screensaver.txt 2022-04-17 18:33:11.492952581 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-17 18:33:11.968955186 +0000 ++@@ -17,8 +17,6 @@ ++ vis tInstruction,0 ++ vis tTmp,0 ++ vis p0,0 ++- vis tNotifyHead,0 ++- vis tNotifyText,0 ++ //load gloabl time string from pageIcons ++ //tTime.txt=vaTime.txt ++ spstr pageIcons.vaTime.txt,tTime.txt,"?",0 ++@@ -292,26 +290,6 @@ ++ Text : ++ Max. Text Size : 10 ++ ++-Text tNotifyHead ++- Attributes ++- Scope : local ++- Dragging : 0 ++- Disable release event after dragging: 0 ++- Send Component ID : disabled ++- Associated Keyboard : none ++- Text : ++- Max. Text Size : 35 ++- ++-Text tNotifyText ++- Attributes ++- Scope : local ++- Dragging : 0 ++- Disable release event after dragging: 0 ++- Send Component ID : disabled ++- Associated Keyboard : none ++- Text : ++- Max. Text Size : 35 ++- ++ Picture p0 ++ Attributes ++ Scope : local ++@@ -543,20 +521,6 @@ ++ spstr strCommand.txt,tTmp.txt,"~",23 ++ covx tTmp.txt,tMR.pco,0,0 ++ } ++- if(tInstruction.txt=="notify") ++- { ++- spstr strCommand.txt,tNotifyHead.txt,"~",1 ++- spstr strCommand.txt,tNotifyText.txt,"~",2 ++- if(tNotifyHead.txt!=""||tNotifyText.txt!="") ++- { ++- vis tNotifyHead,1 ++- vis tNotifyText,1 ++- }else ++- { ++- vis tNotifyHead,0 ++- vis tNotifyText,0 ++- } ++- } ++ if(tInstruction.txt=="pageType") ++ { ++ dim=100 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index ea4d736e..6a55d408 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -10,6 +10,10 @@ pageTest 13 Component(s) 13 Line(s) of event code 13 Unique line(s) of event code +screensaver + 35 Component(s) + 282 Line(s) of event code + 229 Unique line(s) of event code popupLight 27 Component(s) 338 Line(s) of event code @@ -38,10 +42,6 @@ cardGrid 39 Component(s) 418 Line(s) of event code 244 Unique line(s) of event code -screensaver - 33 Component(s) - 266 Line(s) of event code - 218 Unique line(s) of event code cardAlarm 35 Component(s) 343 Line(s) of event code @@ -53,6 +53,6 @@ cardEntities Total 12 Page(s) - 341 Component(s) - 3661 Line(s) of event code - 1002 Unique line(s) of event code + 343 Component(s) + 3677 Line(s) of event code + 1012 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index 1ba7e29f..58b73288 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -25,6 +25,8 @@ Page screensaver vis tInstruction,0 vis tTmp,0 vis p0,0 + vis tNotifyHead,0 + vis tNotifyText,0 //load gloabl time string from pageIcons //tTime.txt=vaTime.txt spstr pageIcons.vaTime.txt,tTime.txt,"?",0 @@ -763,6 +765,66 @@ Text tMR Horizontal Spacing : 0 Vertical Spacing : 0 +Text tNotifyHead + Attributes + ID : 33 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 201 + Width : 450 + Height : 58 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 3 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : top + Input Type : character + Text : + Max. Text Size : 35 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tNotifyText + Attributes + ID : 34 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 258 + Width : 450 + Height : 47 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : top + Input Type : character + Text : + Max. Text Size : 35 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + Picture p0 Attributes ID : 1 @@ -1005,6 +1067,20 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",23 covx tTmp.txt,tMR.pco,0,0 } + if(tInstruction.txt=="notify") + { + spstr strCommand.txt,tNotifyHead.txt,"~",1 + spstr strCommand.txt,tNotifyText.txt,"~",2 + if(tNotifyHead.txt!=""||tNotifyText.txt!="") + { + vis tNotifyHead,1 + vis tNotifyText,1 + }else + { + vis tNotifyHead,0 + vis tNotifyText,0 + } + } if(tInstruction.txt=="pageType") { dim=100 diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index f7600ee3..0f91fd6f 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -17,6 +17,8 @@ Page screensaver vis tInstruction,0 vis tTmp,0 vis p0,0 + vis tNotifyHead,0 + vis tNotifyText,0 //load gloabl time string from pageIcons //tTime.txt=vaTime.txt spstr pageIcons.vaTime.txt,tTime.txt,"?",0 @@ -290,6 +292,26 @@ Text tMR Text : Max. Text Size : 10 +Text tNotifyHead + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 35 + +Text tNotifyText + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 35 + Picture p0 Attributes Scope : local @@ -521,6 +543,20 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",23 covx tTmp.txt,tMR.pco,0,0 } + if(tInstruction.txt=="notify") + { + spstr strCommand.txt,tNotifyHead.txt,"~",1 + spstr strCommand.txt,tNotifyText.txt,"~",2 + if(tNotifyHead.txt!=""||tNotifyText.txt!="") + { + vis tNotifyHead,1 + vis tNotifyText,1 + }else + { + vis tNotifyHead,0 + vis tNotifyText,0 + } + } if(tInstruction.txt=="pageType") { dim=100