alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-24 01:10:22 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

lsm303: 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 13:26:21 -06:00 committed by Mihai Tudor Panu
parent 77abd94682
commit 9e20268bb8
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lsm303/lsm303.cxx
View File

@ -26,6 +26,8 @@
*/ */
#include <iostream> #include <iostream>
#include <string>
#include <stdexcept>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
@ -35,8 +37,6 @@ using namespace upm;
LSM303::LSM303(int bus, int addrMag, int addrAcc, int accScale) : m_i2c(bus) LSM303::LSM303(int bus, int addrMag, int addrAcc, int accScale) : m_i2c(bus)
{ {
mraa::Result ret = mraa::SUCCESS;
m_addrMag = addrMag; m_addrMag = addrMag;
m_addrAcc = addrAcc; m_addrAcc = addrAcc;
@ -184,17 +184,21 @@ LSM303::setRegisterSafe(uint8_t slave, uint8_t sregister, uint8_t data)
{ {
buf[0] = sregister; buf[0] = sregister;
buf[1] = data; buf[1] = data;
if (m_i2c.address(slave) != mraa::SUCCESS) { if (m_i2c.address(slave) != mraa::SUCCESS) {
fprintf(stderr, "lsm303: Failed to connect to slave\n"); throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_i2c_address() failed");
return mraa::ERROR_INVALID_HANDLE; return mraa::ERROR_INVALID_HANDLE;
} }
if (m_i2c.write(buf, 2) != mraa::SUCCESS) { if (m_i2c.write(buf, 2) != mraa::SUCCESS) {
fprintf(stderr, "lsm303: Failed to write to register\n"); throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_i2c_write() failed");
return mraa::ERROR_INVALID_HANDLE; return mraa::ERROR_INVALID_HANDLE;
} }
uint8_t val = m_i2c.readReg(sregister); uint8_t val = m_i2c.readReg(sregister);
if (val != data) { if (val != data) {
fprintf(stderr, "lsm303: Failed to set register correctly\n"); throw std::invalid_argument(std::string(__FUNCTION__) +
": failed to set register correctly");
return mraa::ERROR_UNSPECIFIED; return mraa::ERROR_UNSPECIFIED;
} }
return mraa::SUCCESS; return mraa::SUCCESS;