diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-12-03 17:09:01 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-12-03 17:09:01 +0200 |
| commit | afad6e269f061efe77729275c5f0d35f8a061a4e (patch) | |
| tree | 2fa4e7a9177ef52f545ab72dc7f35c483e3cbfe2 /Software/Embedded_SW/Embedded/Modules | |
| parent | 389aef8ec68dd58a9b40c95c5b55d339a5f67528 (diff) | |
| download | Tango-afad6e269f061efe77729275c5f0d35f8a061a4e.tar.gz Tango-afad6e269f061efe77729275c5f0d35f8a061a4e.zip | |
Version 1.5.3.3 release
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
3 files changed, 15 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c index 0e235e043..12842177c 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c @@ -413,8 +413,12 @@ uint32_t DispenserHomingRequestFunc(MessageContainer* requestContainer) responseContainer.continuous = true; if (MotorId <= NUM_OF_MOTORS) { - //if ((JobIsActive() == false)&&(isMotorConfigured(MotorId) == true)) - if (isMotorConfigured(MotorId) == true) + if ((JobIsActive())&&(DispenserUsedInJob[request->index] == true)) + { + responseContainer.error = ERROR_CODE__GENERAL_ERROR; + responseContainer.errormessage = "Dispenser active in job"; + } + else if (isMotorConfigured(MotorId) == true) { if (request->direction == MOTOR_DIRECTION__Backward) //dispenser homing status = IDS_HomeDispenser(request->index,speed,DispenserHomingRequestCallback); diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsJogging.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsJogging.c index 6d09e9f9e..c023a211c 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsJogging.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsJogging.c @@ -168,7 +168,12 @@ uint32_t DispenserJoggingRequestFunc(MessageContainer* requestContainer) if (MotorId <= NUM_OF_MOTORS) { // if ((JobIsActive() == false)&&(isMotorConfigured(MotorId) == true)) - if (isMotorConfigured(MotorId) == true) + if ((JobIsActive())&&(DispenserUsedInJob[request->index] == true)) + { + responseContainer.error = ERROR_CODE__GENERAL_ERROR; + responseContainer.errormessage = "Dispenser active in job"; + } + else if (isMotorConfigured(MotorId) == true) { switch (request->direction) { diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c index 2f8de1643..71524b0ee 100644 --- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c +++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c @@ -225,6 +225,9 @@ void setArcHeadAlarms(uint32_t AlarmId, bool value) { switch(AlarmId) { + case EVENT_TYPE__DYEING_HEAD_COVER_IS_OPEN: + ReportWithPackageFilter(HeatersFilter,"FlatHeadAlarms on",__FILE__,AlarmId,count9,RpError, 0,0); + break; /*case EVENT_TYPE__DYEING_HEAD_ARC_LID_IS_OPEN: ReportWithPackageFilter(HeatersFilter,"ArcHeadAlarms on",__FILE__,AlarmId,count9,RpError, 0,0); break; |