Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

TRX_SECURITY correction KD101. Set KR18

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@3129 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
wherzig 2013-04-28 20:08:05 +00:00
parent 71904ff61b
commit 14ff63b19f
1 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
FHEM/46_TRX_SECURITY.pm
View File

@ -58,6 +58,7 @@ my %security_device_commands = ( # HEXSTRING => commands
# 0x20: X10, KD101, Visonic, Meiantech # 0x20: X10, KD101, Visonic, Meiantech
0x2000 => [ "Closed", "", "Open", "", "", "", ""], # DS10A 0x2000 => [ "Closed", "", "Open", "", "", "", ""], # DS10A
0x2001 => [ "", "", "", "", "alert", "normal", ""], # MS10A 0x2001 => [ "", "", "", "", "alert", "normal", ""], # MS10A
0x2002 => [ "", "", "", "", "", "", "Panic", "EndPanic", "", "Arm_Away", "Arm_Away_Delayed", "Arm_Home", "Arm_Home_Delayed", "Disarm"], # KR18
0x2003 => [ "", "", "", "", "", "", "alert", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "pair",], # KD101 0x2003 => [ "", "", "", "", "", "", "alert", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "pair",], # KD101
); );
@ -109,7 +110,7 @@ TRX_SECURITY_Set($@)
my $device_type = $hash->{TRX_SECURITY_type}; my $device_type = $hash->{TRX_SECURITY_type};
my $deviceid = $hash->{TRX_SECURITY_deviceid}; my $deviceid = $hash->{TRX_SECURITY_deviceid};
if ($device_type ne "KD101" && $device_type ne "DS10A" && $device_type ne "MS10A") { if ($device_type ne "KD101" && $device_type ne "DS10A" && $device_type ne "MS10A" && $device_type ne "KR18") {
return "No set implemented for $device_type"; return "No set implemented for $device_type";
} }
@ -153,6 +154,10 @@ TRX_SECURITY_Set($@)
$id1 = $2; $id1 = $2;
$id2 = "00"; $id2 = "00";
$id3 = $1; $id3 = $1;
} elsif ($deviceid =~ /(..)(..)(..)/ ) {
$id1 = $1;
$id2 = $2;
$id3 = $3;
} else { } else {
Log 4,"TRX_SECURITY_Set lightning1 wrong deviceid: name=$name device_type=$device_type, deviceid=$deviceid"; Log 4,"TRX_SECURITY_Set lightning1 wrong deviceid: name=$name device_type=$device_type, deviceid=$deviceid";
return "error set name=$name deviceid=$deviceid"; return "error set name=$name deviceid=$deviceid";
@ -164,25 +169,27 @@ TRX_SECURITY_Set($@)
Log 1,"TRX_SECURITY_Set name=$name device_type=$device_type, deviceid=$deviceid id1=$id1, id2=$id2, id3=$id3, command=$command" if ($TRX_SECURITY_debug == 1); Log 1,"TRX_SECURITY_Set name=$name device_type=$device_type, deviceid=$deviceid id1=$id1, id2=$id2, id3=$id3, command=$command" if ($TRX_SECURITY_debug == 1);
Log 1,"TRX_SECURITY_Set hexline=$hex_prefix$hex_command" if ($TRX_SECURITY_debug == 1); Log 1,"TRX_SECURITY_Set hexline=$hex_prefix$hex_command" if ($TRX_SECURITY_debug == 1);
my $sensor = ""; if ($device_type ne "KD101") {
my $sensor = "";
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
# Now set the statechange: # Now set the statechange:
if ($hash->{STATE} ne $command) { if ($hash->{STATE} ne $command) {
$sensor = "statechange"; $sensor = "statechange";
readingsBulkUpdate($hash, $sensor, $command);
}
# Now set the devicelog:
$sensor = $hash->{TRX_SECURITY_devicelog};
readingsBulkUpdate($hash, $sensor, $command); readingsBulkUpdate($hash, $sensor, $command);
}
# Now set the devicelog: # Set battery
$sensor = $hash->{TRX_SECURITY_devicelog}; $sensor = "battery";
readingsBulkUpdate($hash, $sensor, $command); readingsBulkUpdate($hash, $sensor, "ok");
# Set battery readingsEndUpdate($hash, 1);
$sensor = "battery"; }
readingsBulkUpdate($hash, $sensor, "ok");
readingsEndUpdate($hash, 1);
} else { } else {
return "No set implemented for $device_type . Unknown protocol type"; return "No set implemented for $device_type . Unknown protocol type";
@ -354,7 +361,7 @@ sub TRX_SECURITY_parse_X10Sec {
0x05 => ['X10Sec', 'normal', '', '', ''], 0x05 => ['X10Sec', 'normal', '', '', ''],
0x06 => ['X10Sec', 'alert', '', '', ''], 0x06 => ['X10Sec', 'alert', '', '', ''],
0x07 => ['X10Sec', 'normal', '', '', ''], 0x07 => ['X10Sec', 'Security-EndPanic', '', '', ''],
0x08 => ['X10Sec', 'IR', '', '', ''], 0x08 => ['X10Sec', 'IR', '', '', ''],
@ -415,6 +422,7 @@ sub TRX_SECURITY_parse_X10Sec {
Log 1, "TRX_SECURITY: $name devn=$device_name first=$firstdevice subtype=$subtype command=$command, delay=$delay, batt=$battery cmd=$hexdata" if ($TRX_SECURITY_debug == 1); Log 1, "TRX_SECURITY: $name devn=$device_name first=$firstdevice subtype=$subtype command=$command, delay=$delay, batt=$battery cmd=$hexdata" if ($TRX_SECURITY_debug == 1);
my $n = 0; my $n = 0;
my $tm = TimeNow(); my $tm = TimeNow();
my $val = ""; my $val = "";
@ -444,7 +452,7 @@ sub TRX_SECURITY_parse_X10Sec {
readingsBeginUpdate($def); readingsBeginUpdate($def);
if (($device_type ne "KR18") || ($device_type ne "VISONIC_REMOTE")) { if (($device_type ne "KR18") && ($device_type ne "VISONIC_REMOTE")) {
if ($firstdevice == 1) { if ($firstdevice == 1) {
$val .= $current; $val .= $current;
} }
@ -460,13 +468,17 @@ sub TRX_SECURITY_parse_X10Sec {
$current = $command; $current = $command;
#$sensor = $def->{TRX_SECURITY_devicelog}; #$sensor = $def->{TRX_SECURITY_devicelog};
$val = $current; #$val = $current;
readingsBulkUpdate($def, $sensor, $current); #readingsBulkUpdate($def, $sensor, $current);
$current = "Security-Panic" if ($command eq "alert");
my @cmd_split = split(/-/, $command); my @cmd_split = split(/-/, $command);
$sensor = $cmd_split[0]; $sensor = $cmd_split[0];
$current = $cmd_split[1]; $current = $cmd_split[1];
readingsBulkUpdate($def, $sensor, $current); readingsBulkUpdate($def, $sensor, $current);
$val .= $current;
} }
if ($battery ne "") { if ($battery ne "") {