mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-22 01:11:42 +00:00
Added BuiltInAccelerometer in Java and updated C++
Change-Id: I5a3360c51334e85da6a15fd640f9420bc3b64dca
This commit is contained in:
58
wpilibj/wpilibJavaJNI/lib/AccelerometerJNI.cpp
Normal file
58
wpilibj/wpilibJavaJNI/lib/AccelerometerJNI.cpp
Normal file
@@ -0,0 +1,58 @@
|
||||
#include <jni.h>
|
||||
#include "edu_wpi_first_wpilibj_hal_AccelerometerJNI.h"
|
||||
#include "HAL/Accelerometer.hpp"
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_wpilibj_hal_AccelerometerJNI
|
||||
* Method: setAccelerometerActive
|
||||
* Signature: (Z)V
|
||||
*/
|
||||
JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_hal_AccelerometerJNI_setAccelerometerActive
|
||||
(JNIEnv *, jclass, jboolean active)
|
||||
{
|
||||
setAccelerometerActive(active);
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_wpilibj_hal_AccelerometerJNI
|
||||
* Method: setAccelerometerRange
|
||||
* Signature: (I)V
|
||||
*/
|
||||
JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_hal_AccelerometerJNI_setAccelerometerRange
|
||||
(JNIEnv *, jclass, jint range)
|
||||
{
|
||||
setAccelerometerRange((AccelerometerRange)range);
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_wpilibj_hal_AccelerometerJNI
|
||||
* Method: getAccelerometerX
|
||||
* Signature: ()D
|
||||
*/
|
||||
JNIEXPORT jdouble JNICALL Java_edu_wpi_first_wpilibj_hal_AccelerometerJNI_getAccelerometerX
|
||||
(JNIEnv *, jclass)
|
||||
{
|
||||
return getAccelerometerX();
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_wpilibj_hal_AccelerometerJNI
|
||||
* Method: getAccelerometerY
|
||||
* Signature: ()D
|
||||
*/
|
||||
JNIEXPORT jdouble JNICALL Java_edu_wpi_first_wpilibj_hal_AccelerometerJNI_getAccelerometerY
|
||||
(JNIEnv *, jclass)
|
||||
{
|
||||
return getAccelerometerY();
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_wpilibj_hal_AccelerometerJNI
|
||||
* Method: getAccelerometerZ
|
||||
* Signature: ()D
|
||||
*/
|
||||
JNIEXPORT jdouble JNICALL Java_edu_wpi_first_wpilibj_hal_AccelerometerJNI_getAccelerometerZ
|
||||
(JNIEnv *, jclass)
|
||||
{
|
||||
return getAccelerometerZ();
|
||||
}
|
||||
@@ -20,10 +20,10 @@
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<repositories>
|
||||
|
||||
|
||||
</repositories>
|
||||
<pluginRepositories>
|
||||
|
||||
|
||||
</pluginRepositories>
|
||||
<properties>
|
||||
<embeddedJDKHome>${user.home}${file.separator}jdk-linux-arm-vfp-sflt${file.separator}jdk1.7.0_45</embeddedJDKHome>
|
||||
@@ -83,7 +83,7 @@
|
||||
<file>${embeddedJDKIncludePath}</file>
|
||||
</files>
|
||||
<message>A copy of the 'Linux ARM v6/v7 Soft Float ABI' JDK must be extracted to '${embeddedJDKHome}' and
|
||||
the folder '${embeddedJDKIncludePath}' must exist to build this module. You must use Java 7 u45. This JDK may be downloaded from
|
||||
the folder '${embeddedJDKIncludePath}' must exist to build this module. You must use Java 7 u45. This JDK may be downloaded from
|
||||
http://www.oracle.com/technetwork/java/javase/downloads/java-archive-downloads-javase7-521261.html#jdk-7u45-oth-JPR. To override
|
||||
this default location, specify a value for the 'embeddedJDKHome' property at the command line, like 'mvn -DembeddedJDKHome=path/to/jdk'</message>
|
||||
</requireFilesExist>
|
||||
@@ -113,6 +113,7 @@ this default location, specify a value for the 'embeddedJDKHome' property at the
|
||||
<javahClassName>edu.wpi.first.wpilibj.communication.FRCNetworkCommunicationsLibrary</javahClassName>
|
||||
<javahClassName>edu.wpi.first.wpilibj.hal.HALUtil</javahClassName>
|
||||
<javahClassName>edu.wpi.first.wpilibj.hal.JNIWrapper</javahClassName>
|
||||
<javahClassName>edu.wpi.first.wpilibj.hal.AccelerometerJNI</javahClassName>
|
||||
<javahClassName>edu.wpi.first.wpilibj.hal.AnalogJNI</javahClassName>
|
||||
<javahClassName>edu.wpi.first.wpilibj.hal.CounterJNI</javahClassName>
|
||||
<javahClassName>edu.wpi.first.wpilibj.hal.DIOJNI</javahClassName>
|
||||
@@ -128,7 +129,7 @@ this default location, specify a value for the 'embeddedJDKHome' property at the
|
||||
</javahClassNames>
|
||||
<!-- enable additional javah interface in dependencies list -->
|
||||
<!-- javahSearchJNIFromDependencies>true</javahSearchJNIFromDependencies -->
|
||||
<!--
|
||||
<!--
|
||||
| Add jdk include directories to system include path
|
||||
| Override ${jkdIncludePath} If your jdk does not conform to Sun JDK layout
|
||||
-->
|
||||
@@ -242,7 +243,7 @@ this default location, specify a value for the 'embeddedJDKHome' property at the
|
||||
</then>
|
||||
<else>
|
||||
<copy todir="${project.build.directory}" >
|
||||
<fileset dir="${mvn.cpp-root.zip.path}" />
|
||||
<fileset dir="${mvn.cpp-root.zip.path}" />
|
||||
</copy>
|
||||
</else>
|
||||
</if>
|
||||
|
||||
Reference in New Issue
Block a user