diff --git a/fhem/FHEM/59_OPENWEATHER.pm b/fhem/FHEM/59_OPENWEATHER.pm
index eb07ea933..cbb086cb0 100644
--- a/fhem/FHEM/59_OPENWEATHER.pm
+++ b/fhem/FHEM/59_OPENWEATHER.pm
@@ -119,9 +119,7 @@ use LWP::UserAgent;
use HTTP::Request;
use HTML::Parser;
-# Modul Version for remote debugging
my $MODUL = "OPENWEATHER";
- my $modulVersion = '# $Id$';
sub OPENWEATHER_Log($$$);
sub OPENWEATHER_Start($);
@@ -194,8 +192,7 @@ OPENWEATHER_Define($$)
# Get first data after 7 seconds
InternalTimer(gettimeofday() + 7, "OPENWEATHER_Start", $hash, 0) if $interval > 0;
- $hash->{fhem}{modulVersion} = '# $ID: $';
- OPENWEATHER_Log $hash, 5, "OPENWEATHER.pm version is " . $hash->{fhem}{modulVersion};
+ $hash->{fhem}{modulVersion} = '$Date$';
return undef;
} #end OPENWEATHER_Define
diff --git a/fhem/FHEM/59_PROPLANTA.pm b/fhem/FHEM/59_PROPLANTA.pm
index 8f6f7d294..280994e04 100644
--- a/fhem/FHEM/59_PROPLANTA.pm
+++ b/fhem/FHEM/59_PROPLANTA.pm
@@ -331,7 +331,6 @@ use vars qw($readingFnAttributes);
use vars qw(%defs);
my $MODUL = "PROPLANTA";
-my $modulVersion = '# $Id$';
my %url_template_1 =( "de" => "http://www.proplanta.de/Wetter/LOKALERORT-Wetter.html"
, "at" => "http://www.proplanta.de/Agrarwetter-Oesterreich/LOKALERORT/"
@@ -397,7 +396,7 @@ sub PROPLANTA_Define($$)
$hash->{STATE} = "Initializing";
$hash->{LOCAL} = 0;
$hash->{INTERVAL} = 3600;
- $hash->{fhem}{modulVersion} = $modulVersion;
+ $hash->{fhem}{modulVersion} = '$Date$';
RemoveInternalTimer($hash);
diff --git a/fhem/FHEM/70_JSONMETER.pm b/fhem/FHEM/70_JSONMETER.pm
index a0a424064..97d71c940 100644
--- a/fhem/FHEM/70_JSONMETER.pm
+++ b/fhem/FHEM/70_JSONMETER.pm
@@ -3,13 +3,13 @@
#
# 70_JSONMETER.pm
#
-# Copyright notice
-#
# (c) 2014 Torsten Poitzsch < torsten . poitzsch at gmx . de >
#
# This module reads data from devices that provide OBIS compatible data
# in json format (e.g. power meters)
#
+# Copyright notice
+#
# 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
@@ -60,8 +60,7 @@ sub JSONMETER_doStatisticMinMax ($$$);
sub JSONMETER_doStatisticMinMaxSingle ($$$$);
sub JSONMETER_doStatisticDelta ($$$$$);
sub JSONMETER_doStatisticDeltaSingle ($$$$$$);
-# Modul Version for remote debugging
- my $modulVersion = "2014-04-29";
+
my $MODUL = "JSONMETER";
##############################################################
# Syntax: meterType => port URL-Path
@@ -200,8 +199,7 @@ JSONMETER_Define($$)
#Reset temporary values
$hash->{fhem}{jsonInterpreter} = "";
- $hash->{fhem}{modulVersion} = $modulVersion;
- JSONMETER_Log $hash, 5, "JSONMETER.pm version is $modulVersion.";
+ $hash->{fhem}{modulVersion} = '$Date$';
return undef;
} #end JSONMETER_Define
@@ -906,6 +904,7 @@ JSONMETER_doStatisticDeltaSingle ($$$$$$)
JSONMETER
+
This module reads data from a measurement unit (so called smart meters for electricity, gas or heat)
@@ -918,17 +917,14 @@ JSONMETER_doStatisticDeltaSingle ($$$$$$)
Define
+
define <name> JSONMETER <deviceType> [<ip address>] [poll-interval]
Example: define powermeter JSONMETER ITF 192.168.178.20 300
- [poll-interval]
-
- Default is 300 seconds. Smallest possible value is 10. With 0 it will only update on "manual" request.
-
<deviceType>
- Used to define the path and port to extract the json file.
+ Mandatory. Used to define the path and port to extract the json file.
The attribute 'pathString' can be used to add login information to the URL path of predefined devices.
@@ -944,6 +940,14 @@ JSONMETER_doStatisticDeltaSingle ($$$$$$)
- url - use the URL defined via the attributes 'pathString' and 'port'
- file - use the file defined via the attribute 'pathString' (positioned in the FHEM file system)
+
+ [<ip address>]
+
+ IP address of the phyisical device. (not needed for 'url' and 'file')
+
+ [poll-interval]
+
+ Optional. Default is 300 seconds. Smallest possible value is 10. With 0 it will only update on "manual" request.
@@ -991,45 +995,46 @@ JSONMETER_doStatisticDeltaSingle ($$$$$$)
Attributes
- alwaysAnalyse < 0 | 1 >
-
- Repeats by each update the json analysis - use if structure of json data changes
-
- Normally the once analysed structure is saved to reduce CPU load.
-
- doStatistics < 0 | 1 >
-
- Builds daily, monthly and yearly statistics for certain readings (average/min/max or cumulated values).
-
- Logging and visualisation of the statistics should be done with readings of type 'statReadingNameLast'.
-
- pathString <string>
-
- - if deviceType = 'file': specifies the local file name and path
- - if deviceType = 'url': specifies the url path
- - other deviceType: can be used to add login information to the url path of predefined devices
-
-
- port <number>
-
- Specifies the IP port for the deviceType 'url' (default is 80)
-
- timeOut <seconds>
-
- Specifies the timeout for the reading of the raw data. (default is 10)
-
- The run time of the reading process can be measured via "get jsonFile".
-
- - readingFnAttributes
+ alwaysAnalyse < 0 | 1 >
+
+ Repeats by each update the json analysis - use if structure of json data changes
+
+ Normally the once analysed structure is saved to reduce CPU load.
+
+ doStatistics < 0 | 1 >
+
+ Builds daily, monthly and yearly statistics for certain readings (average/min/max or cumulated values).
+
+ Logging and visualisation of the statistics should be done with readings of type 'statReadingNameLast'.
+
+ pathString <string>
+
+ - if deviceType = 'file': specifies the local file name and path
+ - if deviceType = 'url': specifies the url path
+ - other deviceType: can be used to add login information to the url path of predefined devices
+
+
+ port <number>
+
+ Specifies the IP port for the deviceType 'url' (default is 80)
+
+ timeOut <seconds>
+
+ Specifies the timeout for the reading of the raw data. (default is 10)
+
+ The run time of the reading process can be measured via "get jsonFile".
+
+ - readingFnAttributes
-
+
=end html
=begin html_DE
JSONMETER
+
Dieses Modul liest Daten von Messgeräten (z.B. Stromzähler, Gaszähler oder Wärmezähler, so genannte Smartmeter),
welche OBIS kompatible Daten im JSON-Format auf einem Webserver oder auf dem FHEM-Dateisystem zur Verfügung stellen.
@@ -1146,7 +1151,7 @@ JSONMETER_doStatisticDeltaSingle ($$$$$$)
- readingFnAttributes
-
+
=end html_DE
=cut
diff --git a/fhem/FHEM/98_statistics.pm b/fhem/FHEM/98_statistics.pm
index 39ae5d39f..a162d18bb 100644
--- a/fhem/FHEM/98_statistics.pm
+++ b/fhem/FHEM/98_statistics.pm
@@ -53,7 +53,6 @@ sub statistics_maxDecPlaces($$);
sub statistics_UpdateDevReading($$$$);
# Modul Version for remote debugging
- my $modulVersion = "2014-07-06";
my $MODUL = "statistics";
##############################################################
@@ -147,7 +146,7 @@ statistics_Define($$)
$hash->{DEV_REGEXP} = $devName;
$hash->{STATE} = "Waiting for notifications";
- $hash->{fhem}{modulVersion} = $modulVersion;
+ $hash->{fhem}{modulVersion} = '$Date$';
RemoveInternalTimer($hash);
@@ -1019,7 +1018,7 @@ statistics_UpdateDevReading($$$$)
statistics
-
+
This modul calculates for certain readings of given devices statistical values and adds them to the devices.
@@ -1117,7 +1116,7 @@ statistics_UpdateDevReading($$$$)
Allows the correct timely assignment within plots, can be adapted to CPU load.
- singularReadings <DeviceRegExp:ReadingRegExp>:statTypes:period
+ singularReadings <DeviceRegExp:ReadingRegExp>:statTypes:period
- statTypes: Min|Avg|Max|Delta|Duration|Tendency
- period: Hour|Day|Month|Year|1h|2h|3h|6h