alarm handling improved, including fan alarms

7 files changed, 110 insertions, 129 deletions

diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c
index 95651eba2..0b308408c 100644
--- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c
+++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c
@@ -350,15 +350,15 @@ uint32_t Dryer_Read_Blower_Tach()
     return RPM;
 }
 */
+uint32_t Drayer_Fan_Speed_RPM = 0;
 
+uint32_t Get_Dryer_Fan_Tacho()
+{
+    return Drayer_Fan_Speed_RPM;
+}
 uint32_t Read_Dryer_Fan_Tacho()
 {
-
-    uint32_t Drayer_Fan_Speed_RPM = 0;
-
     Drayer_Fan_Speed_RPM = Calculate_Tacho_Fan_Speed(FPGA_Freq, 12, F1_Prescaler1_reg5, F1_Tacho_reg8);
-
-
     return Drayer_Fan_Speed_RPM;
 }
 
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.h b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.h
index e660b450a..121211c69 100644
--- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.h
+++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.h
@@ -15,6 +15,7 @@ void Control_Dryer_Fan_PWM(uint8_t PWM_Command_Precent);
 void Machine_Idle_Breathing_Led();
 
 uint32_t Read_Dryer_Fan_Tacho();
+uint32_t Get_Dryer_Fan_Tacho();
 
 void Set_Speed_Sensor_TypeII_Registers(uint32_t Counter, uint32_t Prescaler);
 uint32_t Read_Speed_Sensor_TypeII();
diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
index 4a93c6aab..e736d45ea 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
@@ -1,3 +1,4 @@
+
 /*
  * AlarmHandling.c
 
@@ -491,14 +492,14 @@ uint32_t AlarmHandlingLoadFile(void)
                 {
                     FileAlarmItem[F_count].AlarmDirection = AlarmParametersTable->alarmitem[i]->alarmdirection;
                     FileAlarmItem[F_count].AlarmDirection =  AlarmParametersTable->alarmitem[i]->alarmdirection;
-                    FileAlarmItem[F_count].Frequency =       AlarmParametersTable->alarmitem[i]->frequency;  //1/10/100/1000
+                    //FileAlarmItem[F_count].Frequency =       AlarmParametersTable->alarmitem[i]->frequency;  //1/10/100/1000
                     FileAlarmItem[F_count].AlarmSource =     AlarmParametersTable->alarmitem[i]->alarmsource;
                     FileAlarmItem[F_count].DeviceId =        AlarmParametersTable->alarmitem[i]->deviceid;
                     FileAlarmItem[F_count].ModuleDeviceId =  AlarmParametersTable->alarmitem[i]->moduledeviceid;
                     FileAlarmItem[F_count].AlarmValue =      AlarmParametersTable->alarmitem[i]->alarmvalue;
                     FileAlarmItem[F_count].AlarmDirection =  AlarmParametersTable->alarmitem[i]->alarmdirection;
                     FileAlarmItem[F_count].Severity =        AlarmParametersTable->alarmitem[i]->severity;
-                    FileAlarmItem[F_count].Predecessor =     AlarmParametersTable->alarmitem[i]->predecessor;
+                    //FileAlarmItem[F_count].Predecessor =     AlarmParametersTable->alarmitem[i]->predecessor;
                     FileAlarmItem[F_count].DebounceValue =   AlarmParametersTable->alarmitem[i]->debouncevalue;
                     FileAlarmItem[F_count].EventType =       AlarmParametersTable->alarmitem[i]->eventtype;
                     FileAlarmItem[F_count].isPersistent =    AlarmParametersTable->alarmitem[i]->ispersistent;
@@ -1213,29 +1214,8 @@ uint32_t AlarmHandlingLoop(uint32_t tick)
         if (AlarmItem[Alarm_i].AlarmSource > ALARM_SOURCE_TYPE__FluidLevelAlarm)
             continue;
         AlarmCounter++;
-        if (tick%AlarmItem[Alarm_i].Frequency == 0)
+        switch (AlarmItem[Alarm_i].AlarmSource)
         {
-            switch (AlarmItem[Alarm_i].AlarmSource)
-            {
-            /*case ALARM_SOURCE_TYPE__TemperatureAlarm:
-                ivalue = MillisecGetTemperatures((TEMPERATURE_SENSOR_ID_ENUM)AlarmItem[Alarm_i].DeviceId);
-                if (AlarmItem[Alarm_i].AlarmDirection == true)
-                {
-                    if (ivalue/100 >= AlarmItem[Alarm_i].AlarmValue)
-                    {
-                        //LOG_ERROR (ivalue/100,"Temperature spike");
-                        Status = true;
-                    }
-                }
-                else
-                {
-                    if (ivalue/100 <= AlarmItem[Alarm_i].AlarmValue)
-                    {
-                        //LOG_ERROR (ivalue/100,"iTemperature spike");
-                        Status = true;
-                    }
-                }
-                break;*/
             case ALARM_SOURCE_TYPE__CoversAlarm:
                 if (CheckTamperAlarms)
                 {
@@ -1261,14 +1241,6 @@ uint32_t AlarmHandlingLoop(uint32_t tick)
                 if (CheckHardLimitAlarms)
                 {
                     Status =  AlarmState[Alarm_i].Status;
-                    /*if (AlarmItem[Alarm_i].AlarmDirection == true)
-                    {
-                        value = Get_Notification_Disp_UP(AlarmItem[Alarm_i].DeviceId);
-                    }
-                    else
-                    {
-                        value = Get_Notification_Disp_Down(AlarmItem[Alarm_i].DeviceId);
-                    } polling in the safety */
                 }
                 else
                 {
@@ -1422,21 +1394,6 @@ uint32_t AlarmHandlingLoop(uint32_t tick)
                             default:
                                 Status = false;
                         }
-                        /*value = MotorGetStatus((TimerMotors_t)AlarmItem[Alarm_i].DeviceId);
-                        if (AlarmItem[Alarm_i].AlarmDirection == true)
-                        {
-                            if (value && AlarmItem[Alarm_i].AlarmValue)
-                            {
-                                Status = true;
-                            }
-                        }
-                        else
-                        {
-                            if ((value && AlarmItem[Alarm_i].AlarmValue)==false)
-                            {
-                                Status = true;
-                            }
-                        }*/
                     }
                 }
                 else
