From 2c5f6a31b17a8cb9a2fc38c31b9e46add8576531 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Sun, 8 Apr 2012 08:29:00 +0000 Subject: [PATCH] setList added to dummy git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@1422 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- CHANGED | 2 +- FHEM/98_dummy.pm | 12 ++++++------ docs/commandref.html | 10 ++++++++-- webfrontend/pgm2/01_FHEMWEB.pm | 2 +- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/CHANGED b/CHANGED index 23c21832c..9a05a1df5 100644 --- a/CHANGED +++ b/CHANGED @@ -21,9 +21,9 @@ - feature: remove dependency on Google::Weather, major rewrite (Boris) - feature: started experimental interface implementation (fhem API v2) (Boris) - feature: sleep issued in at/notify/etc is not blocking fhem anymore + - feature: dummy got a setList attribute - feature: new module 02_RSS.pm - - 2011-12-31 (5.2) - bugfix: applying smallscreen attributes to firefox/opera - feature: CUL_TX added (thanks to Peterp) diff --git a/FHEM/98_dummy.pm b/FHEM/98_dummy.pm index 6766765b2..0c6f91153 100644 --- a/FHEM/98_dummy.pm +++ b/FHEM/98_dummy.pm @@ -12,7 +12,7 @@ dummy_Initialize($) $hash->{SetFn} = "dummy_Set"; $hash->{DefFn} = "dummy_Define"; - $hash->{AttrList} = "loglevel:0,1,2,3,4,5,6"; + $hash->{AttrList} = "loglevel:0,1,2,3,4,5,6 setList"; } ################################### @@ -20,13 +20,13 @@ sub dummy_Set($@) { my ($hash, @a) = @_; - - return "no set value specified" if(int(@a) < 2); - return "Unknown argument $a[1], choose one of *" if($a[1] eq "?"); - my $name = shift @a; - my $v = join(" ", @a); + return "no set value specified" if(int(@a) < 1); + my $setList = AttrVal($name, "setList", "*"); + return "Unknown argument ?, choose one of $setList" if($a[0] eq "?"); + + my $v = join(" ", @a); Log GetLogLevel($name,2), "dummy set $name $v"; $hash->{CHANGED}[0] = $v; diff --git a/docs/commandref.html b/docs/commandref.html index ccf6db735..e6e09c31c 100644 --- a/docs/commandref.html +++ b/docs/commandref.html @@ -8663,8 +8663,9 @@ AB600, Duewi, DomiaLite, COCO) and others.
delstruct commands. Each attached device will get the attribute <struct_type>=<name>
when it is added to the list, and the attribute will be deleted if the device is deleted from the structure. - The structure devices can also be added to a structure, e.g. you can have - a building consisting of levels which consists of rooms of devices. + Exception to this are the attributes room and alias. The structure devices + can also be added to a structure, e.g. you can have a building consisting + of levels which consists of rooms of devices.
Example: