[sim] Move Sim classes from HAL to wpilibc/j (#2549)

Also move some things in HAL for consistency.

WAS:
C++:
- C APIs: #include "mockdata/AccelerometerData.h"
- User side class: #include "simulation/AccelerometerSim.h"
Java:
- JNI APIs: hal.sim.mockdata.AccelerometerData (and a few classes in hal.sim)
- User side classes: hal.sim.AccelerometerSim

IS:
C++:
- C APIs: #include "hal/simulation/AccelerometerData.h"
- C++ class: #include "frc/simulation/AccelerometerSim.h"
Java:
- JNI APIs: hal.simulation.AccelerometerData
- User side class: wpilibj.simulation.AccelerometerSim
This commit is contained in:
Peter Johnson
2020-06-27 22:11:24 -07:00
committed by GitHub
parent 22c0e2813a
commit ce3bc91946
207 changed files with 1420 additions and 1415 deletions

View File

@@ -8,20 +8,20 @@
#include <jni.h>
#include "CallbackStore.h"
#include "edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI.h"
#include "mockdata/AccelerometerData.h"
#include "edu_wpi_first_hal_simulation_AccelerometerDataJNI.h"
#include "hal/simulation/AccelerometerData.h"
using namespace hal;
extern "C" {
/*
* Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI
* Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI
* Method: registerActiveCallback
* Signature: (ILjava/lang/Object;Z)I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_registerActiveCallback
Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_registerActiveCallback
(JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
{
return sim::AllocateCallback(env, index, callback, initialNotify,
@@ -29,12 +29,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_registerActiveCallback
}
/*
* Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI
* Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI
* Method: cancelActiveCallback
* Signature: (II)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_cancelActiveCallback
Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_cancelActiveCallback
(JNIEnv* env, jclass, jint index, jint handle)
{
return sim::FreeCallback(env, handle, index,
@@ -42,36 +42,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_cancelActiveCallback
}
/*
* Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI
* Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI
* Method: getActive
* Signature: (I)Z
*/
JNIEXPORT jboolean JNICALL
Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_getActive
Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_getActive
(JNIEnv*, jclass, jint index)
{
return HALSIM_GetAccelerometerActive(index);
}
/*
* Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI
* Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI
* Method: setActive
* Signature: (IZ)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_setActive
Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_setActive
(JNIEnv*, jclass, jint index, jboolean value)
{
HALSIM_SetAccelerometerActive(index, value);
}
/*
* Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI
* Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI
* Method: registerRangeCallback
* Signature: (ILjava/lang/Object;Z)I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_registerRangeCallback
Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_registerRangeCallback
(JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
{
return sim::AllocateCallback(env, index, callback, initialNotify,
@@ -79,12 +79,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_registerRangeCallback
}
/*
* Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI
* Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI
* Method: cancelRangeCallback
* Signature: (II)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_cancelRangeCallback
Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_cancelRangeCallback
(JNIEnv* env, jclass, jint index, jint handle)
{
return sim::FreeCallback(env, handle, index,
@@ -92,24 +92,24 @@ Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_cancelRangeCallback
}
/*
* Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI
* Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI
* Method: getRange
* Signature: (I)I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_getRange
Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_getRange
(JNIEnv*, jclass, jint index)
{
return HALSIM_GetAccelerometerRange(index);
}
/*
* Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI
* Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI
* Method: setRange
* Signature: (II)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_setRange
Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_setRange
(JNIEnv*, jclass, jint index, jint value)
{
HALSIM_SetAccelerometerRange(index,
@@ -117,12 +117,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_setRange
}
/*
* Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI
* Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI
* Method: registerXCallback
* Signature: (ILjava/lang/Object;Z)I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_registerXCallback
Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_registerXCallback
(JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
{
return sim::AllocateCallback(env, index, callback, initialNotify,
@@ -130,12 +130,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_registerXCallback
}
/*
* Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI
* Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI
* Method: cancelXCallback
* Signature: (II)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_cancelXCallback
Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_cancelXCallback
(JNIEnv* env, jclass, jint index, jint handle)
{
return sim::FreeCallback(env, handle, index,
@@ -143,36 +143,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_cancelXCallback
}
/*
* Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI
* Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI
* Method: getX
* Signature: (I)D
*/
JNIEXPORT jdouble JNICALL
Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_getX
Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_getX
(JNIEnv*, jclass, jint index)
{
return HALSIM_GetAccelerometerX(index);
}
/*
* Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI
* Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI
* Method: setX
* Signature: (ID)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_setX
Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_setX
(JNIEnv*, jclass, jint index, jdouble value)
{
HALSIM_SetAccelerometerX(index, value);
}
/*
* Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI
* Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI
* Method: registerYCallback
* Signature: (ILjava/lang/Object;Z)I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_registerYCallback
Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_registerYCallback
(JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
{
return sim::AllocateCallback(env, index, callback, initialNotify,
@@ -180,12 +180,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_registerYCallback
}
/*
* Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI
* Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI
* Method: cancelYCallback
* Signature: (II)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_cancelYCallback
Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_cancelYCallback
(JNIEnv* env, jclass, jint index, jint handle)
{
return sim::FreeCallback(env, handle, index,
@@ -193,36 +193,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_cancelYCallback
}
/*
* Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI
* Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI
* Method: getY
* Signature: (I)D
*/
JNIEXPORT jdouble JNICALL
Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_getY
Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_getY
(JNIEnv*, jclass, jint index)
{
return HALSIM_GetAccelerometerY(index);
}
/*
* Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI
* Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI
* Method: setY
* Signature: (ID)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_setY
Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_setY
(JNIEnv*, jclass, jint index, jdouble value)
{
HALSIM_SetAccelerometerY(index, value);
}
/*
* Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI
* Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI
* Method: registerZCallback
* Signature: (ILjava/lang/Object;Z)I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_registerZCallback
Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_registerZCallback
(JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
{
return sim::AllocateCallback(env, index, callback, initialNotify,
@@ -230,12 +230,12 @@ Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_registerZCallback
}
/*
* Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI
* Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI
* Method: cancelZCallback
* Signature: (II)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_cancelZCallback
Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_cancelZCallback
(JNIEnv* env, jclass, jint index, jint handle)
{
return sim::FreeCallback(env, handle, index,
@@ -243,36 +243,36 @@ Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_cancelZCallback
}
/*
* Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI
* Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI
* Method: getZ
* Signature: (I)D
*/
JNIEXPORT jdouble JNICALL
Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_getZ
Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_getZ
(JNIEnv*, jclass, jint index)
{
return HALSIM_GetAccelerometerZ(index);
}
/*
* Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI
* Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI
* Method: setZ
* Signature: (ID)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_setZ
Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_setZ
(JNIEnv*, jclass, jint index, jdouble value)
{
HALSIM_SetAccelerometerZ(index, value);
}
/*
* Class: edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI
* Class: edu_wpi_first_hal_simulation_AccelerometerDataJNI
* Method: resetData
* Signature: (I)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_sim_mockdata_AccelerometerDataJNI_resetData
Java_edu_wpi_first_hal_simulation_AccelerometerDataJNI_resetData
(JNIEnv*, jclass, jint index)
{
HALSIM_ResetAccelerometerData(index);