FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-01 01:09:47 +00:00
Code Issues Releases Wiki Activity

correct overload revocery

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5244 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-03-17 11:22:35 +00:00
parent 6f2e96bf39
commit 34200113eb
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fhem/FHEM/00_HMLAN.pm
View File

@ -899,6 +899,10 @@ sub HMLAN_condUpdate($$) {#####################################################
if ($HMcnd == 4){#HMLAN needs a rest. Supress all sends exept keep alive if ($HMcnd == 4){#HMLAN needs a rest. Supress all sends exept keep alive
$hash->{STATE} = "overload"; $hash->{STATE} = "overload";
} }
else{
$hash->{STATE} = "opened"
if (InternalVal($name,"STATE","") eq "overload");
}
my $HMcndTxt = $HMcond{$HMcnd}?$HMcond{$HMcnd}:"Unknown:$HMcnd"; my $HMcndTxt = $HMcond{$HMcnd}?$HMcond{$HMcnd}:"Unknown:$HMcnd";
Log3 $hash, 1, "HMLAN_Parse: $name new condition $HMcndTxt"; Log3 $hash, 1, "HMLAN_Parse: $name new condition $HMcndTxt";

29
fhem/FHEM/10_CUL_HM.pm
View File

@ -862,11 +862,8 @@ sub CUL_HM_Parse($$) {#########################################################
; ;
} }
elsif($md =~ m/^(KS550|KS888|HM-WDS100-C6-O)/) { ############################ elsif($md =~ m/^(KS550|KS888|HM-WDS100-C6-O)/) { ############################
if($mTp eq "70") {
if($mTp eq "70" && $p =~ m/^(....)(..)(....)(....)(..)(..)(..)/) { my ($t,$h,$r,$w,$wd,$s,$b) = map{hex($_)} unpack 'A4A2A4A4(A2)*',$p;
my ( $t, $h, $r, $w, $wd, $s, $b ) =
(hex($1), hex($2), hex($3), hex($4), hex($5), hex($6), hex($7));
my $tsgn = ($t & 0x4000); my $tsgn = ($t & 0x4000);
$t = ($t & 0x3fff)/10; $t = ($t & 0x3fff)/10;
$t = sprintf("%0.1f", $t-1638.4) if($tsgn); $t = sprintf("%0.1f", $t-1638.4) if($tsgn);
@ -875,17 +872,17 @@ sub CUL_HM_Parse($$) {#########################################################
my $wdr = ($w>>14)*22.5; my $wdr = ($w>>14)*22.5;
$w = ($w & 0x3fff)/10; $w = ($w & 0x3fff)/10;
$wd = $wd * 5; $wd = $wd * 5;
my $sM = "state:";
push @evtEt,[$shash,1,"state:T: $t H: $h W: $w R: $r IR: $ir WD: $wd WDR: $wdr S: $s B: $b"]; if($t) {$sM .= "T: $t " ;push @evtEt,[$shash,1,"temperature:$t" ];}
push @evtEt,[$shash,1,"temperature:$t" ]; if($h) {$sM .= "H: $h " ;push @evtEt,[$shash,1,"humidity:$h" ];}
push @evtEt,[$shash,1,"humidity:$h" ]; if($w) {$sM .= "W: $w " ;push @evtEt,[$shash,1,"windSpeed:$w" ];}
push @evtEt,[$shash,1,"windSpeed:$w" ]; if($wd) {$sM .= "R: $wd " ;push @evtEt,[$shash,1,"windDirection:$wd" ];}
push @evtEt,[$shash,1,"windDirection:$wd" ]; if($wdr){$sM .= "IR: $wdr ";push @evtEt,[$shash,1,"windDirRange:$wdr" ];}
push @evtEt,[$shash,1,"windDirRange:$wdr" ]; if($r) {$sM .= "WD: $r " ;push @evtEt,[$shash,1,"rain:$r" ];}
push @evtEt,[$shash,1,"rain:$r" ]; if($ir) {$sM .= "WDR: $ir ";push @evtEt,[$shash,1,"isRaining:$ir" ];}
push @evtEt,[$shash,1,"isRaining:$ir" ]; if($s) {$sM .= "S: $s " ;push @evtEt,[$shash,1,"sunshine:$s" ];}
push @evtEt,[$shash,1,"sunshine:$s" ]; if($b) {$sM .= "B: $b " ;push @evtEt,[$shash,1,"brightness:$b" ];}
push @evtEt,[$shash,1,"brightness:$b" ]; push @evtEt,[$shash,1,$sM];
} }
else { else {
push @evtEt,[$shash,1,"unknown:$p" ]; push @evtEt,[$shash,1,"unknown:$p" ];