merge conflict

2 files changed, 17 insertions, 13 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c
index 65c124cbd..2a49effc4 100644
--- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c
@@ -733,13 +733,11 @@ bool WasteTankCBFunction()
                 {
                     IFS_info.INK_isOK_flag = false;//0
                     REPORT_MSG(WHS_full," ------------ change INK cartridge status to color Used ----------------- ");
-                    MidTankValvesAction(Cartridge_MidTank_ON);
                     // test the Mid-tank capacity is not at Nadav sequence
-                    // Enable_MidTank_Pressure_Reading(IFS_info.Ink.cart_color);
                     MidTank_Pressure = Get_MidTank_Pressure_Sensor(IFS_info.Ink.cart_color);
                     if ( MidTank_Pressure > MidTank_Pressure_EMPTY )
                     {
-                        ReportWithPackageFilter(WasteFilter,"------------ close door  MidTank_Pressure > MidTank_Pressure_EMPTY -----------------", __FILE__,__LINE__,(MidTank_Pressure_EMPTY), RpMessage, (int)(MidTank_Pressure*1000), 0);
+                        ReportWithPackageFilter(WasteFilter,"------------ close door  MidTank_Pressure > MidTank_Pressure_EMPTY -----------------", __FILE__,__LINE__,(int)(MidTank_Pressure_EMPTY*1000), RpMessage, (int)(MidTank_Pressure*1000), 0);
                         MidTankValvesAction(Cartridge_MidTank_OFF);
                         //Disable_MidTank_Pressure_Reading(IFS_info.Ink.cart_color);
                         REPORT_MSG(WHS_full," ------------ Mid-tank not empty ----------------- ");
@@ -747,6 +745,7 @@ bool WasteTankCBFunction()
                     }
                     IFS_info.MidTank_capacity = MidTank_Pressure;
                     REPORT_MSG(WHS_full," ------------ Mid-tank filling in process ----------------- ");
+                    ReportWithPackageFilter(WasteFilter,"------------ Mid-tank filling in process -----------------", __FILE__,__LINE__,(int)(MidTank_Pressure_EMPTY*1000), RpMessage, (int)(MidTank_Pressure*1000), 0);
                     Pannel_Leds(CART_1, MODE_ON);
                     cart1.color  = BLINK;
                     MidTankValvesAction(Cartridge_MidTank_ON);
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/newWHS_init.c b/Software/Embedded_SW/Embedded/Modules/Waste/newWHS_init.c
index d9801f179..d44047fdb 100644
--- a/Software/Embedded_SW/Embedded/Modules/Waste/newWHS_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/Waste/newWHS_init.c
@@ -7,13 +7,16 @@
 #include <Modules/Waste/newWHS_init.h>
 
 #include <Drivers/I2C_Communication/WHS_Card/IO_Ports_TCA9555/WHS_IO.h>
-#include <Drivers/I2C_Communication/WHS_Card/IO_Ports_TCA9555/TCA9555_Driver.h>
+//#include <Drivers/I2C_Communication/WHS_Card/IO_Ports_TCA9555/TCA9555_Driver.h>
 #include <Drivers/I2C_Communication/WHS_Card/I2C_WHS_Mux.h>
 #include <Drivers/I2C_Communication/I2C.h>
 #include "Drivers/I2C_Communication/WHS_Card/WHS_data.h"
 #include <Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.h>
 #include <Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.h>
 #include <Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC/Max_5805.h>
+#include <Drivers/I2C_Communication/WHS_Card/D_MAX11614/WHS_MAX11614_A2D.h>
+#include <Drivers/I2C_Communication/WHS_Card/D_AD5272/WHS_AD5272_Driver.h>
+
 bool test_9555(void);
 
 
@@ -22,14 +25,16 @@ bool newWHS_init(void)
     bool status = OK;
 //    status = Select_Main_WHS_Mux_Channel();
     status |= WHS_IO_Init();
-    if (Test_WHS_EEPROM()!= OK)
-    {
-        ReportWithPackageFilter(WasteFilter,"------------ Test_WHS_EEPROM U32: test is failed-----------------", __FILE__,__LINE__,0, RpMessage, 0, 0);
-    }
-    status = Test_WHS_Fan();
-    status = Test_WHS_blower();
-    status |= Test_WHS_valve();
-    status |= Test_WHS_pump();
+//    if (Test_WHS_EEPROM()!= OK)
+//    {
+//        ReportWithPackageFilter(WasteFilter,"------------ Test_WHS_EEPROM U32: test is failed-----------------", __FILE__,__LINE__,0, RpMessage, 0, 0);
+//    }
+//    status = Test_WHS_Fan();
+//    status = Test_WHS_blower();
+//    status |= Test_WHS_valve();
+//    status |= Test_WHS_pump();
+//    status |= Test_WHS_max11614();
+    status |= Test_WHS_AD5272_A2D();
 
     //test_9555();
     return status;
@@ -40,7 +45,7 @@ bool test_9555(void)
 {
     bool status = OK;
 
-    status = D_TCA9555_Write_IO(I2C_ID_WHS_CARD, I2CExp1_ADDRESS, TCA9555_PORT_0,  Whs_I2C_EXP_U3_0x40_VALUE.uchar[0]);
+    status = WHS_Write_IO(I2CExp1_ADDRESS, TCA9555_PORT_0);
 
     return status;
 }