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

HMLAN timing multidevices,restrict keepalivetimer, cul_HM: LED16, unit-blank revert

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@2224 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876
2012-11-29 19:52:08 +00:00
parent 74145dd627
commit a233b7e971
2 changed files with 56 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
fhem/FHEM/00_HMLAN.pm
View File

@@ -46,6 +46,9 @@ HMLAN_Initialize($)
"loglevel:0,1,2,3,4,5,6 addvaltrigger " .
"hmId hmKey " .
"hmProtocolEvents:0_off,1_dump,2_dumpFull,3_dumpTrigger";
$hash->{helper}{dPend} = 0;# data pending in HMLAN
$hash->{helper}{lastSend} = 0;
}
#####################################
@@ -311,10 +314,10 @@ HMLAN_Parse($$)
# 81=open
HMLAN_SimpleWrite($hash, '+'.$src) if (($letter eq 'R'));
if (!($flg & 0x25)){#rule out other messages
HMLAN_SimpleWrite($hash, '-'.$src);
HMLAN_SimpleWrite($hash, '+'.$src);
}
# if (!($flg & 0x25)){#rule out other messages
# HMLAN_SimpleWrite($hash, '-'.$src);
# HMLAN_SimpleWrite($hash, '+'.$src);
# }
$dmsg .= "NACK" if($mFld[1] !~ m/00(01|02|21)/ && $letter eq 'R');
$hash->{uptime} = HMLAN_uptime($mFld[2]);
@@ -367,15 +370,31 @@ HMLAN_SimpleWrite(@)
my $name = $hash->{NAME};
my $ll5 = GetLogLevel($name,5);
# Currently it does not seem to be necessary to wait Thus this code is inhibit for now
my $tn = gettimeofday();
# calculate maximum data speed for HMLAN.
# Theorie 2,5kByte/s
# tested allowes no more then 2 byte/ms incl overhead
# It is even slower if HMLAN waits for acks, acks are missing,...
my $bytPend = $hash->{helper}{dPend} -
int(($tn - $hash->{helper}{lastSend})*2000);
$bytPend = 0 if ($bytPend < 0);
$hash->{helper}{dPend} = $bytPend + length($msg);
$hash->{helper}{lastSend} = $tn;
my $wait = $bytPend/2000; # HMLAN
# => wait time to protect HMLAN overload
# my $wait = $bytPend>>11; # fast divide by 2048
# It is not possible to answer befor 100ms
my $id = (length($msg)>51)?substr($msg,46,6):"";
if ($id){
my $DevDelay = $hash->{helper}{nextSend}{$id} - gettimeofday();
if ($DevDelay > 0.01){# wait less then 10 ms will not work
$DevDelay = ((int($DevDelay*100))%100)/100;# security - wait no more then 1 sec
select(undef, undef, undef, $DevDelay);
}
my $DevDelay=0;
if ($id && $hash->{helper}{nextSend}{$id}){
$DevDelay = $hash->{helper}{nextSend}{$id} - $tn; # calculate time passed
$DevDelay = ($DevDelay > 0.01)?( $DevDelay -= int($DevDelay)):0;
}
$wait = ($DevDelay >$wait)?$DevDelay:$wait; # select the longer waittime
select(undef, undef, undef, $wait)if ($wait>0.01);
if ($debug){
Log $ll5, 'HMLAN_Send: S:' .substr($msg,0,9).
' stat: ' .substr($msg,10,2).
@@ -418,6 +437,7 @@ HMLAN_DoInit($)
HMLAN_SimpleWrite($hash, "Y03,00,");
HMLAN_SimpleWrite($hash, "T$s2000,04,00,00000000");
RemoveInternalTimer( $hash);# avoid duplicate timer
InternalTimer(gettimeofday()+25, "HMLAN_KeepAlive", $hash, 0);
return undef;
}
@@ -429,6 +449,7 @@ HMLAN_KeepAlive($)
my $hash = shift;
return if(!$hash->{FD});
HMLAN_SimpleWrite($hash, "K");
RemoveInternalTimer( $hash);# avoid duplicate timer
InternalTimer(gettimeofday()+25, "HMLAN_KeepAlive", $hash, 1);
}
sub

17
fhem/FHEM/10_CUL_HM.pm
View File

@@ -768,7 +768,7 @@ CUL_HM_Parse($$)
my $mask = 3<<$bitLoc;
my $value = sprintf("%08X",(hex($devState) &~$mask)|($msgState<<$bitLoc));
CUL_HM_UpdtReadBulk($shash,1,"color:".$value,
"state".$value);
"state:".$value);
if ($chnHash){
$shash = $chnHash;
my %colorTable=("00"=>"off","01"=>"red","02"=>"green","03"=>"orange");
@@ -923,10 +923,10 @@ CUL_HM_Parse($$)
push @event, "state:$txt";
push @event, "contact:$txt$target";
if($id eq $dst && hex($msgFlag)&0x20){
CUL_HM_SndCmd($shash, $msgcnt."8002$id$src${chn}00"); #Send Ack
$sendAck = "";
}
# if($id eq $dst && hex($msgFlag)&0x20){ General remove if Peter agrees
# CUL_HM_SndCmd($shash, $msgcnt."8002$id$src${chn}00"); #Send Ack
# $sendAck = "";
# }
}
else{push @event, "3SSunknownMsg:$p" if(!@event);}
}
@@ -2098,8 +2098,9 @@ CUL_HM_Set($@)
else{
return "$a[2] unknown. use hex or: ".join(" ",sort keys(%color));
}
CUL_HM_PushCmdStack($hash,sprintf("++%s11%s%s8100%s",
$flag,$id,$dst,$col4all));
CUL_HM_UpdtReadBulk($hash,1,"color:".$col4all,
"state:set_".$col4all);
CUL_HM_PushCmdStack($hash,"++".$flag."11".$id.$dst."8100".$col4all);
}else{# operating on a channel
return "$a[2] unknown. use: ".join(" ",sort keys(%color))
if (!defined($color{$a[2]}) );
@@ -3363,7 +3364,7 @@ CUL_HM_getRegFromStore($$$$)
}
} else { return " conversion undefined - please contact admin";
}
return $convFlg.$data.$unit;
return $convFlg.$data.' '.$unit;
}
#----------------------