@@ -1473,7 +1430,7 @@ uint32_t AlarmHandlingLoop(uint32_t tick)
 
             case ALARM_SOURCE_TYPE__TachoAlarm: // add by shai
                 Status = false;
-                if (CheckTamperAlarms)
+                if (CheckMotorAlarms)
                 {
 
 //                ReportWithPackageFilter(AlarmFilter,"------------FANS_RPM[Alarm_i]----------------", __FILE__,__LINE__,Alarm_i, RpMessage, value, 0);
@@ -1560,16 +1517,19 @@ uint32_t AlarmHandlingLoop(uint32_t tick)
                             }
                             else
                             {
-                                value = Read_Dryer_Fan_Tacho();
+
+                                value = Get_Dryer_Fan_Tacho();
                                 if (AlarmItem[Alarm_i].Severity == DEBUG_LOG_CATEGORY__Critical )
-                                    if ((AlarmItem[Alarm_i].AlarmDirection == UNDER_VALUE) && (value == DRYER_FAN_STOP))
+                                {
+                                    if (value == DRYER_FAN_STOP)
                                     {
                                         Status = true;
-                                        //ReportWithPackageFilter(AlarmFilter,"----------- DRYER FAN RPM Error----------------", __FILE__,__LINE__,0, RpMessage, value, 0);
                                     }
+                                    //ReportWithPackageFilter(AlarmFilter,"----------- DRYER FAN RPM ----------------", __FILE__,__LINE__,msec_millisecondCounter, 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))
+                                    if ((value>0)&&(value < DRYER_FAN_MIN_RPM))
                                     {
                                         Status = true;
                                         //ReportWithPackageFilter(AlarmFilter,"----------- DRYER FAN RPM Error----------------", __FILE__,__LINE__,0, RpMessage, value, 0);
@@ -1621,78 +1581,77 @@ uint32_t AlarmHandlingLoop(uint32_t tick)
                 break;
             default:
                 break;
-            } //switch
-            if (AlarmItem[Alarm_i].DebounceValue > 0) //handle debouncing
+        } //switch
+        if (AlarmItem[Alarm_i].DebounceValue > 0) //handle debouncing
+        {
+            if (Status == true) //increase counter
             {
-                if (Status == true) //increase counter
+                AlarmState[Alarm_i].DebounceCounter++;
+                if (AlarmState[Alarm_i].Status == false) // alarm is not set yet
                 {
-                    AlarmState[Alarm_i].DebounceCounter++;
-                    if (AlarmState[Alarm_i].Status == false) // alarm is not set yet
+                    if (AlarmState[Alarm_i].DebounceCounter < AlarmItem[Alarm_i].DebounceValue) //had not reached the debounce value
                     {
-                        if (AlarmState[Alarm_i].DebounceCounter < AlarmItem[Alarm_i].DebounceValue) //had not reached the debounce value
-                        {
-                            Status = false; //do not set the alarm
-                        } //else alarm will be set
-                    }
-                    else // alarm is already set
-                    {
-                        AlarmState[Alarm_i].DebounceCounter = AlarmItem[Alarm_i].DebounceValue; // do not go over the debounce value
-                    }
+                        Status = false; //do not set the alarm
+                    } //else alarm will be set
                 }
-                else //status  == false - decrease counter
+                else // alarm is already set
                 {
-                    AlarmState[Alarm_i].DebounceCounter--;
-                    if (AlarmState[Alarm_i].Status == true) // alarm is set
-                    {
-                        if (AlarmState[Alarm_i].DebounceCounter > 0) // had not reached zero yet
-                        {
-                            Status = true; // do not reset the alarm yet
-                        }   // else reset the alarm
-                    }
-                    else // if the alarm is off
-                    {
-                        AlarmState[Alarm_i].DebounceCounter = 0; //do not go below 0
-                    }
+                    AlarmState[Alarm_i].DebounceCounter = AlarmItem[Alarm_i].DebounceValue; // do not go over the debounce value
                 }
             }
-            /*if (AlarmItem[Alarm_i].Predecessor!=0xFF)
-            {
-                if (AlarmState[AlarmItem[Alarm_i].Predecessor].Status == true)  //higher hierarchy alarm is on
-                    Status = false;
-            }*/
-            if (Status !=  AlarmState[Alarm_i].Status) //change in alarm Status
+            else //status  == false - decrease counter
             {
-                if (Status == true) // alarm on
+                AlarmState[Alarm_i].DebounceCounter--;
+                if (AlarmState[Alarm_i].Status == true) // alarm is set
                 {
-                    // report the alarm!
-                    AlarmState[Alarm_i].EventPtr = my_malloc (sizeof(Event));
-                    if (AlarmState[Alarm_i].EventPtr)
+                    if (AlarmState[Alarm_i].DebounceCounter > 0) // had not reached zero yet
                     {
-                        event__init(AlarmState[Alarm_i].EventPtr);
-                        AlarmState[Alarm_i].EventPtr->has_type = true;
-                        AlarmState[Alarm_i].EventPtr->type = AlarmItem[Alarm_i].EventType;
-                        AlarmState[Alarm_i].EventPtr->message = NULL;//AlarmItem[Alarm_i].EventName;
-                    }
-                    AlarmState[Alarm_i].Status = true;
-                    AlarmHandlingConsequentActions(Alarm_i, AlarmItem[Alarm_i].Severity);
-                    ReportWithPackageFilter(AlarmFilter,"Alarm ON ", __FILE__,__LINE__,AlarmItem[Alarm_i].EventType, RpMessage, value, Alarm_i);
+                        Status = true; // do not reset the alarm yet
+                    }   // else reset the alarm
                 }
-                else // alarm off
+                else // if the alarm is off
                 {
-                    ReportWithPackageFilter(AlarmFilter,"Alarm OFF ", __FILE__,__LINE__,AlarmItem[Alarm_i].EventType, RpMessage, 0, Alarm_i);
-                    if (AlarmState[Alarm_i].EventPtr)
-                    {
-                        //ROM_IntMasterDisable();
-                        Save_Alarm_i = Alarm_i;
-                        Save_Alarm_ptr = AlarmState[Alarm_i].EventPtr;
-                        Save_Alarm_Type = AlarmItem[Alarm_i].EventType;
-                        my_free(AlarmState[Alarm_i].EventPtr);
-                        AlarmState[Alarm_i].EventPtr = NULL;
-                        //ROM_IntMasterEnable();
-                    }
-                    AlarmState[Alarm_i].Status = false;
-                    AlarmHandlingConsequentActions(Alarm_i, DEBUG_LOG_CATEGORY__Info);
+                    AlarmState[Alarm_i].DebounceCounter = 0; //do not go below 0
+                }
+            }
+        }
+        /*if (AlarmItem[Alarm_i].Predecessor!=0xFF)
+        {
+            if (AlarmState[AlarmItem[Alarm_i].Predecessor].Status == true)  //higher hierarchy alarm is on
+                Status = false;
+        }*/
+        if (Status !=  AlarmState[Alarm_i].Status) //change in alarm Status
+        {
+            if (Status == true) // alarm on
+            {
+                // report the alarm!
+                AlarmState[Alarm_i].EventPtr = my_malloc (sizeof(Event));
+                if (AlarmState[Alarm_i].EventPtr)
+                {
+                    event__init(AlarmState[Alarm_i].EventPtr);
+                    AlarmState[Alarm_i].EventPtr->has_type = true;
+                    AlarmState[Alarm_i].EventPtr->type = AlarmItem[Alarm_i].EventType;
+                    AlarmState[Alarm_i].EventPtr->message = NULL;//AlarmItem[Alarm_i].EventName;
+                }
+                AlarmState[Alarm_i].Status = true;
+                AlarmHandlingConsequentActions(Alarm_i, AlarmItem[Alarm_i].Severity);
+                ReportWithPackageFilter(AlarmFilter,"Alarm ON ", __FILE__,__LINE__,AlarmItem[Alarm_i].EventType, RpMessage, value, Alarm_i);
+            }
+            else // alarm off
+            {
+                ReportWithPackageFilter(AlarmFilter,"Alarm OFF ", __FILE__,__LINE__,AlarmItem[Alarm_i].EventType, RpMessage, 0, Alarm_i);
+                if (AlarmState[Alarm_i].EventPtr)
+                {
+                    //ROM_IntMasterDisable();
+                    Save_Alarm_i = Alarm_i;
+                    Save_Alarm_ptr = AlarmState[Alarm_i].EventPtr;
+                    Save_Alarm_Type = AlarmItem[Alarm_i].EventType;
+                    my_free(AlarmState[Alarm_i].EventPtr);
+                    AlarmState[Alarm_i].EventPtr = NULL;
+                    //ROM_IntMasterEnable();
                 }
+                AlarmState[Alarm_i].Status = false;
+                AlarmHandlingConsequentActions(Alarm_i, DEBUG_LOG_CATEGORY__Info);
             }
         }
     }
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 689219583..1057ddbc3 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -610,21 +610,21 @@ uint32_t MillisecLowLoop(uint32_t tick)
     //call all modules Millisec functions
     //test dancers and speed encoders
     //check all callback units (state machine waiting for completion of a change)
