From fa943de7202a7e9914bdfc117bc7998e7a51612a Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 15 Oct 2022 12:20:57 +0000 Subject: [PATCH] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 89 +++++++++++++++++++++++++++ HMI/US/portrait/diff-eu-version.txt | 89 +++++++++++++++++++++++++++ HMI/US/portrait/diff-filtered.txt | 91 +++++++++++++++++++++++++++- HMI/n2t-out-visual/nspanel_Stats.txt | 14 ++--- HMI/n2t-out-visual/popupNotify.txt | 78 ++++++++++++++++++++++++ HMI/n2t-out/popupNotify.txt | 38 ++++++++++++ 6 files changed, 391 insertions(+), 8 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 8be1b00a..6f61ef56 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -30,3 +30,92 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd +├── popupNotify.txt +│ @@ -21,25 +21,19 @@ +│ vis tId,0 +│ popupNotify.bco=defaultBcoColor +│ tHeading.bco=defaultBcoColor +│ b0.bco=defaultBcoColor +│ tText.bco=defaultBcoColor +│ b1.bco=defaultBcoColor +│ b2.bco=defaultBcoColor +│ - tIcon.bco=defaultBcoColor +│ - tTextAlt.bco=defaultBcoColor +│ tHeading.pco=defaultFontColor +│ b0.pco=defaultFontColor +│ tText.pco=defaultFontColor +│ b1.pco=defaultFontColor +│ b2.pco=defaultFontColor +│ - vis tIcon,0 +│ - vis tTextAlt,0 +│ - tIcon.bco=defaultFontColor +│ - tTextAlt.bco=defaultFontColor +│ +│ Variable (string) strCommand +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 1000 +│ +│ @@ -106,34 +100,14 @@ +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ Max. Text Size : 500 +│ +│ -Text tTextAlt +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Disable release event after dragging: 0 +│ - Send Component ID : disabled +│ - Associated Keyboard : none +│ - Text : +│ - Max. Text Size : 500 +│ - +│ -Text tIcon +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Disable release event after dragging: 0 +│ - Send Component ID : disabled +│ - Associated Keyboard : none +│ - Text : +│ - Max. Text Size : 250 +│ - +│ Picture p0 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ +│ @@ -325,26 +299,14 @@ +│ tText.pco=sys0 +│ //preserve old sleepTimeout +│ vaOldSleepT.val=sleepTimeout +│ // sleep timeout +│ spstr strCommand.txt,tTmp.txt,"~",10 +│ covx tTmp.txt,sys0,0,0 +│ sleepTimeout=sys0 +│ - spstr strCommand.txt,tTmp.txt,"~",11 +│ - covx tTmp.txt,sys0,0,0 +│ - tTextAlt.font=sys0 +│ - tText.font=sys0 +│ - spstr strCommand.txt,tIcon.txt,"~",12 +│ - if(tIcon.txt!="") +│ - { +│ - vis tIcon,1 +│ - vis tTextAlt,1 +│ - vis tText,0 +│ - tTextAlt.txt=tText.txt +│ - } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } +│ if(tInstruction.txt=="date") diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 7cda9500..732cd21d 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -691,6 +691,95 @@ │ crcrest 1,0xffff // reset CRC │ crcputh 55 bb │ crcputs sys0,2 +├── popupNotify.txt +│ @@ -21,25 +21,19 @@ +│ vis tId,0 +│ popupNotify.bco=defaultBcoColor +│ tHeading.bco=defaultBcoColor +│ b0.bco=defaultBcoColor +│ tText.bco=defaultBcoColor +│ b1.bco=defaultBcoColor +│ b2.bco=defaultBcoColor +│ - tIcon.bco=defaultBcoColor +│ - tTextAlt.bco=defaultBcoColor +│ tHeading.pco=defaultFontColor +│ b0.pco=defaultFontColor +│ tText.pco=defaultFontColor +│ b1.pco=defaultFontColor +│ b2.pco=defaultFontColor +│ - vis tIcon,0 +│ - vis tTextAlt,0 +│ - tIcon.bco=defaultFontColor +│ - tTextAlt.bco=defaultFontColor +│ +│ Variable (string) strCommand +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 1000 +│ +│ @@ -106,34 +100,14 @@ +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ Max. Text Size : 500 +│ +│ -Text tTextAlt +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Disable release event after dragging: 0 +│ - Send Component ID : disabled +│ - Associated Keyboard : none +│ - Text : +│ - Max. Text Size : 500 +│ - +│ -Text tIcon +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Disable release event after dragging: 0 +│ - Send Component ID : disabled +│ - Associated Keyboard : none +│ - Text : +│ - Max. Text Size : 250 +│ - +│ Picture p0 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ +│ @@ -325,26 +299,14 @@ +│ tText.pco=sys0 +│ //preserve old sleepTimeout +│ vaOldSleepT.val=sleepTimeout +│ // sleep timeout +│ spstr strCommand.txt,tTmp.txt,"~",10 +│ covx tTmp.txt,sys0,0,0 +│ sleepTimeout=sys0 +│ - spstr strCommand.txt,tTmp.txt,"~",11 +│ - covx tTmp.txt,sys0,0,0 +│ - tTextAlt.font=sys0 +│ - tText.font=sys0 +│ - spstr strCommand.txt,tIcon.txt,"~",12 +│ - if(tIcon.txt!="") +│ - { +│ - vis tIcon,1 +│ - vis tTextAlt,1 +│ - vis tText,0 +│ - tTextAlt.txt=tText.txt +│ - } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } +│ if(tInstruction.txt=="date") ├── screensaver.txt │ @@ -71,15 +71,15 @@ │ Text tTime diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index f8b68aa0..66b49b47 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-10-09 16:56:54.880530529 +0000 ++++ /dev/fd/62 2022-10-15 12:20:50.585699560 +0000 +geIcons.txt +5 +15,15 @@ + Scope : global @@ -17,6 +17,95 @@ + Scope : global + Dragging : 0 + Disable release event after dragging: 0 ++pupNotify.txt ++5 +21,19 @@ ++ vis tId,0 ++ popupNotify.bco=defaultBcoColor ++ tHeading.bco=defaultBcoColor ++ b0.bco=defaultBcoColor ++ tText.bco=defaultBcoColor ++ b1.bco=defaultBcoColor ++ b2.bco=defaultBcoColor ++ tIcon.bco=defaultBcoColor ++ tTextAlt.bco=defaultBcoColor ++ tHeading.pco=defaultFontColor ++ b0.pco=defaultFontColor ++ tText.pco=defaultFontColor ++ b1.pco=defaultFontColor ++ b2.pco=defaultFontColor ++ vis tIcon,0 ++ vis tTextAlt,0 ++ tIcon.bco=defaultFontColor ++ tTextAlt.bco=defaultFontColor ++ ++e (string) strCommand ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 1000 ++ ++34 +100,14 @@ ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 500 ++ ++extAlt ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 500 ++ ++con ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 250 ++ ++ p0 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ ++26 +299,14 @@ ++ tText.pco=sys0 ++ //preserve old sleepTimeout ++ vaOldSleepT.val=sleepTimeout ++ // sleep timeout ++ spstr strCommand.txt,tTmp.txt,"~",10 ++ covx tTmp.txt,sys0,0,0 ++ sleepTimeout=sys0 ++ spstr strCommand.txt,tTmp.txt,"~",11 ++ covx tTmp.txt,sys0,0,0 ++ tTextAlt.font=sys0 ++ tText.font=sys0 ++ spstr strCommand.txt,tIcon.txt,"~",12 ++ if(tIcon.txt!="") ++ { ++ vis tIcon,1 ++ vis tTextAlt,1 ++ vis tText,0 ++ tTextAlt.txt=tText.txt ++ } ++ } ++ if(tInstruction.txt=="time") ++ { ++ // get set time to global variable ++ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 ++ } ++ if(tInstruction.txt=="date") +reensaver.txt +5 +71,15 @@ +ime diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 7ff9dd65..833d1638 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -14,14 +14,14 @@ popupShutter 25 Component(s) 394 Line(s) of event code 216 Unique line(s) of event code -popupNotify - 17 Component(s) - 231 Line(s) of event code - 146 Unique line(s) of event code popupLight 27 Component(s) 391 Line(s) of event code 214 Unique line(s) of event code +popupNotify + 19 Component(s) + 249 Line(s) of event code + 161 Unique line(s) of event code pageStartup 19 Component(s) 172 Line(s) of event code @@ -65,6 +65,6 @@ cardEntities Total 15 Page(s) - 488 Component(s) - 5797 Line(s) of event code - 1561 Unique line(s) of event code + 490 Component(s) + 5815 Line(s) of event code + 1575 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupNotify.txt b/HMI/n2t-out-visual/popupNotify.txt index b5cef585..fdc8740b 100644 --- a/HMI/n2t-out-visual/popupNotify.txt +++ b/HMI/n2t-out-visual/popupNotify.txt @@ -33,11 +33,17 @@ Page popupNotify tText.bco=defaultBcoColor b1.bco=defaultBcoColor b2.bco=defaultBcoColor + tIcon.bco=defaultBcoColor + tTextAlt.bco=defaultBcoColor tHeading.pco=defaultFontColor b0.pco=defaultFontColor tText.pco=defaultFontColor b1.pco=defaultFontColor b2.pco=defaultFontColor + vis tIcon,0 + vis tTextAlt,0 + tIcon.bco=defaultFontColor + tTextAlt.bco=defaultFontColor Variable (string) strCommand Attributes @@ -216,6 +222,66 @@ Text tText Horizontal Spacing : 0 Vertical Spacing : 0 +Text tTextAlt + Attributes + ID : 17 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 135 + y coordinate : 74 + Width : 285 + Height : 171 + 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 : top + Input Type : character + Text : + Max. Text Size : 500 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tIcon + Attributes + ID : 18 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 23 + y coordinate : 74 + Width : 109 + Height : 171 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 4 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 250 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + Picture p0 Attributes ID : 1 @@ -493,6 +559,18 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",10 covx tTmp.txt,sys0,0,0 sleepTimeout=sys0 + spstr strCommand.txt,tTmp.txt,"~",11 + covx tTmp.txt,sys0,0,0 + tTextAlt.font=sys0 + tText.font=sys0 + spstr strCommand.txt,tIcon.txt,"~",12 + if(tIcon.txt!="") + { + vis tIcon,1 + vis tTextAlt,1 + vis tText,0 + tTextAlt.txt=tText.txt + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index 673dd9bb..3126a823 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -25,11 +25,17 @@ Page popupNotify tText.bco=defaultBcoColor b1.bco=defaultBcoColor b2.bco=defaultBcoColor + tIcon.bco=defaultBcoColor + tTextAlt.bco=defaultBcoColor tHeading.pco=defaultFontColor b0.pco=defaultFontColor tText.pco=defaultFontColor b1.pco=defaultFontColor b2.pco=defaultFontColor + vis tIcon,0 + vis tTextAlt,0 + tIcon.bco=defaultFontColor + tTextAlt.bco=defaultFontColor Variable (string) strCommand Attributes @@ -104,6 +110,26 @@ Text tText Text : Max. Text Size : 500 +Text tTextAlt + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 500 + +Text tIcon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 250 + Picture p0 Attributes Scope : local @@ -303,6 +329,18 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",10 covx tTmp.txt,sys0,0,0 sleepTimeout=sys0 + spstr strCommand.txt,tTmp.txt,"~",11 + covx tTmp.txt,sys0,0,0 + tTextAlt.font=sys0 + tText.font=sys0 + spstr strCommand.txt,tIcon.txt,"~",12 + if(tIcon.txt!="") + { + vis tIcon,1 + vis tTextAlt,1 + vis tText,0 + tTextAlt.txt=tText.txt + } } if(tInstruction.txt=="time") {