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

java: now using the C++ style types from mraa defined in types.hpp

Browse Source 
Signed-off-by: Andrei Vasiliu <andrei.vasiliu@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Andrei Vasiliu
2015-08-26 16:38:57 +03:00
committed by Mihai Tudor Panu
parent ea1df1b178
commit b8835958e2
28 changed files with 208 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/mpu9150/ak8975.cxx
View File

@ -40,11 +40,11 @@ AK8975::AK8975(int bus, uint8_t address):
m_yCoeff = 0.0;
m_zCoeff = 0.0;
mraa_result_t rv;
if ( (rv = m_i2c.address(m_addr)) != MRAA_SUCCESS)
mraa::Result rv;
if ( (rv = m_i2c.address(m_addr)) != mraa::SUCCESS)
{
cerr << __FUNCTION__ << ": Could not initialize i2c address. " << endl;
mraa_result_print(rv);
printError(rv);
return;
}
}
@ -89,11 +89,11 @@ bool AK8975::init()
bool AK8975::setMode(CNTL_MODES_T mode)
{
mraa_result_t rv;
if ((rv = m_i2c.writeReg(REG_CNTL, mode)) != MRAA_SUCCESS)
mraa::Result rv;
if ((rv = m_i2c.writeReg(REG_CNTL, mode)) != mraa::SUCCESS)
{
cerr << __FUNCTION__ << ": failed:" << endl;
mraa_result_print(rv);
printError(rv);
return false;
}
@ -171,7 +171,7 @@ bool AK8975::update(bool selfTest)
bool AK8975::selfTest()
{
mraa_result_t rv;
mraa::Result rv;
// set power down first
if (!setMode(CNTL_PWRDWN))
@ -181,10 +181,10 @@ bool AK8975::selfTest()
}
// enable self test bit
if ((rv = m_i2c.writeReg(REG_ASTC, ASTC_SELF)) != MRAA_SUCCESS)
if ((rv = m_i2c.writeReg(REG_ASTC, ASTC_SELF)) != mraa::SUCCESS)
{
cerr << __FUNCTION__ << ": failed to enable self test:" << endl;
mraa_result_print(rv);
printError(rv);
return false;
}
@ -201,10 +201,10 @@ bool AK8975::selfTest()
// Now, reset self test register
uint8_t reg = m_i2c.readReg(REG_ASTC);
reg &= ~ASTC_SELF;
if ((rv = m_i2c.writeReg(REG_ASTC, reg)) != MRAA_SUCCESS)
if ((rv = m_i2c.writeReg(REG_ASTC, reg)) != mraa::SUCCESS)
{
cerr << __FUNCTION__ << ": failed to disable self test:" << endl;
mraa_result_print(rv);
printError(rv);
return false;
}

1
src/mpu9150/ak8975.h
View File

@ -24,6 +24,7 @@
#pragma once
#include <string>
#include <mraa/common.hpp>
#include <mraa/i2c.hpp>
#define AK8975_I2C_BUS 0

12
src/mpu9150/mpu60x0.cxx
View File

@ -50,11 +50,11 @@ MPU60X0::MPU60X0(int bus, uint8_t address) :
m_accelScale = 1.0;
m_gyroScale = 1.0;
mraa_result_t rv;
if ( (rv = m_i2c.address(m_addr)) != MRAA_SUCCESS)
mraa::Result rv;
if ( (rv = m_i2c.address(m_addr)) != mraa::SUCCESS)
{
cerr << __FUNCTION__ << ": Could not initialize i2c address. " << endl;
mraa_result_print(rv);
printError(rv);
return;
}
}
@ -146,11 +146,11 @@ void MPU60X0::readRegs(uint8_t reg, uint8_t *buf, int len)
bool MPU60X0::writeReg(uint8_t reg, uint8_t val)
{
mraa_result_t rv;
if ((rv = m_i2c.writeReg(reg, val)) != MRAA_SUCCESS)
mraa::Result rv;
if ((rv = m_i2c.writeReg(reg, val)) != mraa::SUCCESS)
{
cerr << __FUNCTION__ << ": failed:" << endl;
mraa_result_print(rv);
printError(rv);
return false;
}

1
src/mpu9150/mpu60x0.h
View File

@ -24,6 +24,7 @@
#pragma once
#include <string>
#include <mraa/common.hpp>
#include <mraa/i2c.hpp>
#ifdef SWIGJAVA