From 78a159594b2877a59a1c06a2cad50107d39a32ad Mon Sep 17 00:00:00 2001 From: Stefan Andritoiu Date: Fri, 14 Aug 2015 14:37:02 +0300 Subject: [PATCH] java: solved SWIGTYPE_p_int and SWIGTYPE_p_float Signed-off-by: Stefan Andritoiu Signed-off-by: Mihai Tudor Panu --- src/adxl335/javaupm_adxl335.i | 5 +++-- src/h3lis331dl/javaupm_h3lis331dl.i | 7 ++++--- src/lsm9ds0/javaupm_lsm9ds0.i | 3 ++- src/mhz16/javaupm_mhz16.i | 4 +++- src/mma7660/javaupm_mma7660.i | 7 ++++--- src/mpu9150/javaupm_mpu9150.i | 3 +++ 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/adxl335/javaupm_adxl335.i b/src/adxl335/javaupm_adxl335.i index 277fa569..b809932d 100644 --- a/src/adxl335/javaupm_adxl335.i +++ b/src/adxl335/javaupm_adxl335.i @@ -1,9 +1,10 @@ %module javaupm_adxl335 %include "../upm.i" %include "cpointer.i" +%include "typemaps.i" -%pointer_functions(int, intPointer); -%pointer_functions(float, floatPointer); +%apply int *OUTPUT { int *xVal, int *yVal, int *zVal }; +%apply float *OUTPUT { float *xAccel, float *yAccel, float *zAccel }; %{ #include "adxl335.h" diff --git a/src/h3lis331dl/javaupm_h3lis331dl.i b/src/h3lis331dl/javaupm_h3lis331dl.i index 68712df1..b20c525d 100644 --- a/src/h3lis331dl/javaupm_h3lis331dl.i +++ b/src/h3lis331dl/javaupm_h3lis331dl.i @@ -1,10 +1,11 @@ %module javaupm_h3lis331dl %include "../upm.i" %include "cpointer.i" +%include "typemaps.i" + +%apply int *OUTPUT { int *x, int *y, int*z }; +%apply float *OUTPUT { float *aX, float *aY, float *aZ }; -/* Send "int *" and "float *" to JavaScript as intp and floatp */ -%pointer_functions(int, intp); -%pointer_functions(float, floatp); %{ #include "h3lis331dl.h" diff --git a/src/lsm9ds0/javaupm_lsm9ds0.i b/src/lsm9ds0/javaupm_lsm9ds0.i index 3d192864..a8071c85 100644 --- a/src/lsm9ds0/javaupm_lsm9ds0.i +++ b/src/lsm9ds0/javaupm_lsm9ds0.i @@ -1,8 +1,9 @@ %module javaupm_lsm9ds0 %include "../upm.i" %include "cpointer.i" +%include "typemaps.i" -%pointer_functions(float, floatp); +%apply float *INOUT { float *x, float *y, float *z }; %include "lsm9ds0.h" %{ diff --git a/src/mhz16/javaupm_mhz16.i b/src/mhz16/javaupm_mhz16.i index 58338b7c..d14fb84e 100644 --- a/src/mhz16/javaupm_mhz16.i +++ b/src/mhz16/javaupm_mhz16.i @@ -1,9 +1,11 @@ %module javaupm_mhz16 %include "../upm.i" %include "cpointer.i" +%include "typemaps.i" /* Send "int *" to JavaScript as intp */ -%pointer_functions(int, intp); +%apply int *OUTPUT { int *gas, int *temp }; + %{ #include "mhz16.h" speed_t int_B9600 = B9600; diff --git a/src/mma7660/javaupm_mma7660.i b/src/mma7660/javaupm_mma7660.i index 59c24563..39656af9 100644 --- a/src/mma7660/javaupm_mma7660.i +++ b/src/mma7660/javaupm_mma7660.i @@ -1,10 +1,11 @@ %module javaupm_mma7660 %include "../upm.i" %include "cpointer.i" +%include "typemaps.i" + +%apply int *OUTPUT { int *x, int *y, int *z }; +%apply float *OUTPUT { float *ax, float *ay, float *az }; -/* Send "int *" and "float *" to JavaScript as intp and floatp */ -%pointer_functions(int, intp); -%pointer_functions(float, floatp); %{ #include "mma7660.h" diff --git a/src/mpu9150/javaupm_mpu9150.i b/src/mpu9150/javaupm_mpu9150.i index ac23c5a7..a185dd6b 100644 --- a/src/mpu9150/javaupm_mpu9150.i +++ b/src/mpu9150/javaupm_mpu9150.i @@ -1,5 +1,8 @@ %module javaupm_mpu9150 %include "../upm.i" +%include "typemaps.i" + +%apply float *INOUT { float *x, float *y, float *z }; %{ #include "mpu9150.h"