diff --git a/fhem/FHEM/30_HUEBridge.pm b/fhem/FHEM/30_HUEBridge.pm index a370359ae..cae3deb2f 100644 --- a/fhem/FHEM/30_HUEBridge.pm +++ b/fhem/FHEM/30_HUEBridge.pm @@ -215,10 +215,11 @@ HUEBridge_Define($$) { my ($hash, $def) = @_; - my @args = split("[ \t]+", $def); - return $@ unless ( FHEM::Meta::SetInternals($hash) ); + + my @args = split("[ \t]+", $def); + return "Usage: define HUEBridge [] [interval]" if(@args < 2); my ($name, $type, $host, $interval) = @args; @@ -2044,6 +2045,7 @@ HUEBridge_Attr($$$) =end html +=encoding utf8 =for :application/json;q=META.json 30_HUEBridge.pm { "abstract": "module for the phillips hue bridge", @@ -2060,7 +2062,8 @@ HUEBridge_Attr($$$) "keywords": [ "fhem-mod", "fhem-mod-device", - "HUE" + "HUE", + "zigbee" ], "release_status": "stable", "x_fhem_maintainer": [ diff --git a/fhem/FHEM/30_tradfri.pm b/fhem/FHEM/30_tradfri.pm index 2988f1304..7a6fa34de 100644 --- a/fhem/FHEM/30_tradfri.pm +++ b/fhem/FHEM/30_tradfri.pm @@ -6,6 +6,8 @@ package main; use strict; use warnings; +use FHEM::Meta; + use CoProcess; require "$attr{global}{modpath}/FHEM/30_HUEBridge.pm"; @@ -47,6 +49,8 @@ tradfri_Initialize($) "disable:1 disabledForIntervals ". "createGroupReadings:1,0 ". $readingFnAttributes; + + return FHEM::Meta::InitMod( __FILE__, $hash ); } ##################################### @@ -64,6 +68,9 @@ tradfri_Define($$) { my ($hash, $def) = @_; + return $@ unless ( FHEM::Meta::SetInternals($hash) ); + + my @a = split("[ \t][ \t]*", $def); return "Usage: define tradfri" if(@a != 2); @@ -686,4 +693,61 @@ tradfri_Attr($$$)
=end html + +=encoding utf8 +=for :application/json;q=META.json 30_tradfri.pm +{ + "abstract": "Module to control the FHEM/Tradfri integration", + "x_lang": { + "de": { + "abstract": "Modul zur Konfiguration der FHEM/Tradfri Integration" + } + }, + "keywords": [ + "fhem-mod", + "fhem-mod-device", + "tradfri", + "tradfri-fhem", + "zigbee", + "nodejs", + "node" + ], + "release_status": "stable", + "x_fhem_maintainer": [ + "justme1968" + ], + "x_fhem_maintainer_github": [ + "justme-1968" + ], + "prereqs": { + "runtime": { + "requires": { + "FHEM": 5.00918799, + "perl": 5.014, + "Meta": 0, + "CoProcess": 0, + "JSON": 0, + "Data::Dumper": 0 + }, + "recommends": { + }, + "suggests": { + "HUEDevice": 0 + } + } + }, + "x_prereqs_nodejs": { + "runtime": { + "requires": { + "node": 8.0, + "tradfri-fhem": 0 + }, + "recommends": { + }, + "suggests": { + } + } + } +} +=end :application/json;q=META.json =cut diff --git a/fhem/FHEM/31_HUEDevice.pm b/fhem/FHEM/31_HUEDevice.pm index 1df7c4239..87f51d2f8 100644 --- a/fhem/FHEM/31_HUEDevice.pm +++ b/fhem/FHEM/31_HUEDevice.pm @@ -264,10 +264,11 @@ sub HUEDevice_Define($$) { my ($hash, $def) = @_; - my @args = split("[ \t]+", $def); - return $@ unless ( FHEM::Meta::SetInternals($hash) ); + + my @args = split("[ \t]+", $def); + $hash->{helper}->{devtype} = ""; if( $args[2] eq "group" ) { $hash->{helper}->{devtype} = "G"; @@ -1732,6 +1733,7 @@ absent:{<json>} =end html +=encoding utf8 =for :application/json;q=META.json 31_HUEDevice.pm { "abstract": "devices connected to a Phillips HUE bridge, an Osram LIGHTIFY gateway or a IKEA TRADFRI gateway", @@ -1748,7 +1750,8 @@ absent:{<json>} "keywords": [ "fhem-mod", "fhem-mod-device", - "HUE" + "HUE", + "zigbee" ], "release_status": "stable", "x_fhem_maintainer": [ diff --git a/fhem/FHEM/39_alexa.pm b/fhem/FHEM/39_alexa.pm index 154ccfb9d..3a65ed9dd 100644 --- a/fhem/FHEM/39_alexa.pm +++ b/fhem/FHEM/39_alexa.pm @@ -1320,7 +1320,7 @@ alexa_Attr($$$) =end html - +=encoding utf8 =for :application/json;q=META.json 39_alexa.pm { "abstract": "Module to control the FHEM/Alexa integration",