From 7b7f44d9373e080882f950ea63fb50ec2a98ec6f Mon Sep 17 00:00:00 2001 From: Thad House Date: Sat, 14 Mar 2020 22:04:12 -0700 Subject: [PATCH] Use netcomm function to get target class rather then hardcoded (#2391) It reports the correct value now, and helps for future proofing --- hal/src/main/native/athena/HAL.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hal/src/main/native/athena/HAL.cpp b/hal/src/main/native/athena/HAL.cpp index 35fc3d3105..d548a43892 100644 --- a/hal/src/main/native/athena/HAL.cpp +++ b/hal/src/main/native/athena/HAL.cpp @@ -390,9 +390,8 @@ HAL_Bool HAL_Initialize(int32_t timeout, int32_t mode) { setNewDataSem(nullptr); }); - // image 4; Fixes errors caused by multiple processes. Talk to NI about this nFPGA::nRoboRIO_FPGANamespace::g_currentTargetClass = - nLoadOut::kTargetClass_RoboRIO; + nLoadOut::getTargetClass(); int32_t status = 0; global.reset(tGlobal::create(&status));