[sim] Remove index from RoboRIO simulation interface (#2567)

This commit is contained in:
Peter Johnson
2020-07-04 00:44:56 -07:00
committed by GitHub
parent c4b8a2505d
commit 1851ba1434
9 changed files with 635 additions and 653 deletions

View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */
/* Copyright (c) 2017-2020 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
@@ -19,46 +19,42 @@ void InitializePower() {}
// TODO: Fix the naming in here
extern "C" {
double HAL_GetVinVoltage(int32_t* status) {
return SimRoboRioData[0].vInVoltage;
}
double HAL_GetVinCurrent(int32_t* status) {
return SimRoboRioData[0].vInCurrent;
}
double HAL_GetVinVoltage(int32_t* status) { return SimRoboRioData->vInVoltage; }
double HAL_GetVinCurrent(int32_t* status) { return SimRoboRioData->vInCurrent; }
double HAL_GetUserVoltage6V(int32_t* status) {
return SimRoboRioData[0].userVoltage6V;
return SimRoboRioData->userVoltage6V;
}
double HAL_GetUserCurrent6V(int32_t* status) {
return SimRoboRioData[0].userCurrent6V;
return SimRoboRioData->userCurrent6V;
}
HAL_Bool HAL_GetUserActive6V(int32_t* status) {
return SimRoboRioData[0].userActive6V;
return SimRoboRioData->userActive6V;
}
int32_t HAL_GetUserCurrentFaults6V(int32_t* status) {
return SimRoboRioData[0].userFaults6V;
return SimRoboRioData->userFaults6V;
}
double HAL_GetUserVoltage5V(int32_t* status) {
return SimRoboRioData[0].userVoltage5V;
return SimRoboRioData->userVoltage5V;
}
double HAL_GetUserCurrent5V(int32_t* status) {
return SimRoboRioData[0].userCurrent5V;
return SimRoboRioData->userCurrent5V;
}
HAL_Bool HAL_GetUserActive5V(int32_t* status) {
return SimRoboRioData[0].userActive5V;
return SimRoboRioData->userActive5V;
}
int32_t HAL_GetUserCurrentFaults5V(int32_t* status) {
return SimRoboRioData[0].userFaults5V;
return SimRoboRioData->userFaults5V;
}
double HAL_GetUserVoltage3V3(int32_t* status) {
return SimRoboRioData[0].userVoltage3V3;
return SimRoboRioData->userVoltage3V3;
}
double HAL_GetUserCurrent3V3(int32_t* status) {
return SimRoboRioData[0].userCurrent3V3;
return SimRoboRioData->userCurrent3V3;
}
HAL_Bool HAL_GetUserActive3V3(int32_t* status) {
return SimRoboRioData[0].userActive3V3;
return SimRoboRioData->userActive3V3;
}
int32_t HAL_GetUserCurrentFaults3V3(int32_t* status) {
return SimRoboRioData[0].userFaults3V3;
return SimRoboRioData->userFaults3V3;
}
} // extern "C"

View File

@@ -18,763 +18,775 @@ extern "C" {
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: registerFPGAButtonCallback
* Signature: (ILjava/lang/Object;Z)I
* Signature: (Ljava/lang/Object;Z)I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerFPGAButtonCallback
(JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
(JNIEnv* env, jclass, jobject callback, jboolean initialNotify)
{
return sim::AllocateCallback(env, index, callback, initialNotify,
&HALSIM_RegisterRoboRioFPGAButtonCallback);
return sim::AllocateCallbackNoIndex(
env, callback, initialNotify, &HALSIM_RegisterRoboRioFPGAButtonCallback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: cancelFPGAButtonCallback
* Signature: (II)V
* Signature: (I)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelFPGAButtonCallback
(JNIEnv* env, jclass, jint index, jint handle)
(JNIEnv* env, jclass, jint handle)
{
return sim::FreeCallback(env, handle, index,
&HALSIM_CancelRoboRioFPGAButtonCallback);
return sim::FreeCallbackNoIndex(env, handle,
&HALSIM_CancelRoboRioFPGAButtonCallback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: getFPGAButton
* Signature: (I)Z
* Signature: ()Z
*/
JNIEXPORT jboolean JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getFPGAButton
(JNIEnv*, jclass, jint index)
(JNIEnv*, jclass)
{
return HALSIM_GetRoboRioFPGAButton(index);
return HALSIM_GetRoboRioFPGAButton();
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: setFPGAButton
* Signature: (IZ)V
* Signature: (Z)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setFPGAButton
(JNIEnv*, jclass, jint index, jboolean value)
(JNIEnv*, jclass, jboolean value)
{
HALSIM_SetRoboRioFPGAButton(index, value);
HALSIM_SetRoboRioFPGAButton(value);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: registerVInVoltageCallback
* Signature: (ILjava/lang/Object;Z)I
* Signature: (Ljava/lang/Object;Z)I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerVInVoltageCallback
(JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
(JNIEnv* env, jclass, jobject callback, jboolean initialNotify)
{
return sim::AllocateCallback(env, index, callback, initialNotify,
&HALSIM_RegisterRoboRioVInVoltageCallback);
return sim::AllocateCallbackNoIndex(
env, callback, initialNotify, &HALSIM_RegisterRoboRioVInVoltageCallback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: cancelVInVoltageCallback
* Signature: (II)V
* Signature: (I)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelVInVoltageCallback
(JNIEnv* env, jclass, jint index, jint handle)
(JNIEnv* env, jclass, jint handle)
{
return sim::FreeCallback(env, handle, index,
&HALSIM_CancelRoboRioVInVoltageCallback);
return sim::FreeCallbackNoIndex(env, handle,
&HALSIM_CancelRoboRioVInVoltageCallback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: getVInVoltage
* Signature: (I)D
* Signature: ()D
*/
JNIEXPORT jdouble JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getVInVoltage
(JNIEnv*, jclass, jint index)
(JNIEnv*, jclass)
{
return HALSIM_GetRoboRioVInVoltage(index);
return HALSIM_GetRoboRioVInVoltage();
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: setVInVoltage
* Signature: (ID)V
* Signature: (D)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setVInVoltage
(JNIEnv*, jclass, jint index, jdouble value)
(JNIEnv*, jclass, jdouble value)
{
HALSIM_SetRoboRioVInVoltage(index, value);
HALSIM_SetRoboRioVInVoltage(value);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: registerVInCurrentCallback
* Signature: (ILjava/lang/Object;Z)I
* Signature: (Ljava/lang/Object;Z)I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerVInCurrentCallback
(JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
(JNIEnv* env, jclass, jobject callback, jboolean initialNotify)
{
return sim::AllocateCallback(env, index, callback, initialNotify,
&HALSIM_RegisterRoboRioVInCurrentCallback);
return sim::AllocateCallbackNoIndex(
env, callback, initialNotify, &HALSIM_RegisterRoboRioVInCurrentCallback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: cancelVInCurrentCallback
* Signature: (II)V
* Signature: (I)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelVInCurrentCallback
(JNIEnv* env, jclass, jint index, jint handle)
(JNIEnv* env, jclass, jint handle)
{
return sim::FreeCallback(env, handle, index,
&HALSIM_CancelRoboRioVInCurrentCallback);
return sim::FreeCallbackNoIndex(env, handle,
&HALSIM_CancelRoboRioVInCurrentCallback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: getVInCurrent
* Signature: (I)D
* Signature: ()D
*/
JNIEXPORT jdouble JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getVInCurrent
(JNIEnv*, jclass, jint index)
(JNIEnv*, jclass)
{
return HALSIM_GetRoboRioVInCurrent(index);
return HALSIM_GetRoboRioVInCurrent();
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: setVInCurrent
* Signature: (ID)V
* Signature: (D)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setVInCurrent
(JNIEnv*, jclass, jint index, jdouble value)
(JNIEnv*, jclass, jdouble value)
{
HALSIM_SetRoboRioVInCurrent(index, value);
HALSIM_SetRoboRioVInCurrent(value);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: registerUserVoltage6VCallback
* Signature: (ILjava/lang/Object;Z)I
* Signature: (Ljava/lang/Object;Z)I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserVoltage6VCallback
(JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
(JNIEnv* env, jclass, jobject callback, jboolean initialNotify)
{
return sim::AllocateCallback(env, index, callback, initialNotify,
&HALSIM_RegisterRoboRioUserVoltage6VCallback);
return sim::AllocateCallbackNoIndex(
env, callback, initialNotify,
&HALSIM_RegisterRoboRioUserVoltage6VCallback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: cancelUserVoltage6VCallback
* Signature: (II)V
* Signature: (I)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserVoltage6VCallback
(JNIEnv* env, jclass, jint index, jint handle)
(JNIEnv* env, jclass, jint handle)
{
return sim::FreeCallback(env, handle, index,
&HALSIM_CancelRoboRioUserVoltage6VCallback);
return sim::FreeCallbackNoIndex(env, handle,
&HALSIM_CancelRoboRioUserVoltage6VCallback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: getUserVoltage6V
* Signature: (I)D
* Signature: ()D
*/
JNIEXPORT jdouble JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserVoltage6V
(JNIEnv*, jclass, jint index)
(JNIEnv*, jclass)
{
return HALSIM_GetRoboRioUserVoltage6V(index);
return HALSIM_GetRoboRioUserVoltage6V();
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: setUserVoltage6V
* Signature: (ID)V
* Signature: (D)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserVoltage6V
(JNIEnv*, jclass, jint index, jdouble value)
(JNIEnv*, jclass, jdouble value)
{
HALSIM_SetRoboRioUserVoltage6V(index, value);
HALSIM_SetRoboRioUserVoltage6V(value);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: registerUserCurrent6VCallback
* Signature: (ILjava/lang/Object;Z)I
* Signature: (Ljava/lang/Object;Z)I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserCurrent6VCallback
(JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
(JNIEnv* env, jclass, jobject callback, jboolean initialNotify)
{
return sim::AllocateCallback(env, index, callback, initialNotify,
&HALSIM_RegisterRoboRioUserCurrent6VCallback);
return sim::AllocateCallbackNoIndex(
env, callback, initialNotify,
&HALSIM_RegisterRoboRioUserCurrent6VCallback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: cancelUserCurrent6VCallback
* Signature: (II)V
* Signature: (I)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserCurrent6VCallback
(JNIEnv* env, jclass, jint index, jint handle)
(JNIEnv* env, jclass, jint handle)
{
return sim::FreeCallback(env, handle, index,
&HALSIM_CancelRoboRioUserCurrent6VCallback);
return sim::FreeCallbackNoIndex(env, handle,
&HALSIM_CancelRoboRioUserCurrent6VCallback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: getUserCurrent6V
* Signature: (I)D
* Signature: ()D
*/
JNIEXPORT jdouble JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserCurrent6V
(JNIEnv*, jclass, jint index)
(JNIEnv*, jclass)
{
return HALSIM_GetRoboRioUserCurrent6V(index);
return HALSIM_GetRoboRioUserCurrent6V();
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: setUserCurrent6V
* Signature: (ID)V
* Signature: (D)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserCurrent6V
(JNIEnv*, jclass, jint index, jdouble value)
(JNIEnv*, jclass, jdouble value)
{
HALSIM_SetRoboRioUserCurrent6V(index, value);
HALSIM_SetRoboRioUserCurrent6V(value);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: registerUserActive6VCallback
* Signature: (ILjava/lang/Object;Z)I
* Signature: (Ljava/lang/Object;Z)I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserActive6VCallback
(JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
(JNIEnv* env, jclass, jobject callback, jboolean initialNotify)
{
return sim::AllocateCallback(env, index, callback, initialNotify,
&HALSIM_RegisterRoboRioUserActive6VCallback);
return sim::AllocateCallbackNoIndex(
env, callback, initialNotify,
&HALSIM_RegisterRoboRioUserActive6VCallback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: cancelUserActive6VCallback
* Signature: (II)V
* Signature: (I)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserActive6VCallback
(JNIEnv* env, jclass, jint index, jint handle)
(JNIEnv* env, jclass, jint handle)
{
return sim::FreeCallback(env, handle, index,
&HALSIM_CancelRoboRioUserActive6VCallback);
return sim::FreeCallbackNoIndex(env, handle,
&HALSIM_CancelRoboRioUserActive6VCallback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: getUserActive6V
* Signature: (I)Z
* Signature: ()Z
*/
JNIEXPORT jboolean JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserActive6V
(JNIEnv*, jclass, jint index)
(JNIEnv*, jclass)
{
return HALSIM_GetRoboRioUserActive6V(index);
return HALSIM_GetRoboRioUserActive6V();
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: setUserActive6V
* Signature: (IZ)V
* Signature: (Z)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserActive6V
(JNIEnv*, jclass, jint index, jboolean value)
(JNIEnv*, jclass, jboolean value)
{
HALSIM_SetRoboRioUserActive6V(index, value);
HALSIM_SetRoboRioUserActive6V(value);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: registerUserVoltage5VCallback
* Signature: (ILjava/lang/Object;Z)I
* Signature: (Ljava/lang/Object;Z)I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserVoltage5VCallback
(JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
(JNIEnv* env, jclass, jobject callback, jboolean initialNotify)
{
return sim::AllocateCallback(env, index, callback, initialNotify,
&HALSIM_RegisterRoboRioUserVoltage5VCallback);
return sim::AllocateCallbackNoIndex(
env, callback, initialNotify,
&HALSIM_RegisterRoboRioUserVoltage5VCallback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: cancelUserVoltage5VCallback
* Signature: (II)V
* Signature: (I)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserVoltage5VCallback
(JNIEnv* env, jclass, jint index, jint handle)
(JNIEnv* env, jclass, jint handle)
{
return sim::FreeCallback(env, handle, index,
&HALSIM_CancelRoboRioUserVoltage5VCallback);
return sim::FreeCallbackNoIndex(env, handle,
&HALSIM_CancelRoboRioUserVoltage5VCallback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: getUserVoltage5V
* Signature: (I)D
* Signature: ()D
*/
JNIEXPORT jdouble JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserVoltage5V
(JNIEnv*, jclass, jint index)
(JNIEnv*, jclass)
{
return HALSIM_GetRoboRioUserVoltage5V(index);
return HALSIM_GetRoboRioUserVoltage5V();
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: setUserVoltage5V
* Signature: (ID)V
* Signature: (D)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserVoltage5V
(JNIEnv*, jclass, jint index, jdouble value)
(JNIEnv*, jclass, jdouble value)
{
HALSIM_SetRoboRioUserVoltage5V(index, value);
HALSIM_SetRoboRioUserVoltage5V(value);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: registerUserCurrent5VCallback
* Signature: (ILjava/lang/Object;Z)I
* Signature: (Ljava/lang/Object;Z)I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserCurrent5VCallback
(JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
(JNIEnv* env, jclass, jobject callback, jboolean initialNotify)
{
return sim::AllocateCallback(env, index, callback, initialNotify,
&HALSIM_RegisterRoboRioUserCurrent5VCallback);
return sim::AllocateCallbackNoIndex(
env, callback, initialNotify,
&HALSIM_RegisterRoboRioUserCurrent5VCallback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: cancelUserCurrent5VCallback
* Signature: (II)V
* Signature: (I)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserCurrent5VCallback
(JNIEnv* env, jclass, jint index, jint handle)
(JNIEnv* env, jclass, jint handle)
{
return sim::FreeCallback(env, handle, index,
&HALSIM_CancelRoboRioUserCurrent5VCallback);
return sim::FreeCallbackNoIndex(env, handle,
&HALSIM_CancelRoboRioUserCurrent5VCallback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: getUserCurrent5V
* Signature: (I)D
* Signature: ()D
*/
JNIEXPORT jdouble JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserCurrent5V
(JNIEnv*, jclass, jint index)
(JNIEnv*, jclass)
{
return HALSIM_GetRoboRioUserCurrent5V(index);
return HALSIM_GetRoboRioUserCurrent5V();
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: setUserCurrent5V
* Signature: (ID)V
* Signature: (D)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserCurrent5V
(JNIEnv*, jclass, jint index, jdouble value)
(JNIEnv*, jclass, jdouble value)
{
HALSIM_SetRoboRioUserCurrent5V(index, value);
HALSIM_SetRoboRioUserCurrent5V(value);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: registerUserActive5VCallback
* Signature: (ILjava/lang/Object;Z)I
* Signature: (Ljava/lang/Object;Z)I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserActive5VCallback
(JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
(JNIEnv* env, jclass, jobject callback, jboolean initialNotify)
{
return sim::AllocateCallback(env, index, callback, initialNotify,
&HALSIM_RegisterRoboRioUserActive5VCallback);
return sim::AllocateCallbackNoIndex(
env, callback, initialNotify,
&HALSIM_RegisterRoboRioUserActive5VCallback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: cancelUserActive5VCallback
* Signature: (II)V
* Signature: (I)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserActive5VCallback
(JNIEnv* env, jclass, jint index, jint handle)
(JNIEnv* env, jclass, jint handle)
{
return sim::FreeCallback(env, handle, index,
&HALSIM_CancelRoboRioUserActive5VCallback);
return sim::FreeCallbackNoIndex(env, handle,
&HALSIM_CancelRoboRioUserActive5VCallback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: getUserActive5V
* Signature: (I)Z
* Signature: ()Z
*/
JNIEXPORT jboolean JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserActive5V
(JNIEnv*, jclass, jint index)
(JNIEnv*, jclass)
{
return HALSIM_GetRoboRioUserActive5V(index);
return HALSIM_GetRoboRioUserActive5V();
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: setUserActive5V
* Signature: (IZ)V
* Signature: (Z)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserActive5V
(JNIEnv*, jclass, jint index, jboolean value)
(JNIEnv*, jclass, jboolean value)
{
HALSIM_SetRoboRioUserActive5V(index, value);
HALSIM_SetRoboRioUserActive5V(value);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: registerUserVoltage3V3Callback
* Signature: (ILjava/lang/Object;Z)I
* Signature: (Ljava/lang/Object;Z)I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserVoltage3V3Callback
(JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
(JNIEnv* env, jclass, jobject callback, jboolean initialNotify)
{
return sim::AllocateCallback(env, index, callback, initialNotify,
&HALSIM_RegisterRoboRioUserVoltage3V3Callback);
return sim::AllocateCallbackNoIndex(
env, callback, initialNotify,
&HALSIM_RegisterRoboRioUserVoltage3V3Callback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: cancelUserVoltage3V3Callback
* Signature: (II)V
* Signature: (I)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserVoltage3V3Callback
(JNIEnv* env, jclass, jint index, jint handle)
(JNIEnv* env, jclass, jint handle)
{
return sim::FreeCallback(env, handle, index,
&HALSIM_CancelRoboRioUserVoltage3V3Callback);
return sim::FreeCallbackNoIndex(env, handle,
&HALSIM_CancelRoboRioUserVoltage3V3Callback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: getUserVoltage3V3
* Signature: (I)D
* Signature: ()D
*/
JNIEXPORT jdouble JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserVoltage3V3
(JNIEnv*, jclass, jint index)
(JNIEnv*, jclass)
{
return HALSIM_GetRoboRioUserVoltage3V3(index);
return HALSIM_GetRoboRioUserVoltage3V3();
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: setUserVoltage3V3
* Signature: (ID)V
* Signature: (D)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserVoltage3V3
(JNIEnv*, jclass, jint index, jdouble value)
(JNIEnv*, jclass, jdouble value)
{
HALSIM_SetRoboRioUserVoltage3V3(index, value);
HALSIM_SetRoboRioUserVoltage3V3(value);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: registerUserCurrent3V3Callback
* Signature: (ILjava/lang/Object;Z)I
* Signature: (Ljava/lang/Object;Z)I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserCurrent3V3Callback
(JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
(JNIEnv* env, jclass, jobject callback, jboolean initialNotify)
{
return sim::AllocateCallback(env, index, callback, initialNotify,
&HALSIM_RegisterRoboRioUserCurrent3V3Callback);
return sim::AllocateCallbackNoIndex(
env, callback, initialNotify,
&HALSIM_RegisterRoboRioUserCurrent3V3Callback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: cancelUserCurrent3V3Callback
* Signature: (II)V
* Signature: (I)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserCurrent3V3Callback
(JNIEnv* env, jclass, jint index, jint handle)
(JNIEnv* env, jclass, jint handle)
{
return sim::FreeCallback(env, handle, index,
&HALSIM_CancelRoboRioUserCurrent3V3Callback);
return sim::FreeCallbackNoIndex(env, handle,
&HALSIM_CancelRoboRioUserCurrent3V3Callback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: getUserCurrent3V3
* Signature: (I)D
* Signature: ()D
*/
JNIEXPORT jdouble JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserCurrent3V3
(JNIEnv*, jclass, jint index)
(JNIEnv*, jclass)
{
return HALSIM_GetRoboRioUserCurrent3V3(index);
return HALSIM_GetRoboRioUserCurrent3V3();
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: setUserCurrent3V3
* Signature: (ID)V
* Signature: (D)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserCurrent3V3
(JNIEnv*, jclass, jint index, jdouble value)
(JNIEnv*, jclass, jdouble value)
{
HALSIM_SetRoboRioUserCurrent3V3(index, value);
HALSIM_SetRoboRioUserCurrent3V3(value);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: registerUserActive3V3Callback
* Signature: (ILjava/lang/Object;Z)I
* Signature: (Ljava/lang/Object;Z)I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserActive3V3Callback
(JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
(JNIEnv* env, jclass, jobject callback, jboolean initialNotify)
{
return sim::AllocateCallback(env, index, callback, initialNotify,
&HALSIM_RegisterRoboRioUserActive3V3Callback);
return sim::AllocateCallbackNoIndex(
env, callback, initialNotify,
&HALSIM_RegisterRoboRioUserActive3V3Callback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: cancelUserActive3V3Callback
* Signature: (II)V
* Signature: (I)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserActive3V3Callback
(JNIEnv* env, jclass, jint index, jint handle)
(JNIEnv* env, jclass, jint handle)
{
return sim::FreeCallback(env, handle, index,
&HALSIM_CancelRoboRioUserActive3V3Callback);
return sim::FreeCallbackNoIndex(env, handle,
&HALSIM_CancelRoboRioUserActive3V3Callback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: getUserActive3V3
* Signature: (I)Z
* Signature: ()Z
*/
JNIEXPORT jboolean JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserActive3V3
(JNIEnv*, jclass, jint index)
(JNIEnv*, jclass)
{
return HALSIM_GetRoboRioUserActive3V3(index);
return HALSIM_GetRoboRioUserActive3V3();
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: setUserActive3V3
* Signature: (IZ)V
* Signature: (Z)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserActive3V3
(JNIEnv*, jclass, jint index, jboolean value)
(JNIEnv*, jclass, jboolean value)
{
HALSIM_SetRoboRioUserActive3V3(index, value);
HALSIM_SetRoboRioUserActive3V3(value);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: registerUserFaults6VCallback
* Signature: (ILjava/lang/Object;Z)I
* Signature: (Ljava/lang/Object;Z)I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserFaults6VCallback
(JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
(JNIEnv* env, jclass, jobject callback, jboolean initialNotify)
{
return sim::AllocateCallback(env, index, callback, initialNotify,
&HALSIM_RegisterRoboRioUserFaults6VCallback);
return sim::AllocateCallbackNoIndex(
env, callback, initialNotify,
&HALSIM_RegisterRoboRioUserFaults6VCallback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: cancelUserFaults6VCallback
* Signature: (II)V
* Signature: (I)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserFaults6VCallback
(JNIEnv* env, jclass, jint index, jint handle)
(JNIEnv* env, jclass, jint handle)
{
return sim::FreeCallback(env, handle, index,
&HALSIM_CancelRoboRioUserFaults6VCallback);
return sim::FreeCallbackNoIndex(env, handle,
&HALSIM_CancelRoboRioUserFaults6VCallback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: getUserFaults6V
* Signature: (I)I
* Signature: ()I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserFaults6V
(JNIEnv*, jclass, jint index)
(JNIEnv*, jclass)
{
return HALSIM_GetRoboRioUserFaults6V(index);
return HALSIM_GetRoboRioUserFaults6V();
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: setUserFaults6V
* Signature: (II)V
* Signature: (I)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserFaults6V
(JNIEnv*, jclass, jint index, jint value)
(JNIEnv*, jclass, jint value)
{
HALSIM_SetRoboRioUserFaults6V(index, value);
HALSIM_SetRoboRioUserFaults6V(value);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: registerUserFaults5VCallback
* Signature: (ILjava/lang/Object;Z)I
* Signature: (Ljava/lang/Object;Z)I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserFaults5VCallback
(JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
(JNIEnv* env, jclass, jobject callback, jboolean initialNotify)
{
return sim::AllocateCallback(env, index, callback, initialNotify,
&HALSIM_RegisterRoboRioUserFaults5VCallback);
return sim::AllocateCallbackNoIndex(
env, callback, initialNotify,
&HALSIM_RegisterRoboRioUserFaults5VCallback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: cancelUserFaults5VCallback
* Signature: (II)V
* Signature: (I)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserFaults5VCallback
(JNIEnv* env, jclass, jint index, jint handle)
(JNIEnv* env, jclass, jint handle)
{
return sim::FreeCallback(env, handle, index,
&HALSIM_CancelRoboRioUserFaults5VCallback);
return sim::FreeCallbackNoIndex(env, handle,
&HALSIM_CancelRoboRioUserFaults5VCallback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: getUserFaults5V
* Signature: (I)I
* Signature: ()I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserFaults5V
(JNIEnv*, jclass, jint index)
(JNIEnv*, jclass)
{
return HALSIM_GetRoboRioUserFaults5V(index);
return HALSIM_GetRoboRioUserFaults5V();
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: setUserFaults5V
* Signature: (II)V
* Signature: (I)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserFaults5V
(JNIEnv*, jclass, jint index, jint value)
(JNIEnv*, jclass, jint value)
{
HALSIM_SetRoboRioUserFaults5V(index, value);
HALSIM_SetRoboRioUserFaults5V(value);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: registerUserFaults3V3Callback
* Signature: (ILjava/lang/Object;Z)I
* Signature: (Ljava/lang/Object;Z)I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_registerUserFaults3V3Callback
(JNIEnv* env, jclass, jint index, jobject callback, jboolean initialNotify)
(JNIEnv* env, jclass, jobject callback, jboolean initialNotify)
{
return sim::AllocateCallback(env, index, callback, initialNotify,
&HALSIM_RegisterRoboRioUserFaults3V3Callback);
return sim::AllocateCallbackNoIndex(
env, callback, initialNotify,
&HALSIM_RegisterRoboRioUserFaults3V3Callback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: cancelUserFaults3V3Callback
* Signature: (II)V
* Signature: (I)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_cancelUserFaults3V3Callback
(JNIEnv* env, jclass, jint index, jint handle)
(JNIEnv* env, jclass, jint handle)
{
return sim::FreeCallback(env, handle, index,
&HALSIM_CancelRoboRioUserFaults3V3Callback);
return sim::FreeCallbackNoIndex(env, handle,
&HALSIM_CancelRoboRioUserFaults3V3Callback);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: getUserFaults3V3
* Signature: (I)I
* Signature: ()I
*/
JNIEXPORT jint JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_getUserFaults3V3
(JNIEnv*, jclass, jint index)
(JNIEnv*, jclass)
{
return HALSIM_GetRoboRioUserFaults3V3(index);
return HALSIM_GetRoboRioUserFaults3V3();
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: setUserFaults3V3
* Signature: (II)V
* Signature: (I)V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_setUserFaults3V3
(JNIEnv*, jclass, jint index, jint value)
(JNIEnv*, jclass, jint value)
{
HALSIM_SetRoboRioUserFaults3V3(index, value);
HALSIM_SetRoboRioUserFaults3V3(value);
}
/*
* Class: edu_wpi_first_hal_simulation_RoboRioDataJNI
* Method: resetData
* Signature: (I)V
* Signature: ()V
*/
JNIEXPORT void JNICALL
Java_edu_wpi_first_hal_simulation_RoboRioDataJNI_resetData
(JNIEnv*, jclass, jint index)
(JNIEnv*, jclass)
{
HALSIM_ResetRoboRioData(index);
HALSIM_ResetRoboRioData();
}
} // extern "C"

View File

@@ -13,8 +13,8 @@ using namespace hal;
namespace hal {
namespace init {
void InitializeRoboRioData() {
static RoboRioData srrd[1];
::hal::SimRoboRioData = srrd;
static RoboRioData srrd;
::hal::SimRoboRioData = &srrd;
}
} // namespace init
} // namespace hal
@@ -39,13 +39,11 @@ void RoboRioData::ResetData() {
}
extern "C" {
void HALSIM_ResetRoboRioData(int32_t index) {
SimRoboRioData[index].ResetData();
}
void HALSIM_ResetRoboRioData(void) { SimRoboRioData->ResetData(); }
#define DEFINE_CAPI(TYPE, CAPINAME, LOWERNAME) \
HAL_SIMDATAVALUE_DEFINE_CAPI(TYPE, HALSIM, RoboRio##CAPINAME, \
SimRoboRioData, LOWERNAME)
#define DEFINE_CAPI(TYPE, CAPINAME, LOWERNAME) \
HAL_SIMDATAVALUE_DEFINE_CAPI_NOINDEX(TYPE, HALSIM, RoboRio##CAPINAME, \
SimRoboRioData, LOWERNAME)
DEFINE_CAPI(HAL_Bool, FPGAButton, fpgaButton)
DEFINE_CAPI(double, VInVoltage, vInVoltage)
@@ -64,10 +62,9 @@ DEFINE_CAPI(int32_t, UserFaults5V, userFaults5V)
DEFINE_CAPI(int32_t, UserFaults3V3, userFaults3V3)
#define REGISTER(NAME) \
SimRoboRioData[index].NAME.RegisterCallback(callback, param, initialNotify)
SimRoboRioData->NAME.RegisterCallback(callback, param, initialNotify)
void HALSIM_RegisterRoboRioAllCallbacks(int32_t index,
HAL_NotifyCallback callback,
void HALSIM_RegisterRoboRioAllCallbacks(HAL_NotifyCallback callback,
void* param, HAL_Bool initialNotify) {
REGISTER(fpgaButton);
REGISTER(vInVoltage);