-    bool Ten_msTick, Fifty_msTick, Hundred_msTick , m20msecTick,m70msecTick,m90msecTick, Onesecond_Tick,Tensecond_Tick,OneMinute_Tick,TenMinutes_Tick,OneHourTick,Gradient_Tick;
-    bool O700Millisecond_Tick,O200Millisecond_Tick,O400Millisecond_Tick,O500Millisecond_Tick,O600Millisecond_Tick;
+    bool Ten_msTick, Fifty_msTick, Hundred_msTick , m20msecTick,m90msecTick, Onesecond_Tick,Tensecond_Tick,OneMinute_Tick,TenMinutes_Tick,OneHourTick,Gradient_Tick;
+    bool O700Millisecond_Tick,O200Millisecond_Tick,O400Millisecond_Tick,O500Millisecond_Tick,O600Millisecond_Tick,O800Millisecond_Tick;
     //bool O100Millisecond_Tick,O200Millisecond_Tick,O400Millisecond_Tick,O500Millisecond_Tick,O600Millisecond_Tick,O800Millisecond_Tick,O900Millisecond_Tick;
     Ten_msTick      =   (tick%eTenMillisecond == 0)      ?true:false;
     Fifty_msTick      =   (tick%eHundredMillisecond == 40)      ?true:false; //eFiftyMillisecond
     Hundred_msTick  =   (tick%eHundredMillisecond == 0)  ?true:false;
     m20msecTick  =   (tick%eHundredMillisecond == 20)  ?true:false;
