FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 20:24:36 +00:00
Code Issues Releases Wiki Activity

status timedOn

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@3592 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2013-08-03 15:51:27 +00:00
parent 383fc37b7e
commit 1d54689a8c
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fhem/FHEM/10_CUL_HM.pm
View File

@ -883,6 +883,13 @@ sub CUL_HM_Parse($$) {##############################
my $chId = $src.$chn; my $chId = $src.$chn;
$shash = $modules{CUL_HM}{defptr}{$chId} $shash = $modules{CUL_HM}{defptr}{$chId}
if($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; my $mdCh = $md.$chn;
if($lvlStr{mdCh}{$mdCh} && $lvlStr{mdCh}{$mdCh}{$val}){ if($lvlStr{mdCh}{$mdCh} && $lvlStr{mdCh}{$mdCh}{$val}){
$val = $lvlStr{mdCh}{$mdCh}{$val}; $val = $lvlStr{mdCh}{$mdCh}{$val};
@ -924,7 +931,7 @@ sub CUL_HM_Parse($$) {##############################
delete $shash->{helper}{pOn}; delete $shash->{helper}{pOn};
} }
if ($pon){# we have power ON, perform action 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") CUL_HM_Set($hHash,$hHash->{NAME},"off")
if ($hHash && $hHash->{helper}{param}{offAtPon}); if ($hHash && $hHash->{helper}{param}{offAtPon});
} }
@ -979,6 +986,12 @@ sub CUL_HM_Parse($$) {##############################
$eventName = "motor" if($st eq "blindActuator"); $eventName = "motor" if($st eq "blindActuator");
$eventName = "dim" if($st eq "dimmer"); $eventName = "dim" if($st eq "dimmer");
my $action; #determine action my $action; #determine action
if ($err&0x40){
push @event, "timedOn:running";
}
else{
push @event, "timedOn:off" if ($shash->{READINGS}{timedOn});
}
if ($st ne "switch"){ if ($st ne "switch"){
push @event, "$eventName:up:$vs" if(($err&0x30) == 0x10); push @event, "$eventName:up:$vs" if(($err&0x30) == 0x10);
push @event, "$eventName:down:$vs" if(($err&0x30) == 0x20); push @event, "$eventName:down:$vs" if(($err&0x30) == 0x20);
@ -5138,6 +5151,14 @@ sub CUL_HM_putHash($) {# provide data for HMinfo
$val<br> $val<br>
powerOn [on|off|$val]<br> powerOn [on|off|$val]<br>
[unknown|motor|dim] [up|down|stop]:$val<br> [unknown|motor|dim] [up|down|stop]:$val<br>
timedOn [running|off]<br> # on is temporary - e.g. started with on-for-timer
</li>
<li><B>sensRain</B><br>
$val<br>
powerOn <br>
level <val><br>
timedOn [running|off]<br> # on is temporary - e.g. started with on-for-timer
trigger [Long|Short]_$no trigger event from channel<br>
</li> </li>
<li><B>smokeDetector</B><br> <li><B>smokeDetector</B><br>
[off|smoke-Alarm|alive] # for team leader<br> [off|smoke-Alarm|alive] # for team leader<br>

3
fhem/FHEM/HMConfig.pm
View File

@ -1000,7 +1000,8 @@ my %culHmChanSets = (
,"on-till" =>"<time>" ,"on-till" =>"<time>"
,on =>"" ,on =>""
,off =>"" ,off =>""
,toggle =>""} ,toggle =>""
,statusRequest =>""}
); );
# clones- - - - - - - - - - - - - - - - - # clones- - - - - - - - - - - - - - - - -
#$culHmChanSets{"HM-OU-CF-PL02"} = $culHmChanSets{"HM-OU-CF-PL01"}; #$culHmChanSets{"HM-OU-CF-PL02"} = $culHmChanSets{"HM-OU-CF-PL01"};