correction for MS14A

git-svn-id: https://svn.fhem.de/fhem/trunk@2996 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
wherzig 2013-03-27 19:17:42 +00:00
parent e4d652741f
commit 62b9fa8e13

View File

@ -2,7 +2,6 @@
############################################################################## ##############################################################################
# #
# 46_TRX_LIGHT.pm # 46_TRX_LIGHT.pm
#
# FHEM module for lighting protocols: # FHEM module for lighting protocols:
# X10 lighting, ARC, ELRO AB400D, Waveman, Chacon EMW200, # X10 lighting, ARC, ELRO AB400D, Waveman, Chacon EMW200,
# IMPULS, AC (KlikAanKlikUit, NEXA, CHACON, HomeEasy UK), # IMPULS, AC (KlikAanKlikUit, NEXA, CHACON, HomeEasy UK),
@ -104,7 +103,7 @@ TRX_LIGHT_Initialize($)
$light_device_c2b{$light_device_codes{$k}->[0]} = $k; $light_device_c2b{$light_device_codes{$k}->[0]} = $k;
} }
$hash->{Match} = "^..(10|11|12|13|14).*"; # SVN please update!! $hash->{Match} = "^..(10|11|12|13|14).*";
$hash->{SetFn} = "TRX_LIGHT_Set"; $hash->{SetFn} = "TRX_LIGHT_Set";
$hash->{DefFn} = "TRX_LIGHT_Define"; $hash->{DefFn} = "TRX_LIGHT_Define";
$hash->{UndefFn} = "TRX_LIGHT_Undef"; $hash->{UndefFn} = "TRX_LIGHT_Undef";
@ -525,13 +524,8 @@ sub TRX_LIGHT_parse_X10 {
my $sensor = ""; my $sensor = "";
if ($device_type eq "MS14A") { if ($device_type eq "MS14A") {
# for ms14a behave like x10, but flip second deviceid # for ms14a behave like x10
$device_type = "X10"; $device_type = "X10";
if ($firstdevice == 1) {
$command = ($command eq "on") ? "alert" : "normal" ;
} else {
$command = ($command eq "on") ? "off" : "on" ;
}
} }
if (lc($def->{TRX_LIGHT_devicelog}) eq "window" || lc($def->{TRX_LIGHT_devicelog}) eq "door") { if (lc($def->{TRX_LIGHT_devicelog}) eq "window" || lc($def->{TRX_LIGHT_devicelog}) eq "door") {