From 2d71363a655a0dde07d63538b5c1951c4de957fe Mon Sep 17 00:00:00 2001 From: kbracher Date: Thu, 20 Feb 2025 15:04:12 +0100 Subject: [PATCH] fix: compilation errors --- AMS_Master_Code/Core/Inc/slave_monitoring.h | 4 ++-- .../Core/Lib/ADBMS6830B_Driver/Core/Inc/ADBMS_Driver.h | 1 + .../Core/Lib/ADBMS6830B_Driver/Core/Src/ADBMS_HighLevel.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/AMS_Master_Code/Core/Inc/slave_monitoring.h b/AMS_Master_Code/Core/Inc/slave_monitoring.h index 1ec85fb..cecfd58 100644 --- a/AMS_Master_Code/Core/Inc/slave_monitoring.h +++ b/AMS_Master_Code/Core/Inc/slave_monitoring.h @@ -37,10 +37,10 @@ typedef enum { SLAVE_ERR_INTERNAL_BMS_OVERTEMP, SLAVE_ERR_INTERNAL_BMS_FAULT, SLAVE_ERR_UNKNOWN, -} SlaveErrorKind; +} SlaveErrorKind_master; typedef struct { - SlaveErrorKind kind; + SlaveErrorKind_master kind; uint32_t data; // Cell/temperature ID etc } SlaveError; diff --git a/AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Inc/ADBMS_Driver.h b/AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Inc/ADBMS_Driver.h index d306548..27eb9c4 100755 --- a/AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Inc/ADBMS_Driver.h +++ b/AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Inc/ADBMS_Driver.h @@ -2,6 +2,7 @@ #define ADBMS_DRIVER_H #include +#include "stm32h7xx_hal.h" #define ERROR_TIME_THRESH 150 // ms diff --git a/AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Src/ADBMS_HighLevel.c b/AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Src/ADBMS_HighLevel.c index 4e34f6d..b0f1a57 100755 --- a/AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Src/ADBMS_HighLevel.c +++ b/AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Src/ADBMS_HighLevel.c @@ -7,6 +7,7 @@ #include "ADBMS_HighLevel.h" #include "ADBMS_Abstraction.h" +#include "ADBMS_Error.h" #include "ADBMS_LL_Driver.h" #include "config_ADBMS6830.h" #include "ADBMS_Driver.h"