From 5e9bbb455f5a409128f09aed22478674bdc96026 Mon Sep 17 00:00:00 2001 From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> Date: Fri, 8 Mar 2024 15:58:39 +0100 Subject: [PATCH] Additional Value on Home Page Solves #1838 --- ReleaseNotes.md | 9 +++++ hmi/dev/nspanel_eu_code/home.txt | 24 +++++++++++- hmi/dev/nspanel_us_code/home.txt | 20 ++++++++++ hmi/nspanel_eu.HMI | Bin 15263259 -> 15263259 bytes hmi/nspanel_us.HMI | Bin 15048136 -> 15048136 bytes nspanel_blueprint.yaml | 62 +++++++++++++++++++++++++------ 6 files changed, 101 insertions(+), 14 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 6216657..d5dd9af 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -65,6 +65,10 @@ This change is aimed at improving functionality and compatibility but may requir - **What to Do**: For users who utilized customizations to expose these switches, refer to our updated customization guide. Alternatively, use the `esphome.xxxxx_init_hardware` service for a similar functionality without the memory overhead. +6. **Home Page Redesign**: We've redesigned the Home page layout to incorporate an additional value (sensor) and a utilities button, resulting in a minor repositioning of some components. +This change enhances the page's functionality, offering you a broader overview of your smart home at a glance. +While adjusting to the new layout, you might find some of your usual indicators or controls have shifted places, but they're all still readily accessible, designed with intuitive interaction in mind. + We appreciate your understanding and patience during this transition. Our goal is to ensure NSPanel continues to evolve in a way that enhances your experience and meets future needs. Our community and support channels are open for any questions or assistance you may require. @@ -82,6 +86,7 @@ Our community and support channels are open for any questions or assistance you - [Expanded Entity Selection for Home and Climate Pages](#expanded-entity-selection-for-home-and-climate-pages) - [Introducing the Utilities Dashboard](#introducing-the-utilities-dashboard) - [Expanded Support for "Lock" Entities on Buttons and Chips](#expanded-support-for-lock-entities-on-buttons-and-chips) +- [Additional Value on Home Page](#additional-value-on-home-page) ## Details of noteworthy changes ### Transition to ESP-IDF as Default Framework @@ -204,6 +209,10 @@ We're enhancing the NSPanel's integration capabilities by extending support for This development significantly broadens your ability to interact with and control lock mechanisms directly from the NSPanel. Whether securing your home or managing access to different areas, these updates streamline the control process, integrating seamlessly with your smart home's security setup. +### Additional Value on Home Page +In our continuous effort to enhance the NSPanel's utility and efficiency, we're pleased to announce that the Home page now accommodates a fourth value, complete with its icon. +This addition allows for a more comprehensive at-a-glance view of your essential metrics directly from the home screen, ensuring that crucial information is always just a glance away. + ## Support For support or more information about this update, visit our [GitHub repository](https://github.com/Blackymas/NSPanel_HA_Blueprint) diff --git a/hmi/dev/nspanel_eu_code/home.txt b/hmi/dev/nspanel_eu_code/home.txt index 883f81c..fc81eb1 100644 --- a/hmi/dev/nspanel_eu_code/home.txt +++ b/hmi/dev/nspanel_eu_code/home.txt @@ -246,7 +246,7 @@ Text value01_icon Text : Max. Text Size : 3 -Text value03 +Text value04 Attributes ID : 22 Scope : global @@ -256,7 +256,7 @@ Text value03 Text : Max. Text Size : 10 -Text value03_icon +Text value04_icon Attributes ID : 23 Scope : global @@ -628,6 +628,26 @@ Text bt_utilities page utilities } +Text value03_icon + Attributes + ID : 46 + Scope : global + Dragging : 0 + Send Component ID : on press and release + Associated Keyboard: none + Text : + Max. Text Size : 3 + +Text value03 + Attributes + ID : 47 + Scope : global + Dragging : 0 + Send Component ID : on press and release + Associated Keyboard: none + Text : + Max. Text Size : 10 + Picture weather Attributes ID : 7 diff --git a/hmi/dev/nspanel_us_code/home.txt b/hmi/dev/nspanel_us_code/home.txt index 883f81c..e461e9d 100644 --- a/hmi/dev/nspanel_us_code/home.txt +++ b/hmi/dev/nspanel_us_code/home.txt @@ -628,6 +628,26 @@ Text bt_utilities page utilities } +Text value04_icon + Attributes + ID : 46 + Scope : global + Dragging : 0 + Send Component ID : on press and release + Associated Keyboard: none + Text : + Max. Text Size : 3 + +Text value04 + Attributes + ID : 47 + Scope : global + Dragging : 0 + Send Component ID : on press and release + Associated Keyboard: none + Text : + Max. Text Size : 10 + Picture weather Attributes ID : 7 diff --git a/hmi/nspanel_eu.HMI b/hmi/nspanel_eu.HMI index cc355862121d55b60a6a4db180c7084bef1a06c8..6f8b3e49c5474dcd5fad69e3c42cebd5eb03ee2c 100644 GIT binary patch delta 1951 zcmdT^{ZmwB6h3!%S(->^Q(0!EMjQ!d5&@HO@B>#&Q7d#)QWMi%6B7}E6t=K(+u=THe!-LD>RmA*%Jne&bAB{ zdViNyiFCV$NN7wP*{zO`eI#wkzf1jfT-T9BG++C4i$%*L&Fikp_O_<0_XMr??(vlv+E3{I)lKW;!tyFI087d zlFkq~(EDEyH0lhd0>onqreYeVBLOpD#7rb&7M{m!%s~?7Vjkw>1-yutkcEkQ z2T+MB9K<0U#u12c!iA%##xWd64QlZrKEer{#K)*ZJsR){8gUAr;xkD29H(&xU!VzJ z;w;Xg8E$-q7PO)b?dZUHT);(qjZ5gnH@FNBx^M;G;yYZ$HFV>9T*nRkfF9h$kN62c z;}_h*ZQMC^*OEW%nWGa!y>CQ3eP!8)`@+ijcR`olaCM$BQ$GPRe{j4pFPDxt~jP!OOk#pV>lmOct37iL~-g|FL76e#Pn%D7JEa~z6hcm+{{&joMPU8N+B zh{|6OTFoCUn``0U-l1(7Pw-7h4Tr?5qu8D+Ha)9q6lY0hmpedUp7kZcQf#QLO2q~) zZ`HDbgjO93ThOj&&5{_!f@--uy4sn+%);gaUbT(I)>vmq560Lg2QuSfr{3FA%fbf5 z=`5@xw^AB#i_uZc>~ZT^?4YP+y4kJ>X6_gD!VRe_$(AEXVM}Z(fivq9smYK72_p{-5+k&Nwe~YU$LKW*ObSAP4wNo$c9M;a)aAa{wrnhw+Gg(XG zq~RNEX+}1+#X3odX6~o#ajbcRjqO3=>kEF}_j! q)^-~U9=0}05_4P+S+hv?+r8;Qk~!*5XGQ5YPcO$kX`837Joq0-* delta 1000 zcmdVV>r>2e6vy%3wwK0?F*{6leos7V48x>RW+EZC3QJMs5>{@Zlw4Di-r3}urC)4C za>*^R=|{OF6p5B3mv!BC?IW`@9yW%bi3j`zoSE00@66|%GxN2!R`^;K)&4qBFeRk~ zL>i-nU*+*j7ra_QP+7uspA;|#RInB5q~2m+K&t8Y;?EvmQZ6_vm4_|7U#B`m z@EUdYUfJqkxo60f=@JH)Dz_VhR6@v~y9J_K=&n^VZ<*E-ZHU!0xaz-JQVqem4ujcY zP$_&AYK2CjRp?}g!8h{DfByx4Pp)1x>qV8qN1;||6k3H&){DMg_rEY;(~HqrgfNm( zgff~i#xRy~gfpHAOk@(1i6D|FrZAOh7@5utqKRQ9vxp^**~}rHxy)le3rJugi&%__ zB_y(xWh`d}D@kG%t64)bDXb-xG}e*MdN#0;O>AZh8Ehq!EVhx&c5>K3E|AAg%;d9+ z0(P^9z3gK@2Potq77lTkA|#4A!cnZ0P)ZrcI8HeysNf{0IL#RcW1i54ou@pbo#%A$f=*uY zir2is!CT((o)3KF6HdBnT&7GZM^|B$>~YOQQ0W5pw41|OwVG-0{kdJ(= za(pF=rmk-gH= z$BMj83-J0fK0(8oElLx>d3mCyyQW79bZV-Sh47>DtA858gdqVOtSLo{AT3?^a{ zCgTmnVhW}r4)K_VH!&SEU`7IFViw*)B4%R_l8}tIF&FP31*w>aG^FEQ%tr#bmf(l6Z1fSw4j^Q{yLnW$E zjT4aJ#7UgO=lBArQG+u$i*xuA=WziSaS31HGQP$)xPn?-#Wj43>-Y}e;|JV;>u_C6 zrnhNo@88_td6@XlL#YeN1M`d?jJ0UQUaa9dVSc=wC;Kw?7;oq4-5A@ZXu9he3)Z&V zhXyfbRqUm`R834UV96YZ1~8VZVR>z$2ZI^QQAAl!tNh+jH6T?K zZBaChBUK(3uJVf!Dvyj*`El`7bi_UrrE*8KIKQKVK9kf+H^-{>fOwVLrmLDRGa1{Z z6jYYTSU+VdwaJX_R_ysHjO|zW;B>}LDw^g@@%Fg6yZ@uvjO|oJ=7o&ul(Eki&cE8` z!&qWIV-Cgcy;unrzAFVPFJ7+lq}7ahDf)S9gihgOY^tW~2F6CURUs19Zc!cf67>pt z?hpqn#W}?z+A*#0ePR-1ezxuCp#(?eK)N{Gq8H{W zJ+G54owxVkWV~gaQuIsiL^9v3Ur)xd^?p)Pr5rzi4EJ(%RN-y$aR=!rdatz~JyqDC z=QpJErIqQN@|)$`l={#fN~N(?`7~;o@I83+7(dC^VHIL`b5h!hh8bL>tN+);q%7?3jEa?=t8e*9nE%B_UqK`{YSfvZgj1a z;#%YkEmeEj^<+MmJ&1fB%6fiEI&r5so>S-|aWQFUioPokqHA|udLG|t qx+GdkpprPNh0MP;4x*6f=KIlVXSP>iYu|c-27yMYweQWdS$_kjB-FtG delta 1126 zcmeIu`%ler9LMp`w{vN0emK)6=WMoPYiw9^-9j!Ql^l}feu+vhC70Zz%afx>oG3#TU8NaT2);iRg67Z|2O#FJ|*S$`AenKlp5qy+8ZB-k-fc`!v+#dp0Pf&Ppjv zB_&u)Dj!Ky#j3njdJ(-M(J#alD!SK?iR*<+BZO3yr!Cd#2m2*O|B2l7XMUYpFMWs3wP~bPugf`JI)PbY<@9+2RnUfbMMgU(e|wB73!qVHNIyJ{IrZWf?lXS*Mp2 z9txF0tm`t<(?GK>bZ(I6>26e@*Up;2gMqrtPS^IvGFG8&50@n-EM^JOEM*xn z#1hAH;#t8;R^fv$zm`2 z$Ywt|10-JvUCf$=X diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index 48ab345..d5e941a 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -252,6 +252,26 @@ blueprint: description: *description_icon_color default: [200, 204, 200] selector: *color_selector + home_value04: + name: Home page - Entity State 04 - Entity (Optional) + description: *description_entity_displayed + default: [] + selector: *selector_value_entity + home_value04_label_color: + name: Home page - Entity State 04 - Text color + description: *description_text_color + default: [200, 204, 200] + selector: *color_selector + home_value04_icon: + name: Home page - Entity State 04 - Icon (Optional) + description: *description_icon_automatic_default + default: [] + selector: *selector_icon + home_value04_icon_color: + name: Home page - Entity State 04 - Icon color + description: *description_icon_color + default: [200, 204, 200] + selector: *color_selector ##### Chips - Page Home ##### ##### PLACEHOLDER ###################################################################### chip_font_size: @@ -6844,26 +6864,33 @@ trigger: ##### Trigger - Home - Values - State change ################################################################################################################# - ##### HOME Value 01 - Trigger 'home_value01_state' ##### + ##### HOME Value 01 ##### - platform: event event_type: state_changed event_data: entity_id: !input 'home_value01' - id: home_value01_state + id: home_values_state - ##### HOME Value 02 - Trigger 'home_value02_state' ##### + ##### HOME Value 02 ##### - platform: event event_type: state_changed event_data: entity_id: !input 'home_value02' - id: home_value02_state + id: home_values_state - ##### HOME Value 03 - Trigger 'home_value03_state' ##### + ##### HOME Value 03 ##### - platform: event event_type: state_changed event_data: entity_id: !input 'home_value03' - id: home_value03_state + id: home_values_state + + ##### HOME Value 04 ##### + - platform: event + event_type: state_changed + event_data: + entity_id: !input 'home_value04' + id: home_values_state ##### Trigger - Home - Notification ####################################################################################################################### - platform: template @@ -7127,7 +7154,7 @@ condition: - condition: or # Update page Home only when visible or home_page_background_update is enabled conditions: - '{{ home_page_background_update or pages.current == pages.home }}' - - '{{ trigger.id not in ["home_value01_state", "home_value02_state", "home_value03_state"] }}' + - '{{ trigger.id != "home_values_state" }}' - condition: or # Do not update with indoor temp changes when embedded indoor temp is used conditions: - condition: not @@ -8043,6 +8070,12 @@ action: label_color_rgb: !input 'home_value03_label_color' page: home component: value03 + - entity: !input 'home_value04' + icon: !input 'home_value04_icon' + icon_color_rgb: !input 'home_value04_icon_color' + label_color_rgb: !input 'home_value04_label_color' + page: home + component: value04 - repeat: for_each: > {{ @@ -8065,7 +8098,15 @@ action: entity_id: '{{ repeat.item.entity }}' overlap: icon: '{{ repeat.item.icon if repeat.item.icon is defined else None }}' - icon_color: '{{ repeat.item.icon_color_rgb if repeat.item.icon_color_rgb is defined else None }}' + icon_color: > + {{ + repeat.item.icon_color_rgb + if + repeat.item.icon_color_rgb is defined and + repeat.item.icon_color_rgb is sequence and + repeat.item.icon_color_rgb != [200, 204, 200] + else None + }} - *variable_entity - if: '{{ entity_has_value }}' then: @@ -10128,10 +10169,7 @@ action: - alias: Home page - Entity States conditions: - condition: trigger - id: - - home_value01_state - - home_value02_state - - home_value03_state + id: home_values_state - '{{ pages.current == pages.home }}' sequence: - *variables-home_page_values