[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
2026-06-26 01:51:41 +00:00 · 2020-06-27 22:11:24 -07:00
parent 22c0e2813a
commit ce3bc91946
207 changed files with 1420 additions and 1415 deletions
--- a/hal/src/main/native/sim/jni/PCMDataJNI.cpp
+++ b/hal/src/main/native/sim/jni/PCMDataJNI.cpp
@@ -8,20 +8,20 @@
 #include <jni.h>

 #include "CallbackStore.h"
-#include "edu_wpi_first_hal_sim_mockdata_PCMDataJNI.h"
-#include "mockdata/PCMData.h"
+#include "edu_wpi_first_hal_simulation_PCMDataJNI.h"
+#include "hal/simulation/PCMData.h"

 using namespace hal;

 extern "C" {

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    registerSolenoidInitializedCallback
 * Signature: (IILjava/lang/Object;Z)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerSolenoidInitializedCallback
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_registerSolenoidInitializedCallback
  (JNIEnv* env, jclass, jint index, jint channel, jobject callback,
   jboolean initialNotify)
 {
@@ -31,12 +31,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerSolenoidInitializedCallba
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    cancelSolenoidInitializedCallback
 * Signature: (III)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelSolenoidInitializedCallback
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_cancelSolenoidInitializedCallback
  (JNIEnv* env, jclass, jint index, jint channel, jint handle)
 {
  return sim::FreeChannelCallback(env, handle, index, channel,
@@ -44,36 +44,36 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelSolenoidInitializedCallback
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    getSolenoidInitialized
 * Signature: (II)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_getSolenoidInitialized
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_getSolenoidInitialized
  (JNIEnv*, jclass, jint index, jint channel)
 {
  return HALSIM_GetPCMSolenoidInitialized(index, channel);
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    setSolenoidInitialized
 * Signature: (IIZ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_setSolenoidInitialized
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_setSolenoidInitialized
  (JNIEnv*, jclass, jint index, jint channel, jboolean value)
 {
  HALSIM_SetPCMSolenoidInitialized(index, channel, value);
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    registerSolenoidOutputCallback
 * Signature: (IILjava/lang/Object;Z)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerSolenoidOutputCallback
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_registerSolenoidOutputCallback
  (JNIEnv* env, jclass, jint index, jint channel, jobject callback,
   jboolean initialNotify)
 {
@@ -83,12 +83,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerSolenoidOutputCallback
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    cancelSolenoidOutputCallback
 * Signature: (III)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelSolenoidOutputCallback
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_cancelSolenoidOutputCallback
  (JNIEnv* env, jclass, jint index, jint channel, jint handle)
 {
  return sim::FreeChannelCallback(env, handle, index, channel,
@@ -96,36 +96,36 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelSolenoidOutputCallback
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    getSolenoidOutput
 * Signature: (II)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_getSolenoidOutput
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_getSolenoidOutput
  (JNIEnv*, jclass, jint index, jint channel)
 {
  return HALSIM_GetPCMSolenoidOutput(index, channel);
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    setSolenoidOutput
 * Signature: (IIZ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_setSolenoidOutput
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_setSolenoidOutput
  (JNIEnv*, jclass, jint index, jint channel, jboolean value)
 {
  HALSIM_SetPCMSolenoidOutput(index, channel, value);
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    registerCompressorInitializedCallback
 * Signature: (ILjava/lang/Object;Z)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerCompressorInitializedCallback
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_registerCompressorInitializedCallback
  (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
 {
  return sim::AllocateCallback(
@@ -134,12 +134,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerCompressorInitializedCall
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    cancelCompressorInitializedCallback
 * Signature: (II)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelCompressorInitializedCallback
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_cancelCompressorInitializedCallback
  (JNIEnv* env, jclass, jint index, jint handle)
 {
  return sim::FreeCallback(env, handle, index,
@@ -147,36 +147,36 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelCompressorInitializedCallba
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    getCompressorInitialized
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_getCompressorInitialized
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_getCompressorInitialized
  (JNIEnv*, jclass, jint index)
 {
  return HALSIM_GetPCMCompressorInitialized(index);
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    setCompressorInitialized
 * Signature: (IZ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_setCompressorInitialized
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_setCompressorInitialized
  (JNIEnv*, jclass, jint index, jboolean value)
 {
  HALSIM_SetPCMCompressorInitialized(index, value);
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    registerCompressorOnCallback
 * Signature: (ILjava/lang/Object;Z)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerCompressorOnCallback
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_registerCompressorOnCallback
  (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
 {
  return sim::AllocateCallback(env, index, callback, initialNotify,
@@ -184,12 +184,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerCompressorOnCallback
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    cancelCompressorOnCallback
 * Signature: (II)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelCompressorOnCallback
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_cancelCompressorOnCallback
  (JNIEnv* env, jclass, jint index, jint handle)
 {
  return sim::FreeCallback(env, handle, index,
@@ -197,36 +197,36 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelCompressorOnCallback
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    getCompressorOn
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_getCompressorOn
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_getCompressorOn
  (JNIEnv*, jclass, jint index)
 {
  return HALSIM_GetPCMCompressorOn(index);
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    setCompressorOn
 * Signature: (IZ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_setCompressorOn
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_setCompressorOn
  (JNIEnv*, jclass, jint index, jboolean value)
 {
  HALSIM_SetPCMCompressorOn(index, value);
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    registerClosedLoopEnabledCallback
 * Signature: (ILjava/lang/Object;Z)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerClosedLoopEnabledCallback
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_registerClosedLoopEnabledCallback
  (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
 {
  return sim::AllocateCallback(env, index, callback, initialNotify,
@@ -234,12 +234,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerClosedLoopEnabledCallback
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    cancelClosedLoopEnabledCallback
 * Signature: (II)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelClosedLoopEnabledCallback
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_cancelClosedLoopEnabledCallback
  (JNIEnv* env, jclass, jint index, jint handle)
 {
  return sim::FreeCallback(env, handle, index,
@@ -247,36 +247,36 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelClosedLoopEnabledCallback
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    getClosedLoopEnabled
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_getClosedLoopEnabled
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_getClosedLoopEnabled
  (JNIEnv*, jclass, jint index)
 {
  return HALSIM_GetPCMClosedLoopEnabled(index);
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    setClosedLoopEnabled
 * Signature: (IZ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_setClosedLoopEnabled
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_setClosedLoopEnabled
  (JNIEnv*, jclass, jint index, jboolean value)
 {
  HALSIM_SetPCMClosedLoopEnabled(index, value);
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    registerPressureSwitchCallback
 * Signature: (ILjava/lang/Object;Z)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerPressureSwitchCallback
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_registerPressureSwitchCallback
  (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
 {
  return sim::AllocateCallback(env, index, callback, initialNotify,
@@ -284,12 +284,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerPressureSwitchCallback
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    cancelPressureSwitchCallback
 * Signature: (II)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelPressureSwitchCallback
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_cancelPressureSwitchCallback
  (JNIEnv* env, jclass, jint index, jint handle)
 {
  return sim::FreeCallback(env, handle, index,
@@ -297,36 +297,36 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelPressureSwitchCallback
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    getPressureSwitch
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_getPressureSwitch
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_getPressureSwitch
  (JNIEnv*, jclass, jint index)
 {
  return HALSIM_GetPCMPressureSwitch(index);
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    setPressureSwitch
 * Signature: (IZ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_setPressureSwitch
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_setPressureSwitch
  (JNIEnv*, jclass, jint index, jboolean value)
 {
  HALSIM_SetPCMPressureSwitch(index, value);
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    registerCompressorCurrentCallback
 * Signature: (ILjava/lang/Object;Z)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerCompressorCurrentCallback
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_registerCompressorCurrentCallback
  (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
 {
  return sim::AllocateCallback(env, index, callback, initialNotify,
@@ -334,12 +334,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerCompressorCurrentCallback
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    cancelCompressorCurrentCallback
 * Signature: (II)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelCompressorCurrentCallback
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_cancelCompressorCurrentCallback
  (JNIEnv* env, jclass, jint index, jint handle)
 {
  return sim::FreeCallback(env, handle, index,
@@ -347,36 +347,36 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_cancelCompressorCurrentCallback
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    getCompressorCurrent
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_getCompressorCurrent
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_getCompressorCurrent
  (JNIEnv*, jclass, jint index)
 {
  return HALSIM_GetPCMCompressorCurrent(index);
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    setCompressorCurrent
 * Signature: (ID)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_setCompressorCurrent
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_setCompressorCurrent
  (JNIEnv*, jclass, jint index, jdouble value)
 {
  HALSIM_SetPCMCompressorCurrent(index, value);
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    registerAllNonSolenoidCallbacks
 * Signature: (ILjava/lang/Object;Z)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerAllNonSolenoidCallbacks
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_registerAllNonSolenoidCallbacks
  (JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
 {
  sim::AllocateCallback(
@@ -388,12 +388,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerAllNonSolenoidCallbacks
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    registerAllSolenoidCallbacks
 * Signature: (IILjava/lang/Object;Z)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerAllSolenoidCallbacks
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_registerAllSolenoidCallbacks
  (JNIEnv* env, jclass, jint index, jint channel, jobject callback,
   jboolean initialNotify)
 {
@@ -407,12 +407,12 @@ Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_registerAllSolenoidCallbacks
 }

 /*
- * Class:     edu_wpi_first_hal_sim_mockdata_PCMDataJNI
+ * Class:     edu_wpi_first_hal_simulation_PCMDataJNI
 * Method:    resetData
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_hal_sim_mockdata_PCMDataJNI_resetData
+Java_edu_wpi_first_hal_simulation_PCMDataJNI_resetData
  (JNIEnv*, jclass, jint index)
 {
  HALSIM_ResetPCMData(index);