mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-22 01:11:42 +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:
@@ -14,10 +14,10 @@
|
||||
#include "ConstBufferCallbackStore.h"
|
||||
#include "SimDeviceDataJNI.h"
|
||||
#include "SpiReadAutoReceiveBufferCallbackStore.h"
|
||||
#include "edu_wpi_first_hal_sim_mockdata_SimulatorJNI.h"
|
||||
#include "edu_wpi_first_hal_simulation_SimulatorJNI.h"
|
||||
#include "hal/HAL.h"
|
||||
#include "hal/handles/HandlesInternal.h"
|
||||
#include "mockdata/MockHooks.h"
|
||||
#include "hal/simulation/MockHooks.h"
|
||||
|
||||
using namespace wpi::java;
|
||||
|
||||
@@ -40,14 +40,16 @@ jint SimOnLoad(JavaVM* vm, void* reserved) {
|
||||
if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK)
|
||||
return JNI_ERR;
|
||||
|
||||
notifyCallbackCls = JClass(env, "edu/wpi/first/hal/sim/NotifyCallback");
|
||||
notifyCallbackCls =
|
||||
JClass(env, "edu/wpi/first/hal/simulation/NotifyCallback");
|
||||
if (!notifyCallbackCls) return JNI_ERR;
|
||||
|
||||
notifyCallbackCallback = env->GetMethodID(notifyCallbackCls, "callbackNative",
|
||||
"(Ljava/lang/String;IJD)V");
|
||||
if (!notifyCallbackCallback) return JNI_ERR;
|
||||
|
||||
bufferCallbackCls = JClass(env, "edu/wpi/first/hal/sim/BufferCallback");
|
||||
bufferCallbackCls =
|
||||
JClass(env, "edu/wpi/first/hal/simulation/BufferCallback");
|
||||
if (!bufferCallbackCls) return JNI_ERR;
|
||||
|
||||
bufferCallbackCallback = env->GetMethodID(bufferCallbackCls, "callback",
|
||||
@@ -55,15 +57,15 @@ jint SimOnLoad(JavaVM* vm, void* reserved) {
|
||||
if (!bufferCallbackCallback) return JNI_ERR;
|
||||
|
||||
constBufferCallbackCls =
|
||||
JClass(env, "edu/wpi/first/hal/sim/ConstBufferCallback");
|
||||
JClass(env, "edu/wpi/first/hal/simulation/ConstBufferCallback");
|
||||
if (!constBufferCallbackCls) return JNI_ERR;
|
||||
|
||||
constBufferCallbackCallback = env->GetMethodID(
|
||||
constBufferCallbackCls, "callback", "(Ljava/lang/String;[BI)V");
|
||||
if (!constBufferCallbackCallback) return JNI_ERR;
|
||||
|
||||
spiReadAutoReceiveBufferCallbackCls =
|
||||
JClass(env, "edu/wpi/first/hal/sim/SpiReadAutoReceiveBufferCallback");
|
||||
spiReadAutoReceiveBufferCallbackCls = JClass(
|
||||
env, "edu/wpi/first/hal/simulation/SpiReadAutoReceiveBufferCallback");
|
||||
if (!spiReadAutoReceiveBufferCallbackCls) return JNI_ERR;
|
||||
|
||||
spiReadAutoReceiveBufferCallbackCallback =
|
||||
@@ -109,108 +111,108 @@ jmethodID GetSpiReadAutoReceiveBufferCallback() {
|
||||
|
||||
extern "C" {
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_SimulatorJNI
|
||||
* Class: edu_wpi_first_hal_simulation_SimulatorJNI
|
||||
* Method: setRuntimeType
|
||||
* Signature: (I)V
|
||||
*/
|
||||
JNIEXPORT void JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_SimulatorJNI_setRuntimeType
|
||||
Java_edu_wpi_first_hal_simulation_SimulatorJNI_setRuntimeType
|
||||
(JNIEnv*, jclass, jint type)
|
||||
{
|
||||
HALSIM_SetRuntimeType(static_cast<HAL_RuntimeType>(type));
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_SimulatorJNI
|
||||
* Class: edu_wpi_first_hal_simulation_SimulatorJNI
|
||||
* Method: waitForProgramStart
|
||||
* Signature: ()V
|
||||
*/
|
||||
JNIEXPORT void JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_SimulatorJNI_waitForProgramStart
|
||||
Java_edu_wpi_first_hal_simulation_SimulatorJNI_waitForProgramStart
|
||||
(JNIEnv*, jclass)
|
||||
{
|
||||
HALSIM_WaitForProgramStart();
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_SimulatorJNI
|
||||
* Class: edu_wpi_first_hal_simulation_SimulatorJNI
|
||||
* Method: setProgramStarted
|
||||
* Signature: ()V
|
||||
*/
|
||||
JNIEXPORT void JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_SimulatorJNI_setProgramStarted
|
||||
Java_edu_wpi_first_hal_simulation_SimulatorJNI_setProgramStarted
|
||||
(JNIEnv*, jclass)
|
||||
{
|
||||
HALSIM_SetProgramStarted();
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_SimulatorJNI
|
||||
* Class: edu_wpi_first_hal_simulation_SimulatorJNI
|
||||
* Method: restartTiming
|
||||
* Signature: ()V
|
||||
*/
|
||||
JNIEXPORT void JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_SimulatorJNI_restartTiming
|
||||
Java_edu_wpi_first_hal_simulation_SimulatorJNI_restartTiming
|
||||
(JNIEnv*, jclass)
|
||||
{
|
||||
HALSIM_RestartTiming();
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_SimulatorJNI
|
||||
* Class: edu_wpi_first_hal_simulation_SimulatorJNI
|
||||
* Method: pauseTiming
|
||||
* Signature: ()V
|
||||
*/
|
||||
JNIEXPORT void JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_SimulatorJNI_pauseTiming
|
||||
Java_edu_wpi_first_hal_simulation_SimulatorJNI_pauseTiming
|
||||
(JNIEnv*, jclass)
|
||||
{
|
||||
HALSIM_PauseTiming();
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_SimulatorJNI
|
||||
* Class: edu_wpi_first_hal_simulation_SimulatorJNI
|
||||
* Method: resumeTiming
|
||||
* Signature: ()V
|
||||
*/
|
||||
JNIEXPORT void JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_SimulatorJNI_resumeTiming
|
||||
Java_edu_wpi_first_hal_simulation_SimulatorJNI_resumeTiming
|
||||
(JNIEnv*, jclass)
|
||||
{
|
||||
HALSIM_ResumeTiming();
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_SimulatorJNI
|
||||
* Class: edu_wpi_first_hal_simulation_SimulatorJNI
|
||||
* Method: isTimingPaused
|
||||
* Signature: ()Z
|
||||
*/
|
||||
JNIEXPORT jboolean JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_SimulatorJNI_isTimingPaused
|
||||
Java_edu_wpi_first_hal_simulation_SimulatorJNI_isTimingPaused
|
||||
(JNIEnv*, jclass)
|
||||
{
|
||||
return HALSIM_IsTimingPaused();
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_SimulatorJNI
|
||||
* Class: edu_wpi_first_hal_simulation_SimulatorJNI
|
||||
* Method: stepTiming
|
||||
* Signature: (J)V
|
||||
*/
|
||||
JNIEXPORT void JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_SimulatorJNI_stepTiming
|
||||
Java_edu_wpi_first_hal_simulation_SimulatorJNI_stepTiming
|
||||
(JNIEnv*, jclass, jlong delta)
|
||||
{
|
||||
HALSIM_StepTiming(delta);
|
||||
}
|
||||
|
||||
/*
|
||||
* Class: edu_wpi_first_hal_sim_mockdata_SimulatorJNI
|
||||
* Class: edu_wpi_first_hal_simulation_SimulatorJNI
|
||||
* Method: resetHandles
|
||||
* Signature: ()V
|
||||
*/
|
||||
JNIEXPORT void JNICALL
|
||||
Java_edu_wpi_first_hal_sim_mockdata_SimulatorJNI_resetHandles
|
||||
Java_edu_wpi_first_hal_simulation_SimulatorJNI_resetHandles
|
||||
(JNIEnv*, jclass)
|
||||
{
|
||||
hal::HandleBase::ResetGlobalHandles();
|
||||
|
||||
Reference in New Issue
Block a user