FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

Removed log from CUL, added HM Duplicate checking

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@766 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2010-12-16 08:00:32 +00:00
parent 759e28256d
commit 93334e823b
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/FHEM/00_CUL.pm
View File

@ -171,7 +171,6 @@ sub
CUL_RemoveHMPair($) CUL_RemoveHMPair($)
{ {
my $hash = shift; my $hash = shift;
Log 1, "CUL_RemoveHMPair";
delete($hash->{hmPair}); delete($hash->{hmPair});
} }
@ -916,7 +915,6 @@ CUL_SimpleWrite(@)
$hash->{USBDev}->write($msg . "\n") if($hash->{USBDev}); $hash->{USBDev}->write($msg . "\n") if($hash->{USBDev});
syswrite($hash->{TCPDev}, $msg) if($hash->{TCPDev}); syswrite($hash->{TCPDev}, $msg) if($hash->{TCPDev});
Log 1, "CUL_SimpleWrite >$msg<";
select(undef, undef, undef, 0.001); select(undef, undef, undef, 0.001);
} }

11
fhem/FHEM/10_CUL_HM.pm
View File

@ -238,6 +238,7 @@ CUL_HM_Parse($$)
my $btn = int((($button&0x3f)+1)/2); my $btn = int((($button&0x3f)+1)/2);
my $state = ($button&1 ? "off" : "on") . ($button & 0x40 ? "Long" : ""); my $state = ($button&1 ? "off" : "on") . ($button & 0x40 ? "Long" : "");
my $add = ($dst eq $id) ? "" : " (to $dname)"; my $add = ($dst eq $id) ? "" : " (to $dname)";
push @event, "state:Btn$btn:$state$add"; push @event, "state:Btn$btn:$state$add";
if($id eq $dst) { if($id eq $dst) {
CUL_HM_SendCmd($shash, "++8002".$id.$src."0101". # Send Ack. CUL_HM_SendCmd($shash, "++8002".$id.$src."0101". # Send Ack.
@ -263,6 +264,12 @@ CUL_HM_Parse($$)
my $tn = TimeNow(); my $tn = TimeNow();
for(my $i = 0; $i < int(@event); $i++) { for(my $i = 0; $i < int(@event); $i++) {
next if($event[$i] eq ""); next if($event[$i] eq "");
if($shash->{lastMsgNr} && $shash->{lastMsgNr} eq $msgcnt) {
Log GetLogLevel($name,4), "CUL_HM $name dup mesg";
next;
}
my ($vn, $vv) = split(":", $event[$i], 2); my ($vn, $vv) = split(":", $event[$i], 2);
Log GetLogLevel($name,2), "CUL_HM $name $vn:$vv" if($vn eq "unknown"); Log GetLogLevel($name,2), "CUL_HM $name $vn:$vv" if($vn eq "unknown");
@ -279,7 +286,8 @@ CUL_HM_Parse($$)
$shash->{READINGS}{$vn}{VAL} = $vv; $shash->{READINGS}{$vn}{VAL} = $vv;
} }
$shash->{lastMsgNr} = $msgcnt;
return $name; return $name;
} }
@ -461,6 +469,7 @@ CUL_HM_Pair(@)
if($isSender) { if($isSender) {
$hash->{pairButtons} =~ m/(..)(..)/; $hash->{pairButtons} =~ m/(..)(..)/;
my ($b1, $b2, $cmd) = ($1, $2, ""); my ($b1, $b2, $cmd) = ($1, $2, "");
delete($hash->{cmdStack});
CUL_HM_SendCmd($hash, "++A001$id$src${b1}05$src${b1}04", 1, 1); CUL_HM_SendCmd($hash, "++A001$id$src${b1}05$src${b1}04", 1, 1);
CUL_HM_PushCmdStack($hash, "++A001$id$src${b1}07020201"); CUL_HM_PushCmdStack($hash, "++A001$id$src${b1}07020201");
CUL_HM_PushCmdStack($hash, "++A001$id$src${b1}06"); CUL_HM_PushCmdStack($hash, "++A001$id$src${b1}06");