diff --git a/hal/src/main/native/athena/DigitalInternal.cpp b/hal/src/main/native/athena/DigitalInternal.cpp index fb0cf980835..13fa560d197 100644 --- a/hal/src/main/native/athena/DigitalInternal.cpp +++ b/hal/src/main/native/athena/DigitalInternal.cpp @@ -47,7 +47,7 @@ namespace detail { wpi::mutex& UnsafeGetDIOMutex() { return digitalDIOMutex; } -tDIO* UnsafeGetDigialSystem() { +tDIO* UnsafeGetDigitalSystem() { return digitalSystem.get(); } int32_t ComputeDigitalMask(HAL_DigitalHandle handle, int32_t* status) { diff --git a/hal/src/main/native/athena/mockdata/SPIAccelerometerData.cpp b/hal/src/main/native/athena/mockdata/SPIAccelerometerData.cpp index c938abf55f6..d0aa97f1de3 100644 --- a/hal/src/main/native/athena/mockdata/SPIAccelerometerData.cpp +++ b/hal/src/main/native/athena/mockdata/SPIAccelerometerData.cpp @@ -18,7 +18,7 @@ DEFINE_CAPI(double, X, 0) DEFINE_CAPI(double, Y, 0) DEFINE_CAPI(double, Z, 0) -void HALSIM_RegisterSPIAccelerometerAllCallbcaks(int32_t index, +void HALSIM_RegisterSPIAccelerometerAllCallbacks(int32_t index, HAL_NotifyCallback callback, void* param, HAL_Bool initialNotify) {} diff --git a/hal/src/main/native/include/hal/cpp/UnsafeDIO.h b/hal/src/main/native/include/hal/cpp/UnsafeDIO.h index e7f286bb54f..d79265ec92f 100644 --- a/hal/src/main/native/include/hal/cpp/UnsafeDIO.h +++ b/hal/src/main/native/include/hal/cpp/UnsafeDIO.h @@ -57,7 +57,7 @@ struct DIOSetProxy { }; namespace detail { wpi::mutex& UnsafeGetDIOMutex(); -tDIO* UnsafeGetDigialSystem(); +tDIO* UnsafeGetDigitalSystem(); int32_t ComputeDigitalMask(HAL_DigitalHandle handle, int32_t* status); } // namespace detail @@ -81,7 +81,7 @@ void UnsafeManipulateDIO(HAL_DigitalHandle handle, int32_t* status, return; } wpi::mutex& dioMutex = detail::UnsafeGetDIOMutex(); - tDIO* dSys = detail::UnsafeGetDigialSystem(); + tDIO* dSys = detail::UnsafeGetDigitalSystem(); auto mask = detail::ComputeDigitalMask(handle, status); if (*status != 0) { return; diff --git a/hal/src/main/native/include/hal/simulation/SPIAccelerometerData.h b/hal/src/main/native/include/hal/simulation/SPIAccelerometerData.h index 406798f1255..2018a40023b 100644 --- a/hal/src/main/native/include/hal/simulation/SPIAccelerometerData.h +++ b/hal/src/main/native/include/hal/simulation/SPIAccelerometerData.h @@ -50,7 +50,7 @@ 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, +void HALSIM_RegisterSPIAccelerometerAllCallbacks(int32_t index, HAL_NotifyCallback callback, void* param, HAL_Bool initialNotify); diff --git a/hal/src/main/native/sim/mockdata/SPIAccelerometerData.cpp b/hal/src/main/native/sim/mockdata/SPIAccelerometerData.cpp index 0ec10cf8a28..fa445006518 100644 --- a/hal/src/main/native/sim/mockdata/SPIAccelerometerData.cpp +++ b/hal/src/main/native/sim/mockdata/SPIAccelerometerData.cpp @@ -42,7 +42,7 @@ DEFINE_CAPI(double, Z, z) SimSPIAccelerometerData[index].NAME.RegisterCallback(callback, param, \ initialNotify) -void HALSIM_RegisterSPIAccelerometerAllCallbcaks(int32_t index, +void HALSIM_RegisterSPIAccelerometerAllCallbacks(int32_t index, HAL_NotifyCallback callback, void* param, HAL_Bool initialNotify) {