From d17206c57d58a8bd54e5c2781464aa91b4262edb Mon Sep 17 00:00:00 2001 From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> Date: Sun, 7 Jan 2024 00:16:56 +0100 Subject: [PATCH] Set slider to be controlled by +/- Solves #1548 --- advanced/hmi/nspanel_eu.HMI | Bin 15033379 -> 15033379 bytes advanced/hmi/nspanel_eu_code/climate.txt | 129 ++++++++++++++++++----- advanced/hmi/nspanel_us.HMI | Bin 14820802 -> 14820802 bytes advanced/hmi/nspanel_us_code/climate.txt | 129 ++++++++++++++++++----- 4 files changed, 204 insertions(+), 54 deletions(-) diff --git a/advanced/hmi/nspanel_eu.HMI b/advanced/hmi/nspanel_eu.HMI index d28450032215168127bd7e08de9d2c56e4f3b24b..21e4afa8713fd81bf2227c53d7c2490b484498c8 100644 GIT binary patch delta 4010 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 W@fG50L0) + if(active_slider.val==0) { - slider_high.val-- - temp_number.val=slider_high.val*temp_step.val - temp_number.val+=temp_offset.val - va0.val=temp_number.val/10 - covx va0.val,target_high.txt,0,0 - va0.val=temp_number.val%10 - covx va0.val,va1.txt,0,0 - target_high.txt+="."+va1.txt + if(climateslider.val>0) + { + climateslider.val-- + temp_number.val=climateslider.val*temp_step.val + temp_number.val+=temp_offset.val + va0.val=temp_number.val/10 + covx va0.val,target_high.txt,0,0 + va0.val=temp_number.val%10 + covx va0.val,va1.txt,0,0 + target_high.txt+="."+va1.txt + } + }else if(active_slider.val==1) + { + if(slider_high.val>0) + { + slider_high.val-- + temp_number.val=slider_high.val*temp_step.val + temp_number.val+=temp_offset.val + va0.val=temp_number.val/10 + covx va0.val,target_high.txt,0,0 + va0.val=temp_number.val%10 + covx va0.val,va1.txt,0,0 + target_high.txt+="."+va1.txt + } + }else if(active_slider.val==2) + { + if(slider_low.val>0) + { + slider_low.val-- + temp_number.val=slider_low.val*temp_step.val + temp_number.val+=temp_offset.val + va0.val=temp_number.val/10 + covx va0.val,target_low.txt,0,0 + va0.val=temp_number.val%10 + covx va0.val,va1.txt,0,0 + target_low.txt+="."+va1.txt + } } Touch Release Event @@ -554,16 +600,45 @@ Hotspot increase_temp Events Touch Press Event - if(slider_high.valA%*yWA#I*JPA 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 diff --git a/advanced/hmi/nspanel_us_code/climate.txt b/advanced/hmi/nspanel_us_code/climate.txt index 7ecb10a..ecb4f62 100644 --- a/advanced/hmi/nspanel_us_code/climate.txt +++ b/advanced/hmi/nspanel_us_code/climate.txt @@ -19,6 +19,7 @@ Page climate vis target_high,0 vis target_low,0 vis current_temp,0 + vis climateslider,0 vis slider_high,0 vis slider_low,0 vis button01,0 @@ -118,7 +119,7 @@ Variable (int32) active_slider Scope: local Value: 1 -Variable (int32) hvac_mode +Variable (int32) is_temp_range Attributes ID : 44 Scope: local @@ -469,10 +470,7 @@ Slider slider_high Events Touch Release Event - if(hvac_mode.val!=3) - { - slider_low.val=slider_high.val - } + active_slider.val=1 temp_number.val=slider_high.val*temp_step.val temp_number.val+=temp_offset.val va0.val=temp_number.val/10 @@ -494,10 +492,29 @@ Slider slider_low Events Touch Release Event - if(hvac_mode.val!=3) - { - slider_high.val=slider_low.val - } + active_slider.val=2 + temp_number.val=slider_high.val*temp_step.val + temp_number.val+=temp_offset.val + va0.val=temp_number.val/10 + covx va0.val,target_high.txt,0,0 + va0.val=temp_number.val%10 + covx va0.val,va1.txt,0,0 + target_high.txt+="."+va1.txt + timer01.en=1 + +Slider climateslider + Attributes + ID : 45 + Scope : local + Dragging : 0 + Send Component ID: on press and release + Position : 200 + Upper range limit: 400 + Lower range limit: 0 + + Events + Touch Release Event + active_slider.val=0 temp_number.val=slider_high.val*temp_step.val temp_number.val+=temp_offset.val va0.val=temp_number.val/10 @@ -530,16 +547,45 @@ Hotspot decrease_temp Events Touch Press Event - if(slider_high.val>0) + if(active_slider.val==0) { - slider_high.val-- - temp_number.val=slider_high.val*temp_step.val - temp_number.val+=temp_offset.val - va0.val=temp_number.val/10 - covx va0.val,target_high.txt,0,0 - va0.val=temp_number.val%10 - covx va0.val,va1.txt,0,0 - target_high.txt+="."+va1.txt + if(climateslider.val>0) + { + climateslider.val-- + temp_number.val=climateslider.val*temp_step.val + temp_number.val+=temp_offset.val + va0.val=temp_number.val/10 + covx va0.val,target_high.txt,0,0 + va0.val=temp_number.val%10 + covx va0.val,va1.txt,0,0 + target_high.txt+="."+va1.txt + } + }else if(active_slider.val==1) + { + if(slider_high.val>0) + { + slider_high.val-- + temp_number.val=slider_high.val*temp_step.val + temp_number.val+=temp_offset.val + va0.val=temp_number.val/10 + covx va0.val,target_high.txt,0,0 + va0.val=temp_number.val%10 + covx va0.val,va1.txt,0,0 + target_high.txt+="."+va1.txt + } + }else if(active_slider.val==2) + { + if(slider_low.val>0) + { + slider_low.val-- + temp_number.val=slider_low.val*temp_step.val + temp_number.val+=temp_offset.val + va0.val=temp_number.val/10 + covx va0.val,target_low.txt,0,0 + va0.val=temp_number.val%10 + covx va0.val,va1.txt,0,0 + target_low.txt+="."+va1.txt + } } Touch Release Event @@ -554,16 +600,45 @@ Hotspot increase_temp Events Touch Press Event - if(slider_high.val