java: changed some C types to C++ types
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:
committed by
Mihai Tudor Panu
parent
b8835958e2
commit
ab730038fd
@@ -24,9 +24,18 @@
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <mraa/aio.h>
|
||||
#include <mraa/gpio.h>
|
||||
#include <mraa/spi.h>
|
||||
#include <mraa/aio.hpp>
|
||||
|
||||
#ifdef SWIGJAVA
|
||||
#undef SWIGJAVA
|
||||
#include <mraa/gpio.hpp>
|
||||
#define SWIGJAVA
|
||||
|
||||
#else
|
||||
#include <mraa/gpio.hpp>
|
||||
#endif
|
||||
|
||||
#include <mraa/spi.hpp>
|
||||
|
||||
#define HIGH 1
|
||||
#define LOW 0
|
||||
@@ -71,8 +80,10 @@ class MAX5487 {
|
||||
|
||||
/**
|
||||
* MAX5487 object destructor, closes all IO connections
|
||||
*/
|
||||
~MAX5487 ();
|
||||
* no more needed as the connections will be closed when
|
||||
* m_spi and m_csnPinCtx will go out of scope
|
||||
* ~MAX5487 ();
|
||||
**/
|
||||
|
||||
/**
|
||||
* Sets a wiper for port A.
|
||||
@@ -93,18 +104,18 @@ class MAX5487 {
|
||||
}
|
||||
private:
|
||||
std::string m_name;
|
||||
mraa_spi_context m_spi;
|
||||
mraa_gpio_context m_csnPinCtx;
|
||||
mraa::Spi m_spi;
|
||||
mraa::Gpio m_csnPinCtx;
|
||||
|
||||
/**
|
||||
* Sets the chip select pin to LOW
|
||||
*/
|
||||
mraa_result_t CSOn ();
|
||||
mraa::Result CSOn ();
|
||||
|
||||
/**
|
||||
* Sets the chip select pin to HIGH
|
||||
*/
|
||||
mraa_result_t CSOff ();
|
||||
mraa::Result CSOff ();
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user