FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-04 11:26:55 +00:00
Code Issues Releases Wiki Activity

Rudis way to execute pending trigger - remove tabs

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4250 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2013-11-19 13:20:19 +00:00
parent cafd297b70
commit ae38d12525
4 changed files with 4565 additions and 4566 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fhem/FHEM/10_CUL_HM.pm
View File

@ -1480,7 +1480,7 @@ sub CUL_HM_Parse($$) {##############################
"virtActTrigger:".CUL_HM_id2Name($recId),
"virtActTrigType:".$longPress,
"virtActTrigRpt:".$trgLgRpt,
"virtActTrigNo:".$trigNo );
"virtActTrigNo:".$trigNo);
}
}
}
@ -1537,12 +1537,11 @@ sub CUL_HM_Parse($$) {##############################
push @event, "noReceiver:src:$src ".$mFlg.$mTp." $p" if(!@event && !@entities);
CUL_HM_UpdtReadBulk($shash,1,@event); #events to the channel
$defs{$shash->{NAME}}{EVENTS}++; # count events for channel
push @entities,$shash->{NAME};
foreach (CUL_HM_noDup(@entities)){
DoTrigger($_, undef) if ($_ ne $name);
}
return $name ;
@entities = CUL_HM_noDup(@entities,$shash->{NAME});
$defs{$_}{".noDispatchVars"} = 1 foreach (grep !/$name/,@entities);
return @entities;
}
sub CUL_HM_parseCommon(@){#####################################################
# parsing commands that are device independent
@ -1576,7 +1575,7 @@ sub CUL_HM_parseCommon(@){#####################################################
if ($shash->{helper}{prt}{rspWait}{wakeup}){
if ($shash->{helper}{prt}{rspWait}{mNo} eq $mNo &&
$subType eq "00" ){
$subType eq "00"){
if ($shash->{helper}{prt}{awake} && $shash->{helper}{prt}{awake}==4){#re-wakeup
delete $shash->{helper}{prt}{rspWait};#clear wakeup values
$shash->{helper}{prt}{rspWait}{$_} = $shash->{helper}{prt}{rspWaitSec}{$_}
@ -5713,7 +5712,7 @@ sub CUL_HM_reglUsed($) {# provide data for HMinfo
<li><B>partyMode &lt;HH:MM&gt;&lt;durationDays&gt;</B><br>
set control mode to party and device ending time. Add the time it ends
and the <b>number of days</b> it shall last. If it shall end next day '1'
must be entered<br> </li>
must be entered<br></li>
<li><B>systime</B><br>
set time in climate channel to system time</li>
</ul><br>

2
fhem/FHEM/HMConfig.pm
View File

@ -1161,7 +1161,7 @@ my %culHmChanSets = (
,displayTempUnit=>"[celsius|fahrenheit]"
,controlMode =>"[auto|manual|central|party]"
,statusRequest =>""
,sysTime =>"" },
,sysTime =>""},
"HM-SEC-WIN01" =>{ stop =>"",
level =>"<level> <relockDly> <speed>..."},
"HM-OU-CFM-PL01" =>{ led =>"<color>[,<color>...] [<repeat>]"},