Raspberries/upm
Public Access
2
0
Fork 0
Code Issues Pull Requests 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

12
src/tsl2561/tsl2561.h
View File

@@ -29,7 +29,7 @@
#pragma once
#include <string>
#include <mraa/i2c.h>
#include <mraa/i2c.hpp>
#include <math.h>
namespace upm {
@@ -145,23 +145,23 @@ class TSL2561{
*
* @param reg Addess to write
* @param Value to write
* @return mraa_result_t
* @return mraa::Result
*/
mraa_result_t i2cWriteReg(uint8_t reg, uint8_t value);
mraa::Result i2cWriteReg(uint8_t reg, uint8_t value);
/**
* Reads from a TSL2561 register
*
* @param reg Addess to read
* @param data Byte read from the register
* @return mraa_result_t
* @return mraa::Result
*/
mraa_result_t i2cReadReg(uint8_t reg, uint8_t &data);
mraa::Result i2cReadReg(uint8_t reg, uint8_t &data);
int m_bus;
std::string m_name;
int m_controlAddr;
mraa_i2c_context m_i2ControlCtx;
mraa::I2c m_i2ControlCtx;
uint8_t m_gain;
uint8_t m_integrationTime;