diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-02-07 13:03:22 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-02-07 13:03:22 +0200 |
| commit | 589bffe306db793987c17cd46f1dcac81f47bdcb (patch) | |
| tree | 6c9239daec4d1ba7d2a644a9c7153230d51f0691 /Software/Embedded_SW/Embedded/Modules/AlarmHandling | |
| parent | af1c7bd1b6122c1387fe6e2749f9847f4be84b16 (diff) | |
| download | Tango-589bffe306db793987c17cd46f1dcac81f47bdcb.tar.gz Tango-589bffe306db793987c17cd46f1dcac81f47bdcb.zip | |
remove some warnings
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/AlarmHandling')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c | 5 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c index 9fe67d773..03135c0d5 100644 --- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c +++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c @@ -876,7 +876,6 @@ JobEndReasonEnum AlarmHandlingPrepareJob(void *CurrentJob) { if (HeaterCheckReady()==false) { -#warning fit to new head with new alarms for (Heater_i=HEATER_TYPE__DryerAirHeater;Heater_i<HEATER_TYPE_MAX_HEATERS;Heater_i++) { LoadHeaterState((HeaterType)Heater_i,&HeaterState); @@ -925,7 +924,7 @@ uint32_t AlarmHandling_ControlTrigger(uint32_t IfIndex, uint32_t ReadValue) AlarmHandlingMessageStruc Message; if (AlarmHandlingActive == false) - return; + return OK; //send message to the Millisec task Message.messageId = AlarmHandlingTrigger; Message.msglen = sizeof(AlarmHandlingMessageStruc); @@ -955,7 +954,7 @@ void AlarmHandlingInternalSetAlarm(uint32_t AlarmId, bool value) { int Alarm_i; if (AlarmItem == NULL) - return ERROR; + return; for (Alarm_i = 0;Alarm_i < NumOfSystemAlarms;Alarm_i++) { if (AlarmItem[Alarm_i].EventType == AlarmId) diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.h b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.h index be7687f28..29be2bd23 100644 --- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.h +++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.h @@ -13,6 +13,8 @@ uint32_t AlarmHandlingFlashLoad(void); uint32_t AlarmHandlingLoadFile(void); +void AlarmHandlingInit(void); + uint32_t AlarmHandling_ControlTrigger(uint32_t IfIndex, uint32_t ReadValue); //uint32_t AlarmHandling_CalculateTemperatures(uint32_t SensorId, uint32_t Data); |
