FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00
Code Issues Releases Wiki Activity

73_DoorBird: bugfix for timing between History-Image and event trigger

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@19549 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Sailor 2019-06-04 19:08:27 +00:00
parent b3ad4d26ec
commit f07a1b232b
1 changed files with 79 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
fhem/FHEM/73_DoorBird.pm
View File

@ -660,6 +660,8 @@ sub DoorBird_Read($) {
my $Header = "Accept: application/json"; my $Header = "Accept: application/json";
my $UrlPostfix; my $UrlPostfix;
my $CommandURL; my $CommandURL;
my $ReadingEvent;
my $ReadingEventContent;
my $err; my $err;
my $data; my $data;
my $buf; my $buf;
@ -866,7 +868,7 @@ sub DoorBird_Read($) {
1; 1;
}; };
if ( $@ ) { if ( $@ ) {
Log3 $name, 3, $name. " Message forged!"; Log3 $name, 3, $name. " : Message forged!";
return("Messaged forged!"); return("Messaged forged!");
} }
@ -948,7 +950,11 @@ sub DoorBird_Read($) {
if ((int($TIMESTAMP) == $TIMESTAMP) && ($UdpMotionIdLast != $TIMESTAMP)) { if ((int($TIMESTAMP) == $TIMESTAMP) && ($UdpMotionIdLast != $TIMESTAMP)) {
### Save Timestamp as new ID ### Save Timestamp as new ID
$hash->{helper}{UdpMotionId} = $TIMESTAMP; $hash->{helper}{UdpMotionId} = $TIMESTAMP;
### Create name of reading for event
$ReadingEvent = "motion_sensor";
$ReadingEventContent = "Motion detected!";
### Create Parameter for CommandURL for motionsensor events ### Create Parameter for CommandURL for motionsensor events
$UrlPostfix = "history.cgi?event=motionsensor&index=1"; $UrlPostfix = "history.cgi?event=motionsensor&index=1";
@ -970,11 +976,27 @@ sub DoorBird_Read($) {
callback => \&DoorBird_LastEvent_Image callback => \&DoorBird_LastEvent_Image
}; };
### Initiate communication and close ### Initiate Bulk Update
readingsBeginUpdate($hash);
### Update readings of device
readingsBulkUpdate($hash, "state", $ReadingEventContent, 1);
readingsBulkUpdate($hash, $ReadingEvent, "triggered", 1);
### Execute Readings Bulk Update
readingsEndUpdate($hash, 1);
### Initiate communication
HttpUtils_NonblockingGet($param); HttpUtils_NonblockingGet($param);
### Wrap up a container and initiate the timer to reset reading "doorbell_button"
my %Container;
$Container{"HashReference"} = $hash;
$Container{"Reading"} = $ReadingEvent;
InternalTimer(gettimeofday()+ $hash->{helper}{EventReset}, "DoorBird_EventReset", \%Container, 0);
### Log Entry ### Log Entry
Log3 $name, 3, $name. " : Motion sensor detected a motion in front of DoorBird unit."; Log3 $name, 3, $name. " : An event has been triggered by the DoorBird unit : " . $EVENT;
Log3 $name, 5, $name. " : DoorBird_Read - Timer for reset reading in : " . $hash->{helper}{EventReset}; Log3 $name, 5, $name. " : DoorBird_Read - Timer for reset reading in : " . $hash->{helper}{EventReset};
} }
### If the MessageID is integer type has appeared before ### If the MessageID is integer type has appeared before
@ -991,6 +1013,10 @@ sub DoorBird_Read($) {
### Save Timestamp as new ID ### Save Timestamp as new ID
$hash->{helper}{UdpKeypadId} = $TIMESTAMP; $hash->{helper}{UdpKeypadId} = $TIMESTAMP;
### Create name of reading for event
$ReadingEvent = "keypad_pin";
$ReadingEventContent = "Access via Keypad!";
### Create Parameter for CommandURL for keypad events ### Create Parameter for CommandURL for keypad events
$UrlPostfix = "history.cgi?event=keypad&index=1"; $UrlPostfix = "history.cgi?event=keypad&index=1";
@ -1011,12 +1037,28 @@ sub DoorBird_Read($) {
incrementalTimout => 1, incrementalTimout => 1,
callback => \&DoorBird_LastEvent_Image callback => \&DoorBird_LastEvent_Image
}; };
### Initiate Bulk Update
readingsBeginUpdate($hash);
### Update readings of device
readingsBulkUpdate($hash, "state", $ReadingEventContent, 1);
readingsBulkUpdate($hash, $ReadingEvent, "triggered", 1);
### Execute Readings Bulk Update
readingsEndUpdate($hash, 1);
### Initiate communication and close ### Initiate communication and close
HttpUtils_NonblockingGet($param); HttpUtils_NonblockingGet($param);
### Wrap up a container and initiate the timer to reset reading "doorbell_button"
my %Container;
$Container{"HashReference"} = $hash;
$Container{"Reading"} = $ReadingEvent;
InternalTimer(gettimeofday()+ $hash->{helper}{EventReset}, "DoorBird_EventReset", \%Container, 0);
### Log Entry ### Log Entry
Log3 $name, 3, $name. " : The keypad of the DoorBird unit has been used."; Log3 $name, 3, $name. " : An event has been triggered by the DoorBird unit : " . $EVENT;
Log3 $name, 5, $name. " : DoorBird_Read - Timer for reset reading in : " . $hash->{helper}{EventReset}; Log3 $name, 5, $name. " : DoorBird_Read - Timer for reset reading in : " . $hash->{helper}{EventReset};
} }
### If the MessageID is integer type has appeared before ### If the MessageID is integer type has appeared before
@ -1032,7 +1074,11 @@ sub DoorBird_Read($) {
if ((int($TIMESTAMP) == $TIMESTAMP) && ($UdpDoorbellIdLast != $TIMESTAMP)) { if ((int($TIMESTAMP) == $TIMESTAMP) && ($UdpDoorbellIdLast != $TIMESTAMP)) {
### Save Timestamp as new ID ### Save Timestamp as new ID
$hash->{helper}{UdpDoorbellId} = $TIMESTAMP; $hash->{helper}{UdpDoorbellId} = $TIMESTAMP;
### Create name of reading for event
$ReadingEvent = "doorbell_button_" . sprintf("%03d", $EVENT);
$ReadingEventContent = "doorbell pressed!";
### Create Parameter for CommandURL for doorbell events ### Create Parameter for CommandURL for doorbell events
$UrlPostfix = "history.cgi?event=doorbell&index=1"; $UrlPostfix = "history.cgi?event=doorbell&index=1";
@ -1054,9 +1100,29 @@ sub DoorBird_Read($) {
incrementalTimout => 1, incrementalTimout => 1,
callback => \&DoorBird_LastEvent_Image callback => \&DoorBird_LastEvent_Image
}; };
### Initiate Bulk Update
readingsBeginUpdate($hash);
### Update readings of device
readingsBulkUpdate($hash, "state", $ReadingEventContent, 1);
readingsBulkUpdate($hash, $ReadingEvent, "triggered", 1);
### Execute Readings Bulk Update
readingsEndUpdate($hash, 1);
### Initiate communication and close ### Initiate communication and close
HttpUtils_NonblockingGet($param); HttpUtils_NonblockingGet($param);
### Wrap up a container and initiate the timer to reset reading "doorbell_button"
my %Container;
$Container{"HashReference"} = $hash;
$Container{"Reading"} = $ReadingEvent;
InternalTimer(gettimeofday()+ $hash->{helper}{EventReset}, "DoorBird_EventReset", \%Container, 0);
### Log Entry
Log3 $name, 3, $name. " : An event has been triggered by the DoorBird unit : " . $EVENT;
Log3 $name, 5, $name. " : DoorBird_Read - Timer for reset reading in : " . $hash->{helper}{EventReset};
} }
### If the MessageID is integer type has appeared before ### If the MessageID is integer type has appeared before
else { else {
@ -1911,24 +1977,16 @@ sub DoorBird_LastEvent_Image($$$) {
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $event = $param->{event}; my $event = $param->{event};
my $timestamp = $param->{timestamp}; my $timestamp = $param->{timestamp};
my $ReadingEvent;
my $ReadingImage; my $ReadingImage;
my $ReadingEventContent;
if ($event =~ m/doorbell/ ){ if ($event =~ m/doorbell/ ){
$ReadingEvent = "doorbell_button_" . sprintf("%03d", $param->{doorbellNo});
$ReadingImage = "doorbell_snapshot_" . sprintf("%03d", $param->{doorbellNo}); $ReadingImage = "doorbell_snapshot_" . sprintf("%03d", $param->{doorbellNo});
$ReadingEventContent = "doorbell pressed!";
} }
elsif ($event =~ m/motion/ ){ elsif ($event =~ m/motion/ ){
$ReadingEvent = "motion_sensor";
$ReadingImage = "motion_snapshot"; $ReadingImage = "motion_snapshot";
$ReadingEventContent = "Motion detected!";
} }
elsif ($event =~ m/keypad/ ){ elsif ($event =~ m/keypad/ ){
$ReadingEvent = "keypad_pin";
$ReadingImage = "keypad_snapshot"; $ReadingImage = "keypad_snapshot";
$ReadingEventContent = "Access via Keypad!";
} }
else { else {
### Create Log entry ### Create Log entry
@ -1937,7 +1995,6 @@ sub DoorBird_LastEvent_Image($$$) {
### Exit sub ### Exit sub
return return
} }
### Log Entry for debugging purposes ### Log Entry for debugging purposes
Log3 $name, 5, $name. " : DoorBird_LastEvent_Image ___________________________________________________________"; Log3 $name, 5, $name. " : DoorBird_LastEvent_Image ___________________________________________________________";
@ -1945,16 +2002,13 @@ sub DoorBird_LastEvent_Image($$$) {
Log3 $name, 5, $name. " : DoorBird_LastEvent_Image - length data : " . length($data) if (defined($data )); Log3 $name, 5, $name. " : DoorBird_LastEvent_Image - length data : " . length($data) if (defined($data ));
#Log3 $name, 5, $name. " : DoorBird_LastEvent_Image - param : " . join("\n", @{[%{$param}]}) if (defined($param)); #Log3 $name, 5, $name. " : DoorBird_LastEvent_Image - param : " . join("\n", @{[%{$param}]}) if (defined($param));
### Initiate Bulk Update
readingsBeginUpdate($hash);
### If error message available ### If error message available
if ($err ne "") { if ($err ne "") {
### Create Log entry ### Create Log entry
Log3 $name, 3, $name. " : DoorBird_LastEvent_Image - Error : " . $err if (defined($err )); Log3 $name, 3, $name. " : DoorBird_LastEvent_Image - Error : " . $err if (defined($err ));
### Write Last Image into reading ### Write Last Image into reading
readingsBulkUpdate($hash, $ReadingImage, "", 1); readingsSingleUpdate($hash, $ReadingImage, "No image data", 1);
} }
### if no error message available ### if no error message available
else { else {
@ -1999,9 +2053,6 @@ sub DoorBird_LastEvent_Image($$$) {
Log3 $name, 5, $name. " : DoorBird_LastEvent_Image - Attr WaitForHistory : " . $hash->{helper}{WaitForHistory}; Log3 $name, 5, $name. " : DoorBird_LastEvent_Image - Attr WaitForHistory : " . $hash->{helper}{WaitForHistory};
Log3 $name, 5, $name. " : DoorBird_LastEvent_Image - dt : " . int(time - int($timestamp)); Log3 $name, 5, $name. " : DoorBird_LastEvent_Image - dt : " . int(time - int($timestamp));
### Finish Readings Bulk Update
readingsEndUpdate($hash, 0);
### Try again: Initiate communication and close ### Try again: Initiate communication and close
HttpUtils_NonblockingGet($param); HttpUtils_NonblockingGet($param);
@ -2017,8 +2068,7 @@ sub DoorBird_LastEvent_Image($$$) {
Log3 $name, 5, $name. " : DoorBird_LastEvent_Image - dt : " . int(time - int($timestamp)); Log3 $name, 5, $name. " : DoorBird_LastEvent_Image - dt : " . int(time - int($timestamp));
### Write Last Image into reading ### Write Last Image into reading
readingsBulkUpdate($hash, $ReadingImage, "", 1); readingsSingleUpdate($hash, $ReadingImage, "No image data", 1);
} }
} }
### If timestamp from history picture has been done since the timestamp from the event ### If timestamp from history picture has been done since the timestamp from the event
@ -2118,7 +2168,7 @@ sub DoorBird_LastEvent_Image($$$) {
}; };
### Write Last Image into reading ### Write Last Image into reading
readingsBulkUpdate($hash, $ReadingImage, $ImageFileName, 1); readingsSingleUpdate($hash, $ReadingImage, $ImageFileName, 1);
} }
### Log Entry for debugging purposes ### Log Entry for debugging purposes
Log3 $name, 5, $name. " : DoorBird_LastEvent_Image - ImageData - event : " . length($ImageData); Log3 $name, 5, $name. " : DoorBird_LastEvent_Image - ImageData - event : " . length($ImageData);
@ -2137,7 +2187,7 @@ sub DoorBird_LastEvent_Image($$$) {
$ImageTimeStamp =" "; $ImageTimeStamp =" ";
### Write Last Image into reading ### Write Last Image into reading
readingsBulkUpdate($hash, $ReadingImage, "", 1); readingsSingleUpdate($hash, $ReadingImage, "No image data", 1);
} }
### If http response code is 404 = No picture available to download the event history ### If http response code is 404 = No picture available to download the event history
elsif ($param->{code} == 404) { elsif ($param->{code} == 404) {
@ -2149,7 +2199,7 @@ sub DoorBird_LastEvent_Image($$$) {
$ImageTimeStamp =" "; $ImageTimeStamp =" ";
### Write Last Image into reading ### Write Last Image into reading
readingsBulkUpdate($hash, $ReadingImage, "", 1); readingsSingleUpdate($hash, $ReadingImage, "No image data", 1);
} }
### If http response code is none of one above ### If http response code is none of one above
else { else {
@ -2161,32 +2211,15 @@ sub DoorBird_LastEvent_Image($$$) {
$ImageTimeStamp =" "; $ImageTimeStamp =" ";
### Write Last Image into reading ### Write Last Image into reading
readingsBulkUpdate($hash, $ReadingImage, "", 1); readingsSingleUpdate($hash, $ReadingImage, "No image data", 1);
} }
} }
else { else {
### Write Last Image into reading ### Write Last Image into reading
readingsBulkUpdate($hash, $ReadingImage, "", 1); readingsSingleUpdate($hash, $ReadingImage, "No image data", 1);
} }
} }
### Update readings of device
readingsBulkUpdate($hash, "state", $ReadingEventContent, 1);
readingsBulkUpdate($hash, $ReadingEvent, "triggered", 1);
### Execute Readings Bulk Update
readingsEndUpdate($hash, 1);
### Wrap up a container and initiate the timer to reset reading "doorbell_button"
my %Container;
$Container{"HashReference"} = $hash;
$Container{"Reading"} = $ReadingEvent;
InternalTimer(gettimeofday()+ $hash->{helper}{EventReset}, "DoorBird_EventReset", \%Container, 0);
### Log Entry
Log3 $name, 3, $name. " : An event has been triggered by the DoorBird unit : " . $event;
Log3 $name, 5, $name. " : DoorBird_Read - Timer for reset reading in : " . $hash->{helper}{EventReset};
return; return;
} }
####END####### Define Subfunction for LAST EVENT IMAGE REQUEST #################################################END##### ####END####### Define Subfunction for LAST EVENT IMAGE REQUEST #################################################END#####