From c4728d291e4091976e2fd5f21f98950ff019a9fa Mon Sep 17 00:00:00 2001 From: Thad House Date: Thu, 24 May 2018 17:07:03 -0700 Subject: [PATCH] Makes CAN API initializer setup HAL (#1084) --- hal/src/main/native/athena/CANAPI.cpp | 2 ++ hal/src/main/native/sim/CANAPI.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/hal/src/main/native/athena/CANAPI.cpp b/hal/src/main/native/athena/CANAPI.cpp index 6a77ca9994..f09ce65935 100644 --- a/hal/src/main/native/athena/CANAPI.cpp +++ b/hal/src/main/native/athena/CANAPI.cpp @@ -16,6 +16,7 @@ #include "HAL/Errors.h" #include "HAL/HAL.h" #include "HAL/handles/UnlimitedHandleResource.h" +#include "HALInitializer.h" using namespace hal; @@ -87,6 +88,7 @@ static int32_t CreateCANId(CANStorage* storage, int32_t apiId) { HAL_CANHandle HAL_InitializeCAN(HAL_CANManufacturer manufacturer, int32_t deviceId, HAL_CANDeviceType deviceType, int32_t* status) { + hal::init::CheckInit(); CheckDeltaTime(); auto can = std::make_shared(); diff --git a/hal/src/main/native/sim/CANAPI.cpp b/hal/src/main/native/sim/CANAPI.cpp index 07cfef16bd..1f144849c7 100644 --- a/hal/src/main/native/sim/CANAPI.cpp +++ b/hal/src/main/native/sim/CANAPI.cpp @@ -16,6 +16,7 @@ #include "HAL/Errors.h" #include "HAL/HAL.h" #include "HAL/handles/UnlimitedHandleResource.h" +#include "HALInitializer.h" using namespace hal; @@ -70,6 +71,7 @@ static int32_t CreateCANId(CANStorage* storage, int32_t apiId) { HAL_CANHandle HAL_InitializeCAN(HAL_CANManufacturer manufacturer, int32_t deviceId, HAL_CANDeviceType deviceType, int32_t* status) { + hal::init::CheckInit(); CheckDeltaTime(); auto can = std::make_shared();