FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

git-svn-id: https://svn.fhem.de/fhem/trunk@2096 2b470e98-0d58-463d-a4d8-8e2adae1ed80

Browse Source
This commit is contained in:
mfr69bs 2012-11-08 19:00:24 +00:00
parent d3bd84a474
commit c770bd1abe
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fhem/FHEM/59_HCS.pm
View File

@ -1,5 +1,5 @@
################################################################ ################################################################
# $Id: $ # $Id$
# vim: ts=2:et # vim: ts=2:et
# #
# (c) 2012 Copyright: Martin Fischer (m_fischer at gmx dot de) # (c) 2012 Copyright: Martin Fischer (m_fischer at gmx dot de)
@ -125,7 +125,7 @@ sub
HCS_checkState($) { HCS_checkState($) {
my ($hash) = @_; my ($hash) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $interval = $attr{$name}{interval}; my $interval = AttrVal($name,"interval",10);
my $timer; my $timer;
my $ret; my $ret;
@ -242,6 +242,7 @@ HCS_setState($$) {
my $type = $hash->{TYPE}; my $type = $hash->{TYPE};
my $ll = AttrVal($name,"loglevel",3); my $ll = AttrVal($name,"loglevel",3);
my $device = AttrVal($name,"device",""); my $device = AttrVal($name,"device","");
my $deviceState = Value($device);
my $deviceCmdOn = AttrVal($name,"deviceCmdOn","on"); my $deviceCmdOn = AttrVal($name,"deviceCmdOn","on");
my $deviceCmdOff = AttrVal($name,"deviceCmdOff","off"); my $deviceCmdOff = AttrVal($name,"deviceCmdOff","off");
my $idlePeriod = AttrVal($name,"idleperiod",0); my $idlePeriod = AttrVal($name,"idleperiod",0);
@ -282,9 +283,12 @@ HCS_setState($$) {
if($defs{$device}) { if($defs{$device}) {
my $eventOnChange = AttrVal($name,"event-on-change-reading",""); my $eventOnChange = AttrVal($name,"event-on-change-reading","");
my $eventOnUpdate = AttrVal($name,"event-on-update-reading",""); my $eventOnUpdate = AttrVal($name,"event-on-update-reading","");
if(!$eventOnChange || if(!$eventOnChange ||
($eventOnUpdate && $eventOnUpdate =~ m/device/) || ($eventOnUpdate && $eventOnUpdate =~ m/device/) ||
($eventOnChange && $eventOnChange =~ m/device/ && $cmd ne $stateDevice)) { ($eventOnChange && $eventOnChange =~ m/device/ &&
($cmd ne $stateDevice || $deviceState ne $stateDevice))) {
if(!$idlePeriod || ($idlePeriod && $diffPeriodTime >= $idlePeriod)) { if(!$idlePeriod || ($idlePeriod && $diffPeriodTime >= $idlePeriod)) {
my $cmdret = CommandSet(undef,"$device $cmd"); my $cmdret = CommandSet(undef,"$device $cmd");
$hash->{helper}{lastSend} = $newPeriodTime; $hash->{helper}{lastSend} = $newPeriodTime;
@ -293,6 +297,7 @@ HCS_setState($$) {
} elsif($idlePeriod && $diffPeriodTime < $idlePeriod) { } elsif($idlePeriod && $diffPeriodTime < $idlePeriod) {
Log $ll, "$type $name device $device blocked by idleperiod ($idlePeriod min.)"; Log $ll, "$type $name device $device blocked by idleperiod ($idlePeriod min.)";
} }
} }
} else { } else {
Log 1, "$type $name device '$device' does not exists."; Log 1, "$type $name device '$device' does not exists.";
@ -338,7 +343,7 @@ HCS_getValves($$) {
# get current actuator state from each device # get current actuator state from each device
$valveState = $defs{$d}{READINGS}{"actuator"}{VAL}; $valveState = $defs{$d}{READINGS}{"actuator"}{VAL};
if($valveState) { if($valveState || $valveState eq "0") {
$valveState =~ s/[\s%]//g; $valveState =~ s/[\s%]//g;
if($attr{$d}{ignore}) { if($attr{$d}{ignore}) {