mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-05-01 20:20:10 +00:00
fixed: wrong URL creation
added: documentation git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@3546 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen
parent
c907a989eb
commit
fb3d670333
@ -1,30 +1,34 @@
|
|||||||
################################################################
|
|
||||||
#
|
|
||||||
# Copyright notice
|
|
||||||
#
|
|
||||||
# (c) 2010 Sacha Gloor (sacha@imp.ch)
|
|
||||||
#
|
|
||||||
# This script is free software; you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation; either version 2 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# The GNU General Public License can be found at
|
|
||||||
# http://www.gnu.org/copyleft/gpl.html.
|
|
||||||
# A copy is found in the textfile GPL.txt and important notices to the license
|
|
||||||
# from the author is found in LICENSE.txt distributed with these scripts.
|
|
||||||
#
|
|
||||||
# This script is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# This copyright notice MUST APPEAR in all copies of the script!
|
|
||||||
#
|
|
||||||
################################################################
|
|
||||||
# $Id$
|
# $Id$
|
||||||
|
################################################################
|
||||||
|
#
|
||||||
|
# This module will connect a webbased thermometer
|
||||||
|
# to your fhem installation.
|
||||||
|
#
|
||||||
|
# Further informations about required hardware:
|
||||||
|
# http://www.wut.de/e-57w0w-ww-dade-000.php
|
||||||
|
#
|
||||||
|
# (c) 2010 Sacha Gloor (sacha@imp.ch)
|
||||||
|
#
|
||||||
|
# corrections & documentation added for fhem
|
||||||
|
# 2013-07-30 by betateilchen ®
|
||||||
|
#
|
||||||
|
# This file is part of fhem.
|
||||||
|
#
|
||||||
|
# Fhem is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 2 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# Fhem is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with fhem. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
################################################################
|
||||||
|
|
||||||
##############################################
|
|
||||||
package main;
|
package main;
|
||||||
|
|
||||||
use strict;
|
use strict;
|
||||||
@ -51,71 +55,115 @@ WEBTHERM_Define($$)
|
|||||||
|
|
||||||
my $host = $a[2];
|
my $host = $a[2];
|
||||||
my $host_port = $a[3];
|
my $host_port = $a[3];
|
||||||
my $delay=$a[4];
|
my $interval=$a[4];
|
||||||
$attr{$name}{delay}=$delay if $delay;
|
$attr{$name}{interval}=$interval if $interval;
|
||||||
|
|
||||||
return "Wrong syntax: use define <name> WEBTHERM <ip-address> <port-nr> <poll-delay>" if(int(@a) != 5);
|
return "Usage: define <name> WEBTHERM <ip-address> <port-nr> <poll-interval>" if(int(@a) != 5);
|
||||||
|
|
||||||
$hash->{Host} = $host;
|
$hash->{Host} = $host;
|
||||||
$hash->{Host_Port} = $host_port;
|
$hash->{Host_Port} = $host_port;
|
||||||
|
|
||||||
InternalTimer(gettimeofday()+$delay, "WEBTHERM_GetStatus", $hash, 0);
|
InternalTimer(gettimeofday()+$interval, "WEBTHERM_GetStatus", $hash, 0);
|
||||||
|
|
||||||
return undef;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
#####################################
|
|
||||||
|
|
||||||
sub
|
sub
|
||||||
WEBTHERM_GetStatus($)
|
WEBTHERM_GetStatus($)
|
||||||
{
|
{
|
||||||
my ($hash) = @_;
|
my ($hash) = @_;
|
||||||
my $err_log='';
|
my $err_log='';
|
||||||
my $line;
|
my $line;
|
||||||
|
|
||||||
my $name = $hash->{NAME};
|
my $name = $hash->{NAME};
|
||||||
my $host = $hash->{Host};
|
my $host = $hash->{Host};
|
||||||
|
|
||||||
my $delay=$attr{$name}{delay}||300;
|
my $interval=$attr{$name}{interval}||300;
|
||||||
InternalTimer(gettimeofday()+$delay, "WEBTHERM_GetStatus", $hash, 0);
|
InternalTimer(gettimeofday()+$interval, "WEBTHERM_GetStatus", $hash, 0);
|
||||||
|
|
||||||
if(!defined($hash->{Host_Port})) { return(""); }
|
if(!defined($hash->{Host_Port})) { return(""); }
|
||||||
my $host_port = $hash->{Host_Port};
|
my $host_port = $hash->{Host_Port};
|
||||||
|
|
||||||
my $URL="http://".$host."/Single".$host_port;
|
### 2013-07-30 corrected by betateilchen
|
||||||
my $agent = LWP::UserAgent->new(env_proxy => 1,keep_alive => 1, timeout => 3);
|
# my $URL="http://".$host."/Single".$host_port;
|
||||||
my $header = HTTP::Request->new(GET => $URL);
|
my $URL="http://".$host.":".$host_port."/Single";
|
||||||
my $request = HTTP::Request->new('GET', $URL, $header);
|
### end-of-correction
|
||||||
my $response = $agent->request($request);
|
my $agent = LWP::UserAgent->new(env_proxy => 1,keep_alive => 1, timeout => 3);
|
||||||
|
my $header = HTTP::Request->new(GET => $URL);
|
||||||
|
my $request = HTTP::Request->new('GET', $URL, $header);
|
||||||
|
my $response = $agent->request($request);
|
||||||
|
|
||||||
$err_log.= "Can't get $URL -- ".$response->status_line
|
$err_log.= "Can't get $URL -- ".$response->status_line
|
||||||
unless $response->is_success;
|
unless $response->is_success;
|
||||||
|
|
||||||
if($err_log ne "")
|
if($err_log ne "")
|
||||||
{
|
{
|
||||||
Log GetLogLevel($name,2), "WEBTHERM ".$err_log;
|
Log GetLogLevel($name,2), "WEBTHERM $name ".$err_log;
|
||||||
return("");
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
my $body = $response->content;
|
my $body = $response->content;
|
||||||
my $text='';
|
my $text='';
|
||||||
# print $body."\n";
|
|
||||||
my @values=split(/;/,$body);
|
|
||||||
my $last=$values[$#values];
|
|
||||||
my $state=$last;
|
|
||||||
$state=~s/,/./g;
|
|
||||||
$state=substr($state,0,-2);
|
|
||||||
|
|
||||||
my $sensor="temperature";
|
my @values=split(/;/,$body);
|
||||||
Log 4, "WEBTHERM_GetStatus: $name $host_port ".$hash->{STATE}." -> ".$state;
|
my $last=$values[$#values];
|
||||||
|
my $state=$last;
|
||||||
|
$state=~s/,/./g;
|
||||||
|
$state=substr($state,0,-2);
|
||||||
|
|
||||||
$text="Temperature: ".$state;
|
my $sensor="temperature";
|
||||||
$hash->{STATE} = "T: ".$state;
|
Log 4, "WEBTHERM_GetStatus: $name $host_port ".$hash->{STATE}." -> ".$state;
|
||||||
|
|
||||||
$hash->{CHANGED}[0] = $text;
|
$text="Temperature: ".$state;
|
||||||
$hash->{READINGS}{$sensor}{TIME} = TimeNow();
|
$hash->{STATE} = "T: ".$state;
|
||||||
$hash->{READINGS}{$sensor}{VAL} = $state." (Celsius)";
|
$hash->{CHANGED}[0] = $text;
|
||||||
DoTrigger($name, undef) if($init_done);
|
|
||||||
|
readingsSingleUpdate($name, $sensor, $state, 1);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
1;
|
1;
|
||||||
|
|
||||||
|
=pod
|
||||||
|
=begin html
|
||||||
|
|
||||||
|
<a name="WEBTHERM"></a>
|
||||||
|
<h3>WEBTHERM</h3>
|
||||||
|
<ul>
|
||||||
|
This module connects a <a href="http://www.wut.de/e-57w0w-ww-dade-000.php">Web-Thermometer made by W&T</a> to your FHEM installation.<br/>
|
||||||
|
Currently this module is no longer maintained, but it should work in its current state.<br/>
|
||||||
|
It is provided "as is" for backward compatibility.<br/>
|
||||||
|
<br />
|
||||||
|
<a name="WEBTHERM_Define"></a>
|
||||||
|
<b>Define</b>
|
||||||
|
<ul><br/>
|
||||||
|
<code>define <name> WEBTHERM <ip-address> <port-nr> <interval></code><br/>
|
||||||
|
<br/>
|
||||||
|
Defines a WEBTHERM device at given ip and port.</br>
|
||||||
|
Values are polled periodically defined by given interval (in seconds).<br/>
|
||||||
|
Read temperature is written into reading "state".<br/>
|
||||||
|
</ul>
|
||||||
|
<br/><br />
|
||||||
|
|
||||||
|
<a name="WEBTHERM_Set"></a>
|
||||||
|
<b>Set</b>
|
||||||
|
<ul>
|
||||||
|
N/A
|
||||||
|
</ul>
|
||||||
|
<br/><br />
|
||||||
|
|
||||||
|
<a name="WEBTHERM_Get"></a>
|
||||||
|
<b>Get</b>
|
||||||
|
<ul>
|
||||||
|
N/A
|
||||||
|
</ul>
|
||||||
|
<br/><br />
|
||||||
|
|
||||||
|
<a name="WEBTHERM_Attr"></a>
|
||||||
|
<b>Attr</b>
|
||||||
|
<ul>
|
||||||
|
N/A
|
||||||
|
</ul>
|
||||||
|
</ul>
|
||||||
|
=end html
|
||||||
|
=cut
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user