From afad6e269f061efe77729275c5f0d35f8a061a4e Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Thu, 3 Dec 2020 17:09:01 +0200 Subject: Version 1.5.3.3 release --- Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c | 2 +- .../Embedded/Modules/Diagnostics/DiagnosticsHoming.c | 8 ++++++-- .../Embedded/Modules/Diagnostics/DiagnosticsJogging.c | 7 ++++++- .../Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c | 3 +++ Software/Embedded_SW/Embedded/Software Release Notes.txt | 13 +++++++++++-- 5 files changed, 27 insertions(+), 6 deletions(-) (limited to 'Software/Embedded_SW') diff --git a/Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c b/Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c index 75f68d00c..177867eaf 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c +++ b/Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c @@ -314,7 +314,7 @@ uint32_t MotorRunCallBackFunction(uint32_t IfIndex, uint32_t ReadValue) //TODO { Report("MotorRunCallBackFunction temp curr prev small",__FILE__,encoder,InitialArmLocation,RpWarning,temp,0); failCounter++; - if (failCounter>=5) + if (failCounter>=8) { Report("arm stopped",__FILE__,failCounter,encoder,RpWarning,temp,0); MotorStop(HARDWARE_MOTOR_TYPE__MOTO_DRYER_LOADARM,Hard_Hiz); 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; diff --git a/Software/Embedded_SW/Embedded/Software Release Notes.txt b/Software/Embedded_SW/Embedded/Software Release Notes.txt index 88722710c..e0475b1cf 100644 --- a/Software/Embedded_SW/Embedded/Software Release Notes.txt +++ b/Software/Embedded_SW/Embedded/Software Release Notes.txt @@ -1,14 +1,19 @@ -Embedded SW Release note - Version 1.5.3(2) - Pack 3 +Embedded SW Release note - Version 1.5.3(3) - Pack 3 ============================================================= for QA RFID - suprressed some bug fixes (persistent alarms, most of temperature spikes) remove repeated restart protections Blowers - read V0 on job prepare +*WHS - read V0 on job prepare Temperature build prepare failure handling End heaters before upgrade restart (#4172) fix alarm reports on prepare stage and in logs -#4170 +* multiple thread load fixes +* add flat head open alarm +* cancel ignoring open lids #4025 + +#4170 #4205 #4027 #4182 #4017 other separate tasks for RFID and dispensers EEPROM, and for the shinko @@ -16,7 +21,11 @@ support restart research procedure stub - better than progress!! store process parameter as long as they are not 0 some work for light colors and for BTSR +*Store reset reason in EEPROM in address 40(*4) and on, 40 is latest index +*improve job end processing #4162 +* fix default parameters to include pre-run +*1.5.3.3 Embedded SW Release note - Version 1.5.2(3) - Pack 3 ============================================================= -- cgit v1.3.1