FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-19 12:46:03 +00:00
Code Issues Releases Wiki Activity

00_CUL.pm: TSCUL patches (Forum #57806)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12978 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2017-01-06 12:32:42 +00:00
parent 2a50366bfc
commit 5443a0a2d0
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fhem/FHEM/00_CUL.pm
View File

@ -47,6 +47,7 @@ my @ampllist = (24, 27, 30, 33, 36, 38, 40, 42); # rAmpl(dB)
my $sccMods = "STACKABLE_CC:TSSTACKED"; # for noansi my $sccMods = "STACKABLE_CC:TSSTACKED"; # for noansi
my $culNameRe = "^(CUL|TSCUL)\$"; my $culNameRe = "^(CUL|TSCUL)\$";
my $culLikeRe = "^(CUL|TSCUL|STACKABLE_CC|TSSTACKED)\$";
my $clientsSlowRF = ":FS20:FHT.*:KS300:USF1000:BS:HMS: ". my $clientsSlowRF = ":FS20:FHT.*:KS300:USF1000:BS:HMS: ".
":CUL_EM:CUL_WS:CUL_FHTTK:CUL_HOERMANN: ". ":CUL_EM:CUL_WS:CUL_FHTTK:CUL_HOERMANN: ".
@ -188,7 +189,7 @@ CUL_Define($$)
my $x = $1; my $x = $1;
foreach my $d (keys %defs) { foreach my $d (keys %defs) {
next if($d eq $name); next if($d eq $name);
if($defs{$d}{TYPE} =~ m/$culNameRe/) { if($defs{$d}{TYPE} =~ m/$culLikeRe/) {
if(uc($defs{$d}{FHTID}) =~ m/^$x/) { if(uc($defs{$d}{FHTID}) =~ m/^$x/) {
my $m = "$name: Cannot define multiple CULs with identical ". my $m = "$name: Cannot define multiple CULs with identical ".
"first two digits ($x)"; "first two digits ($x)";
@ -1138,12 +1139,10 @@ sub
CUL_prefix($$$) CUL_prefix($$$)
{ {
my ($isadd, $hash, $msg) = @_; my ($isadd, $hash, $msg) = @_;
my $t = $hash->{TYPE}; while($hash && $hash->{TYPE} !~ m/$culNameRe/) {
while($t !~ m/$culNameRe/) {
$msg = CallFn($hash->{NAME}, $isadd ? "AddPrefix":"DelPrefix", $hash, $msg); $msg = CallFn($hash->{NAME}, $isadd ? "AddPrefix":"DelPrefix", $hash, $msg);
$hash = $hash->{IODev}; $hash = $hash->{IODev};
last if(!$hash); last if(!$hash);
$t = $hash->{TYPE};
} }
return ($hash, $msg); return ($hash, $msg);
} }