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

BMA220: Add string based cons for Accelerometer

Browse Source 
Signed-off-by: Adelin Dobre <adelin.dobre@rinftech.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Adelin Dobre 2018-07-13 17:56:03 +03:00 committed by Mihai Tudor Panu
parent 742150feea
commit 55f749529f
2 changed files with 52 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/bma220/bma220.cxx
View File

@ -29,13 +29,14 @@
#include <string.h>
#include "bma220.hpp"
#include "upm_string_parser.hpp"
using namespace upm;
using namespace std;
BMA220::BMA220(int bus, uint8_t addr) :
m_i2c(bus), m_gpioIntr(0)
m_i2c(new mraa::I2c(bus)), m_gpioIntr(0)
{
m_addr = addr;
@ -46,7 +47,7 @@ BMA220::BMA220(int bus, uint8_t addr) :
m_accelScale = 0.0;
mraa::Result rv;
if ( (rv = m_i2c.address(m_addr)) != mraa::SUCCESS)
if ( (rv = m_i2c->address(m_addr)) != mraa::SUCCESS)
{
throw std::runtime_error(string(__FUNCTION__) +
": I2c.address() failed");
@ -65,9 +66,46 @@ BMA220::BMA220(int bus, uint8_t addr) :
}
}
BMA220::BMA220(std::string initStr) : mraaIo(new mraa::MraaIo(initStr))
{
m_accelX = 0.0;
m_accelY = 0.0;
m_accelZ = 0.0;
m_accelScale = 0.0;
if(mraaIo == NULL) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": Failed to allocate memory for internal member");
}
if(!mraaIo->i2cs.empty()) {
m_i2c = &mraaIo->i2cs[0];
}
else {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_i2c_init() failed");
}
// Init the accelerometer
enableAxes(true, true, true);
// set scaling rate
if (!setAccelerometerScale(FSL_RANGE_2G))
{
throw std::runtime_error(string(__FUNCTION__) +
": Unable to set accel scale");
return;
}
}
BMA220::~BMA220()
{
uninstallISR();
if(mraaIo != NULL)
delete mraaIo;
else
delete m_i2c;
}
void BMA220::update()
@ -96,13 +134,13 @@ void BMA220::updateAccelerometer()
uint8_t BMA220::readReg(uint8_t reg)
{
return m_i2c.readReg(reg);
return m_i2c->readReg(reg);
}
bool BMA220::writeReg(uint8_t reg, uint8_t val)
{
mraa::Result rv;
if ((rv = m_i2c.writeReg(reg, val)) != mraa::SUCCESS)
if ((rv = m_i2c->writeReg(reg, val)) != mraa::SUCCESS)
{
throw std::runtime_error(std::string(__FUNCTION__) +
": I2c.writeReg() failed");

11
src/bma220/bma220.hpp
View File

@ -28,6 +28,7 @@
#include <mraa/common.hpp>
#include <mraa/i2c.hpp>
#include <mraa/gpio.hpp>
#include <mraa/initio.hpp>
#include <interfaces/iAcceleration.hpp>
@ -484,6 +485,13 @@ namespace upm {
*/
BMA220(int bus=BMA220_I2C_BUS, uint8_t addr=BMA220_DEFAULT_ADDR);
/**
* Instantiates BMA220 Accelerometer object based on a given string.
*
* @param initStr string containing specific information for BMA220 initialization.
*/
BMA220(std::string initStr);
/**
* BMA220 Destructor
*/
@ -807,8 +815,9 @@ namespace upm {
mraa::Gpio* get_gpioIntr();
protected:
mraa::I2c m_i2c;
mraa::I2c *m_i2c;
mraa::Gpio *m_gpioIntr;
mraa::MraaIo *mraaIo;
uint8_t m_addr;
// uncompensated accelerometer values