version 1.5.3.4

2 files changed, 26 insertions, 23 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
index 160c3a0b5..db4535e06 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
@@ -1006,30 +1006,33 @@ JobEndReasonEnum AlarmHandlingPrepareJob(void *CurrentJob)
                 }
             }
     }
-    if ((AlarmState[Alarm_i].Status == true)&&(FoundReason == JOB_OK))
+    for (Alarm_i = 0;Alarm_i<NumOfSystemAlarms;Alarm_i++)
     {
-        if(AlarmItem[Alarm_i].Severity>=DEBUG_LOG_CATEGORY__Error)
+        if ((AlarmState[Alarm_i].Status == true)&&(FoundReason == JOB_OK))
         {
-            ReportWithPackageFilter(AlarmFilter,"an alarm existing before job", __FILE__,__LINE__,AlarmItem[Alarm_i].EventType, AlarmItem[Alarm_i].Severity, AlarmItem[Alarm_i].DeviceId, 0);
-            switch (AlarmItem[Alarm_i].EventType )
+            if(AlarmItem[Alarm_i].Severity>=DEBUG_LOG_CATEGORY__Error)
             {
-                case EVENT_TYPE__INSUFFICIENT_AIR_FLOW:
-                case EVENT_TYPE__VOC_SENSOR_ALARM_TIME:
-#warning unmark to prevent job on voc alarm//case EVENT_TYPE__VOC_SENSOR_ALARM_SLOPE:
-                //case EVENT_TYPE__POWER_UP_BIT_FAILURE:
-                    FoundReason = JOB_WASTE_HANDLING_PROBLEM;
-                    AlarmId = Alarm_i;
-                    ReportWithPackageFilter(AlarmFilter,"an alarm preventing job", __FILE__,__LINE__,AlarmItem[Alarm_i].EventType, AlarmItem[Alarm_i].Severity, AlarmItem[Alarm_i].DeviceId, 0);
-                    break;
-                case EVENT_TYPE__ELECTRICAL_CABINET_OVERTEMPERATURE:
-                case EVENT_TYPE__MACHINE_INTERNAL_OVERTEMPERATURE:
-                case EVENT_TYPE__MACHINE_INTERNAL_OVERTEMPERATURE_2:
-                    FoundReason = JOB_TEMPERATURE_ALARM;
-                    AlarmId = Alarm_i;
-                    ReportWithPackageFilter(AlarmFilter,"machine internal over-temperature is preventing job", __FILE__,__LINE__,AlarmItem[Alarm_i].EventType, AlarmItem[Alarm_i].Severity, AlarmItem[Alarm_i].DeviceId, 0);
-                    break;
-                default:
-                    break;
+                ReportWithPackageFilter(AlarmFilter,"an alarm existing before job", __FILE__,__LINE__,AlarmItem[Alarm_i].EventType, AlarmItem[Alarm_i].Severity, AlarmItem[Alarm_i].DeviceId, 0);
+                switch (AlarmItem[Alarm_i].EventType )
+                {
+                    case EVENT_TYPE__INSUFFICIENT_AIR_FLOW:
+                    case EVENT_TYPE__VOC_SENSOR_ALARM_TIME:
+                    //case EVENT_TYPE__VOC_SENSOR_ALARM_SLOPE:
+                    //case EVENT_TYPE__POWER_UP_BIT_FAILURE:
+                        FoundReason = JOB_WASTE_HANDLING_PROBLEM;
+                        AlarmId = Alarm_i;
+                        ReportWithPackageFilter(AlarmFilter,"an alarm preventing job", __FILE__,__LINE__,AlarmItem[Alarm_i].EventType, AlarmItem[Alarm_i].Severity, AlarmItem[Alarm_i].DeviceId, 0);
+                        break;
+                    case EVENT_TYPE__ELECTRICAL_CABINET_OVERTEMPERATURE:
+                    case EVENT_TYPE__MACHINE_INTERNAL_OVERTEMPERATURE:
+                    case EVENT_TYPE__MACHINE_INTERNAL_OVERTEMPERATURE_2:
+                        FoundReason = JOB_TEMPERATURE_ALARM;
+                        AlarmId = Alarm_i;
+                        ReportWithPackageFilter(AlarmFilter,"machine internal over-temperature is preventing job", __FILE__,__LINE__,AlarmItem[Alarm_i].EventType, AlarmItem[Alarm_i].Severity, AlarmItem[Alarm_i].DeviceId, 0);
+                        break;
+                    default:
+                        break;
+                }
             }
         }
     }
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
index 879aa84a6..c196ea031 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -693,8 +693,6 @@ bool AdjustDispenserSpeedToPressure(int DispenserId, double RefMaxPressure,doubl
                      for (Dispenser_i = 0; Dispenser_i < n_dispensers; Dispenser_i++)
                      {
                          DispenserId = Dispensers[Dispenser_i]->index;
-                         if (DispenserId!=Dispenser_i)
-                             ReportWithPackageFilter(IDSFilter,"DispenserId!=Dispenser_i",__FILE__,__LINE__,DispenserId,RpWarning,(int)Dispenser_i,0);
                          HW_Motor_Id = DispenserIdToMotorId[DispenserId];
                          if (MotorsCfg[HW_Motor_Id].hardwaremotortype
                                  != DispenserIdToMotorId[DispenserId])
@@ -703,6 +701,8 @@ bool AdjustDispenserSpeedToPressure(int DispenserId, double RefMaxPressure,doubl
                          {
                              continue;
                          }
+                         if (DispenserId!=Dispenser_i)
+                             ReportWithPackageFilter(IDSFilter,"DispenserId!=Dispenser_i",__FILE__,__LINE__,DispenserId,RpWarning,(int)Dispenser_i,0);
                          //(Speed*uStep*PPR)/((2*PI*Dispenser_Radius)
                          segmentfirst_speed = Dispensers[Dispenser_i]->nanolitterpersecond
                                  / Dispensers[Dispenser_i]->nanoliterperpulse;