Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

9 files changed, 31 insertions, 30 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
index ef9f2fffb..8f3cde15f 100644
--- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c
+++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
@@ -481,6 +481,6 @@ STATUS ReportInit(ReportInitParams InitParams)
     InitFilter  = ReportAddFilterPackage("Init");
     MaintFilter  = ReportAddFilterPackage("Maint");
 //    Filter  = ReportAddFilterPackage("");
-    //ReportSwitchPackageFilter(WasteFilter,REPORT_OFF);
+    ReportSwitchPackageFilter(WasteFilter,REPORT_OFF);
     return status;
 }
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/EEPROM/Head_EEPROM.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/EEPROM/Head_EEPROM.c
index 9b17ae0dd..a3de380b4 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/EEPROM/Head_EEPROM.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/EEPROM/Head_EEPROM.c
@@ -125,6 +125,7 @@ uint32_t Check_Head_Type_Via_EEPROM()
         Head_struct.Read_Head_EEPROM.bytes.HeadType = Read_Buf[1]; //HEAD_TYPE_SYLKO / HEAD_TYPE_STAPLE_SPUN
 
         Head_Type = Head_struct.Read_Head_EEPROM.bytes.HeadType;
+        Head_Type = HEAD_TYPE_SYLKO;
     }
 
     return status;
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/D_EMC2302_fan.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/D_EMC2302_fan.c
index 24f5fdb5b..cc61998a3 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/D_EMC2302_fan.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/D_EMC2302_fan.c
@@ -322,19 +322,19 @@ uint8_t D_Fan_Read_Tacho_HIGH(uint8_t EMC2302_I2C_bus_number ,uint8_t EMC2302_I2
     {
         writebuffer = EMC2301_TACH_1_READING_HIGH;
         status = I2C_Write(EMC2302_I2C_bus_number, EMC2302_I2C_addr, &writebuffer, 1);
-        ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_HIGH W (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0);
+        //ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_HIGH W (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0);
         delayUs(10);//TODO - check the delay
-        status = I2C_Read(EMC2302_I2C_bus_number, EMC2302_I2C_addr + 1, p_data, 1);
-        ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_HIGH R (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0);
+        status |= I2C_Read(EMC2302_I2C_bus_number, EMC2302_I2C_addr + 1, p_data, 1);
+        //ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_HIGH R (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0);
     }
     else
     {
         writebuffer = EMC2301_TACH_2_READING_HIGH;
         status = I2C_Write(EMC2302_I2C_bus_number, EMC2302_I2C_addr, &writebuffer, 1);
-        ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_HIGH W (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0);
+        //ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_HIGH W (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0);
         delayUs(10);//TODO - check the delay
-        status = I2C_Read(EMC2302_I2C_bus_number, EMC2302_I2C_addr + 1, p_data, 1);
-        ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_HIGH R (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0);
+        status |= I2C_Read(EMC2302_I2C_bus_number, EMC2302_I2C_addr + 1, p_data, 1);
+        //ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_HIGH R (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0);
     }
 
     return status;
@@ -349,19 +349,19 @@ uint8_t D_Fan_Read_Tacho_LOW(uint8_t EMC2302_I2C_bus_number ,uint8_t EMC2302_I2C
     {
         writebuffer = EMC2301_TACH_1_READING_LOW;
         status = I2C_Write(EMC2302_I2C_bus_number, EMC2302_I2C_addr, &writebuffer, 1);
-        ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_LOW W (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0);
+        //ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_LOW W (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0);
         delayUs(10);//TODO - check the delay
-        status = I2C_Read(EMC2302_I2C_bus_number, EMC2302_I2C_addr + 1, p_data, 1);
-        ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_LOW R (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0);
+        status |= I2C_Read(EMC2302_I2C_bus_number, EMC2302_I2C_addr + 1, p_data, 1);
+        //ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_LOW R (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0);
     }
     else
     {
         writebuffer = EMC2301_TACH_2_READING_LOW;
         status = I2C_Write(EMC2302_I2C_bus_number, EMC2302_I2C_addr, &writebuffer, 1);
-        ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_LOW W (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0);
+        //ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_LOW W (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0);
         delayUs(10);//TODO - check the delay
-        status = I2C_Read(EMC2302_I2C_bus_number, EMC2302_I2C_addr + 1, p_data, 1);
-        ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_LOW R (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0);
+        status |= I2C_Read(EMC2302_I2C_bus_number, EMC2302_I2C_addr + 1, p_data, 1);
+        //ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_LOW R (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0);
     }
 
     return status;
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.c
index db8698837..2debef0d6 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.c
@@ -127,9 +127,7 @@ bool WHS_Read_fan_tach(WHS_fan_num fan_number)
     Select_WHS_Fan_Mux_Channel(fan_number);
 
     status |= D_Fan_Read_Tacho_HIGH(I2C_ID_WHS_CARD ,I2CFanViaSwitch_ADDRESS, !(fan_number & 0x01), &(D_EMC2302_Read[fan_driver].Reg.TACHReading_High[!(fan_number & 0x01)]));
-    delayUs(10);//TODO - check the delay
     status |= D_Fan_Read_Tacho_LOW (I2C_ID_WHS_CARD ,I2CFanViaSwitch_ADDRESS, !(fan_number & 0x01), &(D_EMC2302_Read[fan_driver].Reg.TACHReading_Low [!(fan_number & 0x01)]));
-    delayUs(10);//TODO - check the delay
 
     return status;
 }
@@ -151,7 +149,7 @@ void Read_All_WHS_Fans_Tach()
 {
     WHS_fan_num fan_number=0;
 
-    for (fan_number = FAN1 ; fan_number < maxFAN; fan_number++)
+    for (fan_number = FAN1 ; fan_number < FAN5/*maxFAN*/; fan_number++)
     {
             WHS_Read_fan_tach(fan_number);
     }
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.h b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.h
index 72d63d28e..8e3502f0a 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.h
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.h
@@ -25,9 +25,9 @@ bool get_cur_vlv1(uint16_t *value);
 
 typedef enum
 {
-    DRIER_FLOW_METER = 0,
+    HEAD_FLOW_METER = 0,
     NU_FLOW_METER,
-    HEAD_FLOW_METER
+    DRIER_FLOW_METER
 }WHS_Flow_Meter;
 
 
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c
index 5c8cf5cfb..22c409a05 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c
@@ -30,7 +30,7 @@ double average_Q_orifice1;
 double average_Q_orifice3;
 bool ORF1_flageNewBlowerValue;
 bool ORF3_flageNewBlowerValue;
-double SetPoint_Q = 5.0;
+double SetPoint_Q = 7.0;
 bool CofigurationFlow = 1;
 
 int32_t i2c_smbus_write_word_data(int i2cFileDescriptor, uint8_t command_regAddress, uint16_t regValue)
@@ -326,7 +326,7 @@ bool WHS_Set_Blower_Control_Closed_Loop(double SetPoint_Q)
 
     uint16_t volt;
 double tmp = 0.0;
-    current_dying_head_flow_Q = get_average_ORF3_Q();
+    current_dying_head_flow_Q = get_average_ORF1_Q();
     ReportWithPackageFilter(WasteFilter,"------------ current_dying_head_flow_Q =-----------------", __FILE__,__LINE__, current_dying_head_flow_Q, RpMessage, 0, 0);
     ReportWithPackageFilter(WasteFilter,"------------ SET_DYEING_HEAD_ORRIFFICE_SENSOR =-----------------", __FILE__,__LINE__, SET_DYEING_HEAD_ORRIFFICE_SENSOR, RpMessage, current_dying_head_flow_Q, 0);
     tmp = fabs((current_dying_head_flow_Q*10) - (SetPoint_Q*10));
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index 0764b2028..8ee9b06ae 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -722,6 +722,13 @@ void DiagnosticOneSecCollection(void)
         DiagnosticsMonitor.n_headairflow = 1;
         DiagnosticsMonitor.headairflow = &HeadFlowMeter;
     }
+    HeatersCurrent[HEATER_DRYER_CURRENT_1][0] = Get_Heaters_Current(HEATER_DRYER_CURRENT_1);
+    HeatersCurrent[HEATER_DRYER_CURRENT_2][0] = Get_Heaters_Current(HEATER_DRYER_CURRENT_2);
+    DiagnosticsMonitor.n_drierzone1heatercurrent = 1;
+    DiagnosticsMonitor.drierzone1heatercurrent = HeatersCurrent[HEATER_DRYER_CURRENT_1];
+    DiagnosticsMonitor.n_drierzone2heatercurrent = 1;
+    DiagnosticsMonitor.drierzone2heatercurrent = HeatersCurrent[HEATER_DRYER_CURRENT_2];
+
     if (Head_Type == HEAD_TYPE_SYLKO_WITHOUT_CARD)
     {
         DiagnosticLoadTemperature(HARDWARE_PID_CONTROL_TYPE__MixerHeater, MillisecGetTemperatures( MIXER_PT100));
@@ -796,11 +803,6 @@ void Diagnostic100msecCollection(void)
         }
     }
 
