From 90f694f71f7333f2b119710e15903a6f783149b4 Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Tue, 5 Sep 2017 21:11:05 +0200 Subject: [PATCH] add makeDeviceName fhem.pl function to create new devices --- 73_GardenaSmartBridge.pm | 4 ++-- 74_GardenaSmartDevice.pm | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/73_GardenaSmartBridge.pm b/73_GardenaSmartBridge.pm index 9a225a6..928d0e8 100644 --- a/73_GardenaSmartBridge.pm +++ b/73_GardenaSmartBridge.pm @@ -70,7 +70,7 @@ eval "use IO::Socket::SSL;1" or $missingModul .= "IO::Socket::SSL "; ###todo Hier fehlt noch Modulabfrage für ssl -my $version = "0.2.0"; +my $version = "0.2.1"; @@ -809,7 +809,7 @@ sub GardenaSmartBridge_ParseJSON($$) { diff --git a/74_GardenaSmartDevice.pm b/74_GardenaSmartDevice.pm index f68d13c..c105417 100644 --- a/74_GardenaSmartDevice.pm +++ b/74_GardenaSmartDevice.pm @@ -64,11 +64,11 @@ use Time::Local; use Data::Dumper; #debugging -eval "use Encode qw(encode encode_utf8 decode_utf8);1" or $missingModul .= "Encode "; +# eval "use Encode qw(encode encode_utf8 decode_utf8);1" or $missingModul .= "Encode "; wird nicht benötigt eval "use JSON;1" or $missingModul .= "JSON "; -my $version = "0.2.1"; +my $version = "0.2.2"; @@ -313,8 +313,9 @@ sub GardenaSmartDevice_Parse($$) { } else { - Log3 $name, 3, "GardenaSmartDevice ($name) - autocreate new device " . join('',split("[ \t]+",$decode_json->{name})) . " with deviceId $decode_json->{id}, model $decode_json->{category} and IODev IODev=$name"; - return "UNDEFINED " . join('',split("[ \t]+",$decode_json->{name})) . " GardenaSmartDevice $decode_json->{id} $decode_json->{category} IODev=$name"; + Log3 $name, 3, "GardenaSmartDevice ($name) - autocreate new device " . makeDeviceName($decode_json->{name}) . " with deviceId $decode_json->{id}, model $decode_json->{category} and IODev IODev=$name"; + #return "UNDEFINED " . join('',split("[ \t]+",$decode_json->{name})) . " GardenaSmartDevice $decode_json->{id} $decode_json->{category} IODev=$name"; + return "UNDEFINED " . makeDeviceName($decode_json->{name}) . " GardenaSmartDevice $decode_json->{id} $decode_json->{category} IODev=$name"; } } }