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

ADXL345: Make some changes in cpp interface

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-10-31 13:03:30 +02:00 committed by Mihai Tudor Panu
parent 1111a830c9
commit fe3dcc01b2
2 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/adxl345/adxl345.cxx
View File

@ -29,6 +29,8 @@
#include <utility> #include <utility>
#include "math.h" #include "math.h"
#include "adxl345.hpp" #include "adxl345.hpp"
#include "upm_string_parser.hpp"
#define READ_BUFFER_LENGTH 6 #define READ_BUFFER_LENGTH 6
@ -88,15 +90,10 @@
using namespace upm; using namespace upm;
static bool operator!(mraa::MraaIo &mraaIo) Adxl345::Adxl345(int bus) : m_i2c(bus)
{
return mraaIo.getMraaDescriptors() == NULL;
}
Adxl345::Adxl345(int bus) : m_i2c(new mraa::I2c(bus))
{ {
//init bus and reset chip //init bus and reset chip
if ( m_i2c->address(ADXL345_I2C_ADDR) != mraa::SUCCESS ){ if ( m_i2c.address(ADXL345_I2C_ADDR) != mraa::SUCCESS ){
throw std::invalid_argument(std::string(__FUNCTION__) + throw std::invalid_argument(std::string(__FUNCTION__) +
": i2c.address() failed"); ": i2c.address() failed");
return; return;
@ -104,7 +101,7 @@ Adxl345::Adxl345(int bus) : m_i2c(new mraa::I2c(bus))
m_buffer[0] = ADXL345_POWER_CTL; m_buffer[0] = ADXL345_POWER_CTL;
m_buffer[1] = ADXL345_POWER_ON; m_buffer[1] = ADXL345_POWER_ON;
if( m_i2c->write(m_buffer, 2) != mraa::SUCCESS){ if( m_i2c.write(m_buffer, 2) != mraa::SUCCESS){
throw std::runtime_error(std::string(__FUNCTION__) + throw std::runtime_error(std::string(__FUNCTION__) +
": i2c.write() control register failed"); ": i2c.write() control register failed");
return; return;
@ -112,7 +109,7 @@ Adxl345::Adxl345(int bus) : m_i2c(new mraa::I2c(bus))
m_buffer[0] = ADXL345_DATA_FORMAT; m_buffer[0] = ADXL345_DATA_FORMAT;
m_buffer[1] = ADXL345_16G | ADXL345_FULL_RES; m_buffer[1] = ADXL345_16G | ADXL345_FULL_RES;
if( m_i2c->write(m_buffer, 2) != mraa::SUCCESS){ if( m_i2c.write(m_buffer, 2) != mraa::SUCCESS){
throw std::runtime_error(std::string(__FUNCTION__) + throw std::runtime_error(std::string(__FUNCTION__) +
": i2c.write() mode register failed"); ": i2c.write() mode register failed");
return; return;
@ -128,21 +125,25 @@ Adxl345::Adxl345(int bus) : m_i2c(new mraa::I2c(bus))
Adxl345::update(); Adxl345::update();
} }
Adxl345::Adxl345(std::string initStr) : mraaIo(initStr) Adxl345::Adxl345(std::string initStr) : m_i2c(nullptr), mraaIo(initStr)
{ {
if(!mraaIo.i2cs.empty()) mraa_io_descriptor* descs = mraaIo.getMraaDescriptors();
{ std::vector<std::string> upmTokens;
m_i2c = &mraaIo.i2cs[0];
if(!mraaIo.getLeftoverStr().empty()) {
upmTokens = UpmStringParser::parse(mraaIo.getLeftoverStr());
} }
else
{ if(!descs->i2cs) {
throw std::invalid_argument(std::string(__FUNCTION__) + throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_i2c_init() failed"); ": mraa_i2c_init() failed");
} else {
m_i2c = descs->i2cs[0];
} }
m_buffer[0] = ADXL345_POWER_CTL; m_buffer[0] = ADXL345_POWER_CTL;
m_buffer[1] = ADXL345_POWER_ON; m_buffer[1] = ADXL345_POWER_ON;
if( m_i2c->write(m_buffer, 2) != mraa::SUCCESS ){ if( m_i2c.write(m_buffer, 2) != mraa::SUCCESS ){
throw std::runtime_error(std::string(__FUNCTION__) + throw std::runtime_error(std::string(__FUNCTION__) +
": i2c.write() control register failed"); ": i2c.write() control register failed");
return; return;
@ -150,7 +151,7 @@ Adxl345::Adxl345(std::string initStr) : mraaIo(initStr)
m_buffer[0] = ADXL345_DATA_FORMAT; m_buffer[0] = ADXL345_DATA_FORMAT;
m_buffer[1] = ADXL345_16G | ADXL345_FULL_RES; m_buffer[1] = ADXL345_16G | ADXL345_FULL_RES;
if( m_i2c->write(m_buffer, 2) != mraa::SUCCESS){ if( m_i2c.write(m_buffer, 2) != mraa::SUCCESS){
throw std::runtime_error(std::string(__FUNCTION__) + throw std::runtime_error(std::string(__FUNCTION__) +
": i2c.write() mode register failed"); ": i2c.write() mode register failed");
return; return;
@ -168,8 +169,6 @@ Adxl345::Adxl345(std::string initStr) : mraaIo(initStr)
Adxl345::~Adxl345() Adxl345::~Adxl345()
{ {
if(!mraaIo)
delete m_i2c;
} }
float* float*
@ -207,9 +206,9 @@ Adxl345::getScale(){
uint8_t result; uint8_t result;
m_i2c->writeByte(ADXL345_DATA_FORMAT); m_i2c.writeByte(ADXL345_DATA_FORMAT);
result = m_i2c->readByte(); result = m_i2c.readByte();
return pow(2, (result & 0x03) + 1); return pow(2, (result & 0x03) + 1);
} }
@ -217,9 +216,9 @@ Adxl345::getScale(){
mraa::Result mraa::Result
Adxl345::update(void) Adxl345::update(void)
{ {
m_i2c->writeByte(ADXL345_XOUT_L); m_i2c.writeByte(ADXL345_XOUT_L);
m_i2c->read(m_buffer, DATA_REG_SIZE); m_i2c.read(m_buffer, DATA_REG_SIZE);
// x // x
m_rawaccel[0] = ((m_buffer[1] << 8 ) | m_buffer[0]); m_rawaccel[0] = ((m_buffer[1] << 8 ) | m_buffer[0]);

2
src/adxl345/adxl345.hpp
View File

@ -124,7 +124,7 @@ private:
float m_offsets[3]; float m_offsets[3];
int16_t m_rawaccel[3]; int16_t m_rawaccel[3];
uint8_t m_buffer[READ_BUFFER_LENGTH]; uint8_t m_buffer[READ_BUFFER_LENGTH];
mraa::I2c* m_i2c = NULL; mraa::I2c m_i2c;
mraa::MraaIo mraaIo; mraa::MraaIo mraaIo;
}; };