mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes/reduced logging on 70_WS3600.pm

Browse Source 
Made CUL_FHTTK work with 98_autocreate.pm, (first) GPLOT info is now used
Added sanity checking to fhem.pl, does not save undefined fields anymore
Added fht80tf.gplot, may need (re-)work


git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@539 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
painseeker
2010-01-04 23:07:35 +00:00
parent 6131d5bd56
commit 1771a0efe6
4 changed files with 68 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
FHEM/98_autocreate.pm
View File

@@ -11,11 +11,13 @@ use warnings;
# - check "UNDEFINED" parameters for BS/USF1000/X10
my %flogpar = (
"CUL_EM:.*" => { GPLOT => "cul_em:Power,", FILTER => "%NAME:CNT:.*" },
"CUL_WS:.*" => { GPLOT => "cul_ws:Temp,", FILTER => "%NAME" },
"FHT:.*" => { GPLOT => "fht:Temp/Act,", FILTER => "%NAME" },
"HMS:HMS100T.*" => { GPLOT => "hms:Temp/Hum,", FILTER => "%NAME:T:.*" },
"KS300:.*" => { GPLOT => "ks300:Temp/Rain,ks300_2:Wind/Hum,",
"CUL_EM:.*" => { GPLOT => "cul_em:Power,", FILTER => "%NAME:CNT:.*" },
"CUL_WS:.*" => { GPLOT => "hms:Temp/Hum,", FILTER => "%NAME" },
"CUL_FHTTK:.*" => { GPLOT => "fht80tf:Window,", FILTER => "%NAME" },
"FHT:.*" => { GPLOT => "fht:Temp/Act,", FILTER => "%NAME" },
"HMS:HMS100TFK_.*" => { GPLOT => "fht80tf:Contact,", FILTER => "%NAME" },
"HMS:HMS100T._.*" => { GPLOT => "hms:Temp/Hum,", FILTER => "%NAME:T:.*" },
"KS300:.*" => { GPLOT => "ks300:Temp/Rain,ks300_2:Wind/Hum,",
FILTER => "%NAME:T:.*" },
);
@@ -91,7 +93,7 @@ autocreate_Notify($$)
my $flname = "FileLog_$name";
my ($gplot, $filter) = ("", $name);
foreach my $k (keys %flogpar) {
next if("$type:$name" !~ m/^$k$/);
next if("$type:$name" !~ m/^$k$/);
$gplot = $flogpar{$k}{GPLOT};
$filter = replace_wildcards($hash, $flogpar{$k}{FILTER});
}
@@ -110,7 +112,10 @@ autocreate_Notify($$)
next if(!$attr{$me}{weblink} || !$gplot);
$room = replace_wildcards($hash, $attr{$me}{weblink_room});
my $wlname = "weblink_$name";
$cmd = "$wlname weblink fileplot $flname:$lctype:CURRENT";
my $gplotfile;
my $stuff;
($gplotfile, $stuff) = split(/:/, $gplot);
$cmd = "$wlname weblink fileplot $flname:$gplotfile:CURRENT";
Log GetLogLevel($me,2), "autocreate: define $cmd";
$ret = CommandDefine(undef, $cmd);
if($ret) {