From c54abdafa3678a7381155c6a661655fffb2bbbc4 Mon Sep 17 00:00:00 2001
From: moises <>
Date: Thu, 24 Jan 2019 23:47:47 +0000
Subject: [PATCH] 98_livetracking: added events for OwnTrack zones
git-svn-id: https://svn.fhem.de/fhem/trunk@18406 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
fhem/CHANGED | 1 +
fhem/FHEM/38_netatmo.pm | 31 +++++++++++++++++++++++++------
fhem/FHEM/60_allergy.pm | 2 --
fhem/FHEM/98_livetracking.pm | 13 +++++++------
4 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/fhem/CHANGED b/fhem/CHANGED
index b0d54634d..9b11c2b1d 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,5 +1,6 @@
# 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.
+ - feature: 98_livetracking: added events for OwnTrack zones
- feature: 93_DbRep: command exportToFile or attribute "expimpfile" accept
option "MAXLINES="
- bugfix: 09_CUL_FHTTK: removed low batt information from state, moved to
diff --git a/fhem/FHEM/38_netatmo.pm b/fhem/FHEM/38_netatmo.pm
index 1217d631b..a35aea708 100644
--- a/fhem/FHEM/38_netatmo.pm
+++ b/fhem/FHEM/38_netatmo.pm
@@ -6469,7 +6469,7 @@ sub netatmo_weatherIcon()
Define
define <name> netatmo [ACCOUNT] <username> <password> <client_id> <client_secret>
- define <name> netatmo <device>
+ define <name> netatmo <device> (you should use autocreate from the account device!)
Defines a netatmo device.
@@ -6480,11 +6480,18 @@ sub netatmo_weatherIcon()
Examples:
define netatmo netatmo ACCOUNT abc@test.com myPassword 2134123412399119d4123134 AkqcOIHqrasfdaLKcYgZasd987123asd
- define netatmo netatmo 2f:13:2b:93:12:31
- define netatmo netatmo MODULE 2f:13:2b:93:12:31 f1:32:b9:31:23:11
- define netatmo netatmo HOME 1234567890abcdef12345678
- define netatmo netatmo CAMERA 1234567890abcdef12345678 70:ee:12:34:56:78
- define netatmo netatmo PERSON 1234567890abcdef12345678 01234567-89ab-cdef-0123-456789abcdef
+ define netatmo_station netatmo 2f:13:2b:93:12:31
+ define netatmo_module netatmo MODULE 2f:13:2b:93:12:31 f1:32:b9:31:23:11
+ define netatmo_publicstation netatmo PUBLIC 70:ee:50:27:2c:9c 02:00:00:27:4a:a6 temperature,humidity 70:ee:50:27:2c:9c pressure 05:00:00:04:cc:42 rain 06:00:00:01:ae:94 windstrength,windangle,guststrength,gustangle
+ define netatmo_maparea netatmo PUBLIC 47.8941876,16.64446 0.08
+ define netatmo_forecast netatmo FORECAST 2f:13:2b:93:12:31
+ define netatmo_relay netatmo RELAY 70:ee:50:00:12:34
+ define netatmo_thermostat netatmo THERMOSTAT 70:ee:50:00:12:34 04:00:00:0a:00:11
+ define netatmo_home netatmo HOME 1234567890abcdef12345678
+ define netatmo_camera netatmo CAMERA 1234567890abcdef12345678 70:ee:12:34:56:78
+ define netatmo_tag netatmo TAG 70:ee:12:34:56:78 70:ee:50:11:22:33
+ define netatmo_person netatmo PERSON 1234567890abcdef12345678 01234567-89ab-cdef-0123-456789abcdef
+ define netatmo_webhook netatmo WEBHOOK
@@ -6498,6 +6505,18 @@ sub netatmo_weatherIcon()
Readings
+ - temperature
+ - humidity
+ - pressure
+ - co2
+ - noise
+ - rain
+ - rain_hour
+ - rain_day
+ - windstrength
+ - windangle
+ - guststrength
+ - gustangle
diff --git a/fhem/FHEM/60_allergy.pm b/fhem/FHEM/60_allergy.pm
index 48b28dd1a..5e5f48663 100755
--- a/fhem/FHEM/60_allergy.pm
+++ b/fhem/FHEM/60_allergy.pm
@@ -24,8 +24,6 @@ use Time::Local;
use Encode;
use XML::Simple;
-use LWP::UserAgent;
-use HTTP::Request;
use utf8;
diff --git a/fhem/FHEM/98_livetracking.pm b/fhem/FHEM/98_livetracking.pm
index 0507dcdd0..07f043dcb 100644
--- a/fhem/FHEM/98_livetracking.pm
+++ b/fhem/FHEM/98_livetracking.pm
@@ -626,12 +626,12 @@ sub livetracking_ParseLife360($$) {
next if($lastreading > $dataset->{startTimestamp});
- Log3 ($name, 2, "$name new l360 data: /n".Dumper($dataset));
+ Log3 ($name, 6, "$name new l360 data: /n".Dumper($dataset));
my $accurate = 1;
$accurate = 0 if(defined($attr{$name}{filterAccuracy}) and defined($dataset->{accuracy}) and $attr{$name}{filterAccuracy} < $dataset->{accuracy});
- Log3 ($name, 5, "$name Life360: ".$dataset->{latitude}.",".$dataset->{longitude});
+ Log3 ($name, 4, "$name Life360: ".$dataset->{latitude}.",".$dataset->{longitude});
$lastreading = $dataset->{endTimestamp}+1;
@@ -928,9 +928,9 @@ sub livetracking_ParseOwnTracks
next if(!defined($attr{$name}{"beacon_$i"}));
if($beaconid eq $attr{$name}{"beacon_$i"})
{
- readingsBulkUpdate($hash, "beacon_".$i."_proximity", $dataset->{prox});
+ readingsBulkUpdate($hash, "beacon_".$i."_proximity", int($dataset->{prox}));
$hash->{CHANGETIME}[1] = FmtDateTime($dataset->{tst});
- readingsBulkUpdate($hash, "beacon_".$i."_accuracy", $dataset->{acc});
+ readingsBulkUpdate($hash, "beacon_".$i."_accuracy", sprintf("%.2f", $dataset->{acc}));
$hash->{CHANGETIME}[2] = FmtDateTime($dataset->{tst});
readingsBulkUpdate($hash, "beacon_".$i."_rssi", $dataset->{rssi});
$hash->{CHANGETIME}[3] = FmtDateTime($dataset->{tst});
@@ -1037,7 +1037,8 @@ sub livetracking_ParseOwnTracks
}
if(defined($dataset->{desc}) and defined($dataset->{event}))
{
- Log3 ($name, 3, "$name OwnTracks Zone Event: ".$dataset->{event}." ".$dataset->{desc});
+ DoTrigger($name, $dataset->{event}.": ".$dataset->{desc});
+ Log3 ($name, 4, "$name OwnTracks Zone Event: ".$dataset->{event}." ".$dataset->{desc});
my $place = livetracking_utf8clean($dataset->{desc});
@@ -2075,7 +2076,7 @@ sub livetracking_utf8clean($) {
Preferred language used to return reverse geocoding results
- createAddressReading (0/1)
+ addressReading (0/1)
Write reverse geocoding results to address reading