-    m70msecTick  =   (tick%eHundredMillisecond == 70)  ?true:false;
+    //m70msecTick  =   (tick%eHundredMillisecond == 70)  ?true:false;
     m90msecTick  =   (tick%eHundredMillisecond == 90)  ?true:false;
     O700Millisecond_Tick  =   (tick%eOneSecond == 700)           ?true:false;
     O200Millisecond_Tick  =   (tick%eOneSecond == 200)           ?true:false;
     O400Millisecond_Tick  =   (tick%eOneSecond == 400)           ?true:false;
     O500Millisecond_Tick  =   (tick%eOneSecond == 500)           ?true:false;
     O600Millisecond_Tick  =   (tick%eOneSecond == 600)           ?true:false;
-    //O800Millisecond_Tick  =   (tick%eOneSecond == 800)           ?true:false;
+    O800Millisecond_Tick  =   (tick%eOneSecond == 800)           ?true:false;
     //O900Millisecond_Tick  =   (tick%eOneSecond == 900)           ?true:false;
     Gradient_Tick  =   (tick%400 == 0)           ?true:false;
     Onesecond_Tick  =   (tick%eOneSecond == 0)           ?true:false;
@@ -660,10 +660,10 @@ uint32_t MillisecLowLoop(uint32_t tick)
         Trigger_PT100_Read();//call every 50mSec (minimum delay 30mSec)
         //Set_HeadCard_PT100();//call every 50mSec (minimum delay 30mSec)
     }
