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

10_CUL_HM: aes bug remove

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8853 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2015-06-28 17:46:15 +00:00
parent 7257fe9fe6
commit 2e06b913b0
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fhem/FHEM/10_CUL_HM.pm
View File

@ -1184,7 +1184,7 @@ sub CUL_HM_Parse($$) {#########################################################
push @evtEt,[$shash,1,"state:NACK"]; push @evtEt,[$shash,1,"state:NACK"];
} }
elsif($parse eq "AES"){ elsif($parse eq "AES"){
;# nothing todo return CUL_HM_pushEvnts();# exit now, don't send ACK
} }
elsif($mTp eq "12") {#$lcm eq "09A112" Another fhem request (HAVE_DATA) elsif($mTp eq "12") {#$lcm eq "09A112" Another fhem request (HAVE_DATA)
; ;
@ -1788,11 +1788,6 @@ sub CUL_HM_Parse($$) {#########################################################
else{ #invalid PhysLevel else{ #invalid PhysLevel
$rSUpdt = 1; $rSUpdt = 1;
CUL_HM_stateUpdatDly($name,5) if ($shash->{helper}{dlvl});# update to get level CUL_HM_stateUpdatDly($name,5) if ($shash->{helper}{dlvl});# update to get level
# CUL_HM_stateUpdatDly($name,5); # update to get level
# we have to relay on device. Ack may come from a conditional event (BM)
# if condition is not met device will not send status.
# We need to avoid regular requests
# therefore only update if we initiated the request
} }
} }
} }
@ -4160,7 +4155,7 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
elsif($cmd eq "led") { ###################################################### elsif($cmd eq "led") { ######################################################
if ($md eq "HM-OU-LED16"){ if ($md eq "HM-OU-LED16"){
my %color=(off=>0,red=>1,green=>2,orange=>3); my %color=(off=>0,red=>1,green=>2,orange=>3);
if (length($hash->{DEF}) == 6){# command called for a device, not a channel if ($roleD){# command called for a device, not a channel
my $col4all; my $col4all;
if (defined($color{$a[2]})){ if (defined($color{$a[2]})){
$col4all = sprintf("%02X",$color{$a[2]}*85);#Color for 4 LEDS $col4all = sprintf("%02X",$color{$a[2]}*85);#Color for 4 LEDS
@ -5083,11 +5078,11 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
$key2 = unpack("H*", $cipher->encrypt($payload2)); $key2 = unpack("H*", $cipher->encrypt($payload2));
} }
else { else {
$key1 = sprintf("%02X",$oldKeyIdx); $key1 = sprintf("01%02X",$oldKeyIdx);
$key2 = sprintf("%02X",($oldKeyIdx+1)); $key2 = sprintf("01%02X",($oldKeyIdx+1));
} }
CUL_HM_PushCmdStack($hash,'++'.$flag.'04'.$id.$dst.'01'.$key1); CUL_HM_PushCmdStack($hash,'++'.$flag.'04'.$id.$dst.$key1);
CUL_HM_PushCmdStack($hash,'++'.$flag.'04'.$id.$dst.'01'.$key2); CUL_HM_PushCmdStack($hash,'++'.$flag.'04'.$id.$dst.$key2);
} }