mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-07-03 03:01:44 +00:00
[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
@@ -8,20 +8,20 @@
|
||||
#include <jni.h>
|
||||
|
||||
#include "CallbackStore.h"
|
||||
#include "edu_wpi_first_hal_sim_mockdata_DIODataJNI.h"
|
||||
#include "mockdata/DIOData.h"
|
||||
#include "edu_wpi_first_hal_simulation_DIODataJNI.h"
|
||||
#include "hal/simulation/DIOData.h"
|
||||
|
||||
using namespace hal;
|
||||
|
||||
extern "C" {
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI
|
||||
* Class: edu_wpi_first_hal_simulation_DIODataJNI
|
||||
* Method: registerInitializedCallback
|
||||
* Signature: (ILjava/lang/Object;Z)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_registerInitializedCallback
|
||||
Java_edu_wpi_first_hal_simulation_DIODataJNI_registerInitializedCallback
|
||||
(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_DIODataJNI_registerInitializedCallback
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI
|
||||
* Class: edu_wpi_first_hal_simulation_DIODataJNI
|
||||
* Method: cancelInitializedCallback
|
||||
* Signature: (II)V
|
||||
*/
|
||||
JNIEXPORT void JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_cancelInitializedCallback
|
||||
Java_edu_wpi_first_hal_simulation_DIODataJNI_cancelInitializedCallback
|
||||
(JNIEnv* env, jclass, jint index, jint handle)
|
||||
{
|
||||
return sim::FreeCallback(env, handle, index,
|
||||
@@ -42,36 +42,36 @@ Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_cancelInitializedCallback
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI
|
||||
* Class: edu_wpi_first_hal_simulation_DIODataJNI
|
||||
* Method: getInitialized
|
||||
* Signature: (I)Z
|
||||
*/
|
||||
JNIEXPORT jboolean JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_getInitialized
|
||||
Java_edu_wpi_first_hal_simulation_DIODataJNI_getInitialized
|
||||
(JNIEnv*, jclass, jint index)
|
||||
{
|
||||
return HALSIM_GetDIOInitialized(index);
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI
|
||||
* Class: edu_wpi_first_hal_simulation_DIODataJNI
|
||||
* Method: setInitialized
|
||||
* Signature: (IZ)V
|
||||
*/
|
||||
JNIEXPORT void JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_setInitialized
|
||||
Java_edu_wpi_first_hal_simulation_DIODataJNI_setInitialized
|
||||
(JNIEnv*, jclass, jint index, jboolean value)
|
||||
{
|
||||
HALSIM_SetDIOInitialized(index, value);
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI
|
||||
* Class: edu_wpi_first_hal_simulation_DIODataJNI
|
||||
* Method: registerValueCallback
|
||||
* Signature: (ILjava/lang/Object;Z)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_registerValueCallback
|
||||
Java_edu_wpi_first_hal_simulation_DIODataJNI_registerValueCallback
|
||||
(JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
|
||||
{
|
||||
return sim::AllocateCallback(env, index, callback, initialNotify,
|
||||
@@ -79,48 +79,48 @@ Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_registerValueCallback
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI
|
||||
* Class: edu_wpi_first_hal_simulation_DIODataJNI
|
||||
* Method: cancelValueCallback
|
||||
* Signature: (II)V
|
||||
*/
|
||||
JNIEXPORT void JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_cancelValueCallback
|
||||
Java_edu_wpi_first_hal_simulation_DIODataJNI_cancelValueCallback
|
||||
(JNIEnv* env, jclass, jint index, jint handle)
|
||||
{
|
||||
return sim::FreeCallback(env, handle, index, &HALSIM_CancelDIOValueCallback);
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI
|
||||
* Class: edu_wpi_first_hal_simulation_DIODataJNI
|
||||
* Method: getValue
|
||||
* Signature: (I)Z
|
||||
*/
|
||||
JNIEXPORT jboolean JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_getValue
|
||||
Java_edu_wpi_first_hal_simulation_DIODataJNI_getValue
|
||||
(JNIEnv*, jclass, jint index)
|
||||
{
|
||||
return HALSIM_GetDIOValue(index);
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI
|
||||
* Class: edu_wpi_first_hal_simulation_DIODataJNI
|
||||
* Method: setValue
|
||||
* Signature: (IZ)V
|
||||
*/
|
||||
JNIEXPORT void JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_setValue
|
||||
Java_edu_wpi_first_hal_simulation_DIODataJNI_setValue
|
||||
(JNIEnv*, jclass, jint index, jboolean value)
|
||||
{
|
||||
HALSIM_SetDIOValue(index, value);
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI
|
||||
* Class: edu_wpi_first_hal_simulation_DIODataJNI
|
||||
* Method: registerPulseLengthCallback
|
||||
* Signature: (ILjava/lang/Object;Z)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_registerPulseLengthCallback
|
||||
Java_edu_wpi_first_hal_simulation_DIODataJNI_registerPulseLengthCallback
|
||||
(JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
|
||||
{
|
||||
return sim::AllocateCallback(env, index, callback, initialNotify,
|
||||
@@ -128,12 +128,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_registerPulseLengthCallback
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI
|
||||
* Class: edu_wpi_first_hal_simulation_DIODataJNI
|
||||
* Method: cancelPulseLengthCallback
|
||||
* Signature: (II)V
|
||||
*/
|
||||
JNIEXPORT void JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_cancelPulseLengthCallback
|
||||
Java_edu_wpi_first_hal_simulation_DIODataJNI_cancelPulseLengthCallback
|
||||
(JNIEnv* env, jclass, jint index, jint handle)
|
||||
{
|
||||
return sim::FreeCallback(env, handle, index,
|
||||
@@ -141,36 +141,36 @@ Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_cancelPulseLengthCallback
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI
|
||||
* Class: edu_wpi_first_hal_simulation_DIODataJNI
|
||||
* Method: getPulseLength
|
||||
* Signature: (I)D
|
||||
*/
|
||||
JNIEXPORT jdouble JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_getPulseLength
|
||||
Java_edu_wpi_first_hal_simulation_DIODataJNI_getPulseLength
|
||||
(JNIEnv*, jclass, jint index)
|
||||
{
|
||||
return HALSIM_GetDIOPulseLength(index);
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI
|
||||
* Class: edu_wpi_first_hal_simulation_DIODataJNI
|
||||
* Method: setPulseLength
|
||||
* Signature: (ID)V
|
||||
*/
|
||||
JNIEXPORT void JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_setPulseLength
|
||||
Java_edu_wpi_first_hal_simulation_DIODataJNI_setPulseLength
|
||||
(JNIEnv*, jclass, jint index, jdouble value)
|
||||
{
|
||||
HALSIM_SetDIOPulseLength(index, value);
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI
|
||||
* Class: edu_wpi_first_hal_simulation_DIODataJNI
|
||||
* Method: registerIsInputCallback
|
||||
* Signature: (ILjava/lang/Object;Z)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_registerIsInputCallback
|
||||
Java_edu_wpi_first_hal_simulation_DIODataJNI_registerIsInputCallback
|
||||
(JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
|
||||
{
|
||||
return sim::AllocateCallback(env, index, callback, initialNotify,
|
||||
@@ -178,12 +178,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_registerIsInputCallback
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI
|
||||
* Class: edu_wpi_first_hal_simulation_DIODataJNI
|
||||
* Method: cancelIsInputCallback
|
||||
* Signature: (II)V
|
||||
*/
|
||||
JNIEXPORT void JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_cancelIsInputCallback
|
||||
Java_edu_wpi_first_hal_simulation_DIODataJNI_cancelIsInputCallback
|
||||
(JNIEnv* env, jclass, jint index, jint handle)
|
||||
{
|
||||
return sim::FreeCallback(env, handle, index,
|
||||
@@ -191,36 +191,36 @@ Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_cancelIsInputCallback
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI
|
||||
* Class: edu_wpi_first_hal_simulation_DIODataJNI
|
||||
* Method: getIsInput
|
||||
* Signature: (I)Z
|
||||
*/
|
||||
JNIEXPORT jboolean JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_getIsInput
|
||||
Java_edu_wpi_first_hal_simulation_DIODataJNI_getIsInput
|
||||
(JNIEnv*, jclass, jint index)
|
||||
{
|
||||
return HALSIM_GetDIOIsInput(index);
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI
|
||||
* Class: edu_wpi_first_hal_simulation_DIODataJNI
|
||||
* Method: setIsInput
|
||||
* Signature: (IZ)V
|
||||
*/
|
||||
JNIEXPORT void JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_setIsInput
|
||||
Java_edu_wpi_first_hal_simulation_DIODataJNI_setIsInput
|
||||
(JNIEnv*, jclass, jint index, jboolean value)
|
||||
{
|
||||
HALSIM_SetDIOIsInput(index, value);
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI
|
||||
* Class: edu_wpi_first_hal_simulation_DIODataJNI
|
||||
* Method: registerFilterIndexCallback
|
||||
* Signature: (ILjava/lang/Object;Z)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_registerFilterIndexCallback
|
||||
Java_edu_wpi_first_hal_simulation_DIODataJNI_registerFilterIndexCallback
|
||||
(JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
|
||||
{
|
||||
return sim::AllocateCallback(env, index, callback, initialNotify,
|
||||
@@ -228,12 +228,12 @@ Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_registerFilterIndexCallback
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI
|
||||
* Class: edu_wpi_first_hal_simulation_DIODataJNI
|
||||
* Method: cancelFilterIndexCallback
|
||||
* Signature: (II)V
|
||||
*/
|
||||
JNIEXPORT void JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_cancelFilterIndexCallback
|
||||
Java_edu_wpi_first_hal_simulation_DIODataJNI_cancelFilterIndexCallback
|
||||
(JNIEnv* env, jclass, jint index, jint handle)
|
||||
{
|
||||
return sim::FreeCallback(env, handle, index,
|
||||
@@ -241,36 +241,36 @@ Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_cancelFilterIndexCallback
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI
|
||||
* Class: edu_wpi_first_hal_simulation_DIODataJNI
|
||||
* Method: getFilterIndex
|
||||
* Signature: (I)I
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_getFilterIndex
|
||||
Java_edu_wpi_first_hal_simulation_DIODataJNI_getFilterIndex
|
||||
(JNIEnv*, jclass, jint index)
|
||||
{
|
||||
return HALSIM_GetDIOFilterIndex(index);
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI
|
||||
* Class: edu_wpi_first_hal_simulation_DIODataJNI
|
||||
* Method: setFilterIndex
|
||||
* Signature: (II)V
|
||||
*/
|
||||
JNIEXPORT void JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_setFilterIndex
|
||||
Java_edu_wpi_first_hal_simulation_DIODataJNI_setFilterIndex
|
||||
(JNIEnv*, jclass, jint index, jint value)
|
||||
{
|
||||
HALSIM_SetDIOFilterIndex(index, value);
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_DIODataJNI
|
||||
* Class: edu_wpi_first_hal_simulation_DIODataJNI
|
||||
* Method: resetData
|
||||
* Signature: (I)V
|
||||
*/
|
||||
JNIEXPORT void JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_DIODataJNI_resetData
|
||||
Java_edu_wpi_first_hal_simulation_DIODataJNI_resetData
|
||||
(JNIEnv*, jclass, jint index)
|
||||
{
|
||||
HALSIM_ResetDIOData(index);
|
||||
|
||||
Reference in New Issue
Block a user