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

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.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

17
src/lsm6dsl/javaupm_lsm6dsl.i
View File

@ -6,10 +6,23 @@
%ignore getAccelerometer(float *, float *, float *);
%ignore getGyroscope(float *, float *, float *);
%include "lsm6dsl_defs.h"
%include "lsm6dsl.hpp"
%{
#include "lsm6dsl.hpp"
#include "lsm6dsl_defs.h"
%}
%include "lsm6dsl_defs.h"
%include "lsm6dsl.hpp"
%ignore installISR(LSM6DSL_INTERRUPT_PINS_T , int , mraa::Edge , void *, void *);
%extend upm::LSM6DSL {
void installISR(LSM6DSL_INTERRUPT_PINS_T intr, int gpio,
mraa::Edge level, jobject runnable)
{
$self->installISR(intr, gpio, level, mraa_java_isr_callback,
runnable);
}
}
JAVA_JNI_LOADLIBRARY(javaupm_lsm6dsl)

16
src/lsm6dsl/lsm6dsl.hpp
View File

@ -277,15 +277,6 @@ namespace upm {
*/
void setAccelerometerOffsets(int x, int y, int z, bool weight);
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
void installISR(LSM6DSL_INTERRUPT_PINS_T intr, int gpio,
mraa::Edge level, jobject runnable)
{
installISR(intr, gpio, level, mraa_java_isr_callback,
runnable);
}
#else
/**
* install an interrupt handler
*
@ -302,7 +293,6 @@ namespace upm {
void installISR(LSM6DSL_INTERRUPT_PINS_T intr, int gpio,
mraa::Edge level,
void (*isr)(void *), void *arg);
#endif
/**
* uninstall a previously installed interrupt handler
@ -347,11 +337,5 @@ namespace upm {
LSM6DSL(const LSM6DSL&) = delete;
LSM6DSL &operator=(const LSM6DSL&) = delete;
// Adding a private function definition for java bindings
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
void installISR(LSM6DSL_INTERRUPT_PINS_T intr, int gpio,
mraa::Edge level,
void (*isr)(void *), void *arg);
#endif
};
}