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

wrong return for UNDEFINED. KD101 does not support battery. no statechange for KD101

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@2048 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
wherzig 2012-11-01 18:53:56 +00:00
parent 5586a2d242
commit 49d11d0998
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
FHEM/46_TRX_SECURITY.pm
View File

@ -180,7 +180,7 @@ sub TRX_SECURITY_parse_X10Sec {
if (!$def) { if (!$def) {
Log 1, "UNDEFINED $device_name TRX_SECURITY $dev_type $device $dev_reading"; Log 1, "UNDEFINED $device_name TRX_SECURITY $dev_type $device $dev_reading";
Log 3, "TRX_SECURITY: TRX_SECURITY Unknown device $device_name, please define it"; Log 3, "TRX_SECURITY: TRX_SECURITY Unknown device $device_name, please define it";
return ""; return "UNDEFINED $device_name TRX_SECURITY $dev_type $device $dev_reading";
} }
} }
@ -245,7 +245,7 @@ sub TRX_SECURITY_parse_X10Sec {
} }
my $battery_level = $bytes->[7] & 0x0f; my $battery_level = $bytes->[7] & 0x0f;
if (($battery eq "") && ($dev_type ne "kd101")) { if (($battery eq "") && ($dev_type ne "KD101")) {
if ($battery_level == 0x9) { $battery = 'batt_ok'} if ($battery_level == 0x9) { $battery = 'batt_ok'}
elsif ($battery_level == 0x0) { $battery = 'batt_low'} elsif ($battery_level == 0x0) { $battery = 'batt_low'}
else { else {
@ -261,11 +261,11 @@ sub TRX_SECURITY_parse_X10Sec {
my $tm = TimeNow(); my $tm = TimeNow();
my $val = ""; my $val = "";
my $device_type = $def->{TRX_SECURITY_type}; my $device_type = uc($def->{TRX_SECURITY_type});
my $sensor = ""; my $sensor = "";
if ($device_type eq "sd90") { if ($device_type eq "SD90") {
$sensor = $firstdevice == 1 ? $def->{TRX_SECURITY_devicelog} : $def->{TRX_SECURITY_devicelog2}; $sensor = $firstdevice == 1 ? $def->{TRX_SECURITY_devicelog} : $def->{TRX_SECURITY_devicelog2};
} else { } else {
$sensor = $def->{TRX_SECURITY_devicelog}; $sensor = $def->{TRX_SECURITY_devicelog};
@ -280,13 +280,14 @@ sub TRX_SECURITY_parse_X10Sec {
readingsBeginUpdate($def); readingsBeginUpdate($def);
if (($dev_type ne "kr18") || ($dev_type ne "VISONIC_REMOTE")) { if (($device_type ne "KR18") || ($device_type ne "VISONIC_REMOTE")) {
if ($firstdevice == 1) { if ($firstdevice == 1) {
$val .= $current; $val .= $current;
} }
readingsUpdate($def, $sensor, $current); readingsUpdate($def, $sensor, $current);
if (($def->{STATE} ne $val)) { # KD101 does not show normal, so statechange does not make sense
if (($def->{STATE} ne $val) && ($device_type ne "KD101")) {
$sensor = "statechange"; $sensor = "statechange";
readingsUpdate($def, $sensor, $current); readingsUpdate($def, $sensor, $current);
} }