alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-24 01:10:22 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

java: converted all int16_t* to short[] and updated examples

Browse Source 
Signed-off-by: Stefan Andritoiu <stefan.andritoiu@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Stefan Andritoiu 2015-11-03 17:40:37 +02:00 committed by Mihai Tudor Panu
parent 6e2355ce9a
commit ba43986f82
8 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/java/Adxl345Sample.java
View File

@ -49,10 +49,9 @@ public class Adxl345Sample {
accel = sensor.getAcceleration(); accel = sensor.getAcceleration();
System.out.println("Current scale: " + sensor.getScale()); System.out.println("Current scale: " + sensor.getScale());
System.out.println("Raw Values: X: " + val[0] + " Y: " + val[1] System.out.println("Raw Values: X: " + val[0] + " Y: " + val[1] + " Z: " + val[2]);
+ " Z: " + val[2]); System.out.println("Acceleration: X: " + accel[0] + "g Y: " + accel[1] + "g Z: "
System.out.println("Acceleration: X: " + accel[0] + "g Y: " + accel[2] + "g");
+ accel[1] + "g Z: " + accel[2] + "g");
Thread.sleep(1000); Thread.sleep(1000);
} }

5
examples/java/Hmc5883lSample.java
View File

@ -38,7 +38,7 @@ public class Hmc5883lSample {
// Instantiate on I2C // Instantiate on I2C
upm_hmc5883l.Hmc5883l compas = new upm_hmc5883l.Hmc5883l(0); upm_hmc5883l.Hmc5883l compas = new upm_hmc5883l.Hmc5883l(0);
int[] pos; short[] pos;
// Set your declination from true north in radians // Set your declination from true north in radians
compas.set_declination(0.2749f); compas.set_declination(0.2749f);
@ -48,8 +48,7 @@ public class Hmc5883lSample {
compas.update(); compas.update();
pos = compas.coordinates(); pos = compas.coordinates();
System.out.println("Coor: " + (short) pos[0] + " " + (short) pos[1] + " " System.out.println("Coor: " + pos[0] + " " + pos[1] + " " + pos[2]);
+ (short) pos[2]);
System.out.println("Heading: " + compas.heading() + " Direction:" + compas.direction()); System.out.println("Heading: " + compas.heading() + " Direction:" + compas.direction());
Thread.sleep(2000); Thread.sleep(2000);

2
examples/java/Itg3200Sample.java
View File

@ -36,7 +36,7 @@ public class Itg3200Sample {
public static void main(String[] args) throws InterruptedException { public static void main(String[] args) throws InterruptedException {
// ! [Interesting] // ! [Interesting]
int[] rot; short[] rot;
float[] ang; float[] ang;
// Note: Sensor not supported on Intel Edison with Arduino breakout // Note: Sensor not supported on Intel Edison with Arduino breakout

4
examples/java/LSM303Sample.java
View File

@ -41,7 +41,7 @@ public class LSM303Sample {
// Get the coordinate data // Get the coordinate data
sensor.getCoordinates(); sensor.getCoordinates();
int[] coor = sensor.getRawCoorData(); // in XYZ order.· short[] coor = sensor.getRawCoorData(); // in XYZ order.·
// The sensor returns XZY, but the driver compensates and makes it XYZ // The sensor returns XZY, but the driver compensates and makes it XYZ
// Print out the X, Y, and Z coordinate data using two different methods // Print out the X, Y, and Z coordinate data using two different methods
@ -54,7 +54,7 @@ public class LSM303Sample {
// Get the acceleration // Get the acceleration
sensor.getAcceleration(); sensor.getAcceleration();
int[] accel = sensor.getRawAccelData(); short[] accel = sensor.getRawAccelData();
// Print out the X, Y, and Z acceleration data using two different // Print out the X, Y, and Z acceleration data using two different
// methods // methods

2
src/adxl345/javaupm_adxl345.i
View File

@ -16,7 +16,7 @@
%typemap(out) float * { %typemap(out) float * {
$result = JCALL1(NewFloatArray, jenv, 3); $result = JCALL1(NewFloatArray, jenv, 3);
JCALL4(SetFloatArrayRegion, jenv, $result, 0, 3, $1); JCALL4(SetFloatArrayRegion, jenv, $result, 0, 3, $1);
delete [] $1; //delete [] $1;
} }

10
src/hmc5883l/javaupm_hmc5883l.i
View File

@ -5,17 +5,17 @@
#include "hmc5883l.h" #include "hmc5883l.h"
%} %}
%typemap(jni) int16_t* "jintArray" %typemap(jni) int16_t* "jshortArray"
%typemap(jstype) int16_t* "int[]" %typemap(jstype) int16_t* "short[]"
%typemap(jtype) int16_t* "int[]" %typemap(jtype) int16_t* "short[]"
%typemap(javaout) int16_t* { %typemap(javaout) int16_t* {
return $jnicall; return $jnicall;
} }
%typemap(out) int16_t *coordinates { %typemap(out) int16_t *coordinates {
$result = JCALL1(NewIntArray, jenv, 3); $result = JCALL1(NewShortArray, jenv, 3);
JCALL4(SetIntArrayRegion, jenv, $result, 0, 3, (const signed int*)$1); JCALL4(SetShortArrayRegion, jenv, $result, 0, 3, (jshort*)$1);
//delete [] $1; //delete [] $1;
} }

10
src/itg3200/javaupm_itg3200.i
View File

@ -19,17 +19,17 @@
} }
%typemap(jni) int16_t* "jintArray" %typemap(jni) int16_t* "jshortArray"
%typemap(jstype) int16_t* "int[]" %typemap(jstype) int16_t* "short[]"
%typemap(jtype) int16_t* "int[]" %typemap(jtype) int16_t* "short[]"
%typemap(javaout) int16_t* { %typemap(javaout) int16_t* {
return $jnicall; return $jnicall;
} }
%typemap(out) int16_t *getRawValues { %typemap(out) int16_t *getRawValues {
$result = JCALL1(NewIntArray, jenv, 3); $result = JCALL1(NewShortArray, jenv, 3);
JCALL4(SetIntArrayRegion, jenv, $result, 0, 3, (const signed int*)$1); JCALL4(SetShortArrayRegion, jenv, $result, 0, 3, (jshort*)$1);
//delete [] $1; //delete [] $1;
} }

10
src/lsm303/javaupm_lsm303.i
View File

@ -5,17 +5,17 @@
#include "lsm303.h" #include "lsm303.h"
%} %}
%typemap(jni) int16_t* "jintArray" %typemap(jni) int16_t* "jshortArray"
%typemap(jstype) int16_t* "int[]" %typemap(jstype) int16_t* "short[]"
%typemap(jtype) int16_t* "int[]" %typemap(jtype) int16_t* "short[]"
%typemap(javaout) int16_t* { %typemap(javaout) int16_t* {
return $jnicall; return $jnicall;
} }
%typemap(out) int16_t *getRawAccelData { %typemap(out) int16_t *getRawAccelData {
$result = JCALL1(NewIntArray, jenv, 3); $result = JCALL1(NewShortArray, jenv, 3);
JCALL4(SetIntArrayRegion, jenv, $result, 0, 3, (const signed int*)$1); JCALL4(SetShortArrayRegion, jenv, $result, 0, 3, (jshort*)$1);
//delete [] $1; //delete [] $1;
} }