From 8ae7e973f24cf9bb1566e4dbc0d333ed96932256 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Fri, 12 Dec 2014 00:11:50 -0800 Subject: [PATCH] getHALErrorMessage(): Add missing CTRE errors. Change-Id: Ifea0bd9c57d007744616c8808e8f4b1429199898 --- hal/include/HAL/Errors.hpp | 2 ++ hal/lib/Athena/HAL.cpp | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/hal/include/HAL/Errors.hpp b/hal/include/HAL/Errors.hpp index ed890d2325..aecc9fd729 100644 --- a/hal/include/HAL/Errors.hpp +++ b/hal/include/HAL/Errors.hpp @@ -4,6 +4,8 @@ #define CTR_TxTimeout_MESSAGE "CTRE CAN Transmit Timeout" #define CTR_InvalidParamValue_MESSAGE "CTRE CAN Invalid Parameter" #define CTR_UnexpectedArbId_MESSAGE "CTRE Unexpected Arbitration ID (CAN Node ID)" +#define CTR_TxFailed_MESSAGE "CTRE CAN Transmit Error" +#define CTR_SigNotUpdated_MESSAGE "CTRE CAN Signal Not Updated" #define NiFpga_Status_FifoTimeout_MESSAGE "NIFPGA: FIFO timeout error" #define NiFpga_Status_TransferAborted_MESSAGE "NIFPGA: Transfer aborted error" diff --git a/hal/lib/Athena/HAL.cpp b/hal/lib/Athena/HAL.cpp index b14e7aa9e2..f48a746afd 100644 --- a/hal/lib/Athena/HAL.cpp +++ b/hal/lib/Athena/HAL.cpp @@ -54,6 +54,10 @@ const char* getHALErrorMessage(int32_t code) return CTR_InvalidParamValue_MESSAGE; case CTR_UnexpectedArbId: return CTR_UnexpectedArbId_MESSAGE; + case CTR_TxFailed: + return CTR_TxFailed_MESSAGE; + case CTR_SigNotUpdated: + return CTR_SigNotUpdated_MESSAGE; case NiFpga_Status_FifoTimeout: return NiFpga_Status_FifoTimeout_MESSAGE; case NiFpga_Status_TransferAborted: