Raspberries/upm
Public Access
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make static allocation for mraaIo variable

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-08-02 15:32:42 +03:00
committed by Mihai Tudor Panu
parent 90167f6ac1
commit 9869b31a3e
6 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/bma220/bma220.cxx
View File

@@ -34,6 +34,10 @@
using namespace upm;
using namespace std;
static bool operator!(mraa::MraaIo &mraaIo)
{
return mraaIo.getMraaDescriptors() == NULL;
}
BMA220::BMA220(int bus, uint8_t addr) :
m_i2c(new mraa::I2c(bus)), m_gpioIntr(0)
@@ -66,7 +70,7 @@ BMA220::BMA220(int bus, uint8_t addr) :
}
}
BMA220::BMA220(std::string initStr) : mraaIo(new mraa::MraaIo(initStr))
BMA220::BMA220(std::string initStr) : mraaIo(initStr)
{
m_accelX = 0.0;
m_accelY = 0.0;
@@ -74,13 +78,8 @@ BMA220::BMA220(std::string initStr) : mraaIo(new mraa::MraaIo(initStr))
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];
if(!mraaIo.i2cs.empty()) {
m_i2c = &mraaIo.i2cs[0];
}
else {
throw std::invalid_argument(std::string(__FUNCTION__) +
@@ -98,8 +97,8 @@ BMA220::BMA220(std::string initStr) : mraaIo(new mraa::MraaIo(initStr))
}
std::vector<std::string> upmTokens;
if(!mraaIo->getLeftoverStr().empty()) {
upmTokens = UpmStringParser::parse(mraaIo->getLeftoverStr());
if(!mraaIo.getLeftoverStr().empty()) {
upmTokens = UpmStringParser::parse(mraaIo.getLeftoverStr());
}
std::string::size_type sz;
@@ -139,9 +138,7 @@ BMA220::BMA220(std::string initStr) : mraaIo(new mraa::MraaIo(initStr))
BMA220::~BMA220()
{
uninstallISR();
if(mraaIo != NULL)
delete mraaIo;
else
if(!mraaIo)
delete m_i2c;
}

18
src/bma220/bma220.hpp
View File

@@ -181,6 +181,22 @@ namespace upm {
/**
* REG_TAP_CONFIG bits
*/
typedef enum {
TAP_CONFIG_DUR0 = 0x01,
TAP_CONFIG_DUR1 = 0x02,
TAP_CONFIG_DUR2 = 0x04,
_TAP_CONFIG_DUR_MASK = 7,
_TAP_CONFIG_DUR_SHIFT = 0,
TAP_CONFIG_THRESH0 = 0x08,
TAP_CONFIG_THRESH1 = 0x10,
TAP_CONFIG_THRESH2 = 0x20,
TAP_CONFIG_THRESH3 = 0x40,
_TAP_CONFIG_THRESH_MASK = 15,
_TAP_CONFIG_THRESH_SHIFT = 3,
TAP_CONFIG_FILTER = 0x80
} TAP_CONFIG_BITS_T;
/**
* REG_SLOPE_CONFIG bits
@@ -801,7 +817,7 @@ namespace upm {
protected:
mraa::I2c *m_i2c;
mraa::Gpio *m_gpioIntr;
mraa::MraaIo *mraaIo;
mraa::MraaIo mraaIo;
uint8_t m_addr;
// uncompensated accelerometer values