FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-08 13:24:56 +00:00
Code Issues Releases Wiki Activity

14_CUL_REDIRECT: Add redirect for Oregon 3 protocol

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10090 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
dancer0705 2015-12-04 18:11:10 +00:00
parent a5a7693e12
commit 546ed14ca5
2 changed files with 65 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- feature: 14_CUL_REDIRECT: Add redirect for Oregon 3 protocol
- bugfix: 49_SSCam: avoid possible blocking situation of FHEM when a - bugfix: 49_SSCam: avoid possible blocking situation of FHEM when a
recording is running recording is running
- bugfix: 49_SSCam: avoid messages "insufficient user privilege" even - bugfix: 49_SSCam: avoid messages "insufficient user privilege" even

64
fhem/FHEM/14_CUL_REDIRECT.pm
View File

@ -100,6 +100,63 @@ sub decodeOrego2 {
} }
return (-1, "Not a origon 2 protocol"); return (-1, "Not a origon 2 protocol");
} }
#
# Decode Oregon 3
#
sub decodeOrego3 {
my $msg = shift;
my $name = shift;
my @a = split("", $msg);
Log3 $name, 5, "CUL_REDIRECT decode Oregon 3 ($msg)";
my $newMSG = "";
my $bitData;
my $hlen = length($msg);
my $blen = $hlen * 4;
$bitData= unpack("B$blen", pack("H$hlen", $msg));
Log3 $name, 5, "bitdata: $bitData";
if (index($bitData,"11110101") != -1)
{ # Valid OSV2 detected!
Log3 $name, 5, "OSV3 protocol detected ($msg)";
my $message_start=index($bitData,"0101");
my $message_end=length($bitData)-8;
my $message_length = $message_end - $message_start;
my $idx=0;
my $osv2bits="";
my $osv2hex ="";
for ($idx=$message_start; $idx<$message_end; $idx=$idx+8)
{
if (length($bitData)-$idx < 16 )
{
last;
}
my $byte = "";
$byte= substr($bitData,$idx,8); ## Ignore every 9th bit
Log3 $name, 5, "$name: byte in order $byte ";
$byte = scalar reverse $byte;
Log3 $name, 5, "$name: byte reversed $byte , as hex: ".sprintf('%X', oct("0b$byte"))."\n";
#$osv2hex=$osv2hex.sprintf('%X', oct("0b$byte"));
$osv2hex=$osv2hex.sprintf('%2X', oct("0b$byte")) ;
}
$osv2hex = sprintf("%2X", length($osv2hex)*4).$osv2hex;
if (length($osv2hex)*4 > 87) {
Log3 $name, 5, "CUL_REDIRECT: OSV3 protocol converted to hex: ($osv2hex) with length (".(length($osv2hex)*4).") bits \n";
return (1,$osv2hex);
} else {
Log3 $name, 5, "CUL_REDIRECT: ERROR: To short: OSV3 protocol converted to hex: ($osv2hex) with length (".(length($osv2hex)*4).") bits \n";
return (-1, "CUL_REDIRECT: ERROR: To short: OSV3 protocol converted to hex: ($osv2hex) with length (".(length($osv2hex)*4).") bits");
}
}
return (-1, "Not a origon 3 protocol");
}
sub decode_Hideki sub decode_Hideki
{ {
@ -220,6 +277,13 @@ CUL_REDIRECT_Parse($$)
# Orego2 # Orego2
Log3 $name, 5, "CUL_REDIRECT ($msg) match Manchester COODE length: $l"; Log3 $name, 5, "CUL_REDIRECT ($msg) match Manchester COODE length: $l";
my ($rcode,$res) = decodeOrego2(substr($msg, 1), $name); my ($rcode,$res) = decodeOrego2(substr($msg, 1), $name);
if ($rcode != -1) {
$dmsg = $res;
Log3 $name, 5, "$name Dispatch now to Oregon Module.";
CUL_REDIRECT_Dispatch($hash,$msg,$dmsg);
$message_dispatched=TRUE;
}
($rcode,$res) = decodeOrego3(substr($msg, 1), $name);
if ($rcode != -1) { if ($rcode != -1) {
$dmsg = $res; $dmsg = $res;
Log3 $name, 5, "$name Dispatch now to Oregon Module."; Log3 $name, 5, "$name Dispatch now to Oregon Module.";