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

htu21d: 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 12:30:45 -06:00 committed by Mihai Tudor Panu
parent 69bd77dd30
commit 3fc672a19f
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/htu21d/htu21d.cpp
View File

@ -22,6 +22,9 @@
*/
#include <iostream>
#include <string>
#include <stdexcept>
#include <unistd.h>
#include <stdlib.h>
@ -37,10 +40,18 @@ HTU21D::HTU21D(int bus, int devAddr) : m_i2ControlCtx(bus) {
m_controlAddr = devAddr;
m_bus = bus;
if ( (m_i2ControlCtx == NULL) )
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_i2c_init() failed");
return;
}
mraa::Result ret = m_i2ControlCtx.address(m_controlAddr);
if (ret != mraa::SUCCESS) {
fprintf(stderr, "Error accessing i2c bus\n");
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_i2c_address() failed");
}
resetSensor();
}
@ -206,8 +217,15 @@ HTU21D::i2cWriteReg (uint8_t reg, uint8_t value) {
mraa::Result error = mraa::SUCCESS;
uint8_t data[2] = { reg, value };
<<<<<<< HEAD
m_i2ControlCtx.address (m_controlAddr);
error = m_i2ControlCtx.write (data, 2);
=======
mraa_i2c_address (m_i2ControlCtx, m_controlAddr);
if ( mraa_i2c_write(m_i2ControlCtx, data, 2) != MRAA_SUCCESS)
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_i2c_write() failed");
>>>>>>> f09bf63... htu21d: throw exception(s) on fatal errors
return error;
}