Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

20_ROOMMATE,20_GUEST: improved location* reading handling

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10458 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2016-01-11 00:59:51 +00:00
parent 9bb1cada7c
commit 4f19169cb8
2 changed files with 72 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
fhem/FHEM/20_GUEST.pm
View File

@ -964,13 +964,13 @@ sub GUEST_SetLocation($$$;$$$$$$) {
my $currWayhome = ReadingsVal( $name, "wayhome", "0" ); my $currWayhome = ReadingsVal( $name, "wayhome", "0" );
my $currLat = ReadingsVal( $name, "locationLat", "-" ); my $currLat = ReadingsVal( $name, "locationLat", "-" );
my $currLong = ReadingsVal( $name, "locationLong", "-" ); my $currLong = ReadingsVal( $name, "locationLong", "-" );
my $currAddr = ReadingsVal( $name, "locationAddr", "-" ); my $currAddr = ReadingsVal( $name, "locationAddr", "" );
$id = "-" if ( !$id || $id eq "" ); $id = "-" if ( !$id || $id eq "" );
$lat = "-" if ( !$lat || $lat eq "" ); $lat = "-" if ( !$lat || $lat eq "" );
$long = "-" if ( !$long || $long eq "" ); $long = "-" if ( !$long || $long eq "" );
$address = "-" if ( !$address || $address eq "" ); $address = "" if ( !$address );
$time = "" if ( !$time ); $time = "" if ( !$time );
$device = "" if ( !$device ); $device = "" if ( !$device );
Log3 $name, 5, Log3 $name, 5,
"GUEST $name: received location information: id=$id name=$location trig=$trigger date=$time lat=$lat long=$long address:$address device=$device"; "GUEST $name: received location information: id=$id name=$location trig=$trigger date=$time lat=$lat long=$long address:$address device=$device";
@ -998,7 +998,6 @@ sub GUEST_SetLocation($$$;$$$$$$) {
# check for implicit state change # check for implicit state change
# #
my $stateChange = 0; my $stateChange = 0;
my $wayhome;
# home # home
if ( $location eq "home" || grep( m/^$searchstring$/, @location_home ) ) { if ( $location eq "home" || grep( m/^$searchstring$/, @location_home ) ) {
@ -1060,7 +1059,6 @@ sub GUEST_SetLocation($$$;$$$$$$) {
{ {
Log3 $name, 3, "GUEST $name: on way back home from $location"; Log3 $name, 3, "GUEST $name: on way back home from $location";
readingsBulkUpdate( $hash, "wayhome", "1" ); readingsBulkUpdate( $hash, "wayhome", "1" );
$wayhome = 1;
} }
# wayhome=false # wayhome=false
@ -1071,7 +1069,6 @@ sub GUEST_SetLocation($$$;$$$$$$) {
Log3 $name, 3, Log3 $name, 3,
"GUEST $name: seems not to be on way back home anymore"; "GUEST $name: seems not to be on way back home anymore";
readingsBulkUpdate( $hash, "wayhome", "0" ); readingsBulkUpdate( $hash, "wayhome", "0" );
$wayhome = 1;
} }
} }
@ -1081,44 +1078,52 @@ sub GUEST_SetLocation($$$;$$$$$$) {
Log3 $name, 3, Log3 $name, 3,
"GUEST $name: seems to stay at $location before coming home"; "GUEST $name: seems to stay at $location before coming home";
readingsBulkUpdate( $hash, "wayhome", "2" ); readingsBulkUpdate( $hash, "wayhome", "2" );
$wayhome = 1;
} }
# revert wayhome during active wayhome tracing # revert wayhome during active wayhome tracing
elsif ( $stateChange == 0 && $trigger == 0 && $currWayhome == 2 ) { elsif ( $stateChange == 0 && $trigger == 0 && $currWayhome == 2 ) {
Log3 $name, 3, "GUEST $name: finally on way back home from $location"; Log3 $name, 3, "GUEST $name: finally on way back home from $location";
readingsBulkUpdate( $hash, "wayhome", "1" ); readingsBulkUpdate( $hash, "wayhome", "1" );
$wayhome = 1;
} }
if ( $trigger == 1 ) { my $currLongDiff = 0;
my $currLatDiff = 0;
$currLongDiff =
maxNum( ReadingsVal( $name, "lastLocationLong", 0 ), $currLong ) -
minNum( ReadingsVal( $name, "lastLocationLong", 0 ), $currLong )
if ( $currLong ne "-" );
$currLatDiff =
maxNum( ReadingsVal( $name, "lastLocationLat", 0 ), $currLat ) -
minNum( ReadingsVal( $name, "lastLocationLat", 0 ), $currLat )
if ( $currLat ne "-" );
if (
$trigger == 1
&& ( $stateChange > 0
|| ReadingsVal( $name, "lastLocation", "-" ) ne $currLocation
|| $currLongDiff > 0.00002
|| $currLatDiff > 0.00002 )
)
{
Log3 $name, 5, "GUEST $name: archiving last known location"; Log3 $name, 5, "GUEST $name: archiving last known location";
readingsBulkUpdate( $hash, "lastLocationLat", $currLat ); readingsBulkUpdate( $hash, "lastLocationLat", $currLat );
readingsBulkUpdate( $hash, "lastLocationLong", $currLong ); readingsBulkUpdate( $hash, "lastLocationLong", $currLong );
readingsBulkUpdate( $hash, "lastLocationAddr", $currAddr ); readingsBulkUpdate( $hash, "lastLocationAddr", $currAddr )
readingsBulkUpdate( $hash, "lastLocation", $currLocation ); if ( $currAddr ne "" );
readingsBulkUpdate( $hash, "lastLocation", $currLocation );
} }
if ( $wayhome readingsBulkUpdate( $hash, "locationLat", $lat );
|| $stateChange > 0 readingsBulkUpdate( $hash, "locationLong", $long );
|| ( $lat ne "-" && $long ne "-" ) )
{ if ( $address ne "" ) {
Log3 $name, 5, "GUEST $name: Using new lat/long/addr information";
readingsBulkUpdate( $hash, "locationLat", $lat );
readingsBulkUpdate( $hash, "locationLong", $long );
readingsBulkUpdate( $hash, "locationAddr", $address ); readingsBulkUpdate( $hash, "locationAddr", $address );
} }
elsif ( $currAddr ne "" ) {
else { readingsBulkUpdate( $hash, "locationAddr", "-" );
Log3 $name, 5,
"GUEST $name: keeping last known lat/long/addr information";
readingsBulkUpdate( $hash, "locationLat", $currLat );
readingsBulkUpdate( $hash, "locationLong", $currLong );
readingsBulkUpdate( $hash, "locationAddr", $currAddr );
} }
readingsBulkUpdate( $hash, "location", $location ) readingsBulkUpdate( $hash, "location", $location );
if ( $location ne "wayhome" );
readingsEndUpdate( $hash, 1 ); readingsEndUpdate( $hash, 1 );

67
fhem/FHEM/20_ROOMMATE.pm
View File

@ -944,13 +944,13 @@ sub ROOMMATE_SetLocation($$$;$$$$$$) {
my $currWayhome = ReadingsVal( $name, "wayhome", "0" ); my $currWayhome = ReadingsVal( $name, "wayhome", "0" );
my $currLat = ReadingsVal( $name, "locationLat", "-" ); my $currLat = ReadingsVal( $name, "locationLat", "-" );
my $currLong = ReadingsVal( $name, "locationLong", "-" ); my $currLong = ReadingsVal( $name, "locationLong", "-" );
my $currAddr = ReadingsVal( $name, "locationAddr", "-" ); my $currAddr = ReadingsVal( $name, "locationAddr", "" );
$id = "-" if ( !$id || $id eq "" ); $id = "-" if ( !$id || $id eq "" );
$lat = "-" if ( !$lat || $lat eq "" ); $lat = "-" if ( !$lat || $lat eq "" );
$long = "-" if ( !$long || $long eq "" ); $long = "-" if ( !$long || $long eq "" );
$address = "-" if ( !$address || $address eq "" ); $address = "" if ( !$address );
$time = "" if ( !$time ); $time = "" if ( !$time );
$device = "" if ( !$device ); $device = "" if ( !$device );
Log3 $name, 5, Log3 $name, 5,
"ROOMMATE $name: received location information: id=$id name=$location trig=$trigger date=$time lat=$lat long=$long address:$address device=$device"; "ROOMMATE $name: received location information: id=$id name=$location trig=$trigger date=$time lat=$lat long=$long address:$address device=$device";
@ -978,7 +978,6 @@ sub ROOMMATE_SetLocation($$$;$$$$$$) {
# check for implicit state change # check for implicit state change
# #
my $stateChange = 0; my $stateChange = 0;
my $wayhome;
# home # home
if ( $location eq "home" || grep( m/^$searchstring$/, @location_home ) ) { if ( $location eq "home" || grep( m/^$searchstring$/, @location_home ) ) {
@ -1040,7 +1039,6 @@ sub ROOMMATE_SetLocation($$$;$$$$$$) {
{ {
Log3 $name, 3, "ROOMMATE $name: on way back home from $location"; Log3 $name, 3, "ROOMMATE $name: on way back home from $location";
readingsBulkUpdate( $hash, "wayhome", "1" ); readingsBulkUpdate( $hash, "wayhome", "1" );
$wayhome = 1;
} }
# wayhome=false # wayhome=false
@ -1051,7 +1049,6 @@ sub ROOMMATE_SetLocation($$$;$$$$$$) {
Log3 $name, 3, Log3 $name, 3,
"ROOMMATE $name: seems not to be on way back home anymore"; "ROOMMATE $name: seems not to be on way back home anymore";
readingsBulkUpdate( $hash, "wayhome", "0" ); readingsBulkUpdate( $hash, "wayhome", "0" );
$wayhome = 1;
} }
} }
@ -1061,7 +1058,6 @@ sub ROOMMATE_SetLocation($$$;$$$$$$) {
Log3 $name, 3, Log3 $name, 3,
"ROOMMATE $name: seems to stay at $location before coming home"; "ROOMMATE $name: seems to stay at $location before coming home";
readingsBulkUpdate( $hash, "wayhome", "2" ); readingsBulkUpdate( $hash, "wayhome", "2" );
$wayhome = 1;
} }
# revert wayhome during active wayhome tracing # revert wayhome during active wayhome tracing
@ -1069,37 +1065,46 @@ sub ROOMMATE_SetLocation($$$;$$$$$$) {
Log3 $name, 3, Log3 $name, 3,
"ROOMMATE $name: finally on way back home from $location"; "ROOMMATE $name: finally on way back home from $location";
readingsBulkUpdate( $hash, "wayhome", "1" ); readingsBulkUpdate( $hash, "wayhome", "1" );
$wayhome = 1;
} }
if ( $trigger == 1 ) { my $currLongDiff = 0;
my $currLatDiff = 0;
$currLongDiff =
maxNum( ReadingsVal( $name, "lastLocationLong", 0 ), $currLong ) -
minNum( ReadingsVal( $name, "lastLocationLong", 0 ), $currLong )
if ( $currLong ne "-" );
$currLatDiff =
maxNum( ReadingsVal( $name, "lastLocationLat", 0 ), $currLat ) -
minNum( ReadingsVal( $name, "lastLocationLat", 0 ), $currLat )
if ( $currLat ne "-" );
if (
$trigger == 1
&& ( $stateChange > 0
|| ReadingsVal( $name, "lastLocation", "-" ) ne $currLocation
|| $currLongDiff > 0.00002
|| $currLatDiff > 0.00002 )
)
{
Log3 $name, 5, "ROOMMATE $name: archiving last known location"; Log3 $name, 5, "ROOMMATE $name: archiving last known location";
readingsBulkUpdate( $hash, "lastLocationLat", $currLat ); readingsBulkUpdate( $hash, "lastLocationLat", $currLat );
readingsBulkUpdate( $hash, "lastLocationLong", $currLong ); readingsBulkUpdate( $hash, "lastLocationLong", $currLong );
readingsBulkUpdate( $hash, "lastLocationAddr", $currAddr ); readingsBulkUpdate( $hash, "lastLocationAddr", $currAddr )
readingsBulkUpdate( $hash, "lastLocation", $currLocation ); if ( $currAddr ne "" );
readingsBulkUpdate( $hash, "lastLocation", $currLocation );
} }
if ( $wayhome readingsBulkUpdate( $hash, "locationLat", $lat );
|| $stateChange > 0 readingsBulkUpdate( $hash, "locationLong", $long );
|| ( $lat ne "-" && $long ne "-" ) )
{ if ( $address ne "" ) {
Log3 $name, 5, "ROOMMATE $name: Using new lat/long/addr information";
readingsBulkUpdate( $hash, "locationLat", $lat );
readingsBulkUpdate( $hash, "locationLong", $long );
readingsBulkUpdate( $hash, "locationAddr", $address ); readingsBulkUpdate( $hash, "locationAddr", $address );
} }
elsif ( $currAddr ne "" ) {
else { readingsBulkUpdate( $hash, "locationAddr", "-" );
Log3 $name, 5,
"ROOMMATE $name: keeping last known lat/long/addr information";
readingsBulkUpdate( $hash, "locationLat", $currLat );
readingsBulkUpdate( $hash, "locationLong", $currLong );
readingsBulkUpdate( $hash, "locationAddr", $currAddr );
} }
readingsBulkUpdate( $hash, "location", $location ) readingsBulkUpdate( $hash, "location", $location );
if ( $location ne "wayhome" );
readingsEndUpdate( $hash, 1 ); readingsEndUpdate( $hash, 1 );