FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-09 20:57:11 +00:00
Code Issues Releases Wiki Activity

98_GEOFANCY: add missing reading PosHomeDist

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17573 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2018-10-20 13:26:55 +00:00
parent ccaeb52ab7
commit 87c8104e2b
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fhem/CHANGED
View File

@ -3,8 +3,8 @@
- feature: 98_GEOFANCY: add new reading LocTravDist; add support for
Geofency.app webhook attributes currentLatitude,
currentLongitude, motion, wifiSSID and wifiBSSID.
New readings: PosBSSID, PosLat, PosLocDist, PosLong, PosMotion,
PosSSID, PosTravDist
New readings: PosBSSID, PosLat, PosHomeDist, PosLocDist,
PosLong, PosMotion, PosSSID, PosTravDist
- bugfix: 98_GEOFANCY: fixed last* readings
- feature: 89_FULLY: New commands for sound playback and photo.
- bugfix: 74_XiaomiBTLESens: fix disableForTimer Problem after reboot

23
fhem/FHEM/98_GEOFANCY.pm
View File

@ -117,6 +117,7 @@ sub GEOFANCY_CGI() {
my $time = "";
my $locName = "";
my $posLocDist = "";
my $posHomeDist = "";
my $locTravDist = "";
my $motion = "";
my $wifiSSID = "";
@ -486,6 +487,21 @@ m/(19|20)\d\d-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])T([0-1][0-9]|2[0-3]):([0-5
"GEOFANCY $name: Unknown device UUID $device: Set attribute devAlias for $name or assign $device to any ROOMMATE or GUEST device using attribute r*_geofenceUUIDs"
if ( $deviceAlias eq "-" );
# distance between home and position
my $homeLat = AttrVal( "global", "latitude", undef );
my $homeLong = AttrVal( "global", "longitude", undef );
if ( $homeLat && $homeLong ) {
Debug "$homeLat $homeLong";
if ( $posLat ne "" && $posLong ne "" ) {
$posHomeDist =
UConv::distance( $posLat, $posLong, $homeLat, $homeLong, 2 );
}
elsif ( $lat ne "" && $long ne "" ) {
$posHomeDist =
UConv::distance( $lat, $long, $homeLat, $homeLong, 2 );
}
}
# distance between location and position
if ( $lat ne "" && $long ne "" && $posLat ne "" && $posLong ne "" ) {
$posLocDist = UConv::distance( $posLat, $posLong, $lat, $long, 2 );
@ -563,8 +579,9 @@ m/(19|20)\d\d-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])T([0-1][0-9]|2[0-3]):([0-5
# backup last known position
foreach (
'PosSSID', 'PosBSSID', 'PosMotion', 'PosLat',
'PosLong', 'PosLocDist', 'PosTravDist', 'LocTravDist'
'PosSSID', 'PosBSSID', 'PosMotion',
'PosLat', 'PosLong', 'PosHomeDist',
'PosLocDist', 'PosTravDist', 'LocTravDist'
)
{
$currReading = "curr" . $_ . "_" . $deviceAlias;
@ -578,6 +595,8 @@ m/(19|20)\d\d-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])T([0-1][0-9]|2[0-3]):([0-5
readingsBulkUpdate( $hash, "currPosMotion_" . $deviceAlias, $motion );
readingsBulkUpdate( $hash, "currPosLat_" . $deviceAlias, $posLat );
readingsBulkUpdate( $hash, "currPosLong_" . $deviceAlias, $posLong );
readingsBulkUpdate( $hash, "currPosHomeDist_" . $deviceAlias,
$posHomeDist );
readingsBulkUpdate( $hash, "currPosLocDist_" . $deviceAlias,
$posLocDist );
readingsBulkUpdate( $hash, "currLocTravDist_" . $deviceAlias,