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

30_HUEBridge: added set inactive/active commands, create event for lastError reading

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15123 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2017-09-23 17:20:38 +00:00
parent 3782465fa0
commit fe83da85ad
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/CHANGED
View File

@ -1,5 +1,7 @@
# 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.
- changed: 30_HUEBridge: added set inactive/active commands
create event for lastError reading
- change: 93_DbLog: V2.22.6 commandref revised - change: 93_DbLog: V2.22.6 commandref revised
- new: 73_UpsPico: New module for UpsPico UPS from pimodules - new: 73_UpsPico: New module for UpsPico UPS from pimodules
- feature: LightScene: added traversalOrder attribute - feature: LightScene: added traversalOrder attribute

29
fhem/FHEM/30_HUEBridge.pm
View File

@ -139,7 +139,7 @@ HUEBridge_Notify($$)
return if(!grep(m/^INITIALIZED|REREADCFG$/, @{$dev->{CHANGED}})); return if(!grep(m/^INITIALIZED|REREADCFG$/, @{$dev->{CHANGED}}));
if( IsDisabled($name) > 0 ) { if( IsDisabled($name) > 0 ) {
readingsSingleUpdate($hash, 'state', 'disabled', 1 ) if( ReadingsVal($name,'state','' ) ne 'disabled' ); readingsSingleUpdate($hash, 'state', 'inactive', 1 ) if( ReadingsVal($name,'inactive','' ) ne 'disabled' );
return undef; return undef;
} }
@ -624,9 +624,19 @@ HUEBridge_Set($@)
return undef; return undef;
} elsif($cmd eq 'active') {
return "can't activate disabled bridge." if(AttrVal($name, "disable", undef));
readingsSingleUpdate($hash, 'state', 'active', 1 );
HUEBridge_OpenDev($hash);
return undef;
} elsif($cmd eq 'inactive') {
readingsSingleUpdate($hash, 'state', 'inactive', 1 );
return undef;
} else { } else {
my $list = "delete creategroup deletegroup savescene deletescene modifyscene scene createrule updaterule deleterule createsensor deletesensor configsensor setsensor deletewhitelist touchlink:noArg checkforupdate:noArg autodetect:noArg autocreate:noArg statusRequest:noArg"; my $list = "active inactive delete creategroup deletegroup savescene deletescene modifyscene scene createrule updaterule deleterule createsensor deletesensor configsensor setsensor deletewhitelist touchlink:noArg checkforupdate:noArg autodetect:noArg autocreate:noArg statusRequest:noArg";
$list .= " swupdate:noArg" if( defined($hash->{updatestate}) && $hash->{updatestate} =~ '^2' ); $list .= " swupdate:noArg" if( defined($hash->{updatestate}) && $hash->{updatestate} =~ '^2' );
return "Unknown argument $cmd, choose one of $list"; return "Unknown argument $cmd, choose one of $list";
} }
@ -948,7 +958,7 @@ sub HUEBridge_ProcessResponse($$)
{ {
my $error = $obj->[0]->{error}->{'description'}; my $error = $obj->[0]->{error}->{'description'};
readingsSingleUpdate($hash, 'lastError', $error, 0 ); readingsSingleUpdate($hash, 'lastError', $error, 1 );
} }
if( !AttrVal( $name,'queryAfterSet', 1 ) ) { if( !AttrVal( $name,'queryAfterSet', 1 ) ) {
@ -1029,7 +1039,7 @@ HUEBridge_Call($$$$;$)
my $name = $hash->{NAME}; my $name = $hash->{NAME};
if( IsDisabled($name) ) { if( IsDisabled($name) ) {
readingsSingleUpdate($hash, 'state', 'disabled', 1 ) if( ReadingsVal($name,'state','' ) ne 'disabled' ); readingsSingleUpdate($hash, 'state', 'inactive', 1 ) if( ReadingsVal($name,'state','' ) ne 'inactive' );
return undef; return undef;
} }
@ -1234,7 +1244,7 @@ HUEBridge_dispatch($$$;$)
{ {
my $error = $json->[0]->{error}->{'description'}; my $error = $json->[0]->{error}->{'description'};
readingsSingleUpdate($hash, 'lastError', $error, 0 ); readingsSingleUpdate($hash, 'lastError', $error, 1 );
Log3 $name, 3, $error; Log3 $name, 3, $error;
} }
@ -1593,6 +1603,15 @@ HUEBridge_Attr($$$)
available (indicated by updatestate with a value of 2. The version and release date is shown in the reading swupdate.<br> available (indicated by updatestate with a value of 2. The version and release date is shown in the reading swupdate.<br>
A notify of the form <code>define HUEUpdate notify bridge:swupdate.* {...}</code> A notify of the form <code>define HUEUpdate notify bridge:swupdate.* {...}</code>
can be used to be informed about available firmware updates.<br></li> can be used to be informed about available firmware updates.<br></li>
<li>inactive<br>
inactivates the current device. note the slight difference to the
disable attribute: using set inactive the state is automatically saved
to the statefile on shutdown, there is no explicit save necesary.<br>
this command is intended to be used by scripts to temporarily
deactivate the harmony device.<br>
the concurrent setting of the disable attribute is not recommended.</li>
<li>active<br>
activates the current device (see inactive).</li>
</ul><br> </ul><br>
<a name="HUEBridge_Attr"></a> <a name="HUEBridge_Attr"></a>