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

00_TUL.pm: fixed write-mechanism, added mod for extended adressing (thx to its2bit)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13012 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
andi291
2017-01-08 16:52:19 +00:00
parent 358cd520b6
commit 00ba54c47f
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
fhem/FHEM/00_TUL.pm
View File

@@ -11,6 +11,7 @@
# ABU 20160516 added log entry for non-compatibility of tul # ABU 20160516 added log entry for non-compatibility of tul
# ABU 20160613 changed log entry for startup # ABU 20160613 changed log entry for startup
# ABU 20161108 added knxd. Added doku as well. Added summary. Treat it like eibd. See thread #58375 # ABU 20161108 added knxd. Added doku as well. Added summary. Treat it like eibd. See thread #58375
# ABU 20170102 fixed write-mechanism, added mod for extended adressing (thx to its2bit)
package main; package main;
@@ -203,7 +204,7 @@ TUL_Write($$$)
return if(!defined($fn)); return if(!defined($fn));
#Discard message, if not set to backward-compatibility #Discard message, if not set to backward-compatibility
if ((AttrVal($name, "useEIB", 0) =~ m/0/) and ($fn =~ m/^B/)) if ((AttrVal($name, "useEIB", 0) =~ m/0/) and ($fn =~ m/\^B/))
{ {
Log3 ($name, 0, "EIB is no longer supported. Message discarded."); Log3 ($name, 0, "EIB is no longer supported. Message discarded.");
return; return;
@@ -406,7 +407,7 @@ TUL_SimpleRead($)
$buf .= $dst; $buf .= $dst;
$buf .= $data; $buf .= $data;
Log(4,"SimpleRead: $buf\n"); Log(3,"SimpleRead: $buf\n");
return $buf; return $buf;
} }
@@ -651,11 +652,17 @@ sub tul_addr2hex
my $b = $_[1]; # 1 if local (group) address, else physical address my $b = $_[1]; # 1 if local (group) address, else physical address
my $str ; my $str ;
if ($b == 1) if ($b == 1)
{ # logical address used {
$str = sprintf "%01x%01x%02x", ($a >> 11) & 0xf, ($a >> 8) & 0x7, $a & 0xff; #logical address used
#old, short-syntax
#$str = sprintf "%01x%01x%02x", ($a >> 11) & 0xf, ($a >> 8) & 0x7, $a & 0xff;
#extended adress-range
$str = sprintf "%02x%01x%02x", ($a >> 11) & 0x1f, ($a >> 8) & 0x7, $a & 0xff;
} }
else { # physical address used else
$str = sprintf "%01x%01x%02x", $a >> 12, ($a >> 8) & 0xf, $a & 0xff; {
#physical address used
$str = sprintf "%02x%01x%02x", $a >> 12, ($a >> 8) & 0xf, $a & 0xff;
} }
return $str; return $str;
} }