alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-15 04:57:30 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

mpu9150: throw exception(s) on fatal errors

Browse Source 
Signed-off-by: Jon Trulson <jtrulson@ics.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Jon Trulson 2015-09-10 16:20:13 -06:00 committed by Mihai Tudor Panu
parent a24f8209bc
commit 5cc8c90251
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/mpu9150/mpu60x0.cxx
View File

@ -53,8 +53,8 @@ MPU60X0::MPU60X0(int bus, uint8_t address) :
mraa::Result rv;
if ( (rv = m_i2c.address(m_addr)) != mraa::SUCCESS)
{
cerr << __FUNCTION__ << ": Could not initialize i2c address. " << endl;
printError(rv);
throw std::runtime_error(std::string(__FUNCTION__) +
": I2c.address() failed");
return;
}
}
@ -69,7 +69,8 @@ bool MPU60X0::init()
// first, take the device out of sleep mode
if (!setSleep(false))
{
cerr << __FUNCTION__ << ": Unable to wake up device" << endl;
throw std::runtime_error(std::string(__FUNCTION__) +
": Unable to wake up device");
return false;
}
@ -77,7 +78,8 @@ bool MPU60X0::init()
// internal clock for stability
if (!setClockSource(PLL_XG))
{
cerr << __FUNCTION__ << ": Unable to set clock source" << endl;
throw std::runtime_error(std::string(__FUNCTION__) +
": Unable to set clock source");
return false;
}
@ -149,8 +151,13 @@ bool MPU60X0::writeReg(uint8_t reg, uint8_t val)
mraa::Result rv;
if ((rv = m_i2c.writeReg(reg, val)) != mraa::SUCCESS)
{
<<<<<<< HEAD
cerr << __FUNCTION__ << ": failed:" << endl;
printError(rv);
=======
throw std::runtime_error(std::string(__FUNCTION__) +
": I2c.writeReg() failed");
>>>>>>> 9378f17... mpu9150: throw exception(s) on fatal errors
return false;
}
@ -215,7 +222,8 @@ bool MPU60X0::setGyroscopeScale(FS_SEL_T scale)
default: // should never occur, but...
m_gyroScale = 1.0; // set a safe, though incorrect value
cerr << __FUNCTION__ << ": internal error, unsupported scale" << endl;
throw std::logic_error(string(__FUNCTION__) +
": internal error, unsupported scale");
break;
}
@ -257,7 +265,8 @@ bool MPU60X0::setAccelerometerScale(AFS_SEL_T scale)
default: // should never occur, but...
m_accelScale = 1.0; // set a safe, though incorrect value
cerr << __FUNCTION__ << ": internal error, unsupported scale" << endl;
throw std::logic_error(string(__FUNCTION__) +
": internal error, unsupported scale");
break;
}