diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 876325d42..942db194f 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -883,6 +883,13 @@ sub CUL_HM_Parse($$) {############################## my $chId = $src.$chn; $shash = $modules{CUL_HM}{defptr}{$chId} if($modules{CUL_HM}{defptr}{$chId}); + if ($err&0x40 && $chn eq "02"){ + push @event, "timedOn:running"; + } + else{ + push @event, "timedOn:off"; + } + my $mdCh = $md.$chn; if($lvlStr{mdCh}{$mdCh} && $lvlStr{mdCh}{$mdCh}{$val}){ $val = $lvlStr{mdCh}{$mdCh}{$val}; @@ -924,7 +931,7 @@ sub CUL_HM_Parse($$) {############################## delete $shash->{helper}{pOn}; } if ($pon){# we have power ON, perform action - push @entities,CUL_HM_UpdtReadSingle($dhash,'powerOn',"",1); + push @entities,CUL_HM_UpdtReadSingle($dhash,'powerOn',"-",1); CUL_HM_Set($hHash,$hHash->{NAME},"off") if ($hHash && $hHash->{helper}{param}{offAtPon}); } @@ -979,6 +986,12 @@ sub CUL_HM_Parse($$) {############################## $eventName = "motor" if($st eq "blindActuator"); $eventName = "dim" if($st eq "dimmer"); my $action; #determine action + if ($err&0x40){ + push @event, "timedOn:running"; + } + else{ + push @event, "timedOn:off" if ($shash->{READINGS}{timedOn}); + } if ($st ne "switch"){ push @event, "$eventName:up:$vs" if(($err&0x30) == 0x10); push @event, "$eventName:down:$vs" if(($err&0x30) == 0x20); @@ -5138,6 +5151,14 @@ sub CUL_HM_putHash($) {# provide data for HMinfo $val
powerOn [on|off|$val]
[unknown|motor|dim] [up|down|stop]:$val
+ timedOn [running|off]
# on is temporary - e.g. started with on-for-timer + +
  • sensRain
    + $val
    + powerOn
    + level
    + timedOn [running|off]
    # on is temporary - e.g. started with on-for-timer + trigger [Long|Short]_$no trigger event from channel
  • smokeDetector
    [off|smoke-Alarm|alive] # for team leader
    diff --git a/fhem/FHEM/HMConfig.pm b/fhem/FHEM/HMConfig.pm index 38565182f..086eff167 100644 --- a/fhem/FHEM/HMConfig.pm +++ b/fhem/FHEM/HMConfig.pm @@ -993,14 +993,15 @@ my %culHmChanSets = ( level =>" ..."}, "HM-OU-CFM-PL01" =>{ led =>"[,...] []"}, "HM-OU-CFM-PL02" =>{ playTone =>"[,...] []"}, - + "WDF-solar01" =>{ peerChan =>" ... single [set|unset] [actor|remote|both]"}, "HM-Sen-RD-O01" =>{ peerChan =>" ... single [set|unset] [actor|remote|both]"}, "HM-Sen-RD-O02" =>{ "on-for-timer" =>"" ,"on-till" =>"