From 78d20ef37c2d006cc61cf85952ee2af495693218 Mon Sep 17 00:00:00 2001 From: Moritz Ruffer <m.ruffer@fasttube.de> Date: Tue, 25 Mar 2025 23:22:05 +0100 Subject: [PATCH] changed GPIO_Values to auxVoltages --- .../Lib/ADBMS6830B_Driver/Core/Inc/ADBMS_Driver.h | 2 +- AMS_Master_Code/Core/Src/main.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) 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 28401f1..c7cff59 100644 --- 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 @@ -87,7 +87,7 @@ typedef struct { uint16_t sumOfCellMeasurements; uint16_t refVoltage; - uint16_t GPIO_Values[MAXIMUM_GPIO]; + // uint16_t GPIO_Values[MAXIMUM_GPIO]; uint32_t overVoltage; uint32_t underVoltage; diff --git a/AMS_Master_Code/Core/Src/main.c b/AMS_Master_Code/Core/Src/main.c index e376680..b440f14 100644 --- a/AMS_Master_Code/Core/Src/main.c +++ b/AMS_Master_Code/Core/Src/main.c @@ -160,13 +160,13 @@ int main(void) // Print GPIO values debug_log(LOG_LEVEL_INFO, " GPIO values:"); debug_log(LOG_LEVEL_INFO, " G0: %4d G1: %4d G2: %4d G3: %4d G4: %4d", - modules[i].GPIO_Values[0], modules[i].GPIO_Values[1], - modules[i].GPIO_Values[2], modules[i].GPIO_Values[3], - modules[i].GPIO_Values[4]); + modules[i].auxVoltages[0], modules[i].auxVoltages[1], + modules[i].auxVoltages[2], modules[i].auxVoltages[3], + modules[i].auxVoltages[4]); debug_log(LOG_LEVEL_INFO, " G5: %4d G6: %4d G7: %4d G8: %4d G9: %4d", - modules[i].GPIO_Values[5], modules[i].GPIO_Values[6], - modules[i].GPIO_Values[7], modules[i].GPIO_Values[8], - modules[i].GPIO_Values[9]); + modules[i].auxVoltages[5], modules[i].auxVoltages[6], + modules[i].auxVoltages[7], modules[i].auxVoltages[8], + modules[i].auxVoltages[9]); debug_log(LOG_LEVEL_INFO, " Internal temp: %d, VAnalog: %d, VDigital: %d, VRef: %d", modules[i].internalDieTemp, modules[i].analogSupplyVoltage,