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

changed error handling from try to eval

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5392 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
klauswitt 2014-03-31 22:30:13 +00:00
parent f0e570e99d
commit afacd504cf
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fhem/FHEM/51_I2C_BMP180.pm
View File

@ -36,7 +36,6 @@ use warnings;
use Time::HiRes qw(usleep); use Time::HiRes qw(usleep);
use Scalar::Util qw(looks_like_number); use Scalar::Util qw(looks_like_number);
use Error qw(:try);
use constant { use constant {
BMP180_I2C_ADDRESS => '0x77', BMP180_I2C_ADDRESS => '0x77',
@ -372,17 +371,13 @@ sub I2C_BMP180_readUncompensatedTemperature($) {
my ($hash) = @_; my ($hash) = @_;
# Write 0x2E into Register 0xF4. This requests a temperature reading # Write 0x2E into Register 0xF4. This requests a temperature reading
# $hash->{devBPM180}->bus_write( (0xF4, 0x2E) );
I2C_BMP180_i2cwrite($hash, hex("F4"), hex("2E")); I2C_BMP180_i2cwrite($hash, hex("F4"), hex("2E"));
usleep(4500); usleep(4500);
# Read the two byte result from address 0xF6 # Read the two byte result from address 0xF6
#my @values = $hash->{devBPM180}->bus_read(0xF6, 2);
#my $retVal = $values[0] << 8 | $values[1];
I2C_BMP180_i2cread($hash, hex("F6"), 2); I2C_BMP180_i2cread($hash, hex("F6"), 2);
return; return;
} }
@ -399,8 +394,6 @@ sub I2C_BMP180_readUncompensatedPressure($$) {
# Write 0x34+($overSamplingSettings << 6) into register 0xF4 # Write 0x34+($overSamplingSettings << 6) into register 0xF4
# Request a pressure reading with oversampling setting # Request a pressure reading with oversampling setting
# $hash->{devBPM180}->bus_write( (0xF4, 0x34 + ($overSamplingSettings << 6)) );
my $data = hex("34") + ($overSamplingSettings << 6); my $data = hex("34") + ($overSamplingSettings << 6);
I2C_BMP180_i2cwrite($hash, hex("F4"), $data); I2C_BMP180_i2cwrite($hash, hex("F4"), $data);
@ -408,8 +401,6 @@ sub I2C_BMP180_readUncompensatedPressure($$) {
usleep( (2 + (3 << $overSamplingSettings)) * 1000 ); usleep( (2 + (3 << $overSamplingSettings)) * 1000 );
# Read the three byte result from 0xF6. 0xF6 = MSB, 0xF7 = LSB and 0xF8 = XLSB # Read the three byte result from 0xF6. 0xF6 = MSB, 0xF7 = LSB and 0xF8 = XLSB
# my @values = $hash->{devBPM180}->bus_read(0xF6, 3);
# my $retVal = ( ( ($values[0] << 16) | ($values[1] << 8) | $values[2] ) >> (8 - $overSamplingSettings) );
I2C_BMP180_i2cread($hash, hex("F6"), 3); I2C_BMP180_i2cread($hash, hex("F6"), 3);
return; return;
@ -418,7 +409,7 @@ sub I2C_BMP180_readUncompensatedPressure($$) {
sub I2C_BMP180_i2cread($$$) { sub I2C_BMP180_i2cread($$$) {
my ($hash, $reg, $nbyte) = @_; my ($hash, $reg, $nbyte) = @_;
if ($hash->{HiPi_used}) { if ($hash->{HiPi_used}) {
try { eval {
my @values = $hash->{devBPM180}->bus_read($reg, $nbyte); my @values = $hash->{devBPM180}->bus_read($reg, $nbyte);
I2C_BMP180_I2CRec($hash, { I2C_BMP180_I2CRec($hash, {
direction => "i2cread", direction => "i2cread",
@ -427,9 +418,8 @@ sub I2C_BMP180_i2cread($$$) {
nbyte => $nbyte, nbyte => $nbyte,
received => join (' ',@values), received => join (' ',@values),
}); });
} catch Error with {
Log3 ($hash, 1, ': ERROR: '. $hash->{NAME} . ': i2c-bus_read failure');
}; };
Log3 ($hash, 1, $hash->{NAME} . ': ' . I2C_BMP180_Catch($@)) if $@;;
} else { } else {
if (defined (my $iodev = $hash->{IODev})) { if (defined (my $iodev = $hash->{IODev})) {
CallFn($iodev->{NAME}, "I2CWrtFn", $iodev, { CallFn($iodev->{NAME}, "I2CWrtFn", $iodev, {
@ -447,7 +437,7 @@ sub I2C_BMP180_i2cread($$$) {
sub I2C_BMP180_i2cwrite($$$) { sub I2C_BMP180_i2cwrite($$$) {
my ($hash, $reg, @data) = @_; my ($hash, $reg, @data) = @_;
if ($hash->{HiPi_used}) { if ($hash->{HiPi_used}) {
try { eval {
$hash->{devBPM180}->bus_write($reg, join (' ',@data)); $hash->{devBPM180}->bus_write($reg, join (' ',@data));
I2C_BMP180_I2CRec($hash, { I2C_BMP180_I2CRec($hash, {
direction => "i2cwrite", direction => "i2cwrite",
@ -455,9 +445,8 @@ sub I2C_BMP180_i2cwrite($$$) {
reg => $reg, reg => $reg,
data => join (' ',@data), data => join (' ',@data),
}); });
} catch Error with {
Log3 ($hash, 1, ': ERROR: ' . $hash->{NAME} . ': i2c-bus_write failure');
}; };
Log3 ($hash, 1, $hash->{NAME} . ': ' . I2C_BMP180_Catch($@)) if $@;;
} else { } else {
if (defined (my $iodev = $hash->{IODev})) { if (defined (my $iodev = $hash->{IODev})) {
CallFn($iodev->{NAME}, "I2CWrtFn", $iodev, { CallFn($iodev->{NAME}, "I2CWrtFn", $iodev, {