cleaning job bug, prevent reporting dispenser homing for auto homing. drier fan / whs fan alarms

4 files changed, 63 insertions, 31 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
index 01d372aae..392be6177 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
@@ -1407,35 +1407,65 @@ uint32_t AlarmHandlingLoop(uint32_t tick)
                             }
                             break;
                         case DRYER_FAN :
-                            value = Read_Dryer_Fan_Tacho();
-                            if (AlarmItem[Alarm_i].Severity == DEBUG_LOG_CATEGORY__Critical )
-                                if ((AlarmItem[Alarm_i].AlarmDirection == UNDER_VALUE) && (value == DRYER_FAN_STOP))
-                                {
-                                    Status = true;
-                                    //ReportWithPackageFilter(AlarmFilter,"----------- DRYER FAN RPM Error----------------", __FILE__,__LINE__,0, RpMessage, value, 0);
-                                }
-                            else if (AlarmItem[Alarm_i].Severity ==  DEBUG_LOG_CATEGORY__Warning)
+							if (IsDryerStopped()==STOP)
                             {
-                                if ((AlarmItem[Alarm_i].AlarmDirection == UNDER_VALUE) && (value < DRYER_FAN_MIN_RPM))
+                                Status = false;
+                                //ReportWithPackageFilter(AlarmFilter,"----------- DRYER_FAN skip-----------", __FILE__,IsDryerStopped(),Alarm_i, RpMessage, Status, 0);
+                            }
+                            else
+                            {
+                                value = Read_Dryer_Fan_Tacho();
+                                if (AlarmItem[Alarm_i].Severity == DEBUG_LOG_CATEGORY__Critical )
+                                    if ((AlarmItem[Alarm_i].AlarmDirection == UNDER_VALUE) && (value == DRYER_FAN_STOP))
+                                    {
+                                        Status = true;
+                                        //ReportWithPackageFilter(AlarmFilter,"----------- DRYER FAN RPM Error----------------", __FILE__,__LINE__,0, RpMessage, value, 0);
+                                    }
+                                else if (AlarmItem[Alarm_i].Severity ==  DEBUG_LOG_CATEGORY__Warning)
                                 {
-                                    Status = true;
-                                    //ReportWithPackageFilter(AlarmFilter,"----------- DRYER FAN RPM Error----------------", __FILE__,__LINE__,0, RpMessage, value, 0);
+                                    if ((AlarmItem[Alarm_i].AlarmDirection == UNDER_VALUE) && (value < DRYER_FAN_MIN_RPM))
+                                    {
+                                        Status = true;
+                                        //ReportWithPackageFilter(AlarmFilter,"----------- DRYER FAN RPM Error----------------", __FILE__,__LINE__,0, RpMessage, value, 0);
+                                    }
                                 }
+                             //ReportWithPackageFilter(AlarmFilter,"----------- DRYER_FAN----------------", __FILE__,value,Alarm_i, RpMessage, Status, 0);
                             }
                             break;
-                    }
+                        default:
 
