From bdb2ae480c0616dff10deabaa7c8cbb6fa16ffff Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Thu, 30 Jan 2020 16:47:22 +0200 Subject: Version 1.4.6.7 : beginning of removing the #ifdefs. Sylco head and arc head temperature control fixed. new events (version 18), --- Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c') diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c index 071270e3a..76cb9afbe 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c +++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c @@ -300,7 +300,7 @@ uint32_t EmbeddedParametersInit(void) } else { - if (LoadConfigurationParamsFromFile()!=OK) + if (LoadConfigurationParamsFromFile(false)!=OK) { LoadConfigurationParameters(0); Report("LoadConfigurationParameters default", __FILE__,__LINE__,0, RpMessage, Fresult, 0); @@ -695,7 +695,7 @@ void HWSystemResetRequest(MessageContainer* requestContainer) } uint32_t FlashInitResults[5] = {0,0,0,0,0}; -uint32_t LoadConfigurationParamsFromFile(void) +uint32_t LoadConfigurationParamsFromFile(bool Initialize) { FRESULT Fresult = FR_OK; uint8_t* buffer = NULL; @@ -715,7 +715,8 @@ uint32_t LoadConfigurationParamsFromFile(void) EraseFlashSection(EMBEDDED_PARAMETERS_MAP_IN_FLASH,Bytes+4); ReadAppAndProgram(EMBEDDED_PARAMETERS_MAP_IN_FLASH, 4,&Bytes); ReadAppAndProgram(EMBEDDED_PARAMETERS_MAP_IN_FLASH+4, Bytes, buffer); - EmbeddedParametersInit(); + if (Initialize) + EmbeddedParametersInit(); } return Fresult; } -- cgit v1.3.1