FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 08:11:44 +00:00
Code Issues Releases Wiki Activity

52_I2C_MCP342x: values are now in V (instead of µV), fixed handling of negative values

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13424 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
klausw 2017-02-16 22:06:16 +00:00
parent 7a2fea58a5
commit 16d2df5844
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/FHEM/52_I2C_MCP342x.pm
View File

@ -279,15 +279,19 @@ sub I2C_MCP342x_GetVoltage ($$) {
my $rawvolt; my $rawvolt;
if ($resol == 18) { if ($resol == 18) {
$rawvolt = ($raw[0] & 0b00000011) << 16 | $raw[1] << 8 | $raw[2]; $rawvolt = ($raw[0] & 0b00000011) << 16 | $raw[1] << 8 | $raw[2];
} elsif ($resol == 14) {
$rawvolt = ($raw[0] & 0b00111111) << 8 | $raw[1];
} elsif ($resol == 12) {
$rawvolt = ($raw[0] & 0b00001111) << 8 | $raw[1];
} else { } else {
$rawvolt = $raw[0] << 8 | $raw[1]; $rawvolt = $raw[0] << 8 | $raw[1];
} }
#Log3 $hash, 1, "Kanal: $channel, rawvolt: $rawvolt, Aufloesung: $resol, Gain: $gain, LSB: $resols{$resol}{lsb}"; Log3 $hash, 4, "Kanal: $channel, rawvolt: $rawvolt, Aufloesung: $resol, Gain: $gain, LSB: $resols{$resol}{lsb}";
$rawvolt -= (1 << $resol) if $rawvolt >= (1 << ($resol - 1)); $rawvolt -= (1 << $resol) if $rawvolt >= (1 << ($resol - 1));
#Log3 $hash, 1, "Kanal: $channel, Unsignedrawvolt: $rawvolt"; Log3 $hash, 4, "Kanal: $channel, Signedrawvolt: $rawvolt";
my $voltage = ( $rawvolt * $resols{$resol}{lsb} ) / $gain ; my $voltage = ( $rawvolt * $resols{$resol}{lsb} ) / $gain ;
#$voltage /= 1000000; $voltage /= 1000000; # LSB Werte in µV
$voltage *= AttrVal($hash->{NAME},("ch" . $channel . "factor"),"1"); $voltage *= AttrVal($hash->{NAME},("ch" . $channel . "factor"),"1");
$voltage = sprintf( $voltage = sprintf(
'%.' . AttrVal($hash->{NAME}, ('ch' . $channel . 'roundDecimal'), 3) . 'f', '%.' . AttrVal($hash->{NAME}, ('ch' . $channel . 'roundDecimal'), 3) . 'f',
@ -295,7 +299,6 @@ sub I2C_MCP342x_GetVoltage ($$) {
); );
$voltage .= " overflow" if ( $rawvolt == ( (1<<($resol-1)) - 1) || $rawvolt == (1<<($resol-1)) ); $voltage .= " overflow" if ( $rawvolt == ( (1<<($resol-1)) - 1) || $rawvolt == (1<<($resol-1)) );
readingsSingleUpdate($hash,"Channel$channel", $voltage, 1); readingsSingleUpdate($hash,"Channel$channel", $voltage, 1);
#Log3 $hash, 1, "Kanal: $channel, Fertig: $voltage";
} else { } else {
Log3 $hash, 3, $hash->{NAME} . " error, output conversion not finished"; Log3 $hash, 3, $hash->{NAME} . " error, output conversion not finished";
} }