Selaa lähdekoodia

- new readings for Luxtronik 2.0
- change min. CheckMK version to 1.2.8

erdoking 7 vuotta sitten
vanhempi
sitoutus
a261584cf7

+ 6 - 2
CHANGELOG.md

@@ -3,8 +3,12 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
- - new agent with supprt for empty readings
- - change req. check_mk version to 1.2.8 [thanks to mab]
+ - new agent with suppurt for empty readings
+
+## [0.9.2] - 2018-07-03
+### Added
+ - change req. check_mk version to 1.2.8 [thanks to mab] 
+ - support for more Luxtronik 2.0 readings (counterHoursHeatPump,counterHoursHeating,counterHoursHotWater) [thanks to mab]
 
 ## [0.9.1] - 2018-06-25
 ### Added

BIN
fhem-0.9.1.mkp


BIN
fhem-0.9.2.mkp


+ 3 - 3
local/share/check_mk/checks/fhem

@@ -178,9 +178,9 @@ def check_fhem(item, params, info):
                 ('returnTemperatureTarget',     'returnTemperatureTarget',      u'°C',              '',                0,          1),
 #                ('counterHours2ndHeatSource1',  'counterHours2ndHeatSource1',   '',                 '',                0,          0),
 #                ('counterHours2ndHeatSource2',  'counterHours2ndHeatSource2',   '',                 '',                0,          0),
-#                ('counterHoursHeatPump',        'counterHoursHeatPump',         '',                 '',                0,          0),
-#                ('counterHoursHeating',         'counterHoursHeating',          '',                 '',                0,          0),
-#                ('counterHoursHotWater',        'counterHoursHotWater',         '',                 '',                0,          0),
+                ('counterHoursHeatPump',        'counterHoursHeatPump',         '',                 '',                1,          1),
+                ('counterHoursHeating',         'counterHoursHeating',          '',                 '',                1,          1),
+                ('counterHoursHotWater',        'counterHoursHotWater',         '',                 '',                1,          1),
 
 
 

+ 25 - 0
local/share/check_mk/pnp-templates/check_mk-fhem.php

@@ -201,4 +201,29 @@ if (isset($fhem_defines['returnTemperature']) ) {
 }
 
 
+# 13. LUXTRONIK2 (counterHoursHeatPump)
+if (isset($fhem_defines['counterHoursHeatPump']) ) {
+   $ds_name[] = 'counterHoursHeatPump';
+   $opt[] = $defopt . "--title \"counter Hours Heating\"";
+   $def[] = ""
+        . fhem_area("counterHoursHeatPump", "00EE76", "counterHoursHeatPump", "h",  FALSE)
+#        . fhem_curve("LINE2", "counterHoursHeating", "00bfff", "counterHoursHeating", "h",  FALSE)
+#        . fhem_area("counterHoursHotWater","ee0000", "counterHoursHotWater",   "h",  FALSE)
+#        . fhem_curve("LINE3", "counterHoursHeating", "00bfff", "counterHoursHeating", "h",  FALSE)
+
+
+        ;
+}
+
+# 14. LUXTRONIK2 (counterHoursHeating)
+if (isset($fhem_defines['counterHoursHeating'])  or isset($fhem_defines['counterHoursHotWater'])) {
+   $ds_name[] = 'counterHoursHeating';
+   $opt[] = $defopt . "--title \"counterHoursHotWater + counterHoursHeating\"";
+   $def[] = ""
+        . fhem_area("counterHoursHotWater","ffd700", "counterHoursHotWater",   "h",  FALSE)
+        . fhem_area("counterHoursHeating", "ee0000", "counterHoursHeating", "h",  FALSE)
+        ;
+}
+
+
 ?>