-                    //ReportWithPackageFilter(AlarmFilter,"------------FANS_RPM[Alarm_i]----------------", __FILE__,__LINE__,Alarm_i, RpMessage, value, 0);
-
-                    if (AlarmItem[Alarm_i].Severity == DEBUG_LOG_CATEGORY__Critical )
-                    {
-                        if (AlarmItem[Alarm_i].AlarmDirection == UNDER_VALUE)
-                        {
-                            if (value < AlarmItem[Alarm_i].AlarmValue)
+		                    //ReportWithPackageFilter(AlarmFilter,"------------FANS_RPM[Alarm_i]----------------", __FILE__,__LINE__,Alarm_i, RpMessage, value, 0);
+                            if (AlarmItem[Alarm_i].DeviceId >= WHS_FAN_1 )
                             {
-                                Status = true;
+                                value = WHS_Get_fan_tach(AlarmItem[Alarm_i].DeviceId - WHS_FAN_1+1);
+                                if (AlarmItem[Alarm_i].Severity == DEBUG_LOG_CATEGORY__Critical )
+                                    if ((AlarmItem[Alarm_i].AlarmDirection == UNDER_VALUE) && (value == DRYER_FAN_STOP))
+                                    {
+                                        Status = true;
+                                        //ReportWithPackageFilter(AlarmFilter,"----------- DRYER FAN RPM Error----------------", __FILE__,__LINE__,0, RpMessage, value, 0);
+                                    }
+                                else if (AlarmItem[Alarm_i].Severity ==  DEBUG_LOG_CATEGORY__Warning)
+                                {
+                                    if ((AlarmItem[Alarm_i].AlarmDirection == UNDER_VALUE) && (value < DRYER_FAN_MIN_RPM))
+                                    {
+                                        Status = true;
+                                        //ReportWithPackageFilter(AlarmFilter,"----------- DRYER FAN RPM Error----------------", __FILE__,__LINE__,0, RpMessage, value, 0);
+                                    }
+                                }
+                                if (AlarmItem[Alarm_i].Severity == DEBUG_LOG_CATEGORY__Critical )
+                                {
+                                    if (AlarmItem[Alarm_i].AlarmDirection == UNDER_VALUE)
+                                    {
+                                        if (value < AlarmItem[Alarm_i].AlarmValue)
+                                        {
+                                            Status = true;
+                                        }
+                                    }
+                                }
                             }
-                        }
+                            else
+                                Status = false;
+                            break;
                     }
                 }
                 break;
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
index fecfa5057..6782a8ecb 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
@@ -47,6 +47,9 @@ int NumberOfCycles;
 //int32_t keepkvalright,keepkvalleft;
 uint32_t MotorHomingProgressReport(uint32_t deviceID, uint32_t ReadValue)
 {
+    if (HomingToken[deviceID][0] == 0)
+        return OK;
+
     MessageContainer responseContainer;
     MotorHomingResponse response = MOTOR_HOMING_RESPONSE__INIT;
     bool last = false;
@@ -97,6 +100,8 @@ uint32_t MotorHomingRequestCallback(uint32_t deviceID, uint32_t ReadValue)
     {
         MCU_E2PromProgram(EEPROM_STORAGE_DRYER_CYCLES,NumberOfCycles);//it takes two cycles to identify a stop of the arm
     }
+    if (HomingToken[deviceID][0] == 0)
+        return OK;
     responseContainer = createContainer(MESSAGE_TYPE__MotorHomingResponse, HomingToken[deviceID], true, &response, &motor_homing_response__pack, &motor_homing_response__get_packed_size);
     responseContainer.has_continuous = true;
     responseContainer.continuous = true;
@@ -286,12 +291,15 @@ uint32_t DispenserHomingProgressReport(uint32_t deviceID, uint32_t ReadValue)
     MessageContainer responseContainer;
     DispenserHomingResponse response = DISPENSER_HOMING_RESPONSE__INIT;
 
+    uint8_t MotorId = deviceID+HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_1;
+    if (HomingToken[MotorId][0] == 0)
+        return OK;
+
     bool last = false;
     response.has_progress = true;
     response.has_maxprogress = true;
     response.maxprogress = 5800000;
     response.progress = IDS_Dispenser_Data[deviceID].consumedinnanolitter;
-    uint8_t MotorId = deviceID+HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_1;
 
     responseContainer = createContainer(MESSAGE_TYPE__DispenserHomingResponse, HomingToken[MotorId], last, &response, &dispenser_homing_response__pack, &dispenser_homing_response__get_packed_size);
     Report("DispenserHomingProgressReport",__FILE__,__LINE__,deviceID,RpMessage,IDS_Dispenser_Data[deviceID].consumedinnanolitter,0);
@@ -322,6 +330,8 @@ uint32_t DispenserHomingRequestCallback(uint32_t deviceID, uint32_t ReadValue)
     //Valve_Set((Valves_t) (DispenserId+VALVE_2W_MID_AIR_8), Atm_MidTank_OFF);
     //MotorSetMicroStep(deviceID, MotorsCfg[deviceID].microstep);
 
+    if (HomingToken[MotorId][0] == 0)
+        return OK;
     responseContainer = createContainer(MESSAGE_TYPE__DispenserHomingResponse, HomingToken[MotorId], true, &response, &dispenser_homing_response__pack, &dispenser_homing_response__get_packed_size);
     responseContainer.has_continuous = true;
     responseContainer.continuous = true;
diff --git a/Software/Embedded_SW/Embedded/Modules/General/process.c b/Software/Embedded_SW/Embedded/Modules/General/process.c
index fafdbed65..8c0bc3e73 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/process.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/process.c
@@ -327,7 +327,7 @@ void ProcessRequestFunc(MessageContainer* requestContainer)
 
     if (status == 0)
         status = HandleProcessParameters(ProcessParams,true);
-    if (status)
+    if ((status)&&(status !=ERROR_CODE__GENERAL_ERROR))
     {
         responseContainer.has_error = true;
         responseContainer.error = (ErrorCode)status;
diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
index 572d16bb4..6c7bb087f 100644
--- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
+++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
@@ -10,9 +10,7 @@
 
 #include "PMR/Diagnostics/CartridgeSlot.pb-c.h"
 #include "PMR/Diagnostics/CartridgeTagContent.pb-c.h"
-#include "common/utilities/RfidTagContent.h"
 #include <Drivers/I2C_Communication/RFID_NFC/RFIDTagInfo.h>
-#include <Utilities/RfidTagContent.h>
 
 #include <DataDef.h>
 #include "include.h"
@@ -41,9 +39,7 @@ MidTank_t IFS_MidTankIsActive(void)
     return (IFS_info.Ink.cart_color);
 }
 
-//RfidTagContent TagContent[MAX_CARTRIDGES];
 NFC_Tag NFCTag[MAX_CARTRIDGES];
-//void TagInitialize(RfidTagContent* TagContent);
 
 void IFS_Init(void)
 {
@@ -54,10 +50,6 @@ void IFS_Init(void)
         memset(NFCTag[i].Buf,0,sizeof(NFCTag[i]));
     }
 }
-/*void TagInitialize(RfidTagContent* TagContent)
-{
-
-}*/
 
 /**
  *