diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-09-09 11:21:19 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-09-09 11:21:19 +0300 |
| commit | 679ebf3c9ecb0271b765df122168d45be8a4a7cb (patch) | |
| tree | f31dd6765645d5afca5729adcd61b5b3c4a1b84c /Software/Embedded_SW/Embedded/Modules | |
| parent | 96e602f99fd9989b6161de89fd37fd9d7ac65d19 (diff) | |
| parent | d2c6293957afc55bede9f00db65a50ac0f1b2bf4 (diff) | |
| download | Tango-679ebf3c9ecb0271b765df122168d45be8a4a7cb.tar.gz Tango-679ebf3c9ecb0271b765df122168d45be8a4a7cb.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c | 47 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c | 1 |
2 files changed, 26 insertions, 22 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c index a6075ac09..d0807b20e 100644 --- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c +++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c @@ -958,28 +958,31 @@ uint32_t AlarmHandlingLoop(uint32_t tick) break; case ALARM_SOURCE_TYPE__CurrentAlarm: if (CheckCurrentAlarms) - { - value = Get_Heaters_Current_Integer(AlarmItem[Alarm_i].DeviceId); - if (AlarmItem[Alarm_i].AlarmDirection == true) - { - if ((value >= (AlarmItem[Alarm_i].AlarmValue*1.07))||(value <= (AlarmItem[Alarm_i].AlarmValue*0.80))) - { - Status = true; - } - } - else - { - if (value == 0) - { - Status = true; - } - } - } - else - { - value = false; - } - break; + { + if (Get_Heaters_Current_Integer(AlarmItem[Alarm_i].DeviceId, &value) == OK) + { + if (AlarmItem[Alarm_i].AlarmDirection == true) + { + if ((value >= (AlarmItem[Alarm_i].AlarmValue*1.07)) || (value <= (AlarmItem[Alarm_i].AlarmValue*0.80))) + { + Status = true; + } + } + else + { + if (value == 0) + { + Status = true; + } + } + + } + } + else + { + value = false; + } + break; case ALARM_SOURCE_TYPE__MotorAlarm: if (CheckMotorAlarms) { diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c index 88dc96997..8bece8b61 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c +++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c @@ -310,6 +310,7 @@ uint32_t EmbeddedParametersInit(void) checkTamperAlarms = (EmbeddedParameters->generalparameters[2] < 0.5)?false:true; checkMotorAlarms = (EmbeddedParameters->generalparameters[3] < 0.5)?false:true; AlarmHandlingSetFlags(checkHardLimitAlarms,checkCurrentAlarms,checkTamperAlarms,checkMotorAlarms); +// AlarmHandlingSetCurrentLimits(EmbeddedParameters->currentalarmhighlimit,EmbeddedParameters->currentalarmlowlimit); } if (EmbeddedParameters->n_generalparameters >= 5) SetWinderBackToBaseTime((uint32_t) EmbeddedParameters->generalparameters[4]); |