Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-01 20:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some string reformatting.

Browse Source 
Bugfix for bug reported by Daniel: deleting FS20 device won't result in unknown device


git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@202 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2008-07-11 07:23:47 +00:00
parent f44087bcc6
commit 21f3505cc9
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
FHEM/10_FS20.pm
View File

@ -44,7 +44,10 @@ my %readonly = (
); );
use vars qw(%fs20_c2b); # Peter would like to access it from outside use vars qw(%fs20_c2b); # Peter would like to access it from outside
# defptr{XMIT BTN}{DEVNAME} -> Ptr to global defs entry for this device
my %defptr; my %defptr;
my %follow; my %follow;
my $fs20_simple ="off off-for-timer on on-for-timer on-till reset timer toggle"; my $fs20_simple ="off off-for-timer on on-for-timer on-till reset timer toggle";
my %models = ( my %models = (
@ -275,11 +278,14 @@ FS20_Define($$)
$a[$i] = lc($a[$i]); $a[$i] = lc($a[$i]);
if($a[$i] eq "fg") { if($a[$i] eq "fg") {
return "Bad fg address for $name, see the doc" if( ($a[$i+1] !~ m/^f[a-f0-9]$/) && ($a[$i+1] !~ m/^44[1-4][1-4]$/)); return "Bad fg address for $name, see the doc"
if( ($a[$i+1] !~ m/^f[a-f0-9]$/) && ($a[$i+1] !~ m/^44[1-4][1-4]$/));
} elsif($a[$i] eq "lm") { } elsif($a[$i] eq "lm") {
return "Bad lm address for $name, see the doc" if( ($a[$i+1] !~ m/^[a-f0-9]f$/) && ($a[$i+1] !~ m/^[1-4][1-4]44$/)); return "Bad lm address for $name, see the doc"
if( ($a[$i+1] !~ m/^[a-f0-9]f$/) && ($a[$i+1] !~ m/^[1-4][1-4]44$/));
} elsif($a[$i] eq "gm") { } elsif($a[$i] eq "gm") {
return "Bad gm address for $name, must be ff" if( ($a[$i+1] ne "ff") && ($a[$i+1] ne "4444")); return "Bad gm address for $name, must be ff"
if( ($a[$i+1] ne "ff") && ($a[$i+1] ne "4444"));
} else { } else {
return $u; return $u;
} }
@ -304,6 +310,7 @@ FS20_Undef($$)
foreach my $c (keys %{ $hash->{CODE} } ) { foreach my $c (keys %{ $hash->{CODE} } ) {
$c = $hash->{CODE}{$c}; $c = $hash->{CODE}{$c};
delete($defptr{$c}{$name}) if($defptr{$c}); delete($defptr{$c}{$name}) if($defptr{$c});
delete($defptr{$c}{$name}) if(!%{$defptr{$c}});
} }
return undef; return undef;
} }
@ -356,8 +363,8 @@ FS20_Parse($$)
my $dev_four = hex2four($dev); my $dev_four = hex2four($dev);
my $btn_four = hex2four($btn); my $btn_four = hex2four($btn);
Log 3, "FS20 Unknown device $dev ($dev_four), Button $btn ($btn_four) Code $cde ($v), " . Log 3, "FS20 Unknown device $dev ($dev_four), " .
"please define it"; "Button $btn ($btn_four) Code $cde ($v), please define it";
return "UNDEFINED FS20: $dev/$btn/$cde"; return "UNDEFINED FS20: $dev/$btn/$cde";
} }