alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-10-29 14:15:33 +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

54
src/tcs3414cs/tcs3414cs.cxx
View File

@@ -35,19 +35,13 @@
using namespace upm;
TCS3414CS::TCS3414CS () {
TCS3414CS::TCS3414CS () : m_i2Ctx(0) {
m_name = "TCS3414CS";
if (!(m_i2Ctx = mraa_i2c_init(0)))
{
mraa::Result ret = m_i2Ctx.address(ADDR);
if (ret != mraa::SUCCESS) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_i2c_init() failed");
}
mraa_result_t ret = mraa_i2c_address(m_i2Ctx, ADDR);
if (ret != MRAA_SUCCESS) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_i2c_address() failed");
": m_i2Ctx.address() failed");
}
// Set timing register
@@ -71,10 +65,6 @@ TCS3414CS::TCS3414CS () {
usleep (100000);
}
TCS3414CS::~TCS3414CS () {
mraa_i2c_stop(m_i2Ctx);
}
void
TCS3414CS::readRGB (tcs3414sc_rgb_t * rgb) {
uint8_t buffer[8];
@@ -90,12 +80,12 @@ TCS3414CS::readRGB (tcs3414sc_rgb_t * rgb) {
void
TCS3414CS::clearInterrupt () {
mraa_result_t error = MRAA_SUCCESS;
mraa::Result error = mraa::SUCCESS;
error = mraa_i2c_address (m_i2Ctx, ADDR);
error = mraa_i2c_write_byte (m_i2Ctx, CLR_INT);
error = m_i2Ctx.address (ADDR);
error = m_i2Ctx.writeByte (CLR_INT);
if (error != MRAA_SUCCESS) {
if (error != mraa::SUCCESS) {
throw std::runtime_error(std::string(__FUNCTION__) +
": Couldn't clear interrupt");
}
@@ -110,32 +100,32 @@ uint16_t
TCS3414CS::i2cReadReg_N (int reg, unsigned int len, uint8_t * buffer) {
int readByte = 0;
mraa_i2c_address(m_i2Ctx, ADDR);
mraa_i2c_write_byte(m_i2Ctx, reg);
m_i2Ctx.address(ADDR);
m_i2Ctx.writeByte(reg);
mraa_i2c_address(m_i2Ctx, ADDR);
readByte = mraa_i2c_read(m_i2Ctx, buffer, len);
m_i2Ctx.address(ADDR);
readByte = m_i2Ctx.read(buffer, len);
return readByte;
}
mraa_result_t
mraa::Result
TCS3414CS::i2cWriteReg_N (uint8_t reg, unsigned int len, uint8_t * buffer) {
mraa_result_t error = MRAA_SUCCESS;
mraa::Result error = mraa::SUCCESS;
error = mraa_i2c_address (m_i2Ctx, ADDR);
error = mraa_i2c_write_byte (m_i2Ctx, reg);
error = mraa_i2c_write (m_i2Ctx, buffer, len);
error = m_i2Ctx.address (ADDR);
error = m_i2Ctx.writeByte (reg);
error = m_i2Ctx.write (buffer, len);
return error;
}
mraa_result_t
mraa::Result
TCS3414CS::i2cWriteReg (uint8_t reg, uint8_t data) {
mraa_result_t error = MRAA_SUCCESS;
mraa::Result error = mraa::SUCCESS;
error = mraa_i2c_address (m_i2Ctx, ADDR);
error = mraa_i2c_write_byte (m_i2Ctx, reg);
error = mraa_i2c_write_byte (m_i2Ctx, data);
error = m_i2Ctx.address (ADDR);
error = m_i2Ctx.writeByte (reg);
error = m_i2Ctx.writeByte (data);
return error;
}

13
src/tcs3414cs/tcs3414cs.h
View File

@@ -28,7 +28,7 @@
#pragma once
#include <string>
#include <mraa/i2c.h>
#include <mraa/i2c.hpp>
#define ADDR 0x39 // device address
@@ -135,11 +135,6 @@ class TCS3414CS {
*/
TCS3414CS ();
/**
* TCS3414CS object destructor; basically, it closes the I2C connection.
*/
~TCS3414CS ();
/**
* Gets the RGB value from the sensor.
*
@@ -161,11 +156,11 @@ class TCS3414CS {
}
private:
std::string m_name;
mraa_i2c_context m_i2Ctx;
mraa::I2c m_i2Ctx;
uint16_t i2cReadReg_N (int reg, unsigned int len, uint8_t * buffer);
mraa_result_t i2cWriteReg_N (uint8_t reg, unsigned int len, uint8_t * buffer);
mraa_result_t i2cWriteReg (uint8_t reg, uint8_t data);
mraa::Result i2cWriteReg_N (uint8_t reg, unsigned int len, uint8_t * buffer);
mraa::Result i2cWriteReg (uint8_t reg, uint8_t data);
};
}