Moved SWIG code from C++ files (hpp and cxx) to SWIG interface files (.i). Added getter/setter methods for classes with protected or private vars.

This commit is contained in:
Serban Waltter
2018-01-17 14:20:32 +02:00
committed by Noel Eck
parent 2551596309
commit 63b2b33df7
39 changed files with 351 additions and 367 deletions

View File

@ -622,12 +622,6 @@ namespace upm {
BNO055_SYS_ERR_T getSystemError();
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
void installISR(int gpio, mraa_gpio_edge_t level, jobject runnable)
{
installISR(gpio, level, mraa_java_isr_callback, runnable);
}
#else
/**
* install an interrupt handler.
*
@ -641,7 +635,6 @@ namespace upm {
*/
void installISR(int gpio, mraa_gpio_edge_t level,
void (*isr)(void *), void *arg);
#endif
/**
* uninstall a previously installed interrupt handler
@ -707,10 +700,5 @@ namespace upm {
BNO055(const BNO055&) = delete;
BNO055 &operator=(const BNO055&) = delete;
// Adding a private function definition for java bindings
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
void installISR(int gpio, mraa_gpio_edge_t level,
void (*isr)(void *), void *arg);
#endif
};
}

View File

@ -18,10 +18,20 @@
%template(byteVector) std::vector<uint8_t>;
%template(intVector) std::vector<int>;
%include "bno055_regs.h"
%include "bno055.hpp"
%{
#include "bno055.hpp"
#include "bno055_regs.h"
%}
%include "bno055_regs.h"
%include "bno055.hpp"
%ignore installISR(int , mraa::Edge , void *, void *);
%extend upm::BNO055 {
void installISR(int gpio, mraa_gpio_edge_t level, jobject runnable)
{
$self->installISR(gpio, level, mraa_java_isr_callback, runnable);
}
}
JAVA_JNI_LOADLIBRARY(javaupm_bno055)