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

MAX: convert addr to lowercase, autodetect device type

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@2201 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
mgehre
2012-11-26 19:48:26 +00:00
parent 403a85de44
commit b513ddf524
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
fhem/FHEM/10_MAX.pm
View File

@@ -52,7 +52,7 @@ MAX_Define($$)
if(int(@a)!=4 || $a[3] !~ m/^[A-F0-9]{6}$/i); if(int(@a)!=4 || $a[3] !~ m/^[A-F0-9]{6}$/i);
my $type = $a[2]; my $type = $a[2];
my $addr = $a[3]; my $addr = lc($a[3]); #all addr should be lowercase
Log 5, "Max_define $type with addr $addr "; Log 5, "Max_define $type with addr $addr ";
$hash->{type} = $type; $hash->{type} = $type;
$hash->{addr} = $addr; $hash->{addr} = $addr;
@@ -195,17 +195,24 @@ MAX_Parse($$)
{ {
my ($hash, $msg) = @_; my ($hash, $msg) = @_;
my ($MAX,$msgtype,$addr,@args) = split(",",$msg); my ($MAX,$msgtype,$addr,@args) = split(",",$msg);
return if($MAX ne "MAX");
Log 5, "MAX_Parse $msg";
#Find the device with the given addr #Find the device with the given addr
my $shash = $modules{MAX}{defptr}{$addr}; my $shash = $modules{MAX}{defptr}{$addr};
if(!$shash) if(!$shash)
{ {
if($msgtype eq "define"){ my $devicetype = undef;
my $devicetype = $args[0]; $devicetype = $args[0] if($msgtype eq "define");
$devicetype = "ShutterContact" if($msgtype eq "ShutterContactState");
$devicetype = "Cube" if($msgtype eq "CubeClockState" or $msgtype eq "CubeConnectionState");
$devicetype = "HeatingThermostat" if($msgtype eq "HeatingThermostatConfig" or $msgtype eq "HeatingThermostatState");
if($devicetype) {
return "UNDEFINED MAX_$addr MAX $devicetype $addr"; return "UNDEFINED MAX_$addr MAX $devicetype $addr";
} else { } else {
return; Log 2, "Got message for undefined device, and failed to guess type from msg '$msgtype' - ignoring";
return $hash->{NAME};
} }
} }