alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-07-05 11:21:12 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

misc: Minor fixes due to previous rebase

Browse Source 
Signed-off-by: Andrei Vasiliu <andrei.vasiliu@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Andrei Vasiliu
2015-09-18 16:33:53 +03:00
committed by Mihai Tudor Panu
parent 428bac360b
commit 5e72c4febd
13 changed files with 14 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mpu9150/mpu60x0.cxx
View File

@ -151,13 +151,8 @@ 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;
}