From 4e0c10f48835c91d33de99f2d685a29a51c1cf72 Mon Sep 17 00:00:00 2001 From: Thad House Date: Sat, 27 Apr 2019 20:24:40 -0700 Subject: [PATCH] Fix CAN Clean using wrong ID (#1668) --- hal/src/main/native/athena/CANAPI.cpp | 4 ++-- hal/src/main/native/sim/CANAPI.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hal/src/main/native/athena/CANAPI.cpp b/hal/src/main/native/athena/CANAPI.cpp index 01c06bda10..bbe825ddad 100644 --- a/hal/src/main/native/athena/CANAPI.cpp +++ b/hal/src/main/native/athena/CANAPI.cpp @@ -95,8 +95,8 @@ void HAL_CleanCAN(HAL_CANHandle handle) { for (auto&& i : data->periodicSends) { int32_t s = 0; - HAL_CAN_SendMessage(i.first, nullptr, 0, HAL_CAN_SEND_PERIOD_STOP_REPEATING, - &s); + auto id = CreateCANId(data.get(), i.first); + HAL_CAN_SendMessage(id, nullptr, 0, HAL_CAN_SEND_PERIOD_STOP_REPEATING, &s); i.second = -1; } } diff --git a/hal/src/main/native/sim/CANAPI.cpp b/hal/src/main/native/sim/CANAPI.cpp index a54f06f51c..15668c5a62 100644 --- a/hal/src/main/native/sim/CANAPI.cpp +++ b/hal/src/main/native/sim/CANAPI.cpp @@ -104,8 +104,8 @@ void HAL_CleanCAN(HAL_CANHandle handle) { for (auto&& i : data->periodicSends) { int32_t s = 0; - HAL_CAN_SendMessage(i.first, nullptr, 0, HAL_CAN_SEND_PERIOD_STOP_REPEATING, - &s); + auto id = CreateCANId(data.get(), i.first); + HAL_CAN_SendMessage(id, nullptr, 0, HAL_CAN_SEND_PERIOD_STOP_REPEATING, &s); i.second = -1; } }