FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-20 01:06:04 +00:00
Code Issues Releases Wiki Activity

11_FHT.pm: fix modify, forbid multiple defs with same id (Forum #115907)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23183 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2020-11-18 21:01:30 +00:00
parent 11088cb025
commit 46d6561872
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fhem/FHEM/11_FHT.pm
View File

@ -348,22 +348,28 @@ sub
FHT_Define($$) FHT_Define($$)
{ {
my ($hash, $def) = @_; my ($hash, $def) = @_;
my @a = split("[ \t][ \t]*", $def); my @a = split(" ", $def);
return "wrong syntax: define <name> FHT CODE" if(int(@a) != 3); return "wrong syntax: define <name> FHT CODE" if(int(@a) != 3);
$a[2] = lc($a[2]); my $id = lc($a[2]);
return "Define $a[0]: wrong CODE format: specify a 4 digit hex value" return "Define $a[0]: wrong CODE format: specify a 4 digit hex value"
if($a[2] !~ m/^[a-f0-9][a-f0-9][a-f0-9][a-f0-9]$/i); if($id !~ m/^[a-f0-9][a-f0-9][a-f0-9][a-f0-9]$/i);
return "FHT id $id is already used by $modules{FHT}{defptr}{$id}{NAME}"
if($modules{FHT}{defptr}{$id});
$modules{FHT}{defptr}{$id} = $hash;
$hash->{CODE} = $a[2]; delete($modules{FHT}{defptr}{lc($hash->{OLDDEF})}) # Modify
if($hash->{OLDDEF});
$hash->{CODE} = $id;
AssignIoPort($hash); AssignIoPort($hash);
# Check if the CULs id collides with our id. # Check if the CULs id collides with our id.
if($hash->{IODev} && $hash->{IODev}{TYPE} eq "CUL") { if($hash->{IODev} && $hash->{IODev}{TYPE} eq "CUL") {
$hash->{IODev}{FHTID} =~ m/^(..)(..)$/; $hash->{IODev}{FHTID} =~ m/^(..)(..)$/;
my ($i1, $i2) = (hex($1), hex($2)); my ($i1, $i2) = (hex($1), hex($2));
$a[2] =~ m/^(..)(..)$/; $id =~ m/^(..)(..)$/;
my ($l1, $l2) = (hex($1), hex($2)); my ($l1, $l2) = (hex($1), hex($2));
if($l2 == $i2 && $l1 >= $i1 && $l1 <= $i1+7) { if($l2 == $i2 && $l1 >= $i1 && $l1 <= $i1+7) {
@ -374,10 +380,7 @@ FHT_Define($$)
} }
$hash->{webCmd} = "desired-temp"; # Hint for FHEMWEB $hash->{webCmd} = "desired-temp"; # Hint for FHEMWEB
$modules{FHT}{defptr}{$a[2]} = $hash; $modules{FHT}{defptr}{$id} = $hash;
#Log3 $a[0], 2, "Asking the FHT device $a[0]/$a[2] to send its data";
#FHT_Set($hash, ($a[0], "report1", "255", "report2", "255"));
return undef; return undef;
} }