diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-01-30 16:47:22 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-01-30 16:47:22 +0200 |
| commit | bdb2ae480c0616dff10deabaa7c8cbb6fa16ffff (patch) | |
| tree | bd5b6068a5e56b30cd26a025a20cc456c4d9fcdf /Software/Embedded_SW/Embedded/Modules/General | |
| parent | e1a8c002ded63f0ff87f8b2e9dc93370ff51e5ba (diff) | |
| download | Tango-bdb2ae480c0616dff10deabaa7c8cbb6fa16ffff.tar.gz Tango-bdb2ae480c0616dff10deabaa7c8cbb6fa16ffff.zip | |
Version 1.4.6.7 : beginning of removing the #ifdefs. Sylco head and arc head temperature control fixed. new events (version 18),
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/General')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c | 7 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h | 2 |
2 files changed, 5 insertions, 4 deletions
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; } diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h index 538204f0b..5fd8588af 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h +++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h @@ -16,7 +16,7 @@ extern uint32_t MachineCalibrationDataRequestFunc(MessageContainer* requestConta extern void HWSystemResetRequest(MessageContainer* requestContainer); uint32_t HWConfigurationInit(void); void FlashInitAndLoad(void); -uint32_t LoadConfigurationParamsFromFile(void); +uint32_t LoadConfigurationParamsFromFile(bool Initialize); extern HardwareBlower BlowerCfg; extern bool DataUpdated; |