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

GEOFANCY: improved readings

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4595 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2014-01-09 13:22:00 +00:00
parent b7c168179e
commit e9f7899cc2
1 changed files with 57 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
fhem/FHEM/98_GEOFANCY.pm
View File

@ -25,7 +25,7 @@
# along with fhem. If not, see <http://www.gnu.org/licenses/>. # along with fhem. If not, see <http://www.gnu.org/licenses/>.
# #
# #
# Version: 1.0.0 # Version: 1.0.1
# #
# Major Version History: # Major Version History:
# - 1.0.0 - 2014-01-09 # - 1.0.0 - 2014-01-09
@ -173,7 +173,7 @@ sub GEOFANCY_CGI() {
my $trigger; my $trigger;
my $msg; my $msg;
# data via GET # data received
if ( $request =~ m,^(/[^/]+)\?((.*)?)?$, ) { if ( $request =~ m,^(/[^/]+)\?((.*)?)?$, ) {
$link = $1; $link = $1;
$URI = $2; $URI = $2;
@ -234,14 +234,14 @@ sub GEOFANCY_CGI() {
$trigger = $webArgs->{trigger}; $trigger = $webArgs->{trigger};
} }
# data via POST # no data received
else { else {
Log3 undef, 3, Log3 undef, 3,
"GEOFANCY: Data transfer via POST not implemented. (request URI: $request)"; "GEOFANCY: No data received, see API information on http://wiki.geofancy.com";
return ( return (
"text/plain; charset=utf-8", "text/plain; charset=utf-8",
"NOK Data transfer via POST not implemented. (request URI: $request)" "NOK No data received, see API information on http://wiki.geofancy.com"
); );
} }
@ -287,18 +287,60 @@ sub GEOFANCY_CGI() {
. $trigger; . $trigger;
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
readingsBulkUpdate( $hash, $device, $trigger . " " . $id );
readingsBulkUpdate( $hash, "lastDevice", $device ); # General readings
readingsBulkUpdate( $hash, "lastEnter", $device . " " . $id )
if $trigger eq "enter";
readingsBulkUpdate( $hash, "lastExit", $device . " " . $id )
if $trigger eq "exit";
readingsBulkUpdate( $hash, "lastId_" . $device, $id );
readingsBulkUpdate( $hash, "lastLat_" . $device, $lat );
readingsBulkUpdate( $hash, "lastLong_" . $device, $long );
readingsBulkUpdate( $hash, "lastTrigger_" . $device, $trigger );
readingsBulkUpdate( $hash, "state", readingsBulkUpdate( $hash, "state",
"dev:$device trig:$trigger id:$id lat:$lat long:$long" ); "dev:$device trig:$trigger id:$id lat:$lat long:$long" );
readingsBulkUpdate( $hash, "lastDevice", $device );
readingsBulkUpdate( $hash, "lastArr", $device . " " . $id )
if $trigger eq "enter";
readingsBulkUpdate( $hash, "lastDep", $device . " " . $id )
if $trigger eq "exit";
my $time = TimeNow();
if ( $trigger eq "enter" || $trigger eq "test" ) {
Log3 $name, 3, "GEOFANCY $name: $device arrived at $id";
readingsBulkUpdate( $hash, $device, "arrived " . $id );
readingsBulkUpdate( $hash, "currLoc_" . $device, $id );
readingsBulkUpdate( $hash, "currLocLat_" . $device, $lat );
readingsBulkUpdate( $hash, "currLocLong_" . $device, $long );
readingsBulkUpdate( $hash, "currLocTime_" . $device, $time );
}
if ( $trigger eq "exit" ) {
my $currReading;
my $lastReading;
Log3 $name, 3, "GEOFANCY $name: $device left $id and is underway";
# backup last known location if not "underway"
$currReading = "currLoc_" . $device;
if ( defined( $hash->{READINGS}{$currReading}{VAL} )
&& $hash->{READINGS}{$currReading}{VAL} ne "underway" )
{
foreach ( 'Loc', 'LocLat', 'LocLong' ) {
$currReading = "curr" . $_ . "_" . $device;
$lastReading = "last" . $_ . "_" . $device;
readingsBulkUpdate( $hash, $lastReading,
$hash->{READINGS}{$currReading}{VAL} )
if ( defined( $hash->{READINGS}{$currReading}{VAL} ) );
}
$currReading = "currLocTime_" . $device;
readingsBulkUpdate(
$hash,
"lastLocArr_" . $device,
$hash->{READINGS}{$currReading}{VAL}
) if ( defined( $hash->{READINGS}{$currReading}{VAL} ) );
readingsBulkUpdate( $hash, "lastLocDep_" . $device, $time );
}
readingsBulkUpdate( $hash, $device, "left " . $id );
readingsBulkUpdate( $hash, "currLoc_" . $device, "underway" );
readingsBulkUpdate( $hash, "currLocLat_" . $device, "-" );
readingsBulkUpdate( $hash, "currLocLong_" . $device, "-" );
readingsBulkUpdate( $hash, "currLocTime_" . $device, $time );
}
readingsEndUpdate( $hash, 1 ); readingsEndUpdate( $hash, 1 );
$msg = "$trigger OK"; $msg = "$trigger OK";