From 090a423a21c4c800b1c8717a2eb21a2fe8472696 Mon Sep 17 00:00:00 2001 From: eisler Date: Fri, 3 Feb 2017 09:42:52 +0000 Subject: [PATCH] 00_MQTT: fixed delete MQTT_DEVICE git-svn-id: https://svn.fhem.de/fhem/trunk@13318 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/00_MQTT.pm | 4 +++- fhem/FHEM/10_MQTT_BRIDGE.pm | 5 ++++- fhem/FHEM/10_MQTT_DEVICE.pm | 5 ++++- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 6b49e312f..513feaa6d 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - bufix: 00_MQTT: fixed delete MQTT_DEVICE - update: 98_DOIFtools: suppress lookup windows in DOIF or DOIFtools by attribute DOIFtoolsNoLookUp and DOIFtoolsNoLookUpInDOIF - bugfix: 88_HMCCU: Bug fixes diff --git a/fhem/FHEM/00_MQTT.pm b/fhem/FHEM/00_MQTT.pm index f7eb97552..1cdaeed6d 100644 --- a/fhem/FHEM/00_MQTT.pm +++ b/fhem/FHEM/00_MQTT.pm @@ -478,6 +478,7 @@ sub Client_Define($$) { sub Client_Undefine($) { client_stop(shift); + return undef; }; sub client_attr($$$$$) { @@ -544,7 +545,8 @@ sub client_stop($) { 1; =pod -=item summary connects fhem to MQTT +=item [device] +=item summary connects fhem to MQTT =begin html diff --git a/fhem/FHEM/10_MQTT_BRIDGE.pm b/fhem/FHEM/10_MQTT_BRIDGE.pm index 9e7a137d3..d7d9f4a08 100644 --- a/fhem/FHEM/10_MQTT_BRIDGE.pm +++ b/fhem/FHEM/10_MQTT_BRIDGE.pm @@ -2,7 +2,8 @@ # # fhem bridge to mqtt (see http://mqtt.org) # -# Copyright (C) 2014 Norbert Truchsess +# Copyright (C) 2017 Stephan Eisler +# Copyright (C) 2014 - 2016 Norbert Truchsess # # This file is part of fhem. # @@ -182,6 +183,8 @@ sub onmessage($$$) { 1; =pod +=item [device] +=item summary MQTT_BRIDGE acts as a bridge in between an fhem-device and mqtt-topics =begin html diff --git a/fhem/FHEM/10_MQTT_DEVICE.pm b/fhem/FHEM/10_MQTT_DEVICE.pm index 5d8a68290..8efc4f78e 100644 --- a/fhem/FHEM/10_MQTT_DEVICE.pm +++ b/fhem/FHEM/10_MQTT_DEVICE.pm @@ -2,7 +2,8 @@ # # fhem bridge to mqtt (see http://mqtt.org) # -# Copyright (C) 2014 Norbert Truchsess +# Copyright (C) 2017 Stephan Eisler +# Copyright (C) 2014 - 2016 Norbert Truchsess # # This file is part of fhem. # @@ -188,6 +189,8 @@ sub onmessage($$$) { 1; =pod +=item [device] +=item summary MQTT_DEVICE acts as a fhem-device that is mapped to mqtt-topics =begin html