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

java: changed some C types to C++ types

Browse Source 
Signed-off-by: Andrei Vasiliu <andrei.vasiliu@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>

Conflicts:
	src/mma7455/mma7455.cxx
	src/mma7455/mma7455.h
	src/sm130/sm130.cxx
	src/sm130/sm130.h
This commit is contained in:
Andrei Vasiliu
2015-09-02 14:56:13 +03:00
committed by Mihai Tudor Panu
parent b8835958e2
commit ab730038fd
46 changed files with 731 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/adxl345/adxl345.cxx
View File

@ -85,20 +85,18 @@
using namespace upm;
Adxl345::Adxl345(int bus)
Adxl345::Adxl345(int bus) : m_i2c(bus)
{
//init bus and reset chip
m_i2c = mraa_i2c_init(bus);
mraa_i2c_address(m_i2c, ADXL345_I2C_ADDR);
//reset chip
m_i2c.address(ADXL345_I2C_ADDR);
m_buffer[0] = ADXL345_POWER_CTL;
m_buffer[1] = ADXL345_POWER_ON;
mraa_i2c_write(m_i2c, m_buffer, 2);
m_i2c.write(m_buffer, 2);
mraa_i2c_address(m_i2c, ADXL345_I2C_ADDR);
m_i2c.address(ADXL345_I2C_ADDR);
m_buffer[0] = ADXL345_DATA_FORMAT;
m_buffer[1] = ADXL345_16G | ADXL345_FULL_RES;
mraa_i2c_write(m_i2c, m_buffer, 2);
m_i2c.write(m_buffer, 2);
//2.5V sensitivity is 256 LSB/g = 0.00390625 g/bit
//3.3V x and y sensitivity is 265 LSB/g = 0.003773584 g/bit, z is the same
@ -110,11 +108,6 @@ Adxl345::Adxl345(int bus)
Adxl345::update();
}
Adxl345::~Adxl345()
{
mraa_i2c_stop(m_i2c);
}
float*
Adxl345::getAcceleration()
{
@ -135,23 +128,23 @@ Adxl345::getScale(){
uint8_t result;
mraa_i2c_address(m_i2c, ADXL345_I2C_ADDR);
mraa_i2c_write_byte(m_i2c, ADXL345_DATA_FORMAT);
m_i2c.address(ADXL345_I2C_ADDR);
m_i2c.writeByte(ADXL345_DATA_FORMAT);
mraa_i2c_address(m_i2c, ADXL345_I2C_ADDR);
result = mraa_i2c_read_byte(m_i2c);
m_i2c.address(ADXL345_I2C_ADDR);
result = m_i2c.readByte();
return pow(2, (result & 0x03) + 1);
}
mraa_result_t
mraa::Result
Adxl345::update(void)
{
mraa_i2c_address(m_i2c, ADXL345_I2C_ADDR);
mraa_i2c_write_byte(m_i2c, ADXL345_XOUT_L);
m_i2c.address(ADXL345_I2C_ADDR);
m_i2c.writeByte(ADXL345_XOUT_L);
mraa_i2c_address(m_i2c, ADXL345_I2C_ADDR);
mraa_i2c_read(m_i2c, m_buffer, DATA_REG_SIZE);
m_i2c.address(ADXL345_I2C_ADDR);
m_i2c.read(m_buffer, DATA_REG_SIZE);
// x
m_rawaccel[0] = ((m_buffer[1] << 8 ) | m_buffer[0]);
@ -160,5 +153,5 @@ Adxl345::update(void)
// z
m_rawaccel[2] = ((m_buffer[5] << 8 ) | m_buffer[4]);
return MRAA_SUCCESS;
return mraa::SUCCESS;
}

10
src/adxl345/adxl345.h
View File

@ -23,7 +23,7 @@
*/
#pragma once
#include <mraa/i2c.h>
#include <mraa/i2c.hpp>
#define READ_BUFFER_LENGTH 6
@ -66,9 +66,9 @@ public:
Adxl345(int bus);
/**
* ADXL345 object destructor
* there is no need for a ADXL345 object destructor
* ~Adxl345();
*/
~Adxl345();
/**
* Returns a pointer to a float[3] that contains acceleration (g) forces
@ -98,13 +98,13 @@ public:
*
* @return 0 if successful
*/
mraa_result_t update();
mraa::Result update();
private:
float m_accel[3];
float m_offsets[3];
int16_t m_rawaccel[3];
uint8_t m_buffer[READ_BUFFER_LENGTH];
mraa_i2c_context m_i2c;
mraa::I2c m_i2c;
};
}