diff --git a/esphome/nspanel_esphome_core.yaml b/esphome/nspanel_esphome_core.yaml index 80d393e..e41789f 100644 --- a/esphome/nspanel_esphome_core.yaml +++ b/esphome/nspanel_esphome_core.yaml @@ -52,6 +52,7 @@ esphome: - priority: 600.0 # This is where most sensors are set up. then: - lambda: |- + blueprint_status->publish_state(0); std::string s = "${device_name}"; std::string result; bool last_was_underscore = false; @@ -1400,7 +1401,11 @@ sensor: internal: false disabled_by_default: false filters: - - lambda: return (x / 62) * 100.0f; + - lambda: |- + if (isnan(x) and x>0) + return (x / 62) * 100.0f; + else + return 0; on_value: then: - lambda: |- @@ -1530,7 +1535,6 @@ sensor: ##### START - SWITCH CONFIGURATION ##### switch: - ##### Notification unread ##### - name: Notification unread platform: template diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index ec10992..3b71e84 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -7768,9 +7768,9 @@ action: {% set entity_brightness_index = (entity_brightness | int(255))/255 if is_number(entity_brightness) else 1 %} {{ [ - min(255,entity_rgb_color[0] * entity_brightness_index) | round(0), - min(255,entity_rgb_color[1] * entity_brightness_index) | round(0), - min(255,entity_rgb_color[2] * entity_brightness_index) | round(0) + min(200,entity_rgb_color[0] * entity_brightness_index) | round(0), + min(200,entity_rgb_color[1] * entity_brightness_index) | round(0), + min(200,entity_rgb_color[2] * entity_brightness_index) | round(0) ] }} {% endif %} @@ -7859,8 +7859,6 @@ action: color_rgb: !input 'home_button05_icon_color' title: !input 'qrcode_label' qrcode: !input 'qrcode_value' - - - variables: display: date: format: @@ -7868,11 +7866,7 @@ action: time: format: !input 'time_format' color_rgb: !input 'time_label_color' - - - variables: - screensaver_display_time: !input screensaver_display_time screensaver_display_time_font_size: !input screensaver_display_time_font_size - screensaver_display_time_font_color: !input screensaver_display_time_font_color - &variables_outdoor_temp variables: @@ -8032,9 +8026,9 @@ action: ent_value_xcen: '{{ int(entitypages_value_alignment) if is_number(entitypages_value_alignment) else 0 }}' mui_please_confirm: '{{ mui[language].please_confirm }}' mui_unavailable: '{{ mui[language].unavailable }}' - screensaver_time: '{{ screensaver_display_time if screensaver_display_time is boolean else false }}' + screensaver_time: !input screensaver_display_time screensaver_time_font: '{{ int(screensaver_display_time_font_size) }}' - screensaver_time_color: '{{ screensaver_display_time_font_color if screensaver_display_time_font_color is sequence else [64, 64, 64] }}' + screensaver_time_color: !input screensaver_display_time_font_color decimal_separator: !input decimal_separator continue_on_error: true @@ -8047,12 +8041,13 @@ action: is_{{ repeat.item }}={{ 1 if - buttons_pages.buttons | - selectattr("page", "defined") | - selectattr("page", "eq", repeat.item) | - selectattr("entity", "defined") | - list | - count > 0 + buttons_pages.buttons + | selectattr("page", "defined") + | selectattr("page", "eq", repeat.item) + | selectattr("entity", "defined") + | rejectattr("entity", "eq", []) + | list + | count > 0 else 0 }} continue_on_error: true @@ -8066,12 +8061,13 @@ action: is_{{ repeat.item }}={{ 1 if - entities_pages.entities | - selectattr("page", "defined") | - selectattr("page", "eq", repeat.item) | - selectattr("entity", "defined") | - list | - count > 0 + entities_pages.entities + | selectattr("page", "defined") + | selectattr("page", "eq", repeat.item) + | selectattr("entity", "defined") + | rejectattr("entity", "eq", []) + | list + | count > 0 else 0 }} continue_on_error: true @@ -8320,6 +8316,7 @@ action: {{ home_page_custom_buttons | selectattr("entity", "defined") + | rejectattr("entity", "eq", []) | list }} sequence: @@ -8406,6 +8403,7 @@ action: {{ home_page_status_bar | selectattr("entity", "defined") + | rejectattr("entity", "eq", []) | list }} sequence: @@ -8485,6 +8483,7 @@ action: {{ home_page_values | selectattr("entity", "defined") + | rejectattr("entity", "eq", []) | list }} sequence: @@ -8581,6 +8580,7 @@ action: | selectattr("page", "defined") | selectattr("page", "eq", event_page) | selectattr("entity", "defined") + | rejectattr("entity", "eq", []) | list }} sequence: &display_button_page_button @@ -9140,6 +9140,7 @@ action: {{ climate_page_entities | selectattr("entity", "defined") + | rejectattr("entity", "eq", []) | list }} sequence: *display_value @@ -9250,7 +9251,7 @@ action: component: button09 - &climate-update_custom_buttons-update repeat: - for_each: '{{ climate_custom_buttons | selectattr("entity", "defined") | list }}' + for_each: '{{ climate_custom_buttons | selectattr("entity", "defined") | rejectattr("entity", "eq", []) | list }}' sequence: - condition: '{{ repeat.item.entity is defined and repeat.item.entity is string and repeat.item.entity | length > 0 }}' - variables: @@ -9301,6 +9302,7 @@ action: | selectattr("page", "defined") | selectattr("page", "eq", event_page) | selectattr("entity", "defined") + | rejectattr("entity", "eq", []) | list }} sequence: &update_entity_page_entity @@ -9922,6 +9924,7 @@ action: | selectattr("component", "defined") | selectattr("component", "eq", nspanel_event.component) | selectattr("entity", "defined") + | rejectattr("entity", "eq", []) | list }} - condition: '{{ last_click_button | count >= 0 }}' diff --git a/prebuilt/.gitignore b/prebuilt/.gitignore new file mode 100644 index 0000000..d8b4157 --- /dev/null +++ b/prebuilt/.gitignore @@ -0,0 +1,5 @@ +# Gitignore settings for ESPHome +# This is an example and may include too much for your use-case. +# You can modify this file to suit your needs. +/.esphome/ +/secrets.yaml