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

36
src/max44000/max44000.cxx
View File

@ -30,16 +30,14 @@
using namespace upm;
MAX44000::MAX44000 (int bus, int devAddr) {
MAX44000::MAX44000 (int bus, int devAddr) : m_i2cMaxControlCtx(bus) {
m_name = "MAX44000";
m_maxControlAddr = devAddr;
m_bus = bus;
m_i2cMaxControlCtx = mraa_i2c_init(m_bus);
mraa_result_t ret = mraa_i2c_address(m_i2cMaxControlCtx, m_maxControlAddr);
if (ret != MRAA_SUCCESS) {
mraa::Result ret = m_i2cMaxControlCtx.address(m_maxControlAddr);
if (ret != mraa::SUCCESS) {
fprintf(stderr, "Messed up i2c bus\n");
}
@ -47,10 +45,6 @@ MAX44000::MAX44000 (int bus, int devAddr) {
// i2cWriteReg (TCR, 0x6);
}
MAX44000::~MAX44000() {
mraa_i2c_stop(m_i2cMaxControlCtx);
}
uint16_t
MAX44000::getProximity () {
uint16_t data = 0;
@ -80,11 +74,11 @@ uint8_t
MAX44000::i2cReadReg_8 (int reg) {
uint8_t data;
mraa_i2c_address(m_i2cMaxControlCtx, m_maxControlAddr);
mraa_i2c_write_byte(m_i2cMaxControlCtx, reg);
m_i2cMaxControlCtx.address(m_maxControlAddr);
m_i2cMaxControlCtx.writeByte(reg);
mraa_i2c_address(m_i2cMaxControlCtx, m_maxControlAddr);
mraa_i2c_read(m_i2cMaxControlCtx, &data, 0x1);
m_i2cMaxControlCtx.address(m_maxControlAddr);
m_i2cMaxControlCtx.read(&data, 0x1);
return data;
}
@ -93,22 +87,22 @@ uint16_t
MAX44000::i2cReadReg_16 (int reg) {
uint16_t data;
mraa_i2c_address(m_i2cMaxControlCtx, m_maxControlAddr);
mraa_i2c_write_byte(m_i2cMaxControlCtx, reg);
m_i2cMaxControlCtx.address(m_maxControlAddr);
m_i2cMaxControlCtx.writeByte(reg);
mraa_i2c_address(m_i2cMaxControlCtx, m_maxControlAddr);
mraa_i2c_read(m_i2cMaxControlCtx, (uint8_t *)&data, 0x2);
m_i2cMaxControlCtx.address(m_maxControlAddr);
m_i2cMaxControlCtx.read((uint8_t *)&data, 0x2);
return data;
}
mraa_result_t
mraa::Result
MAX44000::i2cWriteReg (uint8_t reg, uint8_t value) {
mraa_result_t error = MRAA_SUCCESS;
mraa::Result error = mraa::SUCCESS;
uint8_t data[2] = { reg, value };
error = mraa_i2c_address (m_i2cMaxControlCtx, m_maxControlAddr);
error = mraa_i2c_write (m_i2cMaxControlCtx, data, 2);
error = m_i2cMaxControlCtx.address (m_maxControlAddr);
error = m_i2cMaxControlCtx.write (data, 2);
return error;
}

12
src/max44000/max44000.h
View File

@ -24,7 +24,7 @@
#pragma once
#include <string>
#include <mraa/i2c.h>
#include <mraa/i2c.hpp>
#define ADDR 0x4A // device address
@ -89,8 +89,10 @@ class MAX44000 {
/**
* MAX44000 object destructor; basically, it closes the I2C connection.
*/
~MAX44000 ();
* ~MAX44000 ();
* no need for the destructor - the I2c connection will be closed when
* m_i2cMaxControlCtx variable will be out of context
**/
/**
* Reads the proximity value from the sensor (based on ambient data).
@ -129,14 +131,14 @@ class MAX44000 {
* @param reg Address of the register
* @param value Byte to be written
*/
mraa_result_t i2cWriteReg (uint8_t reg, uint8_t value);
mraa::Result i2cWriteReg (uint8_t reg, uint8_t value);
private:
std::string m_name;
int m_maxControlAddr;
int m_bus;
mraa_i2c_context m_i2cMaxControlCtx;
mraa::I2c m_i2cMaxControlCtx;
};
}