diff --git a/advanced/esphome/nspanel_esphome_core.yaml b/advanced/esphome/nspanel_esphome_core.yaml index c116cfc..66ad682 100644 --- a/advanced/esphome/nspanel_esphome_core.yaml +++ b/advanced/esphome/nspanel_esphome_core.yaml @@ -14,12 +14,12 @@ substitutions: ota_password: ${wifi_password} ap_password: ${wifi_password} ##### DON'T CHANGE THIS ###### - version: "4.2beta.4" + version: "4.2beta.5" ############################## ##### External components ##### external_components: - - source: github://pr#6051 # Remove this when that PR is released (Hopefully v2024.1.0) + - source: github://pr#6051 # Remove this and update min ver when that PR is released (Hopefully v2024.1.0) components: - nextion refresh: 300s diff --git a/advanced/hmi/nspanel_CJK_eu.HMI b/advanced/hmi/nspanel_CJK_eu.HMI index be50b57..3fc7f47 100644 Binary files a/advanced/hmi/nspanel_CJK_eu.HMI and b/advanced/hmi/nspanel_CJK_eu.HMI differ diff --git a/advanced/hmi/nspanel_CJK_eu.tft b/advanced/hmi/nspanel_CJK_eu.tft index 91da3fd..0766372 100644 Binary files a/advanced/hmi/nspanel_CJK_eu.tft and b/advanced/hmi/nspanel_CJK_eu.tft differ diff --git a/advanced/hmi/nspanel_CJK_eu_code/boot.txt b/advanced/hmi/nspanel_CJK_eu_code/boot.txt index 2e4f89d..c8b433d 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/boot.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/boot.txt @@ -104,7 +104,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2beta.4 + Text : 4.2beta.5 Max. Text Size : 9 Text esph_version diff --git a/advanced/hmi/nspanel_CJK_eu_code/climate.txt b/advanced/hmi/nspanel_CJK_eu_code/climate.txt index 1745915..9f0dcfa 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/climate.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/climate.txt @@ -166,7 +166,7 @@ Variable (string) temp_unit Attributes ID : 50 Scope : local - Text : + Text : ° Max. Text Size: 10 Variable (int32) temp_low_max @@ -606,7 +606,6 @@ Slider climateslider Events Touch Release Event - active_slider.val=0 temp_number0.val=climateslider.val*temp_step.val temp_number0.val+=temp_offset.val va0.val=temp_number0.val/10 @@ -614,6 +613,8 @@ Slider climateslider va0.val=temp_number0.val%10 covx va0.val,va1.txt,0,0 target_high.txt+="."+va1.txt + target_high.txt+=temp_unit.txt + active_slider.val=0 timer0.en=1 Button button_back diff --git a/advanced/hmi/nspanel_CJK_us.HMI b/advanced/hmi/nspanel_CJK_us.HMI index b1237bf..ebacf6a 100644 Binary files a/advanced/hmi/nspanel_CJK_us.HMI and b/advanced/hmi/nspanel_CJK_us.HMI differ diff --git a/advanced/hmi/nspanel_CJK_us.tft b/advanced/hmi/nspanel_CJK_us.tft index 818c542..71a52ef 100644 Binary files a/advanced/hmi/nspanel_CJK_us.tft and b/advanced/hmi/nspanel_CJK_us.tft differ diff --git a/advanced/hmi/nspanel_CJK_us_code/boot.txt b/advanced/hmi/nspanel_CJK_us_code/boot.txt index 3dd3f98..9b69c80 100644 --- a/advanced/hmi/nspanel_CJK_us_code/boot.txt +++ b/advanced/hmi/nspanel_CJK_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.2beta.4 + Text : 4.2beta.5 Max. Text Size : 9 Text esph_version diff --git a/advanced/hmi/nspanel_CJK_us_code/climate.txt b/advanced/hmi/nspanel_CJK_us_code/climate.txt index 259d11b..c7c123f 100644 --- a/advanced/hmi/nspanel_CJK_us_code/climate.txt +++ b/advanced/hmi/nspanel_CJK_us_code/climate.txt @@ -166,7 +166,7 @@ Variable (string) temp_unit Attributes ID : 50 Scope : local - Text : + Text : ° Max. Text Size: 10 Variable (int32) temp_low_max @@ -606,14 +606,15 @@ Slider climateslider Events Touch Release Event - active_slider.val=0 - temp_number0.val=slider_high.val*temp_step.val + temp_number0.val=climateslider.val*temp_step.val temp_number0.val+=temp_offset.val va0.val=temp_number0.val/10 covx va0.val,target_high.txt,0,0 va0.val=temp_number0.val%10 covx va0.val,va1.txt,0,0 target_high.txt+="."+va1.txt + target_high.txt+=temp_unit.txt + active_slider.val=0 timer0.en=1 Button button_back diff --git a/advanced/hmi/nspanel_CJK_us_land.HMI b/advanced/hmi/nspanel_CJK_us_land.HMI index 3f7dd7e..567fef7 100644 Binary files a/advanced/hmi/nspanel_CJK_us_land.HMI and b/advanced/hmi/nspanel_CJK_us_land.HMI differ diff --git a/advanced/hmi/nspanel_CJK_us_land.tft b/advanced/hmi/nspanel_CJK_us_land.tft index 5c9f5f9..60d79ac 100644 Binary files a/advanced/hmi/nspanel_CJK_us_land.tft and b/advanced/hmi/nspanel_CJK_us_land.tft differ diff --git a/advanced/hmi/nspanel_CJK_us_land_code/boot.txt b/advanced/hmi/nspanel_CJK_us_land_code/boot.txt index 2e4f89d..c8b433d 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/boot.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/boot.txt @@ -104,7 +104,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2beta.4 + Text : 4.2beta.5 Max. Text Size : 9 Text esph_version diff --git a/advanced/hmi/nspanel_CJK_us_land_code/climate.txt b/advanced/hmi/nspanel_CJK_us_land_code/climate.txt index 1745915..9f0dcfa 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/climate.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/climate.txt @@ -166,7 +166,7 @@ Variable (string) temp_unit Attributes ID : 50 Scope : local - Text : + Text : ° Max. Text Size: 10 Variable (int32) temp_low_max @@ -606,7 +606,6 @@ Slider climateslider Events Touch Release Event - active_slider.val=0 temp_number0.val=climateslider.val*temp_step.val temp_number0.val+=temp_offset.val va0.val=temp_number0.val/10 @@ -614,6 +613,8 @@ Slider climateslider va0.val=temp_number0.val%10 covx va0.val,va1.txt,0,0 target_high.txt+="."+va1.txt + target_high.txt+=temp_unit.txt + active_slider.val=0 timer0.en=1 Button button_back diff --git a/advanced/hmi/nspanel_eu.HMI b/advanced/hmi/nspanel_eu.HMI index 283fc60..322e3e8 100644 Binary files a/advanced/hmi/nspanel_eu.HMI and b/advanced/hmi/nspanel_eu.HMI differ diff --git a/advanced/hmi/nspanel_eu_code/boot.txt b/advanced/hmi/nspanel_eu_code/boot.txt index 2e4f89d..c8b433d 100644 --- a/advanced/hmi/nspanel_eu_code/boot.txt +++ b/advanced/hmi/nspanel_eu_code/boot.txt @@ -104,7 +104,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2beta.4 + Text : 4.2beta.5 Max. Text Size : 9 Text esph_version diff --git a/advanced/hmi/nspanel_eu_code/climate.txt b/advanced/hmi/nspanel_eu_code/climate.txt index 1745915..9f0dcfa 100644 --- a/advanced/hmi/nspanel_eu_code/climate.txt +++ b/advanced/hmi/nspanel_eu_code/climate.txt @@ -166,7 +166,7 @@ Variable (string) temp_unit Attributes ID : 50 Scope : local - Text : + Text : ° Max. Text Size: 10 Variable (int32) temp_low_max @@ -606,7 +606,6 @@ Slider climateslider Events Touch Release Event - active_slider.val=0 temp_number0.val=climateslider.val*temp_step.val temp_number0.val+=temp_offset.val va0.val=temp_number0.val/10 @@ -614,6 +613,8 @@ Slider climateslider va0.val=temp_number0.val%10 covx va0.val,va1.txt,0,0 target_high.txt+="."+va1.txt + target_high.txt+=temp_unit.txt + active_slider.val=0 timer0.en=1 Button button_back diff --git a/advanced/hmi/nspanel_us.HMI b/advanced/hmi/nspanel_us.HMI index 9f9acbe..a4fe118 100644 Binary files a/advanced/hmi/nspanel_us.HMI and b/advanced/hmi/nspanel_us.HMI differ diff --git a/advanced/hmi/nspanel_us_code/boot.txt b/advanced/hmi/nspanel_us_code/boot.txt index 3dd3f98..9b69c80 100644 --- a/advanced/hmi/nspanel_us_code/boot.txt +++ b/advanced/hmi/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.2beta.4 + Text : 4.2beta.5 Max. Text Size : 9 Text esph_version diff --git a/advanced/hmi/nspanel_us_code/climate.txt b/advanced/hmi/nspanel_us_code/climate.txt index 259d11b..c7c123f 100644 --- a/advanced/hmi/nspanel_us_code/climate.txt +++ b/advanced/hmi/nspanel_us_code/climate.txt @@ -166,7 +166,7 @@ Variable (string) temp_unit Attributes ID : 50 Scope : local - Text : + Text : ° Max. Text Size: 10 Variable (int32) temp_low_max @@ -606,14 +606,15 @@ Slider climateslider Events Touch Release Event - active_slider.val=0 - temp_number0.val=slider_high.val*temp_step.val + temp_number0.val=climateslider.val*temp_step.val temp_number0.val+=temp_offset.val va0.val=temp_number0.val/10 covx va0.val,target_high.txt,0,0 va0.val=temp_number0.val%10 covx va0.val,va1.txt,0,0 target_high.txt+="."+va1.txt + target_high.txt+=temp_unit.txt + active_slider.val=0 timer0.en=1 Button button_back diff --git a/advanced/hmi/nspanel_us_land.HMI b/advanced/hmi/nspanel_us_land.HMI index 020aa54..03d04f9 100644 Binary files a/advanced/hmi/nspanel_us_land.HMI and b/advanced/hmi/nspanel_us_land.HMI differ diff --git a/advanced/hmi/nspanel_us_land_code/boot.txt b/advanced/hmi/nspanel_us_land_code/boot.txt index 2e4f89d..c8b433d 100644 --- a/advanced/hmi/nspanel_us_land_code/boot.txt +++ b/advanced/hmi/nspanel_us_land_code/boot.txt @@ -104,7 +104,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2beta.4 + Text : 4.2beta.5 Max. Text Size : 9 Text esph_version diff --git a/advanced/hmi/nspanel_us_land_code/climate.txt b/advanced/hmi/nspanel_us_land_code/climate.txt index 1745915..9f0dcfa 100644 --- a/advanced/hmi/nspanel_us_land_code/climate.txt +++ b/advanced/hmi/nspanel_us_land_code/climate.txt @@ -166,7 +166,7 @@ Variable (string) temp_unit Attributes ID : 50 Scope : local - Text : + Text : ° Max. Text Size: 10 Variable (int32) temp_low_max @@ -606,7 +606,6 @@ Slider climateslider Events Touch Release Event - active_slider.val=0 temp_number0.val=climateslider.val*temp_step.val temp_number0.val+=temp_offset.val va0.val=temp_number0.val/10 @@ -614,6 +613,8 @@ Slider climateslider va0.val=temp_number0.val%10 covx va0.val,va1.txt,0,0 target_high.txt+="."+va1.txt + target_high.txt+=temp_unit.txt + active_slider.val=0 timer0.en=1 Button button_back diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index 3d50725..8616a0a 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -37,7 +37,7 @@ blueprint: 🎉 Roadmap can be found here: [Roadmap](https://github.com/Blackymas/NSPanel_HA_Blueprint/labels/roadmap) - ℹ️ Version: v4.2beta.4 + ℹ️ Version: v4.2beta.5 source_url: https://github.com/Blackymas/NSPanel_HA_Blueprint/blob/main/nspanel_blueprint.yaml domain: automation @@ -3928,7 +3928,7 @@ trigger_variables: variables: ##### GENERAL ##### - blueprint_version: '4.2beta.4' + blueprint_version: '4.2beta.5' date_format_temp: !input 'date_format' # Avoid breaking change for existing users with legacy type format date_format: > diff --git a/nspanel_eu.tft b/nspanel_eu.tft index cb6c428..e614780 100644 Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ diff --git a/nspanel_us.tft b/nspanel_us.tft index c0142e1..0e6d6c2 100644 Binary files a/nspanel_us.tft and b/nspanel_us.tft differ diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft index 42a478f..30cffdf 100644 Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