diff --git a/advanced/esphome/nspanel_esphome_core.yaml b/advanced/esphome/nspanel_esphome_core.yaml index f10ff92..c116cfc 100644 --- a/advanced/esphome/nspanel_esphome_core.yaml +++ b/advanced/esphome/nspanel_esphome_core.yaml @@ -14,7 +14,7 @@ substitutions: ota_password: ${wifi_password} ap_password: ${wifi_password} ##### DON'T CHANGE THIS ###### - version: "4.2beta.2" + version: "4.2beta.4" ############################## ##### External components ##### diff --git a/advanced/hmi/nspanel_CJK_eu.HMI b/advanced/hmi/nspanel_CJK_eu.HMI index 8521a76..be50b57 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 1dd831c..91da3fd 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 a93e3ee..2e4f89d 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.2 + Text : 4.2beta.4 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 797de4e..1745915 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/climate.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/climate.txt @@ -162,6 +162,31 @@ Variable (int32) temp_number2 Scope: local Value: 0 +Variable (string) temp_unit + Attributes + ID : 50 + Scope : local + Text : + Max. Text Size: 10 + +Variable (int32) temp_low_max + Attributes + ID : 51 + Scope: local + Value: 0 + +Variable (int32) temp_high_min + Attributes + ID : 52 + Scope: local + Value: 0 + +Variable (int32) temp_gap + Attributes + ID : 53 + Scope: local + Value: 0 + Text current_temp Attributes ID : 3 @@ -509,13 +534,20 @@ Slider slider_high Scope : local Dragging : 0 Send Component ID: on press and release - Position : 20 - Upper range limit: 40 + Position : 215 + Upper range limit: 400 Lower range limit: 0 Events + Touch Press Event + temp_gap.val=3*temp_step.val + temp_high_min.val=slider_low.val+temp_gap.val + Touch Release Event - active_slider.val=1 + if(slider_high.valtemp_low_max.val) + { + slider_low.val=temp_low_max.val + } temp_number2.val=slider_low.val*temp_step.val temp_number2.val+=temp_offset.val va0.val=temp_number2.val/10 @@ -545,7 +588,11 @@ Slider slider_low va0.val=temp_number2.val%10 covx va0.val,va1.txt,0,0 target_low.txt+="."+va1.txt + target_low.txt+=temp_unit.txt timer2.en=1 + active_slider.val=2 + temp_gap.val=3*temp_step.val + temp_high_min.val=slider_low.val+temp_gap.val Slider climateslider Attributes @@ -553,8 +600,8 @@ Slider climateslider Scope : local Dragging : 0 Send Component ID: on press and release - Position : 20 - Upper range limit: 40 + Position : 200 + Upper range limit: 400 Lower range limit: 0 Events diff --git a/advanced/hmi/nspanel_CJK_us.HMI b/advanced/hmi/nspanel_CJK_us.HMI index 8cb0f0c..b1237bf 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 a81523b..818c542 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 f630f72..3dd3f98 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.2 + Text : 4.2beta.4 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 c3bdcfc..259d11b 100644 --- a/advanced/hmi/nspanel_CJK_us_code/climate.txt +++ b/advanced/hmi/nspanel_CJK_us_code/climate.txt @@ -162,6 +162,31 @@ Variable (int32) temp_number2 Scope: local Value: 0 +Variable (string) temp_unit + Attributes + ID : 50 + Scope : local + Text : + Max. Text Size: 10 + +Variable (int32) temp_low_max + Attributes + ID : 51 + Scope: local + Value: 0 + +Variable (int32) temp_high_min + Attributes + ID : 52 + Scope: local + Value: 0 + +Variable (int32) temp_gap + Attributes + ID : 53 + Scope: local + Value: 0 + Text current_temp Attributes ID : 3 @@ -509,13 +534,20 @@ Slider slider_high Scope : local Dragging : 0 Send Component ID: on press and release - Position : 200 + Position : 215 Upper range limit: 400 Lower range limit: 0 Events + Touch Press Event + temp_gap.val=3*temp_step.val + temp_high_min.val=slider_low.val+temp_gap.val + Touch Release Event - active_slider.val=1 + if(slider_high.valtemp_low_max.val) + { + slider_low.val=temp_low_max.val + } + temp_number2.val=slider_low.val*temp_step.val temp_number2.val+=temp_offset.val va0.val=temp_number2.val/10 - covx va0.val,target_high.txt,0,0 + covx va0.val,target_low.txt,0,0 va0.val=temp_number2.val%10 covx va0.val,va1.txt,0,0 - target_high.txt+="."+va1.txt + target_low.txt+="."+va1.txt + target_low.txt+=temp_unit.txt timer2.en=1 + active_slider.val=2 + temp_gap.val=3*temp_step.val + temp_high_min.val=slider_low.val+temp_gap.val Slider climateslider Attributes diff --git a/advanced/hmi/nspanel_CJK_us_land.HMI b/advanced/hmi/nspanel_CJK_us_land.HMI index 4d9ca2b..3f7dd7e 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 11ed2de..5c9f5f9 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 a93e3ee..2e4f89d 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.2 + Text : 4.2beta.4 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 45d11c8..1745915 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/climate.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/climate.txt @@ -162,6 +162,31 @@ Variable (int32) temp_number2 Scope: local Value: 0 +Variable (string) temp_unit + Attributes + ID : 50 + Scope : local + Text : + Max. Text Size: 10 + +Variable (int32) temp_low_max + Attributes + ID : 51 + Scope: local + Value: 0 + +Variable (int32) temp_high_min + Attributes + ID : 52 + Scope: local + Value: 0 + +Variable (int32) temp_gap + Attributes + ID : 53 + Scope: local + Value: 0 + Text current_temp Attributes ID : 3 @@ -486,7 +511,7 @@ Text target_high Max. Text Size : 10 Events - Touch Press Event + Touch Release Event active_slider.val=is_temp_range.val Text target_low @@ -509,13 +534,20 @@ Slider slider_high Scope : local Dragging : 0 Send Component ID: on press and release - Position : 20 - Upper range limit: 40 + Position : 215 + Upper range limit: 400 Lower range limit: 0 Events + Touch Press Event + temp_gap.val=3*temp_step.val + temp_high_min.val=slider_low.val+temp_gap.val + Touch Release Event - active_slider.val=1 + if(slider_high.valtemp_low_max.val) + { + slider_low.val=temp_low_max.val + } temp_number2.val=slider_low.val*temp_step.val temp_number2.val+=temp_offset.val va0.val=temp_number2.val/10 @@ -545,7 +588,11 @@ Slider slider_low va0.val=temp_number2.val%10 covx va0.val,va1.txt,0,0 target_low.txt+="."+va1.txt + target_low.txt+=temp_unit.txt timer2.en=1 + active_slider.val=2 + temp_gap.val=3*temp_step.val + temp_high_min.val=slider_low.val+temp_gap.val Slider climateslider Attributes @@ -553,8 +600,8 @@ Slider climateslider Scope : local Dragging : 0 Send Component ID: on press and release - Position : 20 - Upper range limit: 40 + Position : 200 + Upper range limit: 400 Lower range limit: 0 Events diff --git a/advanced/hmi/nspanel_eu.HMI b/advanced/hmi/nspanel_eu.HMI index ca9a7d7..aa4dd20 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 a93e3ee..2e4f89d 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.2 + Text : 4.2beta.4 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 797de4e..1745915 100644 --- a/advanced/hmi/nspanel_eu_code/climate.txt +++ b/advanced/hmi/nspanel_eu_code/climate.txt @@ -162,6 +162,31 @@ Variable (int32) temp_number2 Scope: local Value: 0 +Variable (string) temp_unit + Attributes + ID : 50 + Scope : local + Text : + Max. Text Size: 10 + +Variable (int32) temp_low_max + Attributes + ID : 51 + Scope: local + Value: 0 + +Variable (int32) temp_high_min + Attributes + ID : 52 + Scope: local + Value: 0 + +Variable (int32) temp_gap + Attributes + ID : 53 + Scope: local + Value: 0 + Text current_temp Attributes ID : 3 @@ -509,13 +534,20 @@ Slider slider_high Scope : local Dragging : 0 Send Component ID: on press and release - Position : 20 - Upper range limit: 40 + Position : 215 + Upper range limit: 400 Lower range limit: 0 Events + Touch Press Event + temp_gap.val=3*temp_step.val + temp_high_min.val=slider_low.val+temp_gap.val + Touch Release Event - active_slider.val=1 + if(slider_high.valtemp_low_max.val) + { + slider_low.val=temp_low_max.val + } temp_number2.val=slider_low.val*temp_step.val temp_number2.val+=temp_offset.val va0.val=temp_number2.val/10 @@ -545,7 +588,11 @@ Slider slider_low va0.val=temp_number2.val%10 covx va0.val,va1.txt,0,0 target_low.txt+="."+va1.txt + target_low.txt+=temp_unit.txt timer2.en=1 + active_slider.val=2 + temp_gap.val=3*temp_step.val + temp_high_min.val=slider_low.val+temp_gap.val Slider climateslider Attributes @@ -553,8 +600,8 @@ Slider climateslider Scope : local Dragging : 0 Send Component ID: on press and release - Position : 20 - Upper range limit: 40 + Position : 200 + Upper range limit: 400 Lower range limit: 0 Events diff --git a/advanced/hmi/nspanel_us.HMI b/advanced/hmi/nspanel_us.HMI index fefbc19..0675aa7 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 f630f72..3dd3f98 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.2 + Text : 4.2beta.4 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 c3bdcfc..259d11b 100644 --- a/advanced/hmi/nspanel_us_code/climate.txt +++ b/advanced/hmi/nspanel_us_code/climate.txt @@ -162,6 +162,31 @@ Variable (int32) temp_number2 Scope: local Value: 0 +Variable (string) temp_unit + Attributes + ID : 50 + Scope : local + Text : + Max. Text Size: 10 + +Variable (int32) temp_low_max + Attributes + ID : 51 + Scope: local + Value: 0 + +Variable (int32) temp_high_min + Attributes + ID : 52 + Scope: local + Value: 0 + +Variable (int32) temp_gap + Attributes + ID : 53 + Scope: local + Value: 0 + Text current_temp Attributes ID : 3 @@ -509,13 +534,20 @@ Slider slider_high Scope : local Dragging : 0 Send Component ID: on press and release - Position : 200 + Position : 215 Upper range limit: 400 Lower range limit: 0 Events + Touch Press Event + temp_gap.val=3*temp_step.val + temp_high_min.val=slider_low.val+temp_gap.val + Touch Release Event - active_slider.val=1 + if(slider_high.valtemp_low_max.val) + { + slider_low.val=temp_low_max.val + } + temp_number2.val=slider_low.val*temp_step.val temp_number2.val+=temp_offset.val va0.val=temp_number2.val/10 - covx va0.val,target_high.txt,0,0 + covx va0.val,target_low.txt,0,0 va0.val=temp_number2.val%10 covx va0.val,va1.txt,0,0 - target_high.txt+="."+va1.txt + target_low.txt+="."+va1.txt + target_low.txt+=temp_unit.txt timer2.en=1 + active_slider.val=2 + temp_gap.val=3*temp_step.val + temp_high_min.val=slider_low.val+temp_gap.val Slider climateslider Attributes diff --git a/advanced/hmi/nspanel_us_land.HMI b/advanced/hmi/nspanel_us_land.HMI index 696e3cb..c141389 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 a93e3ee..2e4f89d 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.2 + Text : 4.2beta.4 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 797de4e..1745915 100644 --- a/advanced/hmi/nspanel_us_land_code/climate.txt +++ b/advanced/hmi/nspanel_us_land_code/climate.txt @@ -162,6 +162,31 @@ Variable (int32) temp_number2 Scope: local Value: 0 +Variable (string) temp_unit + Attributes + ID : 50 + Scope : local + Text : + Max. Text Size: 10 + +Variable (int32) temp_low_max + Attributes + ID : 51 + Scope: local + Value: 0 + +Variable (int32) temp_high_min + Attributes + ID : 52 + Scope: local + Value: 0 + +Variable (int32) temp_gap + Attributes + ID : 53 + Scope: local + Value: 0 + Text current_temp Attributes ID : 3 @@ -509,13 +534,20 @@ Slider slider_high Scope : local Dragging : 0 Send Component ID: on press and release - Position : 20 - Upper range limit: 40 + Position : 215 + Upper range limit: 400 Lower range limit: 0 Events + Touch Press Event + temp_gap.val=3*temp_step.val + temp_high_min.val=slider_low.val+temp_gap.val + Touch Release Event - active_slider.val=1 + if(slider_high.valtemp_low_max.val) + { + slider_low.val=temp_low_max.val + } temp_number2.val=slider_low.val*temp_step.val temp_number2.val+=temp_offset.val va0.val=temp_number2.val/10 @@ -545,7 +588,11 @@ Slider slider_low va0.val=temp_number2.val%10 covx va0.val,va1.txt,0,0 target_low.txt+="."+va1.txt + target_low.txt+=temp_unit.txt timer2.en=1 + active_slider.val=2 + temp_gap.val=3*temp_step.val + temp_high_min.val=slider_low.val+temp_gap.val Slider climateslider Attributes @@ -553,8 +600,8 @@ Slider climateslider Scope : local Dragging : 0 Send Component ID: on press and release - Position : 20 - Upper range limit: 40 + Position : 200 + Upper range limit: 400 Lower range limit: 0 Events diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index 9f3dd5d..3d50725 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.3 + ℹ️ Version: v4.2beta.4 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.3' + blueprint_version: '4.2beta.4' 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 6cfb0fb..8a0a5b3 100644 Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ diff --git a/nspanel_us.tft b/nspanel_us.tft index e934c4f..c149fa0 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 c27c3a4..b2f2ffd 100644 Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