bug fix: alarm Id from the waste alarm testing function

4 files changed, 8 insertions, 6 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
index 6df2c27c6..53394f4c0 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
@@ -977,7 +977,7 @@ JobEndReasonEnum AlarmHandlingPrepareJob(void *CurrentJob)
     if ((IFS_Availability[1] == IFS_RECOGNIZED_INIT_PASSED)&&(IFS_Availability[2] == IFS_RECOGNIZED_INIT_PASSED)) //ifs installed -check cartridges
     {
 
-        tempFoundReason = Waste_CheckState();
+        tempFoundReason = Waste_CheckState(&AlarmId);
         if (tempFoundReason!=JOB_OK)
         {
             FoundReason = tempFoundReason;
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_ex.h b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_ex.h
index 8a075bfd4..db15a9ffd 100644
--- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_ex.h
+++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_ex.h
@@ -44,7 +44,7 @@ bool WHS_IsContainerFull();
 bool WHS_WasteCartridgeLowerPresent();
 bool WHS_WasteCartridgeMiddlePresent();
 bool WHS_IsEmptying();
-uint32_t Waste_CheckState(void);
+uint32_t Waste_CheckState(int *AlarmId);
 uint32_t Waste_Prepare(void);
 bool WHS_IsVocPpmOverAlarmLimit();
 void setWastePrepareValues(float HeadLimit,float WasteLimit);
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c
index c2f92d9fd..1e3d4f79a 100644
--- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c
+++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c
@@ -515,7 +515,7 @@ void Waste_StateMachine(void)
             break;
     }
 }
-uint32_t Waste_CheckState(void)
+uint32_t Waste_CheckState(int *AlarmId)
 {
     //check if the waste is ready to run - waste level not above overflow level and no cartridge in the slots
     if (wasteLevel > wasteLevelOverflow)
@@ -524,6 +524,7 @@ uint32_t Waste_CheckState(void)
         JobEndReason = JOB_SAFETY_CRITICAL_ALARM;
         usnprintf(AlarmReasonStr, 100, "cannot start a job with waste tank overflow");
         AlarmHandlingSetAlarm( EVENT_TYPE__WASTE_CONTAINER_OVERFLOW,  true);
+        *AlarmId = EVENT_TYPE__WASTE_CONTAINER_OVERFLOW;
         //PrepareReady(Module_Waste,ModuleFail);
         return JOB_SAFETY_CRITICAL_ALARM;
     }
@@ -537,6 +538,7 @@ uint32_t Waste_CheckState(void)
         Report("cannot start a job with cartridges in the IFS", __FILE__, __LINE__, wasteLevel, RpMessage, wasteLevelOverflow, 0);
         JobEndReason = JOB_WASTE_HANDLING_PROBLEM;
         AlarmHandlingSetAlarm( EVENT_TYPE__ALL_WASTE_CARTRIDGES_FULL,  true);
+        *AlarmId = EVENT_TYPE__ALL_WASTE_CARTRIDGES_FULL;
         usnprintf(AlarmReasonStr, 100, "cannot start a job with cartridges in the IFS");
         //PrepareReady(Module_Waste,ModuleFail);
         return JOB_WASTE_HANDLING_PROBLEM;
diff --git a/Software/Stubs Collection/stubs/embeddedparametersbuild_w_cleaning.cs b/Software/Stubs Collection/stubs/embeddedparametersbuild_w_cleaning.cs
index 6627a4d60..7319b8f41 100644
--- a/Software/Stubs Collection/stubs/embeddedparametersbuild_w_cleaning.cs
+++ b/Software/Stubs Collection/stubs/embeddedparametersbuild_w_cleaning.cs
@@ -137,11 +137,11 @@ SetAutoFill = 3.0;
 configurationParameters.GeneralParameters.Add(SetAutoFill);
 
 double PowerOffDisableCleaning = new Double();
-PowerOffDisableCleaning = 0.0
+PowerOffDisableCleaning = 0.0;
 configurationParameters.GeneralParameters.Add(PowerOffDisableCleaning);
 
 double SublimationBlowTime = new Double();
-SublimationBlowTime = 30.0
+SublimationBlowTime = 30.0;
 configurationParameters.GeneralParameters.Add(SublimationBlowTime);
 
 double AllowedRangeForHeadBlowerDeviation = new Double();
@@ -149,7 +149,7 @@ AllowedRangeForHeadBlowerDeviation = 7;
 configurationParameters.GeneralParameters.Add(AllowedRangeForHeadBlowerDeviation);
 
 double AllowedRangeForWasteBlowerDeviation = new Double();
-AllowedRangeForWasteBlowerDeviation = 20;
+AllowedRangeForWasteBlowerDeviation = 10;
 configurationParameters.GeneralParameters.Add(AllowedRangeForWasteBlowerDeviation);