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

34
src/maxds3231m/maxds3231m.cxx
View File

@ -31,29 +31,19 @@
using namespace upm;
MAXDS3231M::MAXDS3231M (int bus, int devAddr) {
MAXDS3231M::MAXDS3231M (int bus, int devAddr) : m_i2Ctx(bus) {
m_name = "MAXDS3231M";
m_i2cAddr = devAddr;
m_bus = bus;
if (!(m_i2Ctx = mraa_i2c_init(m_bus)))
{
mraa::Result ret = m_i2Ctx.address(m_i2cAddr);
if (ret != mraa::SUCCESS) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_i2c_init() failed");
}
mraa_result_t ret = mraa_i2c_address(m_i2Ctx, m_i2cAddr);
if (ret != MRAA_SUCCESS) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_i2c_address() failed");
": m_i2Ctx.address() failed");
}
}
MAXDS3231M::~MAXDS3231M() {
mraa_i2c_stop(m_i2Ctx);
}
void
MAXDS3231M::setDate (Time3231 &time) {
uint8_t *data = (uint8_t *)&time;
@ -108,20 +98,20 @@ uint16_t
MAXDS3231M::i2cReadReg_N (int reg, unsigned int len, uint8_t * buffer) {
int readByte = 0;
mraa_i2c_address(m_i2Ctx, m_i2cAddr);
mraa_i2c_write_byte(m_i2Ctx, reg);
m_i2Ctx.address(m_i2cAddr);
m_i2Ctx.writeByte(reg);
mraa_i2c_address(m_i2Ctx, m_i2cAddr);
readByte = mraa_i2c_read(m_i2Ctx, buffer, len);
m_i2Ctx.address(m_i2cAddr);
readByte = m_i2Ctx.read(buffer, len);
return readByte;
}
mraa_result_t
mraa::Result
MAXDS3231M::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, m_i2cAddr);
error = mraa_i2c_write (m_i2Ctx, buffer, len);
error = m_i2Ctx.address (m_i2cAddr);
error = m_i2Ctx.write (buffer, len);
return error;
}

11
src/maxds3231m/maxds3231m.h
View File

@ -24,7 +24,7 @@
#pragma once
#include <string>
#include <mraa/i2c.h>
#include <mraa/i2c.hpp>
#define ADDR 0x68 // device address
@ -91,11 +91,6 @@ class MAXDS3231M {
*/
MAXDS3231M (int bus=0, int devAddr=0x68);
/**
* MAXDS3231M object destructor; basically, it closes the I2C connection.
*/
~MAXDS3231M ();
/**
* Sets the date and time on the chip.
*
@ -127,10 +122,10 @@ class MAXDS3231M {
int m_i2cAddr;
int m_bus;
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 i2cWriteReg_N (uint8_t reg, unsigned int len, uint8_t * buffer);
uint8_t DECtoBSD (uint8_t data);
uint8_t BCDtoDEC (uint8_t data);
};