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

31_Nello: minor improvements

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15460 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
neumann 2017-11-19 19:05:42 +00:00
parent 22321540da
commit 68ec2f09ac
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fhem/FHEM/31_Nello.pm
View File

@ -146,11 +146,23 @@ sub Nello_Attr(@) {
CommandDefine(undef, $eventdevice . ' MQTT_DEVICE'); CommandDefine(undef, $eventdevice . ' MQTT_DEVICE');
CommandAttr(undef, $eventdevice . ' room hidden'); CommandAttr(undef, $eventdevice . ' room hidden');
CommandAttr(undef, $eventdevice . ' IODEV '. $bridge); CommandAttr(undef, $eventdevice . ' IODEV '. $bridge);
CommandAttr(undef, $eventdevice . ' subscribeReading_'. $attrValue .'_door /nello_one/'. $attrValue . '/door/'); }
CommandAttr(undef, $eventdevice . ' subscribeReading_'. $attrValue .'_ring /nello_one/'. $attrValue . '/ring/');
CommandAttr(undef, $eventdevice . ' subscribeReading_'. $attrValue .'_tw /nello_one/'. $attrValue . '/tw/'); my $prefix = 'subscribeReading_'. $attrValue .'_';
CommandSave(undef, undef); CommandAttr(undef, $eventdevice . ' '. $prefix . 'door /nello_one/'. $attrValue . '/door/') if(!defined $attr{$eventdevice}{$prefix . 'door'});
} CommandAttr(undef, $eventdevice . ' '. $prefix . 'ring /nello_one/'. $attrValue . '/ring/') if(!defined $attr{$eventdevice}{$prefix . 'ring'});;
CommandAttr(undef, $eventdevice . ' '. $prefix . 'tw /nello_one/'. $attrValue . '/tw/') if(!defined $attr{$eventdevice}{$prefix . 'tw'});
if(defined $hash->{helper}{deviceID} && $hash->{helper}{deviceID} ne $attrValue) {
$prefix = 'subscribeReading_'. $hash->{helper}{deviceID} .'_';
CommandDeleteAttr(undef, $eventdevice . ' '. $prefix . 'door');
CommandDeleteAttr(undef, $eventdevice . ' '. $prefix . 'ring');
CommandDeleteAttr(undef, $eventdevice . ' '. $prefix . 'tw');
}
CommandSave(undef, undef);
$hash->{helper}{deviceID} = $attrValue;
} }
return undef; return undef;
@ -161,6 +173,7 @@ sub Nello_loadInternals($) {
my $name = $hash->{NAME}; my $name = $hash->{NAME};
$hash->{helper}{expires} = ReadingsVal($name, '.expires', undef); $hash->{helper}{expires} = ReadingsVal($name, '.expires', undef);
$hash->{helper}{session} = ReadingsVal($name, '.session', undef); $hash->{helper}{session} = ReadingsVal($name, '.session', undef);
$hash->{helper}{deviceID} = $attr{$name}{"deviceID"};
if(!defined(ReadingsVal($name, '.session', undef))) { if(!defined(ReadingsVal($name, '.session', undef))) {
$hash->{STATE} = 'authorization pending'; $hash->{STATE} = 'authorization pending';
@ -432,6 +445,7 @@ sub Nello_poll {
my $pollInterval = $attr{$name}{updateInterval}; my $pollInterval = $attr{$name}{updateInterval};
InternalTimer(gettimeofday()+(defined $pollInterval ? $pollInterval : (!defined $attr{$name}{deviceID} ? 15 : 15*60)), "Nello_poll", $hash); InternalTimer(gettimeofday()+(defined $pollInterval ? $pollInterval : (!defined $attr{$name}{deviceID} ? 15 : 15*60)), "Nello_poll", $hash);
Nello_updateLocations($hash) if(!defined Nello_defaultLocationID($hash));
Nello_updateActivities($hash); Nello_updateActivities($hash);
} }