diff --git a/fhem/FHEM/00_CUL.pm b/fhem/FHEM/00_CUL.pm index a3020f27a..65087c425 100755 --- a/fhem/FHEM/00_CUL.pm +++ b/fhem/FHEM/00_CUL.pm @@ -81,7 +81,7 @@ CUL_Initialize($) $hash->{StateFn} = "CUL_SetState"; $hash->{AttrList}= "do_not_notify:1,0 dummy:1,0 " . "showtime:1,0 model:CUL,CUN,CUR loglevel:0,1,2,3,4,5,6 " . - "fhtsoftbuffer:1,0 sendpool"; + "fhtsoftbuffer:1,0 sendpool addvaltrigger"; $hash->{ShutdownFn} = "CUL_Shutdown"; } @@ -92,8 +92,11 @@ CUL_Define($$) my ($hash, $def) = @_; my @a = split("[ \t][ \t]*", $def); - return "wrong syntax: define CUL devicename " - if(@a < 4 || @a > 5); + if(@a < 4 || @a > 5) { + my $msg = "wrong syntax: define CUL devicename "; + Log 2, $msg; + return $msg; + } CUL_CloseDev($hash); diff --git a/fhem/FHEM/00_FHZ.pm b/fhem/FHEM/00_FHZ.pm index 18b22e2a9..08e1f63d3 100755 --- a/fhem/FHEM/00_FHZ.pm +++ b/fhem/FHEM/00_FHZ.pm @@ -81,7 +81,7 @@ FHZ_Initialize($) $hash->{StateFn} = "FHZ_SetState"; $hash->{AttrList}= "do_not_notify:1,0 dummy:1,0 " . "showtime:1,0 model:fhz1000,fhz1300 loglevel:0,1,2,3,4,5,6 ". - "fhtsoftbuffer:1,0"; + "fhtsoftbuffer:1,0 addvaltrigger"; } ##################################### diff --git a/fhem/TODO b/fhem/TODO index a909eb4b2..c7c958224 100644 --- a/fhem/TODO +++ b/fhem/TODO @@ -1,6 +1,9 @@ FHEM: +- CUL_WS safety check +- document autocreate rename anomaly (rename filelog only) +- implement PID +- implement wiki decisions - autodetect physical hardware -- commonfunctions.pm - fhem-to-fhem module - CUR built-in MENU creation support @@ -8,3 +11,5 @@ Webpgm2 - plot data from multiple files in a single picture - setting the dummy state via dropdown is not possible - click on the graph only correct for the day zoom +- integrate weblink details in the SVG +- autocreate: multiple plots diff --git a/fhem/docs/commandref.html b/fhem/docs/commandref.html index 3b8353143..e8486bc90 100644 --- a/fhem/docs/commandref.html +++ b/fhem/docs/commandref.html @@ -1800,7 +1800,7 @@ A line ending with \ will be concatenated with the next one, so long lines
  • dummy

  • showtime

  • loglevel

  • -
  • model (CUL,CUR)

  • +
  • model (CUL,CUN,CUR)

  • sendpool
    If using more than one CUL/CUN for covering a large area, sending different events by the different CUL's might disturb each other. This @@ -1812,6 +1812,10 @@ A line ending with \ will be concatenated with the next one, so long lines attr CUN2 sendpool CUN1,CUN2,CUN3
    attr CUN3 sendpool CUN1,CUN2,CUN3

  • +
  • addvaltrigger
    + Create triggers for additional device values. Right now these are RSSI + and RAWMSG for the CUL family and RAWMSG for the FHZ. +


  • diff --git a/fhem/fhem.pl b/fhem/fhem.pl index e5248f6c4..08c7e2fb0 100755 --- a/fhem/fhem.pl +++ b/fhem/fhem.pl @@ -160,7 +160,7 @@ my $nextat; # Time when next timer will be triggered. my $intAtCnt=0; my %duplicate; # Pool of received msg for multi-fhz/cul setups my $duplidx=0; # helper for the above pool -my $cvsid = '$Id: fhem.pl,v 1.109 2010-08-02 12:47:55 rudolfkoenig Exp $'; +my $cvsid = '$Id: fhem.pl,v 1.110 2010-08-14 10:35:12 rudolfkoenig Exp $'; my $namedef = "where is either:\n" . "- a single device name\n" . @@ -1014,7 +1014,11 @@ LoadModule($) if($modules{$m} && !$modules{$m}{LOADED}) { # autoload my $o = $modules{$m}{ORDER}; - CommandReload(undef, "${o}_$m"); + my $ret = CommandReload(undef, "${o}_$m"); + if($ret) { + Log 0, $ret; + return "UNDEFINED"; + } if(!$modules{$m}{LOADED}) { # Case corrected by reload? foreach my $i (keys %modules) { @@ -2160,9 +2164,12 @@ Dispatch($$$) } else { if($defs{$found}) { $defs{$found}{MSGCNT}++; + my $avtrigger = ($attr{$name} && $attr{$name}{addvaltrigger}); if($addvals) { foreach my $av (keys %{$addvals}) { $defs{$found}{"${name}_$av"} = $addvals->{$av}; + push(@{$defs{$found}{CHANGED}}, "$av: $addvals->{$av}") + if($avtrigger); } } $defs{$found}{"${name}_MSGCNT"}++;