Veraion 1.4.6.10 improve current reading, fir I2C interface, improve (?) task priorities

8 files changed, 80 insertions, 32 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
index d1fd48b32..caa3e8df4 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
@@ -66,7 +66,6 @@ uint32_t AlarmHandlingControlId = 0xFF;
 uint32_t AlarmHandlingTick = 0;
 
 double     CurrentAlarmHighLimit ,CurrentAlarmLowLimit;
-
 bool    CheckHardLimitAlarms = false,CheckCurrentAlarms = false,CheckTamperAlarms = false,CheckMotorAlarms = false;
 uint8_t alarm_response_buffer[500];
 
@@ -837,6 +836,13 @@ JobEndReasonEnum AlarmHandlingPrepareJob(void *CurrentJob)
     }
     for (Alarm_i = 0;Alarm_i<NumOfSystemAlarms;Alarm_i++)
     {
+        if ((AlarmState[Alarm_i].Status == true)&&(AlarmItem[Alarm_i].Severity == DEBUG_LOG_CATEGORY__Critical))
+        {
+            status = JOB_SAFETY_CRITICAL_ALARM;
+            ReportWithPackageFilter(AlarmFilter,"critical alarm preventing job", __FILE__,__LINE__,AlarmItem[Alarm_i].EventType, AlarmItem[Alarm_i].Severity, AlarmItem[Alarm_i].DeviceId, 0);
+            AlarmId = Alarm_i;
+            break;
+        }
 
         if (AlarmItem[Alarm_i].AlarmSource == ALARM_SOURCE_TYPE__CoversAlarm)
         {
@@ -1151,24 +1157,31 @@ uint32_t AlarmHandlingLoop(uint32_t tick)
                  {
                     if (AlarmItem[Alarm_i].ModuleDeviceId == 0xFF)
                     {
-                        if (Get_Heaters_Current_float(AlarmItem[Alarm_i].DeviceId, &doubleValue) == OK)
+                        if (LoadHeaterSetPoint(HEATER_TYPE__DryerAirHeater) <= 2)
+                        {
+                            Status = false;
+                        }
+                        else
                         {
-                            if (AlarmItem[Alarm_i].AlarmDirection == true)
+                            if (Get_Heaters_Current_float(AlarmItem[Alarm_i].DeviceId, &doubleValue) == OK)
                             {
-                                if ((doubleValue >= (float)(AlarmItem[Alarm_i].AlarmValue*CurrentAlarmHighLimit)) || (doubleValue <= (float)(AlarmItem[Alarm_i].AlarmValue*CurrentAlarmLowLimit)))
+                                if (AlarmItem[Alarm_i].AlarmDirection == true)
                                 {
-                                    Status = true;
-                                    if (AlarmState[Alarm_i].Status == false)
-                                        ReportWithPackageFilter(AlarmFilter,"OverCurrent Alarm ON ", __FILE__,AlarmItem[Alarm_i].DeviceId,(int)(AlarmItem[Alarm_i].AlarmValue*100), RpMessage, (int)(doubleValue*100), 0);
+                                    if ((doubleValue >= (float)(AlarmItem[Alarm_i].AlarmValue*CurrentAlarmHighLimit)) || (doubleValue <= (float)(AlarmItem[Alarm_i].AlarmValue*CurrentAlarmLowLimit)))
+                                    {
+                                        Status = true;
+                                        if (AlarmState[Alarm_i].Status == false)
+                                            ReportWithPackageFilter(AlarmFilter,"OverCurrent Alarm ON ", __FILE__,AlarmItem[Alarm_i].DeviceId,(int)(AlarmItem[Alarm_i].AlarmValue*100), RpMessage, (int)(doubleValue*100), 0);
+                                    }
                                 }
-                            }
-                            else
-                            {
-                                if (doubleValue <= 0.1)
+                                else
                                 {
-                                    Status = true;
-                                    if (AlarmState[Alarm_i].Status == false)
-                                        ReportWithPackageFilter(AlarmFilter,"loop break Alarm ON ", __FILE__,AlarmItem[Alarm_i].DeviceId,(int)(AlarmItem[Alarm_i].AlarmValue*100), RpMessage, (int)(doubleValue*100), 0);
+                                    if (doubleValue <= 0.1)
+                                    {
+                                        Status = true;
+                                        if (AlarmState[Alarm_i].Status == false)
+                                            ReportWithPackageFilter(AlarmFilter,"loop break Alarm ON ", __FILE__,AlarmItem[Alarm_i].DeviceId,(int)(AlarmItem[Alarm_i].AlarmValue*100), RpMessage, (int)(doubleValue*100), 0);
+                                    }
                                 }
                             }
                         }
@@ -1266,7 +1279,7 @@ uint32_t AlarmHandlingLoop(uint32_t tick)
 
             case ALARM_SOURCE_TYPE__TachoAlarm: // add by shai
                 Status = false;
-                if (CheckCurrentAlarms)
+                if (CheckTamperAlarms)
                 {
 
 //                ReportWithPackageFilter(AlarmFilter,"------------FANS_RPM[Alarm_i]----------------", __FILE__,__LINE__,Alarm_i, RpMessage, value, 0);
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 48c7c3f5e..e5064ef70 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -579,7 +579,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
     //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,OneMinute_Tick,OneHourTick,Gradient_Tick;
-    bool O100Millisecond_Tick,O200Millisecond_Tick,O400Millisecond_Tick,O500Millisecond_Tick,O600Millisecond_Tick;
+    bool O700Millisecond_Tick,O200Millisecond_Tick,O400Millisecond_Tick,O500Millisecond_Tick,O600Millisecond_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
@@ -587,7 +587,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
     m20msecTick  =   (tick%eHundredMillisecond == 20)  ?true:false;
     m70msecTick  =   (tick%eHundredMillisecond == 70)  ?true:false;
     m90msecTick  =   (tick%eHundredMillisecond == 90)  ?true:false;
-    O100Millisecond_Tick  =   (tick%eOneSecond == 100)           ?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;
@@ -663,7 +663,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
     }
     if (Gradient_Tick)
         DispensersCollectionCall();
-    if (O100Millisecond_Tick)
+    if (O700Millisecond_Tick)
     {
         Trigger_Heater_Current_Read();
     }
@@ -705,8 +705,8 @@ uint32_t MillisecLowLoop(uint32_t tick)
         MachineUpdateResponseFunc();
         //KeepAliveOneSecondCall();
 
-        TemperatureListString(Lenstr);
-        ReportWithPackageFilter(ThreadFilter,Lenstr,__FILE__,__LINE__,(int)Counter++,RpWarning,(int) msec_millisecondCounter,0);
+        //TemperatureListString(Lenstr);
+        //ReportWithPackageFilter(ThreadFilter,Lenstr,__FILE__,__LINE__,(int)Counter++,RpWarning,(int) msec_millisecondCounter,0);
         for (Sensor_i = StartPT100;Sensor_i < MAX_HEAD_CARD_TEMP_SENS_ID;Sensor_i++)
         {
             TemperatureCalc[Sensor_i] =  MillisecCalculateTemperatures ( Sensor_i);
@@ -718,10 +718,10 @@ uint32_t MillisecLowLoop(uint32_t tick)
                 PressureCalc[Disp_i] = MillisecCalculatePressures(Disp_i);
             }
         }
-    Trigger_WHS_PT100_Read_All();
-    Trigger_WHS_MAX11614_Read_allADC();
+        Trigger_WHS_PT100_Read_All();
+        Trigger_WHS_MAX11614_Read_allADC();
 //    WHS_Blower_Avarege_ORF1(); //drier
-    WHS_Blower_Avarege_ORF3(); //head
+        WHS_Blower_Avarege_ORF3(); //head
         Trigger_WHSReadAllFanTacho ();
     }
     if (OneMinute_Tick)
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.c b/Software/Embedded_SW/Embedded/Modules/Control/control.c
index 5adf6f83d..a6540bc81 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/control.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/control.c
@@ -576,8 +576,8 @@ uint32_t ControlLowLoop(uint32_t tick)
     if (tick-prevtick>1)
     {
         skipped_ticks = tick-prevtick-1;
-        if (tick-prevtick>10)
-            Report("ControlLowLoop skipped",__FILE__,tick,(int)prevtick,RpWarning,(int)skipped_ticks,0);
+        //if (tick-prevtick>10)
+         //   Report("ControlLowLoop skipped",__FILE__,tick,(int)prevtick,RpWarning,(int)skipped_ticks,0);
     }
     prevtick = tick;
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index bb8f5d994..f1538197b 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -461,7 +461,7 @@ void DiagnosticOneMinuteCollection(void)
 
     for (i=0;i<NUM_OF_CURRENT_HEATERS;i++)
     {
-        if (Read_Head_MixChip_Heaters_Current(i) == true)
+        if (Get_Heater_Current_Reading_State(i) == true)
         {
             HeatersCurrent[i][0] = Get_Heaters_Current(i);
             switch(i)
@@ -542,7 +542,16 @@ void DiagnosticOneSecCollection(void)
         DiagnosticsMonitor.whsblower2voltage = &AcVoltage;
         DiagnosticsMonitor.n_whsblower2voltage = 1;
     }
+    if (WHS_Type == WHS_TYPE_NEW) //rapid/pp machines
+    {
+        DrierFlowMeter = GetWHSAirFlow(DRIER_FLOW_METER);
+        DiagnosticsMonitor.n_dryerairflow = 1;
+        DiagnosticsMonitor.dryerairflow = &DrierFlowMeter;
 
+        HeadFlowMeter = GetWHSAirFlow(HEAD_FLOW_METER);
+        DiagnosticsMonitor.n_headairflow = 1;
+        DiagnosticsMonitor.headairflow = &HeadFlowMeter;
+    }
     if (Head_Type == HEAD_TYPE_SYLKO_WITHOUT_CARD)
     {
         DiagnosticLoadTemperature(HARDWARE_PID_CONTROL_TYPE__MixerHeater, MillisecGetTemperatures( MIXER_PT100));
@@ -616,7 +625,7 @@ void Diagnostic100msecCollection(void)
             dispenserspressure[i][DiagnosticsIndex] = GetDispenserPressure(i); //Read_MidTank_Pressure_Sensor
         }
     }
-    if (DiagnosticMode == Diagnostic_Extreme_Mode)
+    //if (DiagnosticMode == Diagnostic_Extreme_Mode)
     {
         for (i=0;i<NUM_OF_CURRENT_HEATERS;i++)
         {
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index 079903a1c..5f7505e24 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -441,7 +441,7 @@ uint32_t HeatersSingleHeaterEnd(int HeaterId)
             HeaterCmd[HeaterId].targettemperatue = 0;
             HeaterReady[HeaterId] = true;
             HeaterAtTemp[HeaterId] = true;
-            Disable_Reading_Heaters_Current(HeaterId2CurrentId[HeaterId]);
+            //Disable_Reading_Heaters_Current(HeaterId2CurrentId[HeaterId]);
         }
         else if (HeaterId < MAX_AC_HEATERS) //AC Heaters
         {
@@ -1333,7 +1333,7 @@ uint32_t DCHeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
             //DCInitialHeating[index] = false;
             HeatersControlStart();
             AlarmHandlingSetAlarm(HeaterUnderEventType[index], false);
-            Disable_Reading_Heaters_Current(HeaterId2CurrentId[index]);
+           // Disable_Reading_Heaters_Current(HeaterId2CurrentId[index]);
             HeaterReady[index] = true;
         }
         return OK;
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
index 8e01ee810..04abb6870 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -519,7 +519,7 @@ uint32_t InactiveDispenserHome(uint32_t DispenserId, uint32_t ReadValue)
              if (DispenserUsedInJob[i] == true) //we actually should check for all dispensers
              {
                  HW_Motor_Id = DispenserIdToMotorId[i];
-                 if (GetDispenserPressure(i) > DispenserPreparePressure)
+                 if (GetDispenserPressure(i) > DispenserPreparePressure*1.02)
                  {
                      NumofReadyDispensers++;
                      CurrentDispenserSpeed[i] = 0;
@@ -528,7 +528,7 @@ uint32_t InactiveDispenserHome(uint32_t DispenserId, uint32_t ReadValue)
                      //Report("IDS stopped ready",__FILE__,i,(int)(DispenserPreparePressure*100),RpWarning,(int)NumofReadyDispensers,0);
 #else
                      tempSpeed = CurrentDispenserSpeed[i];
-                     updatedSpeed = (tempSpeed*0.985>100)?tempSpeed*0.985:100;
+                     updatedSpeed = (tempSpeed*0.992>100)?tempSpeed*0.992:100;
                      MotorSetSpeed(HW_Motor_Id, updatedSpeed);
                      CurrentDispenserSpeed[i] = updatedSpeed;
                      //Report("IDS reduce speed",__FILE__,i,(int)tempSpeed,RpWarning,(int)updatedSpeed,0);
@@ -543,7 +543,7 @@ uint32_t InactiveDispenserHome(uint32_t DispenserId, uint32_t ReadValue)
 #else
                      tempSpeed = CurrentDispenserSpeed[i];
 #endif
-                     updatedSpeed = (tempSpeed*1.02<InitialDispenserSpeed)?tempSpeed*1.02:InitialDispenserSpeed;
+                     updatedSpeed = (tempSpeed*1.03<InitialDispenserSpeed)?tempSpeed*1.03:InitialDispenserSpeed;
                      MotorSetSpeed(HW_Motor_Id, updatedSpeed);
                      CurrentDispenserSpeed[i] = updatedSpeed;
 #ifdef SPECIAL_DISPENSERS
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index f87aa2eda..e968717e3 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -587,7 +587,25 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
         response.has_progress = true;
 
     }
+    else
+    if(request->amount == 0xC3)  //suspend I2C task
+    {
+        if (request->delay == 0)
+        {
+            LOG_ERROR(request->delay,"Suspend I2C");
+            PowerOffHeatersOff();
+            Task_sleep(1000);
+            Task_setPri (I2C_Task_Handle,-1);
+        }
+        else
+        {
+            LOG_ERROR(request->delay,"Resume");
+            Task_setPri (I2C_Task_Handle,8);
+        }
+        response.progress = request->delay;
+        response.has_progress = true;
 
+    }
     else     
 	if((request->amount == 0xDF) && (request->delay == 0xDF)) //Power off
     {
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
index aa090625c..4ab59ec19 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
@@ -180,6 +180,14 @@
         ProcessParametersClear.headzone4temp  = 0;
         ProcessParametersClear.headzone5temp  = 0;
         ProcessParametersClear.headzone6temp  = 0;
+        ProcessParametersClear.headzone7temp  = 0;
+        ProcessParametersClear.headzone8temp  = 0;
+        ProcessParametersClear.headzone9temp  = 0;
+        ProcessParametersClear.headzone10temp  = 0;
+        ProcessParametersClear.headzone11temp  = 0;
+        ProcessParametersClear.headzone12temp  = 0;
+        ProcessParametersClear.stspzone1temp  = 0;
+        ProcessParametersClear.stspzone2temp  = 0;
         ProcessParametersClear.dyeingspeed = 40;
         ProcessParametersClear.dryerbufferlength = ProcessParametersKeep.dryerbufferlength;
         if (HandleProcessParameters(&ProcessParametersClear,false)!= OK)