From fbefc2a62a392287b9e844b2f71ae3419710e53b Mon Sep 17 00:00:00 2001
From: tpoitzsch <>
Date: Mon, 17 Feb 2014 18:11:25 +0000
Subject: [PATCH] git-svn-id: https://svn.fhem.de/fhem/trunk@4967
2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
fhem/FHEM/70_JSONMETER.pm | 56 +++++++++++++++++++--------------------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/fhem/FHEM/70_JSONMETER.pm b/fhem/FHEM/70_JSONMETER.pm
index 69b7e8d82..3692b090e 100644
--- a/fhem/FHEM/70_JSONMETER.pm
+++ b/fhem/FHEM/70_JSONMETER.pm
@@ -86,11 +86,11 @@ sub JSONMETER_UpdateAborted($);
,[1, "0100290700FF", "electricityPowerPhase2", 1] # {"obis":"0100290700FF","value":14.27,"unit":"W"},
,[1, "01003D0700FF", "electricityPowerPhase3", 1] # {"obis":"01003D0700FF","value":89.40,"unit":"W"},
,[1, "1.8.0|0101010800FF", "electricityConsumed", 2] # {"obis": "1.8.0", "scale": 0, "value": 8802276, "unit": "Wh", "valueString": "0008802.276" },
- ,[1, "0101010801FF", "electricityConsumedTariff1", 2] # {"obis":"0101010801FF","value":33.53,"unit":"kWh"},
- ,[1, "0101010802FF", "electricityConsumedTariff2", 2] # {"obis":"0101010802FF","value":33.53,"unit":"kWh"},
- ,[1, "0101010803FF", "electricityConsumedTariff3", 2] # {"obis":"0101010803FF","value":33.53,"unit":"kWh"},
- ,[1, "0101010804FF", "electricityConsumedTariff4", 2] # {"obis":"0101010804FF","value":33.53,"unit":"kWh"},
- ,[1, "0101010805FF", "electricityConsumedTariff5", 2] # {"obis":"0101010805FF","value":33.53,"unit":"kWh"},
+ ,[1, "1.8.1|0101010801FF", "electricityConsumedTariff1", 2] # {"obis":"0101010801FF","value":33.53,"unit":"kWh"},
+ ,[1, "1.8.2|0101010802FF", "electricityConsumedTariff2", 2] # {"obis":"0101010802FF","value":33.53,"unit":"kWh"},
+ ,[1, "1.8.3|0101010803FF", "electricityConsumedTariff3", 2] # {"obis":"0101010803FF","value":33.53,"unit":"kWh"},
+ ,[1, "1.8.4|0101010804FF", "electricityConsumedTariff4", 2] # {"obis":"0101010804FF","value":33.53,"unit":"kWh"},
+ ,[1, "1.8.5|0101010805FF", "electricityConsumedTariff5", 2] # {"obis":"0101010805FF","value":33.53,"unit":"kWh"},
,[1, "010001080080", "electricityConsumedToday", 1]
,[1, "010001080081", "electricityConsumedYesterday", 1]
,[1, "010001080082", "electricityConsumedLastWeek", 1]
@@ -606,19 +606,19 @@ JSONMETER_UpdateAborted($)
define <name> JSONMETER <deviceType> [<ip address>] [poll-interval]
Example: define powermeter JSONMETER ITF 192.168.178.20 300
-
- If the pool interval is omitted, it is set to 300 (seconds). Smallest possible value is 10.
-
- With 0 it will only update on "manual" request.
+
[poll-interval]
+ <deviceType>
define Stromzaehler JSONMETER ITF 192.168.178.20 300
Gerätetyp
+ [Abfrageinterval]
<Gerätetyp>
+ alwaysAnalyse < 0 | 1 >
- INTERVAL <Abfrageinterval>
statusRequest
alwaysAnalyse < 0 | 1 >
+ doStatistics < 0 | 1 >