From a9b59a17cb244f308512f9235c03f3ded865f72b Mon Sep 17 00:00:00 2001 From: deespe <> Date: Thu, 4 Aug 2016 18:41:39 +0000 Subject: [PATCH] 98_Hyperion.pm: checking global device for userattr before adding them to the Hyperion device git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@11894 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- FHEM/98_Hyperion.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/FHEM/98_Hyperion.pm b/FHEM/98_Hyperion.pm index 9ee2aedce..771a4e236 100644 --- a/FHEM/98_Hyperion.pm +++ b/FHEM/98_Hyperion.pm @@ -239,8 +239,10 @@ sub Hyperion_ParseHttpResponse($$$) $attr{$name}{icon} = "light_led_stripe_rgb" if (!defined($attr{$name}{icon})); $attr{$name}{lightSceneParamsToSave} = "state" if (!defined($attr{$name}{lightSceneParamsToSave})); $attr{$name}{room} = "Hyperion" if (!defined($attr{$name}{room})); - $attr{$name}{userattr} = "lightSceneParamsToSave" if (!defined($attr{$name}{userattr})); - $attr{$name}{userattr} = "lightSceneParamsToSave ".$attr{$name}{userattr} if (defined($attr{$name}{userattr}) && index($attr{$name}{userattr},"lightSceneParamsToSave") == -1); + $attr{$name}{userattr} = "lightSceneParamsToSave" if (!defined($attr{$name}{userattr}) && index($attr{"global"}{userattr},"lightSceneParamsToSave") == -1); + $attr{$name}{userattr} = "lightSceneParamsToSave ".$attr{$name}{userattr} if (defined($attr{$name}{userattr}) && index($attr{$name}{userattr},"lightSceneParamsToSave") == -1 && index($attr{"global"}{userattr},"lightSceneParamsToSave") == -1); + $attr{$name}{userattr} = "homebridgeMapping" if (!defined($attr{$name}{userattr}) && index($attr{"global"}{userattr},"homebridgeMapping") == -1); + $attr{$name}{userattr} = "homebridgeMapping ".$attr{$name}{userattr} if (defined($attr{$name}{userattr}) && index($attr{$name}{userattr},"homebridgeMapping") == -1 && index($attr{"global"}{userattr},"homebridgeMapping") == -1); $attr{$name}{webCmd} = $Hyperion_webCmd if (!defined($attr{$name}{webCmd}) || (defined($attr{$name}{webCmd}) && $attr{$name}{webCmd} eq $Hyperion_webCmd_config)); $attr{$name}{webCmd} = $Hyperion_webCmd_config if (!defined($attr{$name}{webCmd}) || (defined($attr{$name}{webCmd}) && $Hyperion_sets{configFile} ne "textField" && $attr{$name}{webCmd} eq $Hyperion_webCmd)); readingsBeginUpdate($hash);