From d5ae25d5da15e0ee3aedcc5efe519dfc36d73740 Mon Sep 17 00:00:00 2001 From: betateilchen Date: Sun, 8 Jun 2014 09:07:18 +0000 Subject: [PATCH] 55_GDS.pm - modified: minor code improvements git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@6086 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/55_GDS.pm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/55_GDS.pm b/fhem/FHEM/55_GDS.pm index efecb58c5..35128df03 100644 --- a/fhem/FHEM/55_GDS.pm +++ b/fhem/FHEM/55_GDS.pm @@ -292,7 +292,8 @@ sub GDS_Attr(@){ break; } when("gdsSetCond"){ - fhem("define gdsDummy at +00:00:30 set $name conditions $attrValue"); + CommandDefine(undef, "gdsDummy at +00:00:30 set $name conditions $attrValue"); + $attr{gdsDummy}{room} = 'hidden'; break; } default {$attr{$name}{$attrName} = $attrValue;} @@ -591,7 +592,7 @@ sub decodeCAPData($$){ while(($k, $v) = each %readings){ readingsBulkUpdate($hash, $k, latin1ToUtf8($v)) if(defined($v)); } readingsEndUpdate($hash, 1); - + eval {readingsSingleUpdate($hash, 'a_eventCode_AREA_COLOR_hex', _rgbd2h(ReadingsVal($name, 'a_eventCode_AREA_COLOR', '')),0);}; return; } @@ -1072,6 +1073,13 @@ sub sepLine($) { return $output; } +sub _rgbd2h($) { + my ($input) = @_; + my @a = split(" ", $input); + my $output = sprintf( "%x%x%x", $a[0],$a[1],$a[2]); + return $output; +} + sub createIndexFile($){ my ($hash) = @_; my $name = $hash->{NAME}; @@ -1507,7 +1515,7 @@ sub initDropdownLists($){