Display ° when moving sliders

Solves #1569
2024-01-09 18:49:57 +01:00
parent b9c66a33a6
commit a9ef296fb2
26 changed files with 30 additions and 24 deletions
--- 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
--- a/advanced/hmi/nspanel_CJK_eu.HMI
+++ b/advanced/hmi/nspanel_CJK_eu.HMI
--- a/advanced/hmi/nspanel_CJK_eu.tft
+++ b/advanced/hmi/nspanel_CJK_eu.tft
--- 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
--- 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
--- a/advanced/hmi/nspanel_CJK_us.HMI
+++ b/advanced/hmi/nspanel_CJK_us.HMI
--- a/advanced/hmi/nspanel_CJK_us.tft
+++ b/advanced/hmi/nspanel_CJK_us.tft
--- 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
--- 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
--- a/advanced/hmi/nspanel_CJK_us_land.HMI
+++ b/advanced/hmi/nspanel_CJK_us_land.HMI
--- a/advanced/hmi/nspanel_CJK_us_land.tft
+++ b/advanced/hmi/nspanel_CJK_us_land.tft
--- 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
--- 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
--- a/advanced/hmi/nspanel_eu.HMI
+++ b/advanced/hmi/nspanel_eu.HMI
--- 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
--- 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
--- a/advanced/hmi/nspanel_us.HMI
+++ b/advanced/hmi/nspanel_us.HMI
--- 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
--- 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
--- a/advanced/hmi/nspanel_us_land.HMI
+++ b/advanced/hmi/nspanel_us_land.HMI
--- 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
--- 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