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

98_livetracking: added events for OwnTrack zones

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18406 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
moises 2019-01-24 23:47:47 +00:00
parent d421c9a208
commit c54abdafa3
4 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -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

31
fhem/FHEM/38_netatmo.pm
View File

@ -6469,7 +6469,7 @@ sub netatmo_weatherIcon()
<b>Define</b>
<ul>
<code>define &lt;name&gt; netatmo [ACCOUNT] &lt;username&gt; &lt;password&gt; &lt;client_id&gt; &lt;client_secret&gt;</code><br>
<code>define &lt;name&gt; netatmo &lt;device&gt;</code><br>
<code>define &lt;name&gt; netatmo &lt;device&gt;</code> (you should use autocreate from the account device!)<br>
<br>
Defines a netatmo device.<br><br>
@ -6480,11 +6480,18 @@ sub netatmo_weatherIcon()
Examples:
<ul>
<code>define netatmo netatmo ACCOUNT abc@test.com myPassword 2134123412399119d4123134 AkqcOIHqrasfdaLKcYgZasd987123asd</code><br>
<code>define netatmo netatmo 2f:13:2b:93:12:31</code><br>
<code>define netatmo netatmo MODULE 2f:13:2b:93:12:31 f1:32:b9:31:23:11</code><br>
<code>define netatmo netatmo HOME 1234567890abcdef12345678</code><br>
<code>define netatmo netatmo CAMERA 1234567890abcdef12345678 70:ee:12:34:56:78</code><br>
<code>define netatmo netatmo PERSON 1234567890abcdef12345678 01234567-89ab-cdef-0123-456789abcdef</code><br>
<code>define netatmo_station netatmo 2f:13:2b:93:12:31</code><br>
<code>define netatmo_module netatmo MODULE 2f:13:2b:93:12:31 f1:32:b9:31:23:11</code><br>
<code>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</code><br>
<code>define netatmo_maparea netatmo PUBLIC 47.8941876,16.64446 0.08</code><br>
<code>define netatmo_forecast netatmo FORECAST 2f:13:2b:93:12:31</code><br>
<code>define netatmo_relay netatmo RELAY 70:ee:50:00:12:34</code><br>
<code>define netatmo_thermostat netatmo THERMOSTAT 70:ee:50:00:12:34 04:00:00:0a:00:11</code><br>
<code>define netatmo_home netatmo HOME 1234567890abcdef12345678</code><br>
<code>define netatmo_camera netatmo CAMERA 1234567890abcdef12345678 70:ee:12:34:56:78</code><br>
<code>define netatmo_tag netatmo TAG 70:ee:12:34:56:78 70:ee:50:11:22:33</code><br>
<code>define netatmo_person netatmo PERSON 1234567890abcdef12345678 01234567-89ab-cdef-0123-456789abcdef</code><br>
<code>define netatmo_webhook netatmo WEBHOOK</code><br>
</ul>
</ul><br>
@ -6498,6 +6505,18 @@ sub netatmo_weatherIcon()
<a name="netatmo_Readings"></a>
<b>Readings</b>
<ul>
<li>temperature</li>
<li>humidity</li>
<li>pressure</li>
<li>co2</li>
<li>noise</li>
<li>rain</li>
<li>rain_hour</li>
<li>rain_day</li>
<li>windstrength</li>
<li>windangle</li>
<li>guststrength</li>
<li>gustangle</li>
</ul><br>
<a name="netatmo_Set"></a>

2
fhem/FHEM/60_allergy.pm
View File

@ -24,8 +24,6 @@ use Time::Local;
use Encode;
use XML::Simple;
use LWP::UserAgent;
use HTTP::Request;
use utf8;

13
fhem/FHEM/98_livetracking.pm
View File

@ -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($) {
<br>
Preferred language used to return reverse geocoding results
</li><br>
<li><a name="addressReading">createAddressReading</a> (0/1)
<li><a name="addressReading">addressReading</a> (0/1)
<br>
Write reverse geocoding results to address reading
</li><br>