diff --git a/components/nspanel_ha_blueprint_upload_tft/upload_tft.h b/components/nspanel_ha_blueprint_upload_tft/upload_tft.h index 78d688a..a26edec 100644 --- a/components/nspanel_ha_blueprint_upload_tft/upload_tft.h +++ b/components/nspanel_ha_blueprint_upload_tft/upload_tft.h @@ -18,8 +18,8 @@ namespace nspanel_ha_blueprint_upload_tft { const std::string& defaultUrl, const std::string& baseUrl) { // Determine the branch based on the input std::string relative_branch = branch; - if (branch.find("beta") != std::string::npos) relative_branch = "beta"; - else if (branch.find("dev") != std::string::npos) relative_branch = "dev"; + if (branch.find("b") != std::string::npos) relative_branch = "beta"; + else if (branch.find("d") != std::string::npos) relative_branch = "dev"; // Mapping model to the corresponding TFT file name std::string file_name; diff --git a/esphome/nspanel_esphome_addon_upload_tft.yaml b/esphome/nspanel_esphome_addon_upload_tft.yaml index 50720be..1a026d9 100644 --- a/esphome/nspanel_esphome_addon_upload_tft.yaml +++ b/esphome/nspanel_esphome_addon_upload_tft.yaml @@ -19,10 +19,10 @@ external_components: - source: type: git url: https://github.com/Blackymas/NSPanel_HA_Blueprint - ref: dev # To do: Change it for releasing + ref: beta # To do: Change it for releasing components: - nspanel_ha_blueprint_upload_tft - refresh: 3s # To do: Change it for releasing + refresh: 300s # yamllint disable rule:comments-indentation api: diff --git a/esphome/nspanel_esphome_core.yaml b/esphome/nspanel_esphome_core.yaml index 636dfcd..7f8ef7e 100644 --- a/esphome/nspanel_esphome_core.yaml +++ b/esphome/nspanel_esphome_core.yaml @@ -18,7 +18,7 @@ substitutions: temp_units: "°C" invalid_cooldown: "100ms" ##### DON'T CHANGE THIS ###### - version: "4.3.0b1" + version: "4.3.0b2" ############################## ##### External components ##### @@ -28,10 +28,10 @@ external_components: # path: packages/Blackymas/components type: git url: https://github.com/Blackymas/NSPanel_HA_Blueprint - ref: dev # To do: Change it for releasing + ref: beta # To do: Change it for releasing components: - nspanel_ha_blueprint - refresh: 3s # To do: Change it for releasing + refresh: 300s - source: type: git url: https://github.com/edwardtfn/esphome @@ -764,6 +764,7 @@ api: then: - lambda: |- if (!id(is_uploading_tft)) { + set_component_visibility->execute("home.bt_qrcode", !(qrcode.empty())); disp1->set_component_text_printf("qrcode.qrcode_label", "%s", title.c_str()); disp1->set_component_text_printf("qrcode.qrcode_value", "%s", qrcode.c_str()); if (show) goto_page->execute("qrcode"); diff --git a/hmi/dev/nspanel_eu_code/boot.txt b/hmi/dev/nspanel_eu_code/boot.txt index 97b2c8e..8e2230b 100644 --- a/hmi/dev/nspanel_eu_code/boot.txt +++ b/hmi/dev/nspanel_eu_code/boot.txt @@ -101,7 +101,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.3.0b1 + Text : 4.3.0b2 Max. Text Size : 9 Text esph_version diff --git a/hmi/dev/nspanel_eu_code/home.txt b/hmi/dev/nspanel_eu_code/home.txt index fc81eb1..47e8ec6 100644 --- a/hmi/dev/nspanel_eu_code/home.txt +++ b/hmi/dev/nspanel_eu_code/home.txt @@ -13,6 +13,10 @@ Page home Events Preinitialize Event back_page_id=0 + if(qrcode.qrcode_value.txt=="") + { + vis bt_qrcode,0 + } if(is_entitypage01>0||is_entitypage02>0||is_entitypage03>0||is_entitypage04>0) { vis bt_entities,1 @@ -351,7 +355,7 @@ Text bt_qrcode Events Touch Release Event - if(bt_qrcode.txt!="") + if(qrcode.qrcode_value.txt!="") { page qrcode } diff --git a/hmi/dev/nspanel_us_code/boot.txt b/hmi/dev/nspanel_us_code/boot.txt index 8189e0c..d1e4b91 100644 --- a/hmi/dev/nspanel_us_code/boot.txt +++ b/hmi/dev/nspanel_us_code/boot.txt @@ -101,7 +101,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.3.0b1 + Text : 4.3.0b2 Max. Text Size : 9 Events diff --git a/hmi/dev/nspanel_us_code/home.txt b/hmi/dev/nspanel_us_code/home.txt index e461e9d..99bd032 100644 --- a/hmi/dev/nspanel_us_code/home.txt +++ b/hmi/dev/nspanel_us_code/home.txt @@ -13,6 +13,10 @@ Page home Events Preinitialize Event back_page_id=0 + if(qrcode.qrcode_value.txt=="") + { + vis bt_qrcode,0 + } if(is_entitypage01>0||is_entitypage02>0||is_entitypage03>0||is_entitypage04>0) { vis bt_entities,1 @@ -351,7 +355,7 @@ Text bt_qrcode Events Touch Release Event - if(bt_qrcode.txt!="") + if(qrcode.qrcode_value.txt!="") { page qrcode } diff --git a/hmi/dev/nspanel_us_land_code/boot.txt b/hmi/dev/nspanel_us_land_code/boot.txt index 97b2c8e..8e2230b 100644 --- a/hmi/dev/nspanel_us_land_code/boot.txt +++ b/hmi/dev/nspanel_us_land_code/boot.txt @@ -101,7 +101,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.3.0b1 + Text : 4.3.0b2 Max. Text Size : 9 Text esph_version diff --git a/hmi/dev/nspanel_us_land_code/home.txt b/hmi/dev/nspanel_us_land_code/home.txt index fc81eb1..47e8ec6 100644 --- a/hmi/dev/nspanel_us_land_code/home.txt +++ b/hmi/dev/nspanel_us_land_code/home.txt @@ -13,6 +13,10 @@ Page home Events Preinitialize Event back_page_id=0 + if(qrcode.qrcode_value.txt=="") + { + vis bt_qrcode,0 + } if(is_entitypage01>0||is_entitypage02>0||is_entitypage03>0||is_entitypage04>0) { vis bt_entities,1 @@ -351,7 +355,7 @@ Text bt_qrcode Events Touch Release Event - if(bt_qrcode.txt!="") + if(qrcode.qrcode_value.txt!="") { page qrcode } diff --git a/hmi/nspanel_eu.HMI b/hmi/nspanel_eu.HMI index 886ddb4..b589f86 100644 Binary files a/hmi/nspanel_eu.HMI and b/hmi/nspanel_eu.HMI differ diff --git a/hmi/nspanel_eu.tft b/hmi/nspanel_eu.tft index b1f36e8..f2b2bb4 100644 Binary files a/hmi/nspanel_eu.tft and b/hmi/nspanel_eu.tft differ diff --git a/hmi/nspanel_us.HMI b/hmi/nspanel_us.HMI index 669baac..b9479d7 100644 Binary files a/hmi/nspanel_us.HMI and b/hmi/nspanel_us.HMI differ diff --git a/hmi/nspanel_us.tft b/hmi/nspanel_us.tft index 03525e0..10e9ff8 100644 Binary files a/hmi/nspanel_us.tft and b/hmi/nspanel_us.tft differ diff --git a/hmi/nspanel_us_land.HMI b/hmi/nspanel_us_land.HMI index ccdd929..7af1e87 100644 Binary files a/hmi/nspanel_us_land.HMI and b/hmi/nspanel_us_land.HMI differ diff --git a/hmi/nspanel_us_land.tft b/hmi/nspanel_us_land.tft index 212cde1..056c92a 100644 Binary files a/hmi/nspanel_us_land.tft and b/hmi/nspanel_us_land.tft differ diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index d233d5e..e6db95e 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -10,7 +10,7 @@ blueprint: description: > # NSPanel Configuration via Blueprint: Complete UI-Based Setup - **Version**: v4.3.0b1 + **Version**: v4.3.0b2 This project enables comprehensive configuration of your NSPanel through a Blueprint featuring a user interface. @@ -3263,7 +3263,7 @@ trigger_variables: variables: ##### GENERAL ##### - blueprint_version: '4.3.0b1' + blueprint_version: '4.3.0b2' date_format_temp: !input 'date_format' # Avoid breaking change for existing users with legacy type format date_format: '{{ date_format_temp if date_format_temp not in ["%d.%m", "%d/%m", "%-d/%-m", "%-m/%-d"] else "%A, " ~ date_format_temp }}' @@ -7467,6 +7467,7 @@ action: bt_entities_icon: !input home_button06_icon bt_qrcode_icon: !input home_button05_icon qrcode: + enabled: !input qrcode_enabled title: !input qrcode_label qrcode: !input qrcode_value @@ -7538,8 +7539,8 @@ action: - service: '{{ nspanel.service.qrcode }}' data: - title: '{{ qrcode.title }}' - qrcode: '{{ qrcode.qrcode }}' + title: '{{ qrcode.title if qrcode.enabled else "" }}' + qrcode: '{{ qrcode.qrcode if qrcode.enabled else "" }}' show: false continue_on_error: true