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

PRESENCE: "statusRequest" command for lan-bluetooth mode

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4341 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
markusbloch 2013-12-07 18:39:02 +00:00
parent ad1fc6793b
commit 50308f0c17
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/CHANGED
View File

@ -1,6 +1,8 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- SVN - SVN
- feature: PRESENCE: "statusRequest" command for lan-bluetooth mode
(collectord >= 1.4, presenced >= 1.1 required)
- feature: PRESENCE: new collectord package - feature: PRESENCE: new collectord package
- feature: devspec: removed range, added :FILTER and more general search - feature: devspec: removed range, added :FILTER and more general search
- feature: HUEBridge,HUEDevice: support for groups added - feature: HUEBridge,HUEDevice: support for groups added

18
fhem/FHEM/73_PRESENCE.pm
View File

@ -262,16 +262,26 @@ PRESENCE_Set($@)
return "No Argument given" if(!defined($a[1])); return "No Argument given" if(!defined($a[1]));
my $usage = (defined($hash->{MODE}) and $hash->{MODE} ne "lan-bluetooth" ? "Unknown argument ".$a[1].", choose one of statusRequest " : undef); my $usage = "Unknown argument ".$a[1].", choose one of statusRequest";
if($a[1] eq "statusRequest") if($a[1] eq "statusRequest")
{ {
if($hash->{MODE} ne "lan-bluetooth") if($hash->{MODE} ne "lan-bluetooth")
{ {
PRESENCE_StartLocalScan($hash, 1); PRESENCE_StartLocalScan($hash, 1);
return ""; return undef;
} }
else
{
if(exists($hash->{FD}))
{
DevIo_SimpleWrite($hash, "now\n", 0);
}
else
{
return "PRESENCE Definition \"".$hash->{NAME}."\" is not connected to ".$hash->{DeviceName};
}
}
} }
else else
{ {
@ -1063,7 +1073,7 @@ Options:
<ul> <ul>
<li>direct perl script file: <a href="http://svn.code.sf.net/p/fhem/code/trunk/fhem/contrib/PRESENCE/collectord" target="_new">collectord</a></li> <li>direct perl script file: <a href="http://svn.code.sf.net/p/fhem/code/trunk/fhem/contrib/PRESENCE/collectord" target="_new">collectord</a></li>
<li>.deb package for Debian (noarch): <a href="http://svn.code.sf.net/p/fhem/code/trunk/fhem/contrib/PRESENCE/deb/collectord-1.3.deb" target="_new">collectord-1.3.deb</a></li> <li>.deb package for Debian (noarch): <a href="http://svn.code.sf.net/p/fhem/code/trunk/fhem/contrib/PRESENCE/deb/collectord-1.4.deb" target="_new">collectord-1.4.deb</a></li>
</ul> </ul>
</ul><br><br> </ul><br><br>