Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-22 01:11:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move HAL classes to their own base package (#1317)

Browse Source 
Needed for modularization.
This commit is contained in:
Thad House
2018-09-20 21:59:46 -07:00
committed by Peter Johnson
parent 0068b6aea3
commit e210073044
194 changed files with 1027 additions and 1102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hal/src/main/native/sim/jni/SimulatorJNI.cpp
View File

@@ -38,17 +38,17 @@ jint SimOnLoad(JavaVM* vm, void* reserved) {
if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK)
return JNI_ERR;
simValueCls = JClass(env, "edu/wpi/first/wpilibj/sim/SimValue");
simValueCls = JClass(env, "edu/wpi/first/hal/sim/SimValue");
if (!simValueCls) return JNI_ERR;
notifyCallbackCls = JClass(env, "edu/wpi/first/wpilibj/sim/NotifyCallback");
notifyCallbackCls = JClass(env, "edu/wpi/first/hal/sim/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/wpilibj/sim/BufferCallback");
bufferCallbackCls = JClass(env, "edu/wpi/first/hal/sim/BufferCallback");
if (!bufferCallbackCls) return JNI_ERR;
bufferCallbackCallback = env->GetMethodID(bufferCallbackCls, "callback",
@@ -56,7 +56,7 @@ jint SimOnLoad(JavaVM* vm, void* reserved) {
if (!bufferCallbackCallback) return JNI_ERR;
constBufferCallbackCls =
JClass(env, "edu/wpi/first/wpilibj/sim/ConstBufferCallback");
JClass(env, "edu/wpi/first/hal/sim/ConstBufferCallback");
if (!constBufferCallbackCls) return JNI_ERR;
constBufferCallbackCallback = env->GetMethodID(
@@ -64,7 +64,7 @@ jint SimOnLoad(JavaVM* vm, void* reserved) {
if (!constBufferCallbackCallback) return JNI_ERR;
spiReadAutoReceiveBufferCallbackCls =
JClass(env, "edu/wpi/first/wpilibj/sim/SpiReadAutoReceiveBufferCallback");
JClass(env, "edu/wpi/first/hal/sim/SpiReadAutoReceiveBufferCallback");
if (!spiReadAutoReceiveBufferCallbackCls) return JNI_ERR;
spiReadAutoReceiveBufferCallbackCallback =