From cfb83735d1f666b92ecaf44e6feb85dbc68e54c7 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Tue, 23 Jun 2020 19:31:06 +0000 Subject: [PATCH] 01_FHEMWEB.pm: desired-temp: webCmd can be preset by the module (Forum #112162) git-svn-id: https://svn.fhem.de/fhem/trunk@22244 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/01_FHEMWEB.pm | 34 +++++++++++++++++++--------------- fhem/FHEM/10_FBDECT.pm | 2 ++ fhem/FHEM/10_ZWave.pm | 9 ++++++++- fhem/FHEM/11_FHT.pm | 3 ++- 4 files changed, 31 insertions(+), 17 deletions(-) diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index fec4007cf..40f6619d3 100644 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -1462,7 +1462,7 @@ FW_doDetail($) FW_addContent(); if($FW_ss) { - my $webCmd = AttrVal($d, "webCmd", undef); + my $webCmd = AttrVal($d, "webCmd", $h->{webCmd}); if($webCmd) { FW_pO ""; foreach my $cmd (split(":", $webCmd)) { @@ -1811,7 +1811,8 @@ FW_makeDeviceLine($$$$$) FW_pF "\n", ($row&1)?"odd":"even"; my $devName = FW_alias($d,$nameDisplay); - my $icon = AttrVal($d, "icon", ""); + my $icon = AttrVal($d, "icon", $defs{$d}{icon}); + $icon = "" if(!defined($icon)); $icon = FW_makeImage($icon,$icon,"icon") . " " if($icon); $devName="" if($modules{$defs{$d}{TYPE}}{FW_hideDisplayName}); # Forum 88667 @@ -1837,14 +1838,16 @@ FW_makeDeviceLine($$$$$) # Commands, slider, dropdown my $smallscreenCommands = AttrVal($FW_wname, "smallscreenCommands", ""); if((!$FW_ss || $smallscreenCommands) && $cmdlist) { - my @a = split("[: ]", AttrVal($d, "cmdIcon", "")); + my @a = split("[: ]", AttrVal($d, "cmdIcon", + $defs{$d}{cmdIcon} ? $defs{$d}{cmdIcon} : "")); Log 1, "ERROR: bad cmdIcon definition for $d" if(@a % 2); my %cmdIcon = @a; my @cl = split(":", $cmdlist); - my @wcl = split(":", AttrVal($d, "webCmdLabel", "")); + my $wclDefault = $defs{$d}{webCmdLabel} ? $defs{$d}{webCmdLabel} : ""; + my @wcl = split(":", AttrVal($d, "webCmdLabel", $wclDefault)); my $nRows; - $nRows = split("\n", AttrVal($d, "webCmdLabel", "")) if(@wcl); + $nRows = split("\n", AttrVal($d, "webCmdLabel", $wclDefault)) if(@wcl); @wcl = () if(@wcl != @cl); # some safety for(my $i1=0; $i1<@cl; $i1++) { @@ -2893,7 +2896,7 @@ FW_dev2image($;$) my ($name, $state) = @_; my $d = $defs{$name}; return "" if(!$name || !$d); - my $devStateIcon = AttrVal($name, "devStateIcon", undef); + my $devStateIcon = AttrVal($name, "devStateIcon", $d->{devStateIcon}); return "" if(defined($devStateIcon) && lc($devStateIcon) eq 'none'); my $type = $d->{TYPE}; @@ -3199,18 +3202,21 @@ FW_devState($$@) my ($hasOnOff, $link); return ("","","") if(!$FW_wname); - my $cmdList = AttrVal($d, "webCmd", ""); + my $cmdList = AttrVal($d, "webCmd", $defs{$d}{webCmd}); + $cmdList = "" if(!defined($cmdList)); my $allSets = FW_widgetOverride($d, getAllSets($d, $FW_chash)); my $state = $defs{$d}{STATE}; $state = "" if(!defined($state)); my $txt = $state; - my $dsi = ($attr{$d} && ($attr{$d}{stateFormat} || $attr{$d}{devStateIcon})); + my ($ad,$hash) = ($attr{$d}, $defs{$d}); + my $dsi = ($ad && ($ad->{stateFormat}||$ad->{webCmd}||$ad->{devStateIcon})) || + $hash->{webCmd} || $hash->{devStateIcon}; $hasOnOff = ($allSets =~ m/(^| )on(:[^ ]*)?( |$)/i && $allSets =~ m/(^| )off(:[^ ]*)?( |$)/i); if(AttrVal($d, "showtime", undef)) { - my $v = $defs{$d}{READINGS}{state}{TIME}; + my $v = $hash->{READINGS}{state}{TIME}; $txt = $v if(defined($v)); } elsif(!$dsi && $allSets =~ m/\bdesired-temp:/) { @@ -3290,19 +3296,17 @@ FW_devState($$@) $txt = $html; } - my $style = AttrVal($d, "devStateStyle", ""); + my $style = AttrVal($d, "devStateStyle", $hash->{devStateStyle}); + $style = "" if(!defined($style)); $state =~ s/"//g; $state =~ s/<.*?>/ /g; # remove HTML tags for the title $txt = "
$txt
"; - my $type = $defs{$d}{TYPE}; + my $type = $hash->{TYPE}; my $sfn = $modules{$type}{FW_summaryFn}; if($sfn) { - if(!defined($extPage)) { - my %hash; - $extPage = \%hash; - } + $extPage = {} if(!defined($extPage)); no strict "refs"; my $newtxt = &{$sfn}($FW_wname, $d, $rf ? $FW_room : "", $extPage); use strict "refs"; diff --git a/fhem/FHEM/10_FBDECT.pm b/fhem/FHEM/10_FBDECT.pm index b5129d693..cb2e778ef 100644 --- a/fhem/FHEM/10_FBDECT.pm +++ b/fhem/FHEM/10_FBDECT.pm @@ -78,6 +78,7 @@ FBDECT_Define($$) } $hash->{id} = $id; $hash->{props} = shift @a; + $hash->{webCmd} = "desired-temp" if($hash->{props} =~ m/actuator/); $modules{FBDECT}{defptr}{$ioNameAndId} = $hash; AssignIoPort($hash, $ioName); @@ -508,6 +509,7 @@ FBDECT_ParseHttp($$$) } $hash->{props} = $fbprop; # replace values from define + $hash->{webCmd} = "desired-temp" if($hash->{props} =~ m/actuator/); readingsBeginUpdate($hash); Log3 $hash, 5, $hash->{NAME}; foreach my $n (keys %h) { diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm index 3f451a651..633873d72 100644 --- a/fhem/FHEM/10_ZWave.pm +++ b/fhem/FHEM/10_ZWave.pm @@ -639,6 +639,7 @@ my %zwave_cmdArgs = ( indicatorDim => "slider,0,1,99", rgb => "colorpicker,RGB", configRGBLedColorForTesting => "colorpicker,RGB", # Aeon SmartSwitch 6 + "desired-temp" => "slider,7,1,28,1", }, get => { }, @@ -2303,6 +2304,8 @@ ZWave_SetClasses($$$$) $attr{$name}{classes} = join(" ", @classes) if(@classes && !$attr{$name}{classes}); $def->{DEF} = "$homeId ".hex($id); + $def->{webCmd} = "desired-temp" + if($attr{$name}{classes} =~ m/\bTHERMOSTAT_SETPOINT\b/); return ""; } @@ -5361,6 +5364,10 @@ ZWave_Attr(@) } return undef; + } elsif($attrName eq "classes" && $type eq "set") { + $hash->{webCmd} = "desired-temp" + if($param =~ m/\bTHERMOSTAT_SETPOINT\b/); + } elsif($attrName eq "vclasses") { if($type eq "del") { $hash->{".vclasses"} = {}; @@ -6569,7 +6576,7 @@ ZWave_firmwareUpdateParse($$$)
  • desired-temp value
    - same as thermostatSetpoint, used to make life easier for helper-modules + same as thermostatSetpointSet, used to make life easier for helper-modules


    • Class TIME, V2 diff --git a/fhem/FHEM/11_FHT.pm b/fhem/FHEM/11_FHT.pm index db7395658..428aaffd3 100644 --- a/fhem/FHEM/11_FHT.pm +++ b/fhem/FHEM/11_FHT.pm @@ -372,6 +372,7 @@ FHT_Define($$) } } + $hash->{webCmd} = "desired-temp"; # Hint for FHEMWEB $modules{FHT}{defptr}{$a[2]} = $hash; #Log3 $a[0], 2, "Asking the FHT device $a[0]/$a[2] to send its data"; @@ -572,7 +573,7 @@ FHT_Parse($$) readingsBulkUpdate($def, $cmd, $val); if($cmd eq "measured-temp") { - readingsBulkUpdate($def, "state", "measured-temp: $val", 0); + readingsBulkUpdate($def, "state", "$val C", 0); readingsBulkUpdate($def, "temperature", $val); # For dewpoint }