FHEM/mod-XiaomiBTLESens
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add Notify Function for global Events

Browse Source
This commit is contained in:
Marko Oldenburg 2017-10-17 13:22:40 +02:00
parent bad1a26895
commit 96f0bc4fde
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
74_XiaomiFlowerSens.pm
View File

@ -68,6 +68,7 @@ sub XiaomiFlowerSens_stateRequest($);
sub XiaomiFlowerSens_stateRequestTimer($); sub XiaomiFlowerSens_stateRequestTimer($);
sub XiaomiFlowerSens_Set($$@); sub XiaomiFlowerSens_Set($$@);
sub XiaomiFlowerSens_Get($$@); sub XiaomiFlowerSens_Get($$@);
sub XiaomiFlowerSens_Notify($$);
sub XiaomiFlowerSens_CallBatteryFirmware($); sub XiaomiFlowerSens_CallBatteryFirmware($);
sub XiaomiFlowerSens_CallSensData($); sub XiaomiFlowerSens_CallSensData($);
sub XiaomiFlowerSens_WriteSensData($); sub XiaomiFlowerSens_WriteSensData($);
@ -96,6 +97,7 @@ sub XiaomiFlowerSens_Initialize($) {
$hash->{SetFn} = "XiaomiFlowerSens_Set"; $hash->{SetFn} = "XiaomiFlowerSens_Set";
$hash->{GetFn} = "XiaomiFlowerSens_Get"; $hash->{GetFn} = "XiaomiFlowerSens_Get";
$hash->{DefFn} = "XiaomiFlowerSens_Define"; $hash->{DefFn} = "XiaomiFlowerSens_Define";
$hash->{NotifyFn} = "XiaomiFlowerSens_Notify";
$hash->{UndefFn} = "XiaomiFlowerSens_Undef"; $hash->{UndefFn} = "XiaomiFlowerSens_Undef";
$hash->{AttrFn} = "XiaomiFlowerSens_Attr"; $hash->{AttrFn} = "XiaomiFlowerSens_Attr";
$hash->{AttrList} = "interval ". $hash->{AttrList} = "interval ".
@ -130,28 +132,19 @@ sub XiaomiFlowerSens_Define($$) {
return "too few parameters: define <name> XiaomiFlowerSens <BTMAC>" if( @a != 3 ); return "too few parameters: define <name> XiaomiFlowerSens <BTMAC>" if( @a != 3 );
my $name = $a[0]; my $name = $a[0];
my $mac = $a[2]; my $mac = $a[2];
$hash->{BTMAC} = $mac; $hash->{BTMAC} = $mac;
$hash->{VERSION} = $version; $hash->{VERSION} = $version;
$hash->{INTERVAL} = 300; $hash->{INTERVAL} = 300;
$hash->{helper}{CallSensDataCounter} = 0; $hash->{helper}{CallSensDataCounter} = 0;
$hash->{NOTIFYDEV} = "global";
readingsSingleUpdate($hash,"state","initialized", 0); readingsSingleUpdate($hash,"state","initialized", 0);
$attr{$name}{room} = "FlowerSens" if( !defined($attr{$name}{room}) ); $attr{$name}{room} = "FlowerSens" if( !defined($attr{$name}{room}) );
RemoveInternalTimer($hash);
if( $init_done ) {
XiaomiFlowerSens_stateRequestTimer($hash);
} else {
InternalTimer( gettimeofday()+int(rand(30))+15, "XiaomiFlowerSens_stateRequestTimer", $hash, 0 );
}
Log3 $name, 3, "XiaomiFlowerSens ($name) - defined with BTMAC $hash->{BTMAC}"; Log3 $name, 3, "XiaomiFlowerSens ($name) - defined with BTMAC $hash->{BTMAC}";
$modules{XiaomiFlowerSens}{defptr}{$hash->{BTMAC}} = $hash; $modules{XiaomiFlowerSens}{defptr}{$hash->{BTMAC}} = $hash;
@ -230,6 +223,22 @@ sub XiaomiFlowerSens_Attr(@) {
return undef; return undef;
} }
sub XiaomiFlowerSens_Notify($$) {
my ($hash,$dev) = @_;
my $name = $hash->{NAME};
return if (IsDisabled($name));
my $devname = $dev->{NAME};
my $devtype = $dev->{TYPE};
my $events = deviceEvents($dev,1);
return if (!$events);
XiaomiFlowerSens_stateRequestTimer($hash) if( grep /^INITIALIZED$/,@{$events} );
return;
}
sub XiaomiFlowerSens_stateRequest($) { sub XiaomiFlowerSens_stateRequest($) {
my ($hash) = @_; my ($hash) = @_;