diff --git a/components/nspanel_ha_blueprint/pages.h b/components/nspanel_ha_blueprint/pages.h index e7e6b85..fe9ef8c 100644 --- a/components/nspanel_ha_blueprint/pages.h +++ b/components/nspanel_ha_blueprint/pages.h @@ -12,7 +12,7 @@ namespace nspanel_ha_blueprint { /** * @file pages.h - * Defines constants and functions related to page names for "NSPanel HA Blueprint" project.. + * Defines constants and functions related to page names for "NSPanel HA Blueprint" project. */ // Constants diff --git a/esphome/nspanel_esphome_core.yaml b/esphome/nspanel_esphome_core.yaml index 52a3cbd..7d789a2 100644 --- a/esphome/nspanel_esphome_core.yaml +++ b/esphome/nspanel_esphome_core.yaml @@ -27,7 +27,7 @@ external_components: # path: packages/Blackymas/components type: git url: https://github.com/Blackymas/NSPanel_HA_Blueprint - ref: main + ref: dev # To do: Change to "main" when releasing components: - nspanel_ha_blueprint refresh: 300s @@ -2462,6 +2462,11 @@ script: mode: restart then: - lambda: |- + #if ESPHOME_LOG_LEVEL > ESPHOME_LOG_LEVEL_DEBUG + ESP_LOGV("script.refresh_hardware_buttons_bars", "Page: %s", current_page->state.c_str()); + ESP_LOGV("script.refresh_hardware_buttons_bars", "Page id: %i", get_page_id(current_page->state.c_str())); + ESP_LOGV("script.refresh_hardware_buttons_bars", "buttons_bars_pages: %i", id(buttons_bars_pages)); + #endif if (!id(is_uploading_tft) and ((id(buttons_bars_pages) & (1 << get_page_id(current_page->state.c_str()))) != 0)) { switch (int(display_mode->state)) { case 1: // EU model diff --git a/hmi/dev/nspanel_blank_code/page0.txt b/hmi/dev/nspanel_blank_code/page0.txt deleted file mode 100644 index e6969bb..0000000 --- a/hmi/dev/nspanel_blank_code/page0.txt +++ /dev/null @@ -1,21 +0,0 @@ -Page page0 - Attributes - ID : 0 - Scope : local - Dragging : 0 - Send Component ID : disabled - Locked : no - Swide up page ID : disabled - Swide down page ID : disabled - Swide left page ID : disabled - Swide right page ID: disabled - -QR Code qr0 - Attributes - ID : 1 - Scope : local - Dragging : 0 - Send Component ID: disabled - Text : https://github.com/Blackymas/NSPanel_HA_Blueprint - Max. Text Size : 50 - diff --git a/hmi/dev/nspanel_blank_code/screensaver.txt b/hmi/dev/nspanel_blank_code/screensaver.txt deleted file mode 100644 index 66493e7..0000000 --- a/hmi/dev/nspanel_blank_code/screensaver.txt +++ /dev/null @@ -1,31 +0,0 @@ -Page screensaver - Attributes - ID : 0 - Scope : local - Dragging : 0 - Send Component ID : disabled - Locked : no - Swide up page ID : disabled - Swide down page ID : disabled - Swide left page ID : disabled - Swide right page ID: disabled - - Events - Preinitialize Event - printh 92 - prints "currentpage",0 - printh 00 - prints "blank-screensaver",0 - printh 00 - printh FF FF FF - dim=0 - printh 92 - prints "nspanelevent",0 - printh 00 - prints "{\"page\": \"blank-screensaver\", \"component\": \"currentpage\", \"value\": \"pagechange\", \"version\": \"2023.09.19\"}",0 - printh 00 - printh FF FF FF - - Touch Press Event - page blank - diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index 5f30e06..f8c39bb 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -838,7 +838,7 @@ blueprint: - label: "Utilities page" value: '134217728' # 2^27 - label: "Weather pages" - value: '124' # 2^1 + 2^2 + 2^3 + 2^4 + 2^5 + value: '124' # 2^2 + 2^3 + 2^4 + 2^5 + 2^6 - label: "Alarm control panel page" value: '8388608' # 2^23 - label: "Climate page"