From a6e6ae41b95caf45c2fd7a1ed4dde5420b31802b Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Sun, 22 Oct 2017 01:45:41 -0400 Subject: [PATCH] Add function that can register all the HAL callbacks at once (#646) Since all of the callbacks issue a string identifier, it makes it possible and easy to have one function callback, and differentiate the path to take based on the string. Hooking up all the callbacks at once makes it easier for the simulator developer to know when something was added to wpilib rather than looking at the commits. --- .../include/MockData/AccelerometerData.h | 5 +++ .../native/include/MockData/AnalogGyroData.h | 4 +++ .../native/include/MockData/AnalogInData.h | 4 +++ .../native/include/MockData/AnalogOutData.h | 4 +++ .../include/MockData/AnalogTriggerData.h | 5 +++ .../main/native/include/MockData/DIOData.h | 3 ++ .../native/include/MockData/DigitalPWMData.h | 4 +++ .../include/MockData/DriverStationData.h | 4 +++ .../native/include/MockData/EncoderData.h | 4 +++ .../main/native/include/MockData/PCMData.h | 10 ++++++ .../main/native/include/MockData/PDPData.h | 5 +++ .../main/native/include/MockData/PWMData.h | 3 ++ .../main/native/include/MockData/RelayData.h | 4 +++ .../native/include/MockData/RoboRioData.h | 4 +++ .../include/MockData/SPIAccelerometerData.h | 5 +++ .../native/sim/MockData/AccelerometerData.cpp | 13 +++++++ .../native/sim/MockData/AnalogGyroData.cpp | 11 ++++++ .../main/native/sim/MockData/AnalogInData.cpp | 23 ++++++++++++ .../native/sim/MockData/AnalogOutData.cpp | 9 +++++ .../native/sim/MockData/AnalogTriggerData.cpp | 14 ++++++++ hal/src/main/native/sim/MockData/DIOData.cpp | 9 +++++ .../native/sim/MockData/DigitalPWMData.cpp | 11 ++++++ .../native/sim/MockData/DriverStationData.cpp | 18 ++++++++++ .../main/native/sim/MockData/EncoderData.cpp | 18 ++++++++++ hal/src/main/native/sim/MockData/PCMData.cpp | 26 ++++++++++++++ hal/src/main/native/sim/MockData/PDPData.cpp | 9 +++++ hal/src/main/native/sim/MockData/PWMData.cpp | 10 ++++++ .../main/native/sim/MockData/RelayData.cpp | 11 ++++++ .../main/native/sim/MockData/RoboRioData.cpp | 35 +++++++++++++++++++ .../sim/MockData/SPIAccelerometerData.cpp | 16 +++++++++ 30 files changed, 301 insertions(+) diff --git a/hal/src/main/native/include/MockData/AccelerometerData.h b/hal/src/main/native/include/MockData/AccelerometerData.h index 449a70d413..a18e22d569 100644 --- a/hal/src/main/native/include/MockData/AccelerometerData.h +++ b/hal/src/main/native/include/MockData/AccelerometerData.h @@ -55,6 +55,11 @@ void HALSIM_CancelAccelerometerZCallback(int32_t index, int32_t uid); double HALSIM_GetAccelerometerZ(int32_t index); void HALSIM_SetAccelerometerZ(int32_t index, double z); +void HALSIM_RegisterAccelerometerAllCallbacks(int32_t index, + HAL_NotifyCallback callback, + void* param, + HAL_Bool initialNotify); + #ifdef __cplusplus } // extern "C" #endif diff --git a/hal/src/main/native/include/MockData/AnalogGyroData.h b/hal/src/main/native/include/MockData/AnalogGyroData.h index f89f4e8dd2..3a85ac5070 100644 --- a/hal/src/main/native/include/MockData/AnalogGyroData.h +++ b/hal/src/main/native/include/MockData/AnalogGyroData.h @@ -38,6 +38,10 @@ void HALSIM_CancelAnalogGyroInitializedCallback(int32_t index, int32_t uid); HAL_Bool HALSIM_GetAnalogGyroInitialized(int32_t index); void HALSIM_SetAnalogGyroInitialized(int32_t index, HAL_Bool initialized); +void HALSIM_RegisterAnalogGyroAllCallbacks(int32_t index, + HAL_NotifyCallback callback, + void* param, HAL_Bool initialNotify); + #ifdef __cplusplus } // extern "C" #endif diff --git a/hal/src/main/native/include/MockData/AnalogInData.h b/hal/src/main/native/include/MockData/AnalogInData.h index 516a627ae0..ae430f68a2 100644 --- a/hal/src/main/native/include/MockData/AnalogInData.h +++ b/hal/src/main/native/include/MockData/AnalogInData.h @@ -88,6 +88,10 @@ int32_t HALSIM_GetAnalogInAccumulatorDeadband(int32_t index); void HALSIM_SetAnalogInAccumulatorDeadband(int32_t index, int32_t accumulatorDeadband); +void HALSIM_RegisterAnalogInAllCallbacks(int32_t index, + HAL_NotifyCallback callback, + void* param, HAL_Bool initialNotify); + #ifdef __cplusplus } // extern "C" #endif diff --git a/hal/src/main/native/include/MockData/AnalogOutData.h b/hal/src/main/native/include/MockData/AnalogOutData.h index 1f5f2be695..ee40f0a9fa 100644 --- a/hal/src/main/native/include/MockData/AnalogOutData.h +++ b/hal/src/main/native/include/MockData/AnalogOutData.h @@ -31,6 +31,10 @@ void HALSIM_CancelAnalogOutInitializedCallback(int32_t index, int32_t uid); HAL_Bool HALSIM_GetAnalogOutInitialized(int32_t index); void HALSIM_SetAnalogOutInitialized(int32_t index, HAL_Bool initialized); +void HALSIM_RegisterAnalogOutAllCallbacks(int32_t index, + HAL_NotifyCallback callback, + void* param, HAL_Bool initialNotify); + #ifdef __cplusplus } // extern "C" #endif diff --git a/hal/src/main/native/include/MockData/AnalogTriggerData.h b/hal/src/main/native/include/MockData/AnalogTriggerData.h index cee35e3cac..9c2d616907 100644 --- a/hal/src/main/native/include/MockData/AnalogTriggerData.h +++ b/hal/src/main/native/include/MockData/AnalogTriggerData.h @@ -54,6 +54,11 @@ HALSIM_AnalogTriggerMode HALSIM_GetAnalogTriggerTriggerMode(int32_t index); void HALSIM_SetAnalogTriggerTriggerMode(int32_t index, HALSIM_AnalogTriggerMode triggerMode); +void HALSIM_RegisterAnalogTriggerAllCallbacks(int32_t index, + HAL_NotifyCallback callback, + void* param, + HAL_Bool initialNotify); + #ifdef __cplusplus } // extern "C" #endif diff --git a/hal/src/main/native/include/MockData/DIOData.h b/hal/src/main/native/include/MockData/DIOData.h index 281ee0d3b0..f2d6b1afec 100644 --- a/hal/src/main/native/include/MockData/DIOData.h +++ b/hal/src/main/native/include/MockData/DIOData.h @@ -53,6 +53,9 @@ void HALSIM_CancelDIOFilterIndexCallback(int32_t index, int32_t uid); int32_t HALSIM_GetDIOFilterIndex(int32_t index); void HALSIM_SetDIOFilterIndex(int32_t index, int32_t filterIndex); +void HALSIM_RegisterDIOAllCallbacks(int32_t index, HAL_NotifyCallback callback, + void* param, HAL_Bool initialNotify); + #ifdef __cplusplus } // extern "C" #endif diff --git a/hal/src/main/native/include/MockData/DigitalPWMData.h b/hal/src/main/native/include/MockData/DigitalPWMData.h index 9a4e8e1ca1..f288b2e2e6 100644 --- a/hal/src/main/native/include/MockData/DigitalPWMData.h +++ b/hal/src/main/native/include/MockData/DigitalPWMData.h @@ -38,6 +38,10 @@ void HALSIM_CancelDigitalPWMPinCallback(int32_t index, int32_t uid); int32_t HALSIM_GetDigitalPWMPin(int32_t index); void HALSIM_SetDigitalPWMPin(int32_t index, int32_t pin); +void HALSIM_RegisterDigitalPWMAllCallbacks(int32_t index, + HAL_NotifyCallback callback, + void* param, HAL_Bool initialNotify); + #ifdef __cplusplus } // extern "C" #endif diff --git a/hal/src/main/native/include/MockData/DriverStationData.h b/hal/src/main/native/include/MockData/DriverStationData.h index 79a8ee9303..95b9b0d7e3 100644 --- a/hal/src/main/native/include/MockData/DriverStationData.h +++ b/hal/src/main/native/include/MockData/DriverStationData.h @@ -69,6 +69,10 @@ void HALSIM_SetDriverStationMatchTime(double matchTime); void HALSIM_NotifyDriverStationNewData(void); +void HALSIM_RegisterDriverStationAllCallbacks(HAL_NotifyCallback callback, + void* param, + HAL_Bool initialNotify); + #ifdef __cplusplus } // extern "C" #endif diff --git a/hal/src/main/native/include/MockData/EncoderData.h b/hal/src/main/native/include/MockData/EncoderData.h index f6588d98e2..b31651aab7 100644 --- a/hal/src/main/native/include/MockData/EncoderData.h +++ b/hal/src/main/native/include/MockData/EncoderData.h @@ -78,6 +78,10 @@ void HALSIM_CancelEncoderSamplesToAverageCallback(int32_t index, int32_t uid); int32_t HALSIM_GetEncoderSamplesToAverage(int32_t index); void HALSIM_SetEncoderSamplesToAverage(int32_t index, int32_t samplesToAverage); +void HALSIM_RegisterEncoderAllCallbacks(int32_t index, + HAL_NotifyCallback callback, + void* param, HAL_Bool initialNotify); + #ifdef __cplusplus } // extern "C" #endif diff --git a/hal/src/main/native/include/MockData/PCMData.h b/hal/src/main/native/include/MockData/PCMData.h index 8fed2299c1..97484a3a38 100644 --- a/hal/src/main/native/include/MockData/PCMData.h +++ b/hal/src/main/native/include/MockData/PCMData.h @@ -74,6 +74,16 @@ void HALSIM_CancelPCMCompressorCurrentCallback(int32_t index, int32_t uid); double HALSIM_GetPCMCompressorCurrent(int32_t index); void HALSIM_SetPCMCompressorCurrent(int32_t index, double compressorCurrent); +void HALSIM_RegisterPCMAllNonSolenoidCallbacks(int32_t index, + HAL_NotifyCallback callback, + void* param, + HAL_Bool initialNotify); + +void HALSIM_RegisterPCMAllSolenoidCallbacks(int32_t index, int32_t channel, + HAL_NotifyCallback callback, + void* param, + HAL_Bool initialNotify); + #ifdef __cplusplus } // extern "C" #endif diff --git a/hal/src/main/native/include/MockData/PDPData.h b/hal/src/main/native/include/MockData/PDPData.h index c16a59d4d8..6c7d77dcdc 100644 --- a/hal/src/main/native/include/MockData/PDPData.h +++ b/hal/src/main/native/include/MockData/PDPData.h @@ -46,6 +46,11 @@ void HALSIM_CancelPDPCurrentCallback(int32_t index, int32_t channel, double HALSIM_GetPDPCurrent(int32_t index, int32_t channel); void HALSIM_SetPDPCurrent(int32_t index, int32_t channel, double current); +void HALSIM_RegisterPDPAllNonCurrentCallbacks(int32_t index, int32_t channel, + HAL_NotifyCallback callback, + void* param, + HAL_Bool initialNotify); + #ifdef __cplusplus } // extern "C" #endif diff --git a/hal/src/main/native/include/MockData/PWMData.h b/hal/src/main/native/include/MockData/PWMData.h index 77218c7ca5..e329ce9a40 100644 --- a/hal/src/main/native/include/MockData/PWMData.h +++ b/hal/src/main/native/include/MockData/PWMData.h @@ -60,6 +60,9 @@ void HALSIM_CancelPWMZeroLatchCallback(int32_t index, int32_t uid); HAL_Bool HALSIM_GetPWMZeroLatch(int32_t index); void HALSIM_SetPWMZeroLatch(int32_t index, HAL_Bool zeroLatch); +void HALSIM_RegisterPWMAllCallbacks(int32_t index, HAL_NotifyCallback callback, + void* param, HAL_Bool initialNotify); + #ifdef __cplusplus } // extern "C" #endif diff --git a/hal/src/main/native/include/MockData/RelayData.h b/hal/src/main/native/include/MockData/RelayData.h index 2ec8b1abcc..bdd77b7805 100644 --- a/hal/src/main/native/include/MockData/RelayData.h +++ b/hal/src/main/native/include/MockData/RelayData.h @@ -47,6 +47,10 @@ void HALSIM_CancelRelayReverseCallback(int32_t index, int32_t uid); HAL_Bool HALSIM_GetRelayReverse(int32_t index); void HALSIM_SetRelayReverse(int32_t index, HAL_Bool reverse); +void HALSIM_RegisterRelayAllCallcbaks(int32_t index, + HAL_NotifyCallback callback, void* param, + HAL_Bool initialNotify); + #ifdef __cplusplus } // extern "C" #endif diff --git a/hal/src/main/native/include/MockData/RoboRioData.h b/hal/src/main/native/include/MockData/RoboRioData.h index 0d2a022a0b..e4fef6167c 100644 --- a/hal/src/main/native/include/MockData/RoboRioData.h +++ b/hal/src/main/native/include/MockData/RoboRioData.h @@ -133,6 +133,10 @@ void HALSIM_CancelRoboRioUserFaults3V3Callback(int32_t index, int32_t uid); int32_t HALSIM_GetRoboRioUserFaults3V3(int32_t index); void HALSIM_SetRoboRioUserFaults3V3(int32_t index, int32_t userFaults3V3); +void HALSIM_RegisterRoboRioAllCallbacks(int32_t index, + HAL_NotifyCallback callback, + void* param, HAL_Bool initialNotify); + #ifdef __cplusplus } // extern "C" #endif diff --git a/hal/src/main/native/include/MockData/SPIAccelerometerData.h b/hal/src/main/native/include/MockData/SPIAccelerometerData.h index 6a21db15aa..b0915221f4 100644 --- a/hal/src/main/native/include/MockData/SPIAccelerometerData.h +++ b/hal/src/main/native/include/MockData/SPIAccelerometerData.h @@ -53,6 +53,11 @@ void HALSIM_CancelSPIAccelerometerZCallback(int32_t index, int32_t uid); double HALSIM_GetSPIAccelerometerZ(int32_t index); void HALSIM_SetSPIAccelerometerZ(int32_t index, double z); +void HALSIM_RegisterSPIAccelerometerAllCallbcaks(int32_t index, + HAL_NotifyCallback callback, + void* param, + HAL_Bool initialNotify); + #ifdef __cplusplus } // extern "C" #endif diff --git a/hal/src/main/native/sim/MockData/AccelerometerData.cpp b/hal/src/main/native/sim/MockData/AccelerometerData.cpp index 3b513df2c2..0158f35485 100644 --- a/hal/src/main/native/sim/MockData/AccelerometerData.cpp +++ b/hal/src/main/native/sim/MockData/AccelerometerData.cpp @@ -309,4 +309,17 @@ double HALSIM_GetAccelerometerZ(int32_t index) { void HALSIM_SetAccelerometerZ(int32_t index, double z) { SimAccelerometerData[index].SetZ(z); } + +void HALSIM_RegisterAccelerometerAllCallbacks(int32_t index, + HAL_NotifyCallback callback, + void* param, + HAL_Bool initialNotify) { + SimAccelerometerData[index].RegisterActiveCallback(callback, param, + initialNotify); + SimAccelerometerData[index].RegisterRangeCallback(callback, param, + initialNotify); + SimAccelerometerData[index].RegisterXCallback(callback, param, initialNotify); + SimAccelerometerData[index].RegisterYCallback(callback, param, initialNotify); + SimAccelerometerData[index].RegisterZCallback(callback, param, initialNotify); +} } // extern "C" diff --git a/hal/src/main/native/sim/MockData/AnalogGyroData.cpp b/hal/src/main/native/sim/MockData/AnalogGyroData.cpp index f0bcba3024..b05db95a16 100644 --- a/hal/src/main/native/sim/MockData/AnalogGyroData.cpp +++ b/hal/src/main/native/sim/MockData/AnalogGyroData.cpp @@ -192,4 +192,15 @@ HAL_Bool HALSIM_GetAnalogGyroInitialized(int32_t index) { void HALSIM_SetAnalogGyroInitialized(int32_t index, HAL_Bool initialized) { SimAnalogGyroData[index].SetInitialized(initialized); } + +void HALSIM_RegisterAnalogGyroAllCallbacks(int32_t index, + HAL_NotifyCallback callback, + void* param, + HAL_Bool initialNotify) { + SimAnalogGyroData[index].RegisterAngleCallback(callback, param, + initialNotify); + SimAnalogGyroData[index].RegisterRateCallback(callback, param, initialNotify); + SimAnalogGyroData[index].RegisterInitializedCallback(callback, param, + initialNotify); +} } // extern "C" diff --git a/hal/src/main/native/sim/MockData/AnalogInData.cpp b/hal/src/main/native/sim/MockData/AnalogInData.cpp index a8935d564b..7226371f88 100644 --- a/hal/src/main/native/sim/MockData/AnalogInData.cpp +++ b/hal/src/main/native/sim/MockData/AnalogInData.cpp @@ -550,4 +550,27 @@ void HALSIM_SetAnalogInAccumulatorDeadband(int32_t index, int32_t accumulatorDeadband) { SimAnalogInData[index].SetAccumulatorDeadband(accumulatorDeadband); } + +void HALSIM_RegisterAnalogInAllCallbacks(int32_t index, + HAL_NotifyCallback callback, + void* param, HAL_Bool initialNotify) { + SimAnalogInData[index].RegisterInitializedCallback(callback, param, + initialNotify); + SimAnalogInData[index].RegisterAverageBitsCallback(callback, param, + initialNotify); + SimAnalogInData[index].RegisterOversampleBitsCallback(callback, param, + initialNotify); + SimAnalogInData[index].RegisterVoltageCallback(callback, param, + initialNotify); + SimAnalogInData[index].RegisterAccumulatorInitializedCallback(callback, param, + initialNotify); + SimAnalogInData[index].RegisterAccumulatorValueCallback(callback, param, + initialNotify); + SimAnalogInData[index].RegisterAccumulatorCountCallback(callback, param, + initialNotify); + SimAnalogInData[index].RegisterAccumulatorCenterCallback(callback, param, + initialNotify); + SimAnalogInData[index].RegisterAccumulatorDeadbandCallback(callback, param, + initialNotify); +} } // extern "C" diff --git a/hal/src/main/native/sim/MockData/AnalogOutData.cpp b/hal/src/main/native/sim/MockData/AnalogOutData.cpp index dd4a0928f9..b39117c600 100644 --- a/hal/src/main/native/sim/MockData/AnalogOutData.cpp +++ b/hal/src/main/native/sim/MockData/AnalogOutData.cpp @@ -135,4 +135,13 @@ HAL_Bool HALSIM_GetAnalogOutInitialized(int32_t index) { void HALSIM_SetAnalogOutInitialized(int32_t index, HAL_Bool initialized) { SimAnalogOutData[index].SetInitialized(initialized); } + +void HALSIM_RegisterAnalogOutAllCallbacks(int32_t index, + HAL_NotifyCallback callback, + void* param, HAL_Bool initialNotify) { + SimAnalogOutData[index].RegisterVoltageCallback(callback, param, + initialNotify); + SimAnalogOutData[index].RegisterInitializedCallback(callback, param, + initialNotify); +} } // extern "C" diff --git a/hal/src/main/native/sim/MockData/AnalogTriggerData.cpp b/hal/src/main/native/sim/MockData/AnalogTriggerData.cpp index a12ae19312..ed6d88921a 100644 --- a/hal/src/main/native/sim/MockData/AnalogTriggerData.cpp +++ b/hal/src/main/native/sim/MockData/AnalogTriggerData.cpp @@ -254,4 +254,18 @@ void HALSIM_SetAnalogTriggerTriggerMode(int32_t index, HALSIM_AnalogTriggerMode triggerMode) { SimAnalogTriggerData[index].SetTriggerMode(triggerMode); } + +void HALSIM_RegisterAnalogTriggerAllCallbacks(int32_t index, + HAL_NotifyCallback callback, + void* param, + HAL_Bool initialNotify) { + SimAnalogTriggerData[index].RegisterInitializedCallback(callback, param, + initialNotify); + SimAnalogTriggerData[index].RegisterTriggerLowerBoundCallback(callback, param, + initialNotify); + SimAnalogTriggerData[index].RegisterTriggerUpperBoundCallback(callback, param, + initialNotify); + SimAnalogTriggerData[index].RegisterTriggerModeCallback(callback, param, + initialNotify); +} } // extern "C" diff --git a/hal/src/main/native/sim/MockData/DIOData.cpp b/hal/src/main/native/sim/MockData/DIOData.cpp index e68f3cc5e8..4bdd67a4d4 100644 --- a/hal/src/main/native/sim/MockData/DIOData.cpp +++ b/hal/src/main/native/sim/MockData/DIOData.cpp @@ -303,4 +303,13 @@ int32_t HALSIM_GetDIOFilterIndex(int32_t index) { void HALSIM_SetDIOFilterIndex(int32_t index, int32_t filterIndex) { SimDIOData[index].SetFilterIndex(filterIndex); } + +void HALSIM_RegisterDIOAllCallbacks(int32_t index, HAL_NotifyCallback callback, + void* param, HAL_Bool initialNotify) { + SimDIOData[index].RegisterInitializedCallback(callback, param, initialNotify); + SimDIOData[index].RegisterValueCallback(callback, param, initialNotify); + SimDIOData[index].RegisterPulseLengthCallback(callback, param, initialNotify); + SimDIOData[index].RegisterIsInputCallback(callback, param, initialNotify); + SimDIOData[index].RegisterFilterIndexCallback(callback, param, initialNotify); +} } // extern "C" diff --git a/hal/src/main/native/sim/MockData/DigitalPWMData.cpp b/hal/src/main/native/sim/MockData/DigitalPWMData.cpp index 6d76e091e2..db0dc77bd9 100644 --- a/hal/src/main/native/sim/MockData/DigitalPWMData.cpp +++ b/hal/src/main/native/sim/MockData/DigitalPWMData.cpp @@ -192,4 +192,15 @@ int32_t HALSIM_GetDigitalPWMPin(int32_t index) { void HALSIM_SetDigitalPWMPin(int32_t index, int32_t pin) { SimDigitalPWMData[index].SetPin(pin); } + +void HALSIM_RegisterDigitalPWMAllCallbacks(int32_t index, + HAL_NotifyCallback callback, + void* param, + HAL_Bool initialNotify) { + SimDigitalPWMData[index].RegisterInitializedCallback(callback, param, + initialNotify); + SimDigitalPWMData[index].RegisterDutyCycleCallback(callback, param, + initialNotify); + SimDigitalPWMData[index].RegisterPinCallback(callback, param, initialNotify); +} } // extern "C" diff --git a/hal/src/main/native/sim/MockData/DriverStationData.cpp b/hal/src/main/native/sim/MockData/DriverStationData.cpp index 74355e35c4..0b7b497f13 100644 --- a/hal/src/main/native/sim/MockData/DriverStationData.cpp +++ b/hal/src/main/native/sim/MockData/DriverStationData.cpp @@ -448,4 +448,22 @@ void HALSIM_SetDriverStationMatchTime(double matchTime) { void HALSIM_NotifyDriverStationNewData(void) { SimDriverStationData.NotifyNewData(); } + +void HALSIM_RegisterDriverStationAllCallbacks(HAL_NotifyCallback callback, + void* param, + HAL_Bool initialNotify) { + SimDriverStationData.RegisterEnabledCallback(callback, param, initialNotify); + SimDriverStationData.RegisterAutonomousCallback(callback, param, + initialNotify); + SimDriverStationData.RegisterTestCallback(callback, param, initialNotify); + SimDriverStationData.RegisterEStopCallback(callback, param, initialNotify); + SimDriverStationData.RegisterFmsAttachedCallback(callback, param, + initialNotify); + SimDriverStationData.RegisterDsAttachedCallback(callback, param, + initialNotify); + SimDriverStationData.RegisterAllianceStationIdCallback(callback, param, + initialNotify); + SimDriverStationData.RegisterMatchTimeCallback(callback, param, + initialNotify); +} } // extern "C" diff --git a/hal/src/main/native/sim/MockData/EncoderData.cpp b/hal/src/main/native/sim/MockData/EncoderData.cpp index b7f1a878b4..72842590d1 100644 --- a/hal/src/main/native/sim/MockData/EncoderData.cpp +++ b/hal/src/main/native/sim/MockData/EncoderData.cpp @@ -485,4 +485,22 @@ void HALSIM_SetEncoderSamplesToAverage(int32_t index, int32_t samplesToAverage) { SimEncoderData[index].SetSamplesToAverage(samplesToAverage); } + +void HALSIM_RegisterEncoderAllCallbacks(int32_t index, + HAL_NotifyCallback callback, + void* param, HAL_Bool initialNotify) { + SimEncoderData[index].RegisterInitializedCallback(callback, param, + initialNotify); + SimEncoderData[index].RegisterCountCallback(callback, param, initialNotify); + SimEncoderData[index].RegisterPeriodCallback(callback, param, initialNotify); + SimEncoderData[index].RegisterResetCallback(callback, param, initialNotify); + SimEncoderData[index].RegisterMaxPeriodCallback(callback, param, + initialNotify); + SimEncoderData[index].RegisterDirectionCallback(callback, param, + initialNotify); + SimEncoderData[index].RegisterReverseDirectionCallback(callback, param, + initialNotify); + SimEncoderData[index].RegisterSamplesToAverageCallback(callback, param, + initialNotify); +} } // extern "C" diff --git a/hal/src/main/native/sim/MockData/PCMData.cpp b/hal/src/main/native/sim/MockData/PCMData.cpp index 1da5f6a2ad..e634619e80 100644 --- a/hal/src/main/native/sim/MockData/PCMData.cpp +++ b/hal/src/main/native/sim/MockData/PCMData.cpp @@ -448,4 +448,30 @@ double HALSIM_GetPCMCompressorCurrent(int32_t index) { void HALSIM_SetPCMCompressorCurrent(int32_t index, double compressorCurrent) { SimPCMData[index].SetCompressorCurrent(compressorCurrent); } + +void HALSIM_RegisterPCMAllNonSolenoidCallbacks(int32_t index, + HAL_NotifyCallback callback, + void* param, + HAL_Bool initialNotify) { + SimPCMData[index].RegisterCompressorInitializedCallback(callback, param, + initialNotify); + SimPCMData[index].RegisterCompressorOnCallback(callback, param, + initialNotify); + SimPCMData[index].RegisterClosedLoopEnabledCallback(callback, param, + initialNotify); + SimPCMData[index].RegisterPressureSwitchCallback(callback, param, + initialNotify); + SimPCMData[index].RegisterCompressorCurrentCallback(callback, param, + initialNotify); +} + +void HALSIM_RegisterPCMAllSolenoidCallbacks(int32_t index, int32_t channel, + HAL_NotifyCallback callback, + void* param, + HAL_Bool initialNotify) { + SimPCMData[index].RegisterSolenoidInitializedCallback(channel, callback, + param, initialNotify); + SimPCMData[index].RegisterSolenoidOutputCallback(channel, callback, param, + initialNotify); +} } // extern "C" diff --git a/hal/src/main/native/sim/MockData/PDPData.cpp b/hal/src/main/native/sim/MockData/PDPData.cpp index 2fb8048635..7caba9d4e6 100644 --- a/hal/src/main/native/sim/MockData/PDPData.cpp +++ b/hal/src/main/native/sim/MockData/PDPData.cpp @@ -250,4 +250,13 @@ double HALSIM_GetPDPCurrent(int32_t index, int32_t channel) { void HALSIM_SetPDPCurrent(int32_t index, int32_t channel, double current) { SimPDPData[index].SetCurrent(channel, current); } + +void HALSIM_RegisterPDPAllNonCurrentCallbacks(int32_t index, int32_t channel, + HAL_NotifyCallback callback, + void* param, + HAL_Bool initialNotify) { + SimPDPData[index].RegisterInitializedCallback(callback, param, initialNotify); + SimPDPData[index].RegisterTemperatureCallback(callback, param, initialNotify); + SimPDPData[index].RegisterVoltageCallback(callback, param, initialNotify); +} } // extern "C" diff --git a/hal/src/main/native/sim/MockData/PWMData.cpp b/hal/src/main/native/sim/MockData/PWMData.cpp index 2f86d893fd..32487e5616 100644 --- a/hal/src/main/native/sim/MockData/PWMData.cpp +++ b/hal/src/main/native/sim/MockData/PWMData.cpp @@ -361,4 +361,14 @@ HAL_Bool HALSIM_GetPWMZeroLatch(int32_t index) { void HALSIM_SetPWMZeroLatch(int32_t index, HAL_Bool zeroLatch) { SimPWMData[index].SetZeroLatch(zeroLatch); } + +void HALSIM_RegisterPWMAllCallbacks(int32_t index, HAL_NotifyCallback callback, + void* param, HAL_Bool initialNotify) { + SimPWMData[index].RegisterInitializedCallback(callback, param, initialNotify); + SimPWMData[index].RegisterRawValueCallback(callback, param, initialNotify); + SimPWMData[index].RegisterSpeedCallback(callback, param, initialNotify); + SimPWMData[index].RegisterPositionCallback(callback, param, initialNotify); + SimPWMData[index].RegisterPeriodScaleCallback(callback, param, initialNotify); + SimPWMData[index].RegisterZeroLatchCallback(callback, param, initialNotify); +} } // extern "C" diff --git a/hal/src/main/native/sim/MockData/RelayData.cpp b/hal/src/main/native/sim/MockData/RelayData.cpp index 496e123e43..5ed33190fa 100644 --- a/hal/src/main/native/sim/MockData/RelayData.cpp +++ b/hal/src/main/native/sim/MockData/RelayData.cpp @@ -251,4 +251,15 @@ HAL_Bool HALSIM_GetRelayReverse(int32_t index) { void HALSIM_SetRelayReverse(int32_t index, HAL_Bool reverse) { SimRelayData[index].SetReverse(reverse); } + +void HALSIM_RegisterRelayAllCallcbaks(int32_t index, + HAL_NotifyCallback callback, void* param, + HAL_Bool initialNotify) { + SimRelayData[index].RegisterInitializedForwardCallback(callback, param, + initialNotify); + SimRelayData[index].RegisterInitializedReverseCallback(callback, param, + initialNotify); + SimRelayData[index].RegisterForwardCallback(callback, param, initialNotify); + SimRelayData[index].RegisterReverseCallback(callback, param, initialNotify); +} } // extern "C" diff --git a/hal/src/main/native/sim/MockData/RoboRioData.cpp b/hal/src/main/native/sim/MockData/RoboRioData.cpp index 7c4c797528..bc437c9a41 100644 --- a/hal/src/main/native/sim/MockData/RoboRioData.cpp +++ b/hal/src/main/native/sim/MockData/RoboRioData.cpp @@ -887,4 +887,39 @@ int32_t HALSIM_GetRoboRioUserFaults3V3(int32_t index) { void HALSIM_SetRoboRioUserFaults3V3(int32_t index, int32_t userFaults3V3) { SimRoboRioData[index].SetUserFaults3V3(userFaults3V3); } + +void HALSIM_RegisterRoboRioAllCallbacks(int32_t index, + HAL_NotifyCallback callback, + void* param, HAL_Bool initialNotify) { + SimRoboRioData[index].RegisterFPGAButtonCallback(callback, param, + initialNotify); + SimRoboRioData[index].RegisterVInVoltageCallback(callback, param, + initialNotify); + SimRoboRioData[index].RegisterVInCurrentCallback(callback, param, + initialNotify); + SimRoboRioData[index].RegisterUserVoltage6VCallback(callback, param, + initialNotify); + SimRoboRioData[index].RegisterUserCurrent6VCallback(callback, param, + initialNotify); + SimRoboRioData[index].RegisterUserActive6VCallback(callback, param, + initialNotify); + SimRoboRioData[index].RegisterUserVoltage5VCallback(callback, param, + initialNotify); + SimRoboRioData[index].RegisterUserCurrent5VCallback(callback, param, + initialNotify); + SimRoboRioData[index].RegisterUserActive5VCallback(callback, param, + initialNotify); + SimRoboRioData[index].RegisterUserVoltage3V3Callback(callback, param, + initialNotify); + SimRoboRioData[index].RegisterUserCurrent3V3Callback(callback, param, + initialNotify); + SimRoboRioData[index].RegisterUserActive3V3Callback(callback, param, + initialNotify); + SimRoboRioData[index].RegisterUserFaults6VCallback(callback, param, + initialNotify); + SimRoboRioData[index].RegisterUserFaults5VCallback(callback, param, + initialNotify); + SimRoboRioData[index].RegisterUserFaults3V3Callback(callback, param, + initialNotify); +} } // extern "C" diff --git a/hal/src/main/native/sim/MockData/SPIAccelerometerData.cpp b/hal/src/main/native/sim/MockData/SPIAccelerometerData.cpp index 3436e7fa88..43a2f70437 100644 --- a/hal/src/main/native/sim/MockData/SPIAccelerometerData.cpp +++ b/hal/src/main/native/sim/MockData/SPIAccelerometerData.cpp @@ -306,4 +306,20 @@ double HALSIM_GetSPIAccelerometerZ(int32_t index) { void HALSIM_SetSPIAccelerometerZ(int32_t index, double z) { SimSPIAccelerometerData[index].SetZ(z); } + +void HALSIM_RegisterSPIAccelerometerAllCallbcaks(int32_t index, + HAL_NotifyCallback callback, + void* param, + HAL_Bool initialNotify) { + SimSPIAccelerometerData[index].RegisterActiveCallback(callback, param, + initialNotify); + SimSPIAccelerometerData[index].RegisterRangeCallback(callback, param, + initialNotify); + SimSPIAccelerometerData[index].RegisterXCallback(callback, param, + initialNotify); + SimSPIAccelerometerData[index].RegisterYCallback(callback, param, + initialNotify); + SimSPIAccelerometerData[index].RegisterZCallback(callback, param, + initialNotify); +} } // extern "C"