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

98_WOL: from state reflects the state of the device that is woken bei the WOL

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7020 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
dietmar63 2014-11-19 18:44:22 +00:00
parent ed3ca43ae5
commit 2d5e977d1c
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
fhem/FHEM/98_WOL.pm
View File

@ -45,10 +45,10 @@ sub WOL_Set($@) {
Log3 $hash, 3, "[$name] set $name $v"; Log3 $hash, 3, "[$name] set $name $v";
if ($v eq "on") { if ($v eq "on") {
readingsSingleUpdate($hash, "state", $v, 1); readingsSingleUpdate($hash, "active", $v, 1);
Log3 $hash, 3, "[$name] waking $name with MAC $hash->{MAC} IP $hash->{IP} "; Log3 $hash, 3, "[$name] waking $name with MAC $hash->{MAC} IP $hash->{IP} ";
} elsif ($v eq "off") { } elsif ($v eq "off") {
readingsSingleUpdate($hash, "state", $v, 1); readingsSingleUpdate($hash, "active", $v, 1);
my $cmd = AttrVal($name, "shutdownCmd", ""); my $cmd = AttrVal($name, "shutdownCmd", "");
if ($cmd eq "") { if ($cmd eq "") {
Log3 $hash, 3, "[$name] no shutdown command given (see shutdownCmd attribute)!"; Log3 $hash, 3, "[$name] no shutdown command given (see shutdownCmd attribute)!";
@ -67,10 +67,10 @@ sub WOL_Set($@) {
return undef if($v eq "refresh"); return undef if($v eq "refresh");
RemoveInternalTimer($hash); RemoveInternalTimer($hash);
InternalTimer(gettimeofday()+$hash->{INTERVAL}, "WOL_UpdateReadings", $hash, 0); InternalTimer(gettimeofday()+60, "WOL_UpdateReadings", $hash, 0);
my $state = ReadingsVal($hash->{NAME}, "state", "nF"); my $active = ReadingsVal($hash->{NAME}, "active", "nF");
if ($state eq "on") { if ($active eq "on") {
WOL_GetUpdate($hash); WOL_GetUpdate($hash);
} }
return undef; return undef;
@ -112,12 +112,15 @@ sub WOL_Define($$) {
$hash->{INTERVAL} = AttrVal($hash->{NAME}, "interval", 900); $hash->{INTERVAL} = AttrVal($hash->{NAME}, "interval", 900);
RemoveInternalTimer($hash);
InternalTimer(gettimeofday()+5, "WOL_UpdateReadings", $hash, 0);
InternalTimer(gettimeofday()+30,"WOL_GetUpdate", $hash, 0);
readingsSingleUpdate($hash, "packet_via_EW", "none",0); readingsSingleUpdate($hash, "packet_via_EW", "none",0);
readingsSingleUpdate($hash, "packet_via_UDP", "none",0); readingsSingleUpdate($hash, "packet_via_UDP", "none",0);
readingsSingleUpdate($hash, "state", "none",0);
readingsSingleUpdate($hash, "active", "off",0);
RemoveInternalTimer($hash);
WOL_UpdateReadings($hash);
WOL_GetUpdate ($hash);
return undef; return undef;
} }
################################################################################ ################################################################################
@ -139,8 +142,10 @@ sub WOL_UpdateReadings($) {
if (`ping -c 1 -w 2 $ip` =~ m/100%/) { if (`ping -c 1 -w 2 $ip` =~ m/100%/) {
readingsBulkUpdate ($hash, "isRunning", "false"); readingsBulkUpdate ($hash, "isRunning", "false");
readingsBulkUpdate ($hash, "state", "off");
} else { } else {
readingsBulkUpdate ($hash, "isRunning", "true"); readingsBulkUpdate ($hash, "isRunning", "true");
readingsBulkUpdate ($hash, "state", "on");
} }
readingsEndUpdate($hash, defined($hash->{LOCAL} ? 0 : 1)); readingsEndUpdate($hash, defined($hash->{LOCAL} ? 0 : 1));
@ -150,9 +155,9 @@ sub WOL_UpdateReadings($) {
sub WOL_GetUpdate($) { sub WOL_GetUpdate($) {
my ($hash) = @_; my ($hash) = @_;
my $state = ReadingsVal($hash->{NAME}, "state", "nF"); my $active = ReadingsVal($hash->{NAME}, "active", "nF");
if ($state eq "on") { if ($active eq "on") {
wake($hash); WOL_wake($hash);
if ($hash->{REPEAT} > 0) { if ($hash->{REPEAT} > 0) {
InternalTimer(gettimeofday()+$hash->{REPEAT}, "WOL_GetUpdate", $hash, 0); InternalTimer(gettimeofday()+$hash->{REPEAT}, "WOL_GetUpdate", $hash, 0);
} }
@ -160,7 +165,7 @@ sub WOL_GetUpdate($) {
} }
################################################################################ ################################################################################
sub wake($){ sub WOL_wake($){
my ($hash) = @_; my ($hash) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $mac = $hash->{MAC}; my $mac = $hash->{MAC};
@ -171,18 +176,18 @@ sub wake($){
Log3 $hash, 4, "[$name] keeping $name with MAC $mac IP $host busy"; Log3 $hash, 4, "[$name] keeping $name with MAC $mac IP $host busy";
if ($hash->{MODE} eq "BOTH" || $hash->{MODE} eq "EW" ) { if ($hash->{MODE} eq "BOTH" || $hash->{MODE} eq "EW" ) {
wol_by_ew ($hash, $mac); WOL_by_ew ($hash, $mac);
readingsBulkUpdate ($hash, "packet_via_EW", $mac); readingsBulkUpdate ($hash, "packet_via_EW", $mac);
} }
if ($hash->{MODE} eq "BOTH" || $hash->{MODE} eq "UDP" ) { if ($hash->{MODE} eq "BOTH" || $hash->{MODE} eq "UDP" ) {
wol_by_udp ($hash, $mac, $host); WOL_by_udp ($hash, $mac, $host);
readingsBulkUpdate ($hash, "packet_via_UDP", $host); readingsBulkUpdate ($hash, "packet_via_UDP", $host);
} }
readingsEndUpdate($hash, defined($hash->{LOCAL} ? 0 : 1)); readingsEndUpdate($hash, defined($hash->{LOCAL} ? 0 : 1));
} }
################################################################################ ################################################################################
# method to wakevia lan, taken from Net::Wake package # method to wakevia lan, taken from Net::Wake package
sub wol_by_udp { sub WOL_by_udp {
my ($hash, $mac_addr, $host, $port) = @_; my ($hash, $mac_addr, $host, $port) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
@ -209,7 +214,7 @@ sub wol_by_udp {
} }
################################################################################ ################################################################################
# method to wake via system command # method to wake via system command
sub wol_by_ew($$) { sub WOL_by_ew($$) {
my ($hash, $mac) = @_; my ($hash, $mac) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};