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

evaluation and transfer of the ESP3 packet type data to the EnOcean module

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@3269 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
klaus-schauer
2013-06-10 11:11:51 +00:00
parent 96ebc26a99
commit 20051a7cc3
1 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
fhem/FHEM/00_TCM.pm
View File

@@ -28,6 +28,7 @@ sub TCM_Ready($);
sub TCM_Write($$$);
sub TCM_Parse120($$$);
sub TCM_Parse310($$$);
sub TCM_CRC8($);
sub TCM_CSUM($);
@@ -147,7 +148,7 @@ TCM_Write($$$)
# TCM 310 (ESP3)
$bstring = "55" . $fn . TCM_CRC8($fn) . $msg . TCM_CRC8($msg);
}
Log $ll5, "TCM $name sending $bstring";
Log $ll5, "TCM: $name sending $bstring";
DevIo_SimpleWrite($hash, $bstring, 1);
}
@@ -244,7 +245,7 @@ TCM_Read($)
if($net =~ m/^0B(..)(........)(........)(..)/) {
# Receive Radio Telegram (RRT)
my ($org, $d1,$id,$status) = ($1, $2, $3, $4);
my $packetType = 1;
# Re-translate the ORG to RadioORG / TCM310 equivalent
my %orgmap = ("05"=>"F6", "06"=>"D5", "07"=>"A5", );
if($orgmap{$org}) {
@@ -256,7 +257,7 @@ TCM_Read($)
if ($blockSenderID eq "own" && (hex $id) >= $baseID && (hex $id) <= $lastID) {
Log $ll5, "TCM: $name Telegram from $id blocked.";
} else {
Dispatch($hash, "EnOcean:$org:$d1:$id:$status", undef);
Dispatch($hash, "EnOcean:$packetType:$org:$d1:$id:$status", undef);
}
} else {
@@ -276,7 +277,7 @@ TCM_Read($)
} else { # TCM310 / ESP3
while($data =~ m/^55(....)(..)(..)(..)/) {
my ($l1, $l2, $t, $crc) = (hex($1), hex($2), $3, $4);
my ($l1, $l2, $packetType, $crc) = (hex($1), hex($2), hex($3), $4);
my $tlen = 2*(7+$l1+$l2);
last if(length($data) < $tlen);
@@ -302,12 +303,14 @@ TCM_Read($)
next;
}
if($t eq "01") { # Radio
if($packetType == 1) {
# packet type RADIO
$mdata =~ m/^(..)(.*)(........)(..)$/;
my ($org, $d1, $id, $status) = ($1,$2,$3,$4);
$odata =~ m/^(..)(........)(..)(..)$/;
my %addvals = (
PacketType => $packetType,
SubTelNum => hex($1),
DestinationID => $2,
RSSI => hex($3),
@@ -318,10 +321,11 @@ TCM_Read($)
if ($blockSenderID eq "own" && (hex $id) >= $baseID && (hex $id) <= $lastID) {
Log $ll5, "TCM: $name Telegram from $id blocked.";
} else {
Dispatch($hash, "EnOcean:$org:$d1:$id:$status:$odata", \%addvals);
Dispatch($hash, "EnOcean:$packetType:$org:$d1:$id:$status:$odata", \%addvals);
}
} elsif($t eq "02") {
} elsif($packetType == 2) {
# packet type RESPONSE
my $rc = substr($mdata, 0, 2);
my %codes = (
"00" => "RET_OK",
@@ -331,10 +335,30 @@ TCM_Read($)
"04" => "RET_OPERATION_DENIED",
);
$rc = $codes{$rc} if($codes{$rc});
Log (($rc eq "RET_OK") ? $ll5 : $ll2, "$name: RESPONSE: $rc");
Log (($rc eq "RET_OK") ? $ll5 : $ll2, "TCM: $name RESPONSE: $rc");
} elsif($packetType == 3) {
# packet type RADIO_SUB_TEL
Log $ll2, "TCM: $name unknown packet type $packetType: $data";
} elsif($packetType == 4) {
# packet type EVENT
Log $ll2, "TCM: $name unknown packet type $packetType: $data";
} elsif($packetType == 5) {
# packet type COMMON_COMMAND
Log $ll2, "TCM: $name unknown packet type $packetType: $data";
} elsif($packetType == 6) {
# packet type SMART_ACK_COMMAND
Log $ll2, "TCM: $name unknown packet type $packetType: $data";
} elsif($packetType == 7) {
# packet type REMOTE_MAN_COMMAND
Log $ll2, "TCM: $name unknown packet type $packetType: $data";
} else {
Log $ll2, "$name: unknown packet type $t: $data";
Log $ll2, "TCM: $name unknown packet type $packetType: $data";
}
@@ -380,7 +404,7 @@ TCM_Parse120($$$)
my $ll5 = GetLogLevel($name,5);
my $ll2 = GetLogLevel($name,2);
Log $ll5, "TCMParse: $rawmsg";
Log $ll5, "TCM: Parse $rawmsg";
my $msg = "";
my $cmd = $parsetbl120{substr($rawmsg, 0, 4)};
@@ -404,7 +428,7 @@ TCM_Parse120($$$)
}
Log $ll2, "$name $msg" if(!$ret);
Log $ll2, "TCM: $name $msg" if(!$ret);
return $msg;
}
@@ -423,7 +447,7 @@ TCM_Parse310($$$)
my $ll5 = GetLogLevel($name,5);
my $ll2 = GetLogLevel($name,2);
Log $ll5, "TCM Parse: $rawmsg";
Log $ll5, "TCM: Parse $rawmsg";
my $rc = substr($rawmsg, 0, 2);
my $msg;
@@ -444,7 +468,7 @@ TCM_Parse310($$$)
$msg = join(",", @ans);
}
Log $ll2, "$name $msg";
Log $ll2, "TCM: $name $msg";
return $msg;
}
@@ -510,8 +534,7 @@ TCM_Get($@)
TCM_Write($hash, "", $rawcmd);
($err, $msg) = TCM_ReadAnswer($hash, "get $cmd");
$msg = TCM_Parse120($hash, $msg, 1)
if(!$err);
$msg = TCM_Parse120($hash, $msg, 1) if(!$err);
#################################### TCM310
} else {
@@ -522,8 +545,7 @@ TCM_Get($@)
my $cmdHex = $cmdhash->{cmd};
TCM_Write($hash, sprintf("%04X0005", length($cmdHex)/2), $cmdHex);
($err, $msg) = TCM_ReadAnswer($hash, "get $cmd");
$msg = TCM_Parse310($hash, $msg, $cmdhash)
if(!$err);
$msg = TCM_Parse310($hash, $msg, $cmdhash) if(!$err);
}
@@ -746,7 +768,7 @@ TCM_Undef($$)
Please note that EnOcean repeaters also send Fhem data telegrams again. Use
<code>attr &lt;name&gt; <a href="#blockSenderID">blockSenderID</a> own</code>
to block receiving telegrams with TCM SenderIDs.<br>
The address range used by your transceiver module, you can find in the
The address range used by your transceiver module, can be found in the
parameters BaseID and LastID.
<br><br>