diff --git a/fhem/FHEM/98_livetracking.pm b/fhem/FHEM/98_livetracking.pm
index e546fc6f6..58c692da6 100644
--- a/fhem/FHEM/98_livetracking.pm
+++ b/fhem/FHEM/98_livetracking.pm
@@ -58,7 +58,6 @@ sub livetracking_Initialize($) {
"home ".
"swarmHome ".
"owntracksDevice ".
- "traccarDevice ".
"beacon_0 ".
"beacon_1 ".
"beacon_2 ".
@@ -117,7 +116,7 @@ sub livetracking_Define($$$) {
if($req)
{
- $hash->{NOTIFYDEV} = AttrVal($name, "owntracksDevice" , AttrVal($name, "traccarDevice" , "owntracks"));
+ $hash->{NOTIFYDEV} = AttrVal($name, "owntracksDevice" , "owntracks");
}
else
{
@@ -194,7 +193,7 @@ sub livetracking_Set($$@) {
$messagetext = '"content":"'.FmtDateTime(time()).'
FHEM:
'.$messagetext.'",';
}
- fhem('set '.$devname.' msg {"_type":"cmd","action":"action",'.$messagetext.$notifytext.'"tst":'.time().'}');
+ fhem('set '.$devname.' cmd {"_type":"cmd","action":"action",'.$messagetext.$notifytext.'"tst":'.time().'}');
#fhem('set '.$devname.' msg {"_type":"cmd","action":"notify", "content":"'.$notifytext.'","tst":'.time().'}') if($notifytext ne "");
}
@@ -304,9 +303,6 @@ sub livetracking_Attr(@) {
if ($attr && $attr eq 'owntracksDevice') {
$hash->{NOTIFYDEV} = $val if defined $val;
}
- if ($attr && $attr eq 'traccarDevice') {
- $hash->{NOTIFYDEV} = $val if defined $val;
- }
elsif ($attr && $attr =~ /^(zonename_)([0-9]+)/) {
fhem( "deletereading $name zone_".$2 );
}
@@ -688,25 +684,23 @@ sub livetracking_Notify($$)
{
Log3 ($name, 6, "$name OwnTracks data: /n".Dumper($dev));
- if(!($dev->{CHANGED}[0] =~ m/_type":[ ]?"location/ || $dev->{CHANGED}[0] =~ m/_type":[ ]?"position/ || $dev->{CHANGED}[0] =~ m/_type":[ ]?"transition/ || $dev->{CHANGED}[0] =~ m/_type":[ ]?"steps/ || $dev->{CHANGED}[0] =~ m/_type":[ ]?"beacon/ ))
+ my $invaliddata = 1;
+ if(($dev->{CHANGED}[0] =~ m/_type":[ ]?"location/ || $dev->{CHANGED}[0] =~ m/_type":[ ]?"position/ || $dev->{CHANGED}[0] =~ m/_type":[ ]?"transition/ || $dev->{CHANGED}[0] =~ m/_type":[ ]?"steps/ || $dev->{CHANGED}[0] =~ m/_type":[ ]?"beacon/ ))
{
- Log3 ($name, 5, "WRONG OWNTRACKS TYPE ".Dumper($dev->{CHANGED}[0]));
+ $invaliddata = 0;#owntracks
+ }
+ elsif(($dev->{CHANGED}[0] =~ m/position":[ ]?{/))
+ {
+ $invaliddata = 0;#traccar
+ }
+ if($invaliddata == 1){
+ Log3 ($name, 5, "WRONG MQTT TYPE ".Dumper($dev->{CHANGED}[0]));
return undef;
}
$data= substr($dev->{CHANGED}[0],index($dev->{CHANGED}[0], ": {")+2);
$dataset = JSON->new->utf8(0)->decode($data);
- } elsif($devName eq AttrVal($name, "traccarDevice" , "traccar")) {
- if(!($dev->{CHANGED}[0] =~ m/position":[ ]?{/))
- {
- Log3 ($name, 5, "WRONG TRACCAR TYPE ".Dumper($dev->{CHANGED}[0]));
- return undef;
- }
-
- $data= substr($dev->{CHANGED}[0],index($dev->{CHANGED}[0], ": {")+2);
- my $traccardata = JSON->new->utf8(0)->decode($data);
-
} else {
Log3 ($name, 5, "livetracks: Notify ignored from ".$devName);
return undef;
@@ -1287,14 +1281,13 @@ sub livetracking_utf8clean($) {
=item summary Position tracking via OwnTracks, OpenPaths and Swarm
=begin html
-
-livetracking
+livetracking
This modul provides livetracking data from OpenPaths and Swarm (FourSquare).
Swarm Token: https://foursquare.com/oauth2/authenticate?client_id=EFWJ0DNVIREJ2CY1WDIFQ4MAL0ZGZAZUYCNE0NE0XZC3NCPX&response_type=token&redirect_uri=http://localhost&display=wap
- Define
+ Define
define <name> livetracking <...>
@@ -1303,64 +1296,72 @@ sub livetracking_utf8clean($) {
...
- ...
+ Reverse geocoding: Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright
- Get
+ Get
- All/OpenPaths/Swarm
-
- Manually trigger a data update for OpenPaths/Swarm
+ - All
+
+ Manually trigger a data update for all sources (OpenPaths/Swarm)
- owntracksLocation
-
+ - OpenPaths
+
+ Manually trigger a data update for OpenPaths
+
+ - Swarm
+
+ Manually trigger a data update for Swarm
+
+ - owntracksLocation
+
Request position from OwnTracks
- owntracksSteps
-
+ - owntracksSteps
+
Request steps data from OwnTracks
- address [short/long/lat,lng]
-
- Get an address from coordinates
Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright
+ - address [short/long/lat,lng]
+
+ Get an address from coordinates
- Set
+ Set
- Readings
+ Readings
location
GPS position
- distance km
+ distance (km)
GPS distance from home
- accuracy m
+ accuracy (m)
GPS accuracy
- altitude m
+ altitude (m)
GPS altitude
- velocity km/h
+ velocity (km/h)
GPS velocity
- heading deg
+ heading (deg)
GPS heading
@@ -1368,23 +1369,23 @@ sub livetracking_utf8clean($) {
Swarm place name
- steps steps
+ steps (steps)
iOS walked steps
- walking m
+ walking (m)
iOS walked distance
- floorsup floors
+ floorsup (floors)
iOS floors walked up
- floorsdown floors
+ floorsdown (floors)
iOS floors walked down
- zone_N active/inactive
+ zone_N (active/inactive)
Zone status in OwnTracks
@@ -1396,50 +1397,58 @@ sub livetracking_utf8clean($) {
Beacon data for saved beacons for indoor positioning
- batteryState ok/low
+ batteryState (ok/low)
Battery state (can be set through attribute batteryWarning )
- batteryPercent %
+ batteryPercent (%)
Battery percentage
+ connection (mobile/wifi/offline/unknown)
+
+ Phone connection type from OwnTracks at last position
+
- Attributes
+ Attributes
- batteryWarning
+ - batteryWarning (%)
Set battery ok/low threshold
- beacon_N
+ - beacon_N
Saved beacon IDs from OwnTracks for indoor positioning, e.g.:
FDA50693-A4E2-4FB1-AFCF-C6EB07647825,19789,1
- zonename_N
+ - zonename_N
Assign zone name from OwnTracks
- home
+ - home (lat,lon)
- Home location (lat,lon)
+ Home location
- swarmHome
+ - swarmHome (lat,lon)
- Fake home location (that is assigned to private homes for security reasons) of your Swarm home (lat,lon)
+ Fake home location (that is assigned to private homes for security reasons) of your Swarm home (exact position)
- filterAccuracy
+ - filterAccuracy (m)
Minimum accuracy of GPS location to update any readings
- roundDistance, roundAltitude
+ - roundDistance (km)
- Rounding for distance and altitude readings to prevent too many changes
+ Rounding for distance reading to prevent too many changes
- owntracksDevice
+ - roundAltitude (m)
+
+ Rounding for altitude reading to prevent too many changes
+
+ - owntracksDevice
OwnTracks MQTT device to look for notifies from