Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

FBDECT: changing temperature correct logic

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6750 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2014-10-12 11:22:49 +00:00
parent 2e3f1b3166
commit cdbca78d36
1 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
fhem/FHEM/10_FBDECT.pm
View File

@ -13,6 +13,8 @@ sub FBDECT_Set($@);
sub FBDECT_Get($@); sub FBDECT_Get($@);
sub FBDECT_Cmd($$@); sub FBDECT_Cmd($$@);
sub FBDECT_decodePayload($$$);
my @fbdect_models = qw(Powerline546E Dect200); my @fbdect_models = qw(Powerline546E Dect200);
my %fbdect_payload = ( my %fbdect_payload = (
@ -26,9 +28,7 @@ my %fbdect_payload = (
20 => { n=>"power", fmt=>'sprintf("%0.2f W", hex($pyld)/100)' }, 20 => { n=>"power", fmt=>'sprintf("%0.2f W", hex($pyld)/100)' },
21 => { n=>"energy", fmt=>'sprintf("%0.0f Wh",hex($pyld))' }, 21 => { n=>"energy", fmt=>'sprintf("%0.0f Wh",hex($pyld))' },
22 => { n=>"powerFactor", fmt=>'sprintf("%0.3f", hex($pyld))' }, 22 => { n=>"powerFactor", fmt=>'sprintf("%0.3f", hex($pyld))' },
23 => { n=>"temperature", fmt=>'sprintf("%0.1f C (%s)",'. 23 => { n=>"temperature", fmt=>'FBDECT_decodeTemp($pyld, $hash, $addReading)' },
'hex(substr($pyld,6,2))/10,'.
'(hex(substr($pyld,8,8))+0)?"corrected":"measured")' },
35 => { n=>"options", fmt=>'FBDECT_decodeOptions($pyld)' }, 35 => { n=>"options", fmt=>'FBDECT_decodeOptions($pyld)' },
37 => { n=>"control", fmt=>'FBDECT_decodeControl($pyld)' }, 37 => { n=>"control", fmt=>'FBDECT_decodeControl($pyld)' },
); );
@ -132,7 +132,7 @@ FBDECT_Get($@)
my $d = pop @answ; my $d = pop @answ;
my $state = "inactive" if($answ[0] =~ m/ inactive,/); my $state = "inactive" if($answ[0] =~ m/ inactive,/);
while($d) { while($d) {
my ($ptyp, $plen, $pyld) = FBDECT_decodePayload($d); my ($ptyp, $plen, $pyld) = FBDECT_decodePayload($d, $hash, 0);
Log3 $hash, 4, "Payload: $d -> $ptyp: $pyld"; Log3 $hash, 4, "Payload: $d -> $ptyp: $pyld";
last if($ptyp eq ""); last if($ptyp eq "");
if($ptyp eq "state" && if($ptyp eq "state" &&
@ -174,7 +174,7 @@ FBDECT_Parse($$@)
if($mt eq "07") { if($mt eq "07") {
my $d = substr($msg, 32); my $d = substr($msg, 32);
while($d) { while($d) {
my ($ptyp, $plen, $pyld) = FBDECT_decodePayload($d); my ($ptyp, $plen, $pyld) = FBDECT_decodePayload($d, $hash, 1);
Log3 $hash, 4, "Payload: $d -> $ptyp: $pyld"; Log3 $hash, 4, "Payload: $d -> $ptyp: $pyld";
last if($ptyp eq ""); last if($ptyp eq "");
readingsBulkUpdate($hash, $ptyp, $pyld); readingsBulkUpdate($hash, $ptyp, $pyld);
@ -194,12 +194,12 @@ FBDECT_Parse($$@)
push @answ, "FBDECT_DECODE_ERROR:short payload $d"; push @answ, "FBDECT_DECODE_ERROR:short payload $d";
last; last;
} }
my ($ptyp, $plen, $pyld) = FBDECT_decodePayload($d); my ($ptyp, $plen, $pyld) = FBDECT_decodePayload($d, $hash, 1);
last if($ptyp eq ""); last if($ptyp eq "");
push @answ, " $ptyp: $pyld"; push @answ, " $ptyp: $pyld";
$d = substr($d, 16+$plen*2); $d = substr($d, 16+$plen*2);
} }
Log 4, "FBDECT PARSED: ".join(" / ", @answ); Log3 $iodev, 4, "FBDECT PARSED: ".join(" / ", @answ);
# Ignore the rest, is too confusing. # Ignore the rest, is too confusing.
@answ = grep /state:/, @answ; @answ = grep /state:/, @answ;
(undef, $state) = split(": ", $answ[0], 2) if(@answ > 0); (undef, $state) = split(": ", $answ[0], 2) if(@answ > 0);
@ -208,7 +208,7 @@ FBDECT_Parse($$@)
} }
readingsEndUpdate($hash, 1); readingsEndUpdate($hash, 1);
Log 5, "FBDECT_Parse for device $hash->{NAME} done"; Log3 $iodev, 5, "FBDECT_Parse for device $hash->{NAME} done";
return $hash->{NAME}; return $hash->{NAME};
} }
@ -221,6 +221,22 @@ FBDECT_decodeRelayTimes($)
return $p; return $p;
} }
sub
FBDECT_decodeTemp($$$)
{
my ($p, $hash, $addReading) = @_;
my $v = hex(substr($p,0,8));
$v = -(4294967296-$v) if($v > 2147483648);
$v /= 10;
if(hex(substr($p,8,8))+0) {
readingsBulkUpdate($hash, "tempadjust", sprintf("%0.1f C", $v))
if($addReading);
return "";
}
return sprintf("%0.1f C (measured)", $v);
}
sub sub
FBDECT_decodeOptions($) FBDECT_decodeOptions($)
{ {
@ -286,25 +302,28 @@ FBDECT_decodeControl($)
} }
sub sub
FBDECT_decodePayload($) FBDECT_decodePayload($$$)
{ {
my ($d) = @_; my ($d, $hash, $addReading) = @_;
if(length($d) < 12) { if(length($d) < 12) {
Log 4, "FBDECT ignoring payload: data too short"; Log3 $hash, 4, "FBDECT ignoring payload: data too short";
return ("", "", ""); return ("", "", "");
} }
my $ptyp = hex(substr($d, 0, 8)); my $ptyp = hex(substr($d, 0, 8));
my $plen = hex(substr($d, 8, 4)); my $plen = hex(substr($d, 8, 4));
if(length($d) < 16+$plen*2) { if(length($d) < 16+$plen*2) {
Log 4, "FBDECT ignoring payload: data shorter than given length($plen)"; Log3 $hash, 4, "FBDECT ignoring payload: data shorter than given length($plen)";
return ("", "", ""); return ("", "", "");
} }
my $pyld = substr($d, 16, $plen*2); my $pyld = substr($d, 16, $plen*2);
if($fbdect_payload{$ptyp}) { if($fbdect_payload{$ptyp}) {
$pyld = eval $fbdect_payload{$ptyp}{fmt} if($fbdect_payload{$ptyp}{fmt}); $cmdFromAnalyze = $fbdect_payload{$ptyp}{fmt};
$ptyp = $fbdect_payload{$ptyp}{n}; $pyld = eval $cmdFromAnalyze if($cmdFromAnalyze);
$cmdFromAnalyze = undef;
$ptyp = ($pyld ? $fbdect_payload{$ptyp}{n} : "");
} }
return ($ptyp, $plen, $pyld); return ($ptyp, $plen, $pyld);
} }
@ -395,7 +414,8 @@ FBDECT_Undef($$)
<li>power: $v W</li> <li>power: $v W</li>
<li>energy: $v Wh</li> <li>energy: $v Wh</li>
<li>powerFactor: $v"</li> <li>powerFactor: $v"</li>
<li>temperature: $v C ([measured|corrected])</li> <li>temperature: $v C (measured)</li>
<li>tempadjust: $v C</li>
<li>options: uninitialized</li> <li>options: uninitialized</li>
<li>options: powerOnState:[on|off|last],lock:[none,webUi,remoteFb,button]</li> <li>options: powerOnState:[on|off|last],lock:[none,webUi,remoteFb,button]</li>
<li>control: disabled</li> <li>control: disabled</li>