2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-01 01:09:47 +00:00
Commit Graph

38 Commits

Author SHA1 Message Date
tpoitzsch
8e1a0b8458 JSONMETER: energy + energyOUT
git-svn-id: https://svn.fhem.de/fhem/trunk@7793 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2015-01-31 12:36:58 +00:00
tpoitzsch
8223ff2242 LUXTRONIK: docu
git-svn-id: https://svn.fhem.de/fhem/trunk@7396 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2015-01-01 19:35:10 +00:00
tpoitzsch
ad99d84a95 JSONMETER: docu
git-svn-id: https://svn.fhem.de/fhem/trunk@7247 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-12-17 20:42:15 +00:00
tpoitzsch
25881efdaa LUXTRONIK2: docu
git-svn-id: https://svn.fhem.de/fhem/trunk@7234 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-12-16 18:11:25 +00:00
tpoitzsch
420f5d7e44 openweather: date
git-svn-id: https://svn.fhem.de/fhem/trunk@6964 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-11-13 20:44:43 +00:00
rudolfkoenig
4af0529bf7 contrib/pre-commit: new perl version with doc checking
git-svn-id: https://svn.fhem.de/fhem/trunk@6868 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-11-02 15:30:49 +00:00
tpoitzsch
61fbe75d44 JSONMETER: better debugging
git-svn-id: https://svn.fhem.de/fhem/trunk@6853 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-11-01 17:28:08 +00:00
tpoitzsch
3f58590dcf JSONMETER: Attribute timeOut, runtime measurement
git-svn-id: https://svn.fhem.de/fhem/trunk@6242 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-07-11 17:29:21 +00:00
tpoitzsch
9878a96e54 bugfix
git-svn-id: https://svn.fhem.de/fhem/trunk@6232 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-07-10 18:56:32 +00:00
tpoitzsch
d584497bed git-svn-id: https://svn.fhem.de/fhem/trunk@6025 2b470e98-0d58-463d-a4d8-8e2adae1ed80 2014-06-01 12:07:58 +00:00
tpoitzsch
09f5ce0991 git-svn-id: https://svn.fhem.de/fhem/trunk@6020 2b470e98-0d58-463d-a4d8-8e2adae1ed80 2014-05-31 09:14:00 +00:00
tpoitzsch
74b3820ca4 docu
git-svn-id: https://svn.fhem.de/fhem/trunk@5985 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-05-27 04:43:29 +00:00
tpoitzsch
b3325005be docu
git-svn-id: https://svn.fhem.de/fhem/trunk@5923 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-05-21 19:38:37 +00:00
tpoitzsch
b7415b42b3 bugfix: Avg Div 0
git-svn-id: https://svn.fhem.de/fhem/trunk@5806 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-05-10 08:07:03 +00:00
tpoitzsch
b9785ab6c7 # $Id:$
git-svn-id: https://svn.fhem.de/fhem/trunk@5798 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-05-09 16:24:40 +00:00
tpoitzsch
435d9ca9b2 git-svn-id: https://svn.fhem.de/fhem/trunk@5743 2b470e98-0d58-463d-a4d8-8e2adae1ed80 2014-05-04 19:10:48 +00:00
tpoitzsch
e66eee2e38 git-svn-id: https://svn.fhem.de/fhem/trunk@5699 2b470e98-0d58-463d-a4d8-8e2adae1ed80 2014-04-29 20:13:15 +00:00
tpoitzsch
49ccd8ede3 JSONMETER: hourly statistics
git-svn-id: https://svn.fhem.de/fhem/trunk@5698 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-04-29 19:30:17 +00:00
tpoitzsch
db66e9706f JSONMETER: Fix electricityPower LS110
git-svn-id: https://svn.fhem.de/fhem/trunk@5689 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-04-28 18:04:28 +00:00
tpoitzsch
17d8708386 JSONMETER: Consumption statistics redone and time depending tariffs added (activeTariff)
git-svn-id: https://svn.fhem.de/fhem/trunk@5674 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-04-27 05:25:00 +00:00
tpoitzsch
7743e57212 JSONMETER: statElectricityConsumedToday for LS110
git-svn-id: https://svn.fhem.de/fhem/trunk@5578 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-04-20 08:08:44 +00:00
tpoitzsch
fc4b0b965e docu
git-svn-id: https://svn.fhem.de/fhem/trunk@5180 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-03-09 17:44:42 +00:00
tpoitzsch
804b8a0263 docu
git-svn-id: https://svn.fhem.de/fhem/trunk@5133 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-03-05 08:00:05 +00:00
tpoitzsch
835ccf48cf JSONMETER: statistic calculations implemented
git-svn-id: https://svn.fhem.de/fhem/trunk@5121 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-03-04 09:53:27 +00:00
tpoitzsch
ef0e3c969d git-svn-id: https://svn.fhem.de/fhem/trunk@5005 2b470e98-0d58-463d-a4d8-8e2adae1ed80 2014-02-20 21:13:02 +00:00
tpoitzsch
99bf13bbcc LUXTRONIK2: Anzeige der Werte von Solarkollektoren
git-svn-id: https://svn.fhem.de/fhem/trunk@4983 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-02-18 16:49:45 +00:00
tpoitzsch
fbefc2a62a git-svn-id: https://svn.fhem.de/fhem/trunk@4967 2b470e98-0d58-463d-a4d8-8e2adae1ed80 2014-02-17 18:11:25 +00:00
tpoitzsch
2bcf2b5e32 docu link
git-svn-id: https://svn.fhem.de/fhem/trunk@4922 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-02-14 19:02:42 +00:00
tpoitzsch
aa7da050a8 docu
git-svn-id: https://svn.fhem.de/fhem/trunk@4921 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-02-14 18:48:57 +00:00
tpoitzsch
13fa7326aa git-svn-id: https://svn.fhem.de/fhem/trunk@4917 2b470e98-0d58-463d-a4d8-8e2adae1ed80 2014-02-13 21:29:55 +00:00
tpoitzsch
ba2ba2fb51 git-svn-id: https://svn.fhem.de/fhem/trunk@4915 2b470e98-0d58-463d-a4d8-8e2adae1ed80 2014-02-13 21:03:27 +00:00
tpoitzsch
4cd8f925f6 JSONMETER: Regular expressions improved
git-svn-id: https://svn.fhem.de/fhem/trunk@4913 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-02-13 20:43:56 +00:00
tpoitzsch
e1e7a5f500 JSONMETER: Gerätetyp LS110
git-svn-id: https://svn.fhem.de/fhem/trunk@4888 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-02-11 20:14:30 +00:00
tpoitzsch
57a9a06909 html tags fixed
git-svn-id: https://svn.fhem.de/fhem/trunk@4883 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-02-11 18:17:43 +00:00
tpoitzsch
41a39fa313 JSONMETER: docu corrections, additional obis values e.g. powerProduction
git-svn-id: https://svn.fhem.de/fhem/trunk@4871 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-02-10 17:13:38 +00:00
tpoitzsch
564b293656 JSONMETER: Time out BlockingCall will not stop regular update anymore
git-svn-id: https://svn.fhem.de/fhem/trunk@4869 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-02-10 05:59:50 +00:00
tpoitzsch
e4d312604f 70_JSONMETER.pm: Docu change
git-svn-id: https://svn.fhem.de/fhem/trunk@4866 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-02-09 20:25:04 +00:00
tpoitzsch
5f8d8e3db7 new module 70_JSONMETER to read obis compatible data in json format from so called smart meters for electricity, gas or heat
git-svn-id: https://svn.fhem.de/fhem/trunk@4865 2b470e98-0d58-463d-a4d8-8e2adae1ed80
2014-02-09 20:14:53 +00:00