From f92f6a23c7045f5c0c3626a8bf9c3abf286a0bb9 Mon Sep 17 00:00:00 2001 From: Marcel Peterkau Date: Mon, 12 Feb 2024 00:45:34 +0100 Subject: [PATCH] reworked some DTC-Handling --- Software/src/config.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/Software/src/config.cpp b/Software/src/config.cpp index 1806ecb..3a333b7 100644 --- a/Software/src/config.cpp +++ b/Software/src/config.cpp @@ -145,19 +145,14 @@ void GetConfig_EEPROM() uint32_t checksum = LubeConfig.checksum; LubeConfig.checksum = 0; - if (Checksum_EEPROM((uint8_t *)&LubeConfig, sizeof(LubeConfig)) != checksum) - { - MaintainDTC(DTC_EEPROM_CFG_BAD, true); - } + MaintainDTC(DTC_EEPROM_CFG_BAD, (Checksum_EEPROM((uint8_t *)&LubeConfig, sizeof(LubeConfig)) != checksum)); LubeConfig.checksum = checksum; uint32_t ConfigSanityCheckResult = ConfigSanityCheck(false); - if (ConfigSanityCheckResult > 0) - { - MaintainDTC(DTC_EEPROM_CFG_SANITY, true, ConfigSanityCheckResult); - } + MaintainDTC(DTC_EEPROM_CFG_SANITY, (ConfigSanityCheckResult > 0), ConfigSanityCheckResult); + } /** @@ -210,10 +205,8 @@ void GetPersistence_EEPROM() uint32_t checksum = PersistenceData.checksum; PersistenceData.checksum = 0; - if (Checksum_EEPROM((uint8_t *)&PersistenceData, sizeof(PersistenceData)) != checksum) - { - MaintainDTC(DTC_EEPROM_PDS_BAD, true); - } + MaintainDTC(DTC_EEPROM_PDS_BAD, (Checksum_EEPROM((uint8_t *)&PersistenceData, sizeof(PersistenceData)) != checksum)); + PersistenceData.checksum = checksum; } }