alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-07-01 17:31:13 +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

24
src/hmc5883l/hmc5883l.cxx
View File

@ -78,31 +78,29 @@
using namespace upm;
Hmc5883l::Hmc5883l(int bus)
Hmc5883l::Hmc5883l(int bus) : m_i2c(bus)
{
m_i2c = mraa_i2c_init(bus);
mraa_i2c_address(m_i2c, HMC5883L_I2C_ADDR);
m_i2c.address(HMC5883L_I2C_ADDR);
m_rx_tx_buf[0] = HMC5883L_CONF_REG_B;
m_rx_tx_buf[1] = GA_1_3_REG;
mraa_i2c_write(m_i2c, m_rx_tx_buf, 2);
m_i2c.write(m_rx_tx_buf, 2);
mraa_i2c_address(m_i2c, HMC5883L_I2C_ADDR);
m_i2c.address(HMC5883L_I2C_ADDR);
m_rx_tx_buf[0] = HMC5883L_MODE_REG;
m_rx_tx_buf[1] = HMC5883L_CONT_MODE;
mraa_i2c_write(m_i2c, m_rx_tx_buf, 2);
m_i2c.write(m_rx_tx_buf, 2);
Hmc5883l::update();
}
mraa_result_t
mraa::Result
Hmc5883l::update(void)
{
mraa_i2c_address(m_i2c, HMC5883L_I2C_ADDR);
mraa_i2c_write_byte(m_i2c, HMC5883L_DATA_REG);
m_i2c.address(HMC5883L_I2C_ADDR);
m_i2c.writeByte(HMC5883L_DATA_REG);
mraa_i2c_address(m_i2c, HMC5883L_I2C_ADDR);
mraa_i2c_read(m_i2c, m_rx_tx_buf, DATA_REG_SIZE);
m_i2c.address(HMC5883L_I2C_ADDR);
m_i2c.read(m_rx_tx_buf, DATA_REG_SIZE);
// x
m_coor[0] = (m_rx_tx_buf[HMC5883L_X_MSB_REG] << 8 ) | m_rx_tx_buf[HMC5883L_X_LSB_REG];
@ -111,7 +109,7 @@ Hmc5883l::update(void)
// y
m_coor[1] = (m_rx_tx_buf[HMC5883L_Y_MSB_REG] << 8 ) | m_rx_tx_buf[HMC5883L_Y_LSB_REG];
return MRAA_SUCCESS;
return mraa::SUCCESS;
}
float

6
src/hmc5883l/hmc5883l.h
View File

@ -24,7 +24,7 @@
*/
#pragma once
#include <mraa/i2c.h>
#include <mraa/i2c.hpp>
#define MAX_BUFFER_LENGTH 6
@ -88,7 +88,7 @@ public:
*
* @return 0 if successful
*/
mraa_result_t update();
mraa::Result update();
/**
* Sets the magnetic declination for better calibration
@ -105,7 +105,7 @@ private:
int16_t m_coor[3];
float m_declination;
uint8_t m_rx_tx_buf[MAX_BUFFER_LENGTH];
mraa_i2c_context m_i2c;
mraa::I2c m_i2c;
};
}