some changes for rapid first print

5 files changed, 12 insertions, 11 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..b9cef250b 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);
+        //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);
+        //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);
+        //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);
+        //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..ca3ef7c63 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
@@ -151,7 +151,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_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..f00d6c6ed 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
@@ -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));