-    DiagnosticsMonitor.n_drierzone1heatercurrent = 1;
-    HeatersCurrent[HEATER_DRYER_CURRENT_1][0] = Get_Heaters_Current(HEATER_DRYER_CURRENT_1);
-    DiagnosticsMonitor.n_drierzone2heatercurrent = 1;
-    HeatersCurrent[HEATER_DRYER_CURRENT_2][0] = Get_Heaters_Current(HEATER_DRYER_CURRENT_2);
-
    /*dispenser1motorfrequency[DiagnosticsIndex] = MotorGetSpeed(HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_1);
      dispenser2motorfrequency[DiagnosticsIndex] = MotorGetSpeed(HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_2);
      dispenser3motorfrequency[DiagnosticsIndex] = MotorGetSpeed(HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_3);
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c
index 92ab2b43c..20780b8c1 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c
@@ -239,7 +239,10 @@ bool DetectIfCurrentReadingStable(double HeaterCurrent)
     int average = 0;
 
     Maxcount_Heater_Current++;
+    //ReportWithPackageFilter(InitFilter,"DetectIfCurrentReadingStable", __FILE__,GetHeaterState(HEATER_TYPE__DryerMainHeater),(int)(HeaterCurrent*100), RpMessage, Maxcount_Heater_Current, 0);
     Heater_Current[count_Heater_Current++] = HeaterCurrent;
+    //if (HeaterCurrent<1)
+    //    return false;
     if ( count_Heater_Current >= MAX_CURRENT_READING)
         {
             count_Heater_Current = 0;
@@ -353,6 +356,7 @@ uint32_t InitSequenceInitialBlowerActivation(void)
 //        Control_Voltage_To_Blower(BlowerCfg.voltage);
 //    else
         Control_Voltage_To_Blower(4200);
+    Set_All_WHS_Fans(200);
     HWControlId = AddControlCallback("Init Blower", InitSequenceBlowerCallBackFunction, 10* eOneSecond, TemplateDataReadCBFunction,0,0, 0 );
     /*if (RdInkCartridgeSensor()) //if there is a cartridge in the ink slot skip the valves procedure
     {
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c
index 5cc94a909..d737b3172 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c
@@ -91,11 +91,7 @@ uint32_t PowerOffScheduler(uint32_t IfIndex, uint32_t BusyFlag)
         StoredMachineState = PowerOffMachineState;
         PowerOffSequenceStateMachine (PowerOffMachineState);
     }
-    if (UpdateCounter++ >= UPDATE_TIMEOUT)
-    {
-        UpdateCounter = 0;
-        PowerDownUpdate(PowerOffMachineState);
-    }
+    PowerDownUpdate(PowerOffMachineState);
     return OK;
 }
 /*******************************************************************************************************/