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

minor bugs

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6287 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-07-20 16:21:37 +00:00
parent cd051ff37c
commit 2d46276b8b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/10_CUL_HM.pm
View File

@ -1223,8 +1223,8 @@ sub CUL_HM_Parse($$) {#########################################################
if( ( $mTp eq "10" && $mI[0] eq '0B') #info-level if( ( $mTp eq "10" && $mI[0] eq '0B') #info-level
||( $mTp eq "02" && $mI[0] eq '01')) {#ack-status ||( $mTp eq "02" && $mI[0] eq '01')) {#ack-status
my @d = map{hex($_)} unpack 'A2A4(A2)*',$p; my @d = map{hex($_)} unpack 'A2A4(A2)*',$p;
my ($chn,$setTemp,$actTemp, $cRep,$wRep,$bat ,$lbat,$wRep,$ctrlMode,$bState,$pTemp,$pStart,$pEnd) = my ($chn,$setTemp,$actTemp, $cRep,$wRep,$bat ,$lbat,$ctrlMode,$bState,$pTemp,$pStart,$pEnd) =
("02",$d[1],$d[1], $d[2],$d[2],$d[2],$d[2],$d[2],"" ,"off" ,"-" ,"-","-"); ("02",$d[1],$d[1], $d[2],$d[2],$d[2],$d[2],"" ,"off" ,"-" ,"-","-");
$lbat = ($lbat ) & 0x80; $lbat = ($lbat ) & 0x80;
if (defined $d[5]){# message with party mode if (defined $d[5]){# message with party mode
@ -3381,15 +3381,15 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
elsif($cmd eq "level") { #################################################### elsif($cmd eq "level") { ####################################################
#level =>"<level> <relockDly> <speed>..." #level =>"<level> <relockDly> <speed>..."
my (undef,undef,$lvl,$rLocDly,$speed) = @a; my (undef,undef,$lvl,$rLocDly,$speed) = @a;
$rLocDly = 111600 if (!defined($rLocDly)||$rLocDly eq "ignore");# defaults
$speed = 30 if (!defined($speed));
return "please enter level 0 to 100" if (!defined($lvl) || $lvl !~ m/^\d*\.?\d?$/ || $lvl>100); return "please enter level 0 to 100" if (!defined($lvl) || $lvl !~ m/^\d*\.?\d?$/ || $lvl>100);
return "reloclDelay range 0..65535 or ignore" return "reloclDelay range 0..65535 or ignore"
if (defined($rLocDly) && if ( $rLocDly > 111600 ||
($rLocDly > 65535 || ($rLocDly < 0.1 && $rLocDly ne '0' ));
($rLocDly < 0.1 && $rLocDly ne 'ignore' && $rLocDly ne '0' ))); return "select speed range 0 to 100" if ( $speed > 100);
return "select speed range 0 to 100" if (defined($speed) && $speed>100);
$rLocDly = 111600 if (!defined($rLocDly)||$rLocDly eq "ignore");# defaults
$speed = 30 if (!defined($rLocDly));
$rLocDly = CUL_HM_encodeTime8($rLocDly);# calculate hex value $rLocDly = CUL_HM_encodeTime8($rLocDly);# calculate hex value
CUL_HM_PushCmdStack($hash,'++'.$flag.'11'.$id.$dst.'81'.$chn. CUL_HM_PushCmdStack($hash,'++'.$flag.'11'.$id.$dst.'81'.$chn.
sprintf("%02X%02s%02X",$lvl*2,$rLocDly,$speed*2)); sprintf("%02X%02s%02X",$lvl*2,$rLocDly,$speed*2));