-    if(m70msecTick)
+    /*if(m70msecTick)
     {
         AlarmHandling_ControlTrigger(0,0);
-    }
+    }*/
     if (m90msecTick)
     {
         for (Sensor_i = StartPT100;Sensor_i < MAX_HEAD_CARD_TEMP_SENS_ID;Sensor_i++)
@@ -717,14 +717,11 @@ uint32_t MillisecLowLoop(uint32_t tick)
     }
     if (Gradient_Tick)
         DispensersCollectionCall();
-    if (O700Millisecond_Tick)
-    {
-        Trigger_Heater_Current_Read();
-    }
     if (O200Millisecond_Tick)
     {
         Trigger_WHS_MAX11614_Read_allADC();
         FPGA_GetAllDispensersValveBusyOCD();
+        Read_Dryer_Fan_Tacho();
         temp = Read_Fans_Tacho();
         DrawerFansStatus = temp & 0x1F;
         SystemFansStatus = temp & 0xE0;
@@ -755,6 +752,14 @@ uint32_t MillisecLowLoop(uint32_t tick)
             }
         }
     }
+    if (O700Millisecond_Tick)
+    {
+        Trigger_Heater_Current_Read();
+    }
+    if (O800Millisecond_Tick)
+    {
+        AlarmHandling_ControlTrigger(0,0);
+    }
     if (Onesecond_Tick)
     {
         //char Lenstr[160];
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
index ba4749f13..59a0aee51 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
@@ -316,14 +316,15 @@ void HeadBlowersControlLoop ()
     int blowerId;
     static int count[2] = {0, 0};
 
-    ArcHeadAlarms();
-
     if (GetMachineState() < MACHINE_STATE_WAIT_FOR_COOLER)
         return; //do not start before controller is initialized and running
 
     if (!HeadBlowersEnable) {
         return;
     }
+
+    ArcHeadAlarms();
+
     for (blowerId = 0; blowerId <= 1; blowerId++) {
         if (count[blowerId] == HeadBlowersCloseLoopTime[blowerId]) {
             count[blowerId] = 0;
@@ -377,6 +378,8 @@ double PressureSensorGetPressure(uint8_t SensorId)
     V0 = PressureSensorV0[FanId];
     Vm = (double)(MillisecGetTemperatures(SensorId));
     Vm /= 10.0;
+    if ((Vm - V0 + 22)<0)
+        return 0.0;
     Q = sqrt(Vm - V0 + 22) * PRESSURE_SENSOR_CP - PRESSURE_SENSOR_B;
     return Q;
 }
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index b9b916eb6..5b216d25c 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -1233,6 +1233,19 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
         response.has_progress = true;
     }
     else
+    if(request->amount == 0xB23)  //Set loading arm cycles
+    {
+        REPORT_MSG(request->delay,"Control dryer fan tacho");
+        if (request->delay>0)
+            Control_Dryer_Fan(START,request->delay);//use START or STOP,  0 - 100%();
+        else
+            Control_Dryer_Fan(STOP,0);//use START or STOP,  0 - 100%();
+        Task_sleep(1000);
+
+        response.progress = (double)Get_Dryer_Fan_Tacho();
+        response.has_progress = true;
+    }
+    else
     if(request->amount == 0xC3)  //suspend I2C task
     {
         if (request->delay == 0)
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c
index 40315e623..d5e125337 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c
@@ -249,7 +249,7 @@ uint32_t InitSequenceBlowerCallBackFunction(uint32_t IfIndex, uint32_t BusyFlag)
 
     WHS_enable_control_loop(true);
     WHS_Set_SetPoint_Q_value(headairflow);
-    AlarmHandlingSetAlarm (EVENT_TYPE__MACHINE_STATE_INITIAL_BLOWER_FAILED,OFF);  //handle alarm detection and operation
+    //AlarmHandlingSetAlarm (EVENT_TYPE__MACHINE_STATE_INITIAL_BLOWER_FAILED,OFF);  //handle alarm detection and operation
 
     waste_seq_step1();// include 1Sec delay           <- to open !!!!