From 27c6ac1d318042507dcf9cd4e03a0c82f29d973c Mon Sep 17 00:00:00 2001 From: Stefan Andritoiu Date: Fri, 17 Mar 2017 18:51:44 +0200 Subject: [PATCH] java: solved unclean Java bindings for: htu21d, ozw Signed-off-by: Bogdan Ichim Signed-off-by: Stefan Andritoiu --- src/htu21d/javaupm_htu21d.i | 10 +++++++++- src/ozw/javaupm_ozw.i | 6 ++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/htu21d/javaupm_htu21d.i b/src/htu21d/javaupm_htu21d.i index 25c44b4f..a5f8de50 100644 --- a/src/htu21d/javaupm_htu21d.i +++ b/src/htu21d/javaupm_htu21d.i @@ -1,5 +1,13 @@ %module javaupm_htu21d %include "../upm.i" +%include "typemaps.i" + +%apply float *OUTPUT {float *fHum}; +%apply float *OUTPUT {float *fHumTemp}; +%apply float *OUTPUT {float *fDewPt}; +%inline %{ + extern int getHumidityData(float* fHum, float* fHumTemp, float* fDewPt); +%} %{ #include "htu21d.hpp" @@ -16,4 +24,4 @@ System.exit(1); } } -%} \ No newline at end of file +%} diff --git a/src/ozw/javaupm_ozw.i b/src/ozw/javaupm_ozw.i index 542f5361..0cc1c105 100644 --- a/src/ozw/javaupm_ozw.i +++ b/src/ozw/javaupm_ozw.i @@ -5,6 +5,12 @@ %include "arrays_java.i"; %include "../java_buffer.i" +%apply unsigned char *OUTPUT { uint8_t *val }; + +%inline %{ + extern void setValueAsBytes(int nodeId, int index, uint8_t *val, uint8_t len); +%} + %include "ozw.hpp" %{ #include "ozw.hpp"