From 3e59323abba63d364227477f802f2c6f8bc2a091 Mon Sep 17 00:00:00 2001 From: Stefan Andritoiu Date: Mon, 17 Aug 2015 18:25:09 +0300 Subject: [PATCH] java: solved SWIGTYPE_* issues Signed-off-by: Stefan Andritoiu Signed-off-by: Mihai Tudor Panu --- src/adc121c021/javaupm_adc121c021.i | 4 ++-- src/ds1307/javaupm_ds1307.i | 3 +++ src/grovecircularled/javaupm_grovecircularled.i | 1 + src/grovescam/javaupm_grovescam.i | 2 ++ src/lcd/javaupm_i2clcd.i | 4 +++- src/lsm9ds0/javaupm_lsm9ds0.i | 2 ++ src/m24lr64e/javaupm_m24lr64e.i | 4 +++- src/mhz16/javaupm_mhz16.i | 4 +++- src/mma7455/javaupm_mma7455.i | 5 +++++ src/mpr121/javaupm_mpr121.i | 3 +++ src/nrf24l01/javaupm_nrf24l01.i | 3 +++ src/nunchuck/javaupm_nunchuck.i | 3 +++ src/pn532/javaupm_pn532.i | 3 +++ src/pulsensor/javaupm_pulsensor.i | 6 ++++++ src/upm.i | 3 +++ src/zfm20/javaupm_zfm20.i | 9 +++++---- 16 files changed, 50 insertions(+), 9 deletions(-) diff --git a/src/adc121c021/javaupm_adc121c021.i b/src/adc121c021/javaupm_adc121c021.i index 98520ad0..039c0810 100644 --- a/src/adc121c021/javaupm_adc121c021.i +++ b/src/adc121c021/javaupm_adc121c021.i @@ -1,7 +1,7 @@ %module javaupm_adc121c021 %include "../upm.i" -%include "../carrays_uint16_t.i" - +/*%include "../carrays_uint16_t.i" +*/ %{ #include "adc121c021.h" %} diff --git a/src/ds1307/javaupm_ds1307.i b/src/ds1307/javaupm_ds1307.i index a68577f4..4f8d5125 100644 --- a/src/ds1307/javaupm_ds1307.i +++ b/src/ds1307/javaupm_ds1307.i @@ -1,5 +1,8 @@ %module javaupm_ds1307 %include "../upm.i" +%include "arrays_java.i"; + +%apply unsigned char[] {uint8_t *}; %{ #include "ds1307.h" diff --git a/src/grovecircularled/javaupm_grovecircularled.i b/src/grovecircularled/javaupm_grovecircularled.i index 85611481..cdc7b483 100644 --- a/src/grovecircularled/javaupm_grovecircularled.i +++ b/src/grovecircularled/javaupm_grovecircularled.i @@ -1,5 +1,6 @@ %module javaupm_grovecircularled %include "../upm.i" +%include "arrays_java.i"; %{ #include "grovecircularled.h" diff --git a/src/grovescam/javaupm_grovescam.i b/src/grovescam/javaupm_grovescam.i index 250b1383..94e5cb8c 100644 --- a/src/grovescam/javaupm_grovescam.i +++ b/src/grovescam/javaupm_grovescam.i @@ -1,5 +1,7 @@ %module javaupm_grovescam %include "../upm.i" +%include "arrays_java.i"; +%apply unsigned char[] {uint8_t *}; %{ #include "grovescam.h" diff --git a/src/lcd/javaupm_i2clcd.i b/src/lcd/javaupm_i2clcd.i index bd24d63b..2d046d08 100644 --- a/src/lcd/javaupm_i2clcd.i +++ b/src/lcd/javaupm_i2clcd.i @@ -2,7 +2,9 @@ %include "../upm.i" %include "stdint.i" %include "typemaps.i" - +%include "arrays_java.i"; + +%apply unsigned char[] {uint8_t *}; %apply uint8_t *OUTPUT { uint8_t *data }; %include "ssd.h" diff --git a/src/lsm9ds0/javaupm_lsm9ds0.i b/src/lsm9ds0/javaupm_lsm9ds0.i index a8071c85..94debcac 100644 --- a/src/lsm9ds0/javaupm_lsm9ds0.i +++ b/src/lsm9ds0/javaupm_lsm9ds0.i @@ -2,8 +2,10 @@ %include "../upm.i" %include "cpointer.i" %include "typemaps.i" +%include "arrays_java.i"; %apply float *INOUT { float *x, float *y, float *z }; +%apply unsigned char[] {uint8_t *buf}; %include "lsm9ds0.h" %{ diff --git a/src/m24lr64e/javaupm_m24lr64e.i b/src/m24lr64e/javaupm_m24lr64e.i index df89b003..d74546f8 100644 --- a/src/m24lr64e/javaupm_m24lr64e.i +++ b/src/m24lr64e/javaupm_m24lr64e.i @@ -1,7 +1,9 @@ %module javaupm_m24lr64e %include "../upm.i" - %include "stdint.i" +%include "arrays_java.i"; + +%apply unsigned char[] {uint8_t *}; %{ #include "m24lr64e.h" diff --git a/src/mhz16/javaupm_mhz16.i b/src/mhz16/javaupm_mhz16.i index d14fb84e..dbf0ad99 100644 --- a/src/mhz16/javaupm_mhz16.i +++ b/src/mhz16/javaupm_mhz16.i @@ -2,8 +2,10 @@ %include "../upm.i" %include "cpointer.i" %include "typemaps.i" +%include "arrays_java.i"; + +%apply unsigned char[] {unsigned char *}; -/* Send "int *" to JavaScript as intp */ %apply int *OUTPUT { int *gas, int *temp }; %{ diff --git a/src/mma7455/javaupm_mma7455.i b/src/mma7455/javaupm_mma7455.i index 246573e7..c61f055f 100644 --- a/src/mma7455/javaupm_mma7455.i +++ b/src/mma7455/javaupm_mma7455.i @@ -1,5 +1,10 @@ %module javaupm_mma7455 %include "../upm.i" +%include "typemaps.i" +%include "arrays_java.i"; + +%apply unsigned char[] {unsigned char *}; +%apply short *OUTPUT { short * ptrX, short * ptrY, short * ptrZ }; %{ #include "mma7455.h" diff --git a/src/mpr121/javaupm_mpr121.i b/src/mpr121/javaupm_mpr121.i index ca9820da..09a03348 100644 --- a/src/mpr121/javaupm_mpr121.i +++ b/src/mpr121/javaupm_mpr121.i @@ -1,5 +1,8 @@ %module javaupm_mpr121 %include "../upm.i" +%include "arrays_java.i"; + +%apply unsigned char[] {uint8_t *}; %{ #include "mpr121.h" diff --git a/src/nrf24l01/javaupm_nrf24l01.i b/src/nrf24l01/javaupm_nrf24l01.i index d0c069f0..93e65957 100644 --- a/src/nrf24l01/javaupm_nrf24l01.i +++ b/src/nrf24l01/javaupm_nrf24l01.i @@ -1,6 +1,9 @@ %module javaupm_nrf24l01 %include "../upm.i" +%include "arrays_java.i"; +%apply unsigned char[] {uint8_t *}; + %{ #include "nrf24l01.h" %} diff --git a/src/nunchuck/javaupm_nunchuck.i b/src/nunchuck/javaupm_nunchuck.i index c4cafb7c..c323d435 100644 --- a/src/nunchuck/javaupm_nunchuck.i +++ b/src/nunchuck/javaupm_nunchuck.i @@ -1,5 +1,8 @@ %module javaupm_nunchuck %include "../upm.i" +%include "arrays_java.i"; + +%apply unsigned char[] {uint8_t *}; %{ #include "nunchuck.h" diff --git a/src/pn532/javaupm_pn532.i b/src/pn532/javaupm_pn532.i index 4372f82b..85f02566 100644 --- a/src/pn532/javaupm_pn532.i +++ b/src/pn532/javaupm_pn532.i @@ -1,5 +1,8 @@ %module javaupm_pn532 %include "../upm.i" +%include "arrays_java.i" + +%apply unsigned char[] {uint8_t *}; %{ #include "pn532.h" diff --git a/src/pulsensor/javaupm_pulsensor.i b/src/pulsensor/javaupm_pulsensor.i index e6364b96..8767c602 100644 --- a/src/pulsensor/javaupm_pulsensor.i +++ b/src/pulsensor/javaupm_pulsensor.i @@ -1,5 +1,11 @@ %module javaupm_pulsensor %include "../upm.i" +%include "arrays_java.i" + +%ignore sample_thread; +%ignore pin_ctx; +%ignore do_sample; +%ignore callback; %{ #include "pulsensor.h" diff --git a/src/upm.i b/src/upm.i index 6ba93f92..67bceeaa 100644 --- a/src/upm.i +++ b/src/upm.i @@ -4,6 +4,9 @@ #if (SWIGJAVA) + /* %include "arrays_java.i";*/ + /* %apply unsigned char[] {uint8_t *mama}; */ + %apply int { speed_t }; %apply int { mraa_result_t }; #endif diff --git a/src/zfm20/javaupm_zfm20.i b/src/zfm20/javaupm_zfm20.i index f872397e..8b7327d8 100644 --- a/src/zfm20/javaupm_zfm20.i +++ b/src/zfm20/javaupm_zfm20.i @@ -1,14 +1,15 @@ %module javaupm_zfm20 %include "../upm.i" -%include "cpointer.i" %include "stdint.i" %include "typemaps.i" +%include "arrays_java.i"; + +%apply unsigned char[] { unsigned char *pkt }; +%apply signed char[] { char *buffer }; %apply uint16_t *OUTPUT { uint16_t *id, uint16_t *score }; -%apply unsigned char *OUTPUT { unsigned char *pkt}; -/* Send "int *" to Java as intp */ -%pointer_functions(int, intp); + %{ #include "zfm20.h" speed_t int_B57600 = B57600;