Version 1.5.2(1) final

3 files changed, 14 insertions, 12 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
index 5c24b2338..eceb92d63 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
@@ -1040,6 +1040,18 @@ JobEndReasonEnum AlarmHandlingPrepareJob(void *CurrentJob)
     if (FoundReason == JOB_OK)
     {
         FoundReason = Winder_Check_Cone();
+        if (FoundReason!=JOB_OK)
+        {
+            for (Alarm_i = 0;Alarm_i<NumOfSystemAlarms;Alarm_i++)
+            {
+                if (AlarmItem[Alarm_i].EventType == EVENT_TYPE__WINDER_CONE_DOES_NOT_EXIST)
+                {
+                    AlarmId = Alarm_i;
+                    ReportWithPackageFilter(AlarmFilter,"cone not in place - preventing job", __FILE__,AlarmId,AlarmItem[Alarm_i].EventType, AlarmItem[Alarm_i].Severity, AlarmItem[Alarm_i].DeviceId, 0);
+                    break;
+                }
+            }
+        }
     }
     if (FoundReason != JOB_OK)
     {
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index cfd4db0e6..4122955b3 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -548,20 +548,12 @@ void CopyTemperaturesToMonitor(void)
 #warning machine to machine test
         DiagnosticsMonitor.headzone4temperature =
                 HeaterTemperature[HEATER_TYPE__HeaterZone4];
-        DiagnosticsMonitor.headzone6temperature =
-                HeaterTemperature[HEATER_TYPE__HeaterZone6];
-        DiagnosticsMonitor.headzone8temperature =
-                HeaterTemperature[HEATER_TYPE__HeaterZone8];
         DiagnosticsMonitor.headzone9temperature =
                 HeaterTemperature[HEATER_TYPE__HeaterZone9];
         DiagnosticsMonitor.headzone10temperature =
                 HeaterTemperature[HEATER_TYPE__HeaterZone10];
         DiagnosticsMonitor.n_headzone4temperature =
                 HeaterCounterIndex[HEATER_TYPE__HeaterZone4];
-        DiagnosticsMonitor.n_headzone6temperature =
-                HeaterCounterIndex[HEATER_TYPE__HeaterZone6];
-        DiagnosticsMonitor.n_headzone8temperature =
-                HeaterCounterIndex[HEATER_TYPE__HeaterZone8];
         DiagnosticsMonitor.n_headzone9temperature =
                 HeaterCounterIndex[HEATER_TYPE__HeaterZone9];
         DiagnosticsMonitor.n_headzone10temperature =
@@ -1013,8 +1005,6 @@ void DiagnosticOneSecCollection(void)
         DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone12, MillisecGetTemperatures(HEAD_PT100_ZONE_12_0X8A_1));
 #warning MACHINE TO MACHINE TEST
         DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone4, MillisecGetTemperatures(HEAD_PT100_ZONE_4_0X82_1));
-        DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone6, MillisecGetTemperatures(HEAD_PT100_ZONE_6_0X84_1));
-        DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone8, MillisecGetTemperatures(HEAD_PT100_ZONE_8_0X86_1));
         DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone9, MillisecGetTemperatures(HEAD_PT100_ZONE_9_0X88_0));
         DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone10, MillisecGetTemperatures(HEAD_PT100_ZONE_10_0X88_1));
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index 0ce6474cc..a7b3c5d26 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -1246,7 +1246,7 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
         response.has_progress = true;
     }
     else
-    if(request->amount == 0xB24)  //Set loading arm cycles
+    if(request->amount == 0xB24)  //AttemptThreadJoggingFunc
     {
         REPORT_MSG(request->delay,"AttemptThreadJoggingFunc");
         AttemptThreadJoggingFunc(NULL);
@@ -1254,7 +1254,7 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
         response.has_progress = true;
     }
     else
-    if(request->amount == 0xB25)  //Set loading arm cycles
+    if(request->amount == 0xB25)  //Change jog speed
     {
         REPORT_MSG(request->delay,"Change jog speed");
         if (request->delay<100)