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

mma7455: 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:03:33 -06:00 committed by Mihai Tudor Panu
parent b8ee0cf22d
commit e8823dd74e
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/mma7455/mma7455.cxx
View File

@ -23,6 +23,8 @@
*/ */
#include <iostream> #include <iostream>
#include <string>
#include <stdexcept>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -42,9 +44,17 @@ MMA7455::MMA7455 (int bus, int devAddr) : m_i2ControlCtx(bus) {
m_controlAddr = devAddr; m_controlAddr = devAddr;
m_bus = bus; m_bus = bus;
if ( !(m_i2ControlCtx = mraa_i2c_init(m_bus)) )
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_i2c_init() failed");
return;
}
mraa::Result error = m_i2ControlCtx.address(m_controlAddr); mraa::Result error = m_i2ControlCtx.address(m_controlAddr);
if (error != mraa::SUCCESS) { if (error != mraa::SUCCESS) {
fprintf(stderr, "Messed up i2c bus\n"); throw std::runtime_error(std::string(__FUNCTION__) +
": mraa_i2c_address() failed");
return; return;
} }
@ -52,12 +62,14 @@ MMA7455::MMA7455 (int bus, int devAddr) : m_i2ControlCtx(bus) {
data = (BIT (MMA7455_GLVL0) | BIT (MMA7455_MODE0)); data = (BIT (MMA7455_GLVL0) | BIT (MMA7455_MODE0));
error = i2cWriteReg (MMA7455_MCTL, &data, 0x1); error = i2cWriteReg (MMA7455_MCTL, &data, 0x1);
if (error != mraa::SUCCESS) { if (error != mraa::SUCCESS) {
std::cout << "ERROR :: MMA7455 instance wan not created (Mode)" << std::endl; throw std::runtime_error(std::string(__FUNCTION__) +
": writing mode register failed");
return; return;
} }
if (mraa::SUCCESS != calibrate ()) { if (mraa::SUCCESS != calibrate ()) {
std::cout << "ERROR :: MMA7455 instance wan not created (Calibrate)" << std::endl; throw std::runtime_error(std::string(__FUNCTION__) +
": calibrate() failed");
return; return;
} }
} }
@ -140,16 +152,17 @@ short *MMA7455::readData() {
#endif #endif
int int
<<<<<<< HEAD
MMA7455::i2cReadReg (unsigned char reg, uint8_t *buffer, int len) { MMA7455::i2cReadReg (unsigned char reg, uint8_t *buffer, int len) {
if (mraa::SUCCESS != m_i2ControlCtx.address(m_controlAddr)) { if (mraa::SUCCESS != m_i2ControlCtx.address(m_controlAddr)) {
throw std::runtime_error(std::string(__FUNCTION__) +
": mraa_i2c_address() failed");
return 0; return 0;
} }
if (mraa::SUCCESS != m_i2ControlCtx.writeByte(reg)) { if (mraa::SUCCESS != m_i2ControlCtx.writeByte(reg)) {
return 0; throw std::runtime_error(std::string(__FUNCTION__) +
} ": mraa_i2c_write_byte() failed");
if (mraa::SUCCESS != m_i2ControlCtx.address(m_controlAddr)) {
return 0; return 0;
} }
@ -166,10 +179,14 @@ MMA7455::i2cWriteReg (unsigned char reg, uint8_t *buffer, int len) {
error = m_i2ControlCtx.address (m_controlAddr); error = m_i2ControlCtx.address (m_controlAddr);
if (error != mraa::SUCCESS) { if (error != mraa::SUCCESS) {
hrow std::runtime_error(std::string(__FUNCTION__) +
": mraa_i2c_address() failed");
return error; return error;
} }
error = m_i2ControlCtx.write (data, len + 1); error = m_i2ControlCtx.write (data, len + 1);
if (error != mraa::SUCCESS) { if (error != mraa::SUCCESS) {
throw std::runtime_error(std::string(__FUNCTION__) +
": mraa_i2c_write() failed");
return error; return error;
} }