From 530508716283ca4d29405183d5aae9227ea97ac3 Mon Sep 17 00:00:00 2001 From: Thad House Date: Wed, 13 Jul 2016 19:25:57 -0700 Subject: [PATCH] Fixes a missed float to double change in the HAL. (#176) --- hal/include/HAL/HAL.h | 2 +- hal/lib/shared/HAL.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hal/include/HAL/HAL.h b/hal/include/HAL/HAL.h index 506cc9fd1d..49511b147f 100644 --- a/hal/include/HAL/HAL.h +++ b/hal/include/HAL/HAL.h @@ -136,7 +136,7 @@ char* HAL_GetJoystickName(int32_t joystickNum); int32_t HAL_GetJoystickAxisType(int32_t joystickNum, int32_t axis); int32_t HAL_SetJoystickOutputs(int32_t joystickNum, int64_t outputs, int32_t leftRumble, int32_t rightRumble); -float HAL_GetMatchTime(int32_t* status); +double HAL_GetMatchTime(int32_t* status); void HAL_WaitForDSData(void); diff --git a/hal/lib/shared/HAL.cpp b/hal/lib/shared/HAL.cpp index 39ad0f9c28..488c5b29fe 100644 --- a/hal/lib/shared/HAL.cpp +++ b/hal/lib/shared/HAL.cpp @@ -149,7 +149,7 @@ int32_t HAL_SetJoystickOutputs(int32_t joystickNum, int64_t outputs, leftRumble, rightRumble); } -float HAL_GetMatchTime(int32_t* status) { +double HAL_GetMatchTime(int32_t* status) { float matchTime; *status = FRC_NetworkCommunication_getMatchTime(&matchTime); return matchTime;