diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-12-15 10:42:52 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-12-15 10:42:52 +0200 |
| commit | c1097749b08fb69e8ce5ceb1f2eea2992ac73e5e (patch) | |
| tree | 6dcdc75a14b393a68c29e72a6d2846763d130fab /Software/Embedded_SW/Embedded/Modules | |
| parent | 9c395e6db00bae6ceaf58f03b630e5d7bd92ce3c (diff) | |
| download | Tango-c1097749b08fb69e8ce5ceb1f2eea2992ac73e5e.tar.gz Tango-c1097749b08fb69e8ce5ceb1f2eea2992ac73e5e.zip | |
Version 1.4.6.1 alarm handling gap closing
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.h | 1 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.h b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.h index 0f73ed4af..be7687f28 100644 --- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.h +++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.h @@ -8,6 +8,7 @@ #ifndef MODULES_ALARMHANDLING_ALARMHANDLING_H_ #define MODULES_ALARMHANDLING_ALARMHANDLING_H_ #include "StateMachines/Printing/PrintingSTM.h" +#include <PMR/Diagnostics/EventType.pb-c.h> uint32_t AlarmHandlingFlashLoad(void); uint32_t AlarmHandlingLoadFile(void); diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c index 11ab61d24..5f2046c3e 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c +++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c @@ -124,6 +124,7 @@ uint32_t HWConfigurationInit(void) //UploadRequest = upload_hardware_configuration_request__unpack(NULL, Bytes, buffer); if (UploadRequest) { + AlarmHandlingSetAlarm (EVENT_TYPE__MACHINE_STATE_NO_CFG_FILE,OFF); status = HWConfiguration(UploadRequest); if (status !=OK) { @@ -137,6 +138,10 @@ uint32_t HWConfigurationInit(void) } upload_hardware_configuration_request__free_unpacked(UploadRequest,NULL); } + else + { + AlarmHandlingSetAlarm (EVENT_TYPE__MACHINE_STATE_NO_CFG_FILE,ON); + } if (buffer) free (buffer); |