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

8 files changed, 161 insertions, 60 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index a9b539690..6542af287 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -707,7 +707,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
         char Lenstr[160];
         static int Counter = 0;
         MachineUpdateResponseFunc();
-        KeepAliveOneSecondCall();
+        //KeepAliveOneSecondCall();
 
         TemperatureListString(Lenstr);
         ReportWithPackageFilter(ThreadFilter,Lenstr,__FILE__,__LINE__,(int)Counter++,RpWarning,(int) msec_millisecondCounter,0);
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.c b/Software/Embedded_SW/Embedded/Modules/Control/control.c
index 02a216ba6..bb3149b43 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/control.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/control.c
@@ -66,7 +66,7 @@
 
 
 //#define CONTROL_DEBUG
-#define DURATION_LIMIT 5
+#define DURATION_LIMIT 6
 /******************** Definitions  ********************************************/
 #define MAX_TANGO_CONTROL_DEVICES 100
 /******************** STRUCTURES AND ENUMs  ********************************************/
@@ -632,7 +632,7 @@ uint32_t ControlLowLoop(uint32_t tick)
                 dev = ControlLowDevice_i;
             }
         }
-        Report(ControlArray[dev].Name,__FILE__,__LINE__,dev,RpWarning,max,0);
+        //Report(ControlArray[dev].Name,__FILE__,__LINE__,dev,RpWarning,max,0);
     }
 #endif
     //ROM_IntMasterEnable();
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
index 674135180..be8e84f3e 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
@@ -216,7 +216,7 @@ uint32_t DispenserHomingRequestFunc(MessageContainer* requestContainer)
 
     responseContainer = createContainer(MESSAGE_TYPE__DispenserHomingResponse,  requestContainer->token, false, &response, &dispenser_homing_response__pack, &dispenser_homing_response__get_packed_size);
     responseContainer.has_continuous = true;
-responseContainer.continuous = true;
+    responseContainer.continuous = true;
     uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
     size_t container_size = message_container__pack(&responseContainer, container_buffer);
     my_free(responseContainer.data.data);
diff --git a/Software/Embedded_SW/Embedded/Modules/General/buttons.c b/Software/Embedded_SW/Embedded/Modules/General/buttons.c
index d8c68b345..701bde5e9 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/buttons.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/buttons.c
@@ -211,6 +211,7 @@ uint32_t Buttons_Init(void)
     power.state = sttON; //sttOFF, sttON, sttDISABLE, sttENABLE, sttIDLE, sttJOGGING
     power.count = 0;
 
+    Task_sleep(15);
     AddControlCallback("ButtonPowerCB", ButtonPowerCBFunction, BUTTONS_SAMPLE_TIME, ButtonPowerCallBackFunction, 0,0,0 ); // eFiftyMillisecond
 
     strcpy(jog.bttn_name, "jog");
@@ -221,6 +222,7 @@ uint32_t Buttons_Init(void)
     jog.state = sttENABLE; // sttDISABLE, sttENABLE, sttJOGGING
     jog.count = 0;
 
+    Task_sleep(15);
     AddControlCallback("ButtonJogCB", ButtonJogCBFunction, BUTTONS_SAMPLE_TIME, ButtonJogCallBackFunction, 0,0,0 ); //
 
     strcpy(load.bttn_name, "load");
@@ -231,6 +233,7 @@ uint32_t Buttons_Init(void)
     load.state = sttRDY; //
     load.count = 0;
 
+    Task_sleep(15);
     AddControlCallback("ButtonLoadCB", ButtonLoadCBFunction, BUTTONS_SAMPLE_TIME, ButtonLoadCallBackFunction, 0,0,0 ); //
 return OK;
 }
diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
index 7f99a2a92..a98cc173e 100644
--- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
+++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
@@ -317,19 +317,19 @@ bool CartridgeValidationResponseFunc(MessageContainer* requestContainer)
     // 2. the index is out of rang
     if (response == NULL)
     {
-        REPORT_MSG(WHS_filling," ------------ IFS_filling message from PPC is null!!! ----------------- "); // write to log error
+        ReportWithPackageFilter(WHS_filling,"------------ IFS_filling message from PPC is null!!! -----------------", __FILE__,__LINE__,0, RpMessage, 0, 0);
         return ret;
     }
 
     if (response->index < NUM_OF_MIDTANKS)
     {
         IFS_info.Ink.cart_color = response->index; // midtank 1-8
-        ReportWithPackageFilter(WasteFilter,"------------ IFS get message response->index is  -----------------", __FILE__, __LINE__, response->index, RpMessage, 0, 0);
+        ReportWithPackageFilter(WHS_filling,"------------ IFS get message response->index is  -----------------", __FILE__, __LINE__, response->index, RpMessage, 0, 0);
         WHS_info.event = IFS_INK_authentication_pass;
     }
     else
     {
-        ReportWithPackageFilter(WasteFilter,"------------ IFS get message response->index is out of rang -----------------", __FILE__, __LINE__, response->index, RpMessage, 0, 0);
+        ReportWithPackageFilter(WHS_filling,"------------ IFS get message response->index is out of rang -----------------", __FILE__, __LINE__, response->index, RpMessage, 0, 0);
         WHS_info.event = IFS_INK_authentication_fail;
     }
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index c21316318..dbe46db97 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -39,6 +39,8 @@
 #include <Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.h>
 #include <Drivers/I2C_Communication/WHS_Card/IO_Extender_Ports_TCA9555/WHS_IO.h>
 
+#include "Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.h"
+
 extern float NumberOfRotationPerPassage;  // how many rotations per spool passage
 
 //#include "graphics_adapter.h"
@@ -216,25 +218,134 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
 
     }
     else
-    if(request->amount == 0x0EAD)  //Head Card I/O
-    {
-        uint8_t Write_Buf[2] = {0,0};
-        uint8_t Script_Slave_Add = request -> delay >> 16;
-        Write_Buf[0] = request -> delay >> 8;
-        Write_Buf[1] = request -> delay & 0x0000FF;
+        if(request->amount == 0x0EAD)  //Head Card I/O
+        {
+            uint8_t Read_Buf[1] = {0};
+            uint8_t Write_Buf[2] = {0,0};
+            uint8_t Script_Slave_Add = request -> delay >> 16;//Slave address 0x40 / 0x42 / 0x44 / 0x46
+            Write_Buf[0] = (request -> delay & 0x00FF00) >> 8;//read/write low/high
+            /*
+            ------------------
+            | Byte | WR | RD |
+            ------------------
+            | Low  | 02 | 00 |
+            | High | 03 | 01 |
+            ------------------
+            */
+            Write_Buf[1] = request -> delay & 0x0000FF;//data to write
 
-        Select_Main_Head_Mux_Channel();
-        I2C_Write(I2C_ID_HEAD_CARD, Script_Slave_Add, Write_Buf, 2);
+            response.has_progress = false;
 
-        delayms(1);
+            Select_Main_Head_Mux_Channel();
 
-        uint8_t Read_Buf[2] = {0,0};
-        I2C_Read(I2C_ID_HEAD_CARD, Script_Slave_Add + 1, Read_Buf, 2);
-        response.progress = Read_Buf[1] << 8 | Read_Buf[0];
-        response.has_progress = true;
+            if(Write_Buf[0] == 0)//Read
+            {
+                Head_Read_IO_Reg(Script_Slave_Add, LOW);
 
-    }
-    else
+                delayms(1);
+                if(Script_Slave_Add == 0x40)
+                {
+                    Read_Buf[0] = Head_I2C_EXP1_0x40.uchar[0];
+                    response.progress = Read_Buf[0];
+                    response.has_progress = true;
+                }
+                else
+                if(Script_Slave_Add == 0x42)
+                {
+                    Read_Buf[0] = Head_I2C_EXP2_0x42.uchar[0];
+                    response.progress = Read_Buf[0];
+                    response.has_progress = true;
+                }
+                else
+                if(Script_Slave_Add == 0x44)
+                {
+                    Read_Buf[0] = Head_I2C_EXP3_0x44.uchar[0];
+                    response.progress = Read_Buf[0];
+                    response.has_progress = true;
+                }
+                else
+                if(Script_Slave_Add == 0x46)
+                {
+                    Read_Buf[0] = Head_I2C_EXP4_0x46.uchar[0];
+                    response.progress = Read_Buf[0];
+                    response.has_progress = true;
+                }
+            }
+            else
+
+            if(Write_Buf[0] == 1)//Read
+            {
+                Head_Read_IO_Reg(Script_Slave_Add, HIGH);
+
+                delayms(1);
+                if(Script_Slave_Add == 0x40)
+                {
+                    Read_Buf[0] = Head_I2C_EXP1_0x40.uchar[1];
+                    response.progress = Read_Buf[0];
+                    response.has_progress = true;
+                }
+                else
+                if(Script_Slave_Add == 0x42)
+                {
+                    Read_Buf[0] = Head_I2C_EXP2_0x42.uchar[1];
+                    response.progress = Read_Buf[0];
+                    response.has_progress = true;
+                }
+                else
+                if(Script_Slave_Add == 0x44)
+                {
+                    Read_Buf[0] = Head_I2C_EXP3_0x44.uchar[1];
+                    response.progress = Read_Buf[0];
+                    response.has_progress = true;
+                }
+                else
+                if(Script_Slave_Add == 0x46)
+                {
+                    Read_Buf[0] = Head_I2C_EXP4_0x46.uchar[1];
+                    response.progress = Read_Buf[0];
+                    response.has_progress = true;
+                }
+            }
+            else
+            if(Write_Buf[0] == 2)//write
+            {
+                if(Script_Slave_Add == 0x40)
+                {
+                    Head_I2C_EXP1_0x40.uchar[0] = Write_Buf[1];
+                }
+                else
+                if(Script_Slave_Add == 0x42)
+                {
+                    Head_I2C_EXP2_0x42.uchar[0] = Write_Buf[1];
+                }
+                else
+                if(Script_Slave_Add == 0x46)
+                {
+                    Head_I2C_EXP4_0x46.uchar[0] = (Write_Buf[1] & 0x80);
+                }
+
+                Head_Write_IO_Reg(Script_Slave_Add, LOW);
+            }
+            if(Write_Buf[0] == 3)//write
+            {
+                if(Script_Slave_Add == 0x40)
+                {
+                    Head_I2C_EXP1_0x40.uchar[1] = Write_Buf[1];
+                }
+                else
+                if(Script_Slave_Add == 0x42)
+                {
+                    Head_I2C_EXP2_0x42.uchar[1] = Write_Buf[1];
+                }
+                else
+                if(Script_Slave_Add == 0x46)
+                {
+                    Head_I2C_EXP3_0x44.uchar[1] = (Write_Buf[1] & 0x0C);
+                }
+                Head_Write_IO_Reg(Script_Slave_Add, HIGH);
+            }
+        }
+        else
     if(request->amount == 0xFEAD)  //functions Head Card I/O
     {
         Select_Main_Head_Mux_Channel();
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c
index fb3b78752..e53adabb7 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c
@@ -73,14 +73,14 @@ uint32_t MotorsConfigMessage(HardwareConfiguration * HWrequest)
         MotorsCfg[Motor_i].pulseperround = request->pulseperround;
         MotorsCfg[Motor_i].pulleyradius = request->pulleyradius;
         MotorsCfg[Motor_i].configword = request->configword;
-        if(MotorDriverResponse[Motor_i].DriverType == CombinrdMotDriver)
+        /*if(MotorDriverResponse[Motor_i].DriverType == CombinrdMotDriver)
         {
             MotorsCfg[Motor_i].directionthreadwize = request->directionthreadwize ^ 1;//PowerSTEP01
         }
         else
         {
             MotorsCfg[Motor_i].directionthreadwize = request->directionthreadwize;//L6470 + L6472
-        }
+        }*/
         MotorsCfg[Motor_i].kvalhold = request->kvalhold;
         MotorsCfg[Motor_i].kvalrun = request->kvalrun;
         MotorsCfg[Motor_i].kvalacc = request->kvalacc;
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c
index d845a128d..c8101c031 100644
--- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c
@@ -508,6 +508,7 @@ bool initWHS_WasteTank()
 {
     WHS_info.WHS_sensors.waste_tank_empty_sensor = RdWasteTankEmptySensor();
     WHS_info.WHS_sensors.waste_tank_full_sensor =  SENSORnotFULL;
+    Task_sleep(15);
     UpdateStateMachine();
     AddControlCallback("Waste tank",WasteTankCBFunction, WasteTankCallBackTime , WasteTankCallBackFunction, 0,0,0);//eOneMinute
     return OK;
@@ -877,7 +878,6 @@ bool WasteTankCBFunction()
                     break;
 
         case WHS_Timeout:
-            REPORT_MSG(WHS_emptying," ------------ WHS_Timeout ----------------- ");
             ReportWithPackageFilter(WasteFilter,"------------ WHS, WHS_Timeout -------------", __FILE__, __LINE__, WHS_info.sttMachine, RpMessage, 0, 0);
             AlarmHandlingSetAlarm( EVENT_TYPE__WASTE_CONTAINER_EMPTYING_TIMEOUT,  true);
             CartridgeWasteFilling(OFF);
@@ -1057,15 +1057,13 @@ WHS_sensor CartridgeWaste1CallBackFunction()
 
 WHS_sensor CartridgeWaste2CallBackFunction()
 {
-    uint32_t parameter = 6 ;
-
     WHS_sensor ret = WHS_no_event;
-    //ret = RdCartridgeCoverSensor();
+
     if (WHS_info.WHS_sensors.waste_cartridge2_precense_sensor != RdWasteCartridge2Sensor())
     {
-        REPORT_MSG(parameter," ------------ find  : WHS_waste2_presence_sensor event   ----------------- ");
         WHS_info.event = WHS_waste2_presence_sensor;
         WHS_info.WHS_sensors.waste_cartridge2_precense_sensor = !WHS_info.WHS_sensors.waste_cartridge2_precense_sensor;
+        ReportWithPackageFilter(WasteFilter,"------------ find  : WHS_waste2_presence_sensor event -------------", __FILE__, __LINE__, WHS_info.WHS_sensors.waste_cartridge2_precense_sensor, RpMessage, 0, 0);
         ret = WHS_waste2_presence_sensor;
     }
     return ret;
@@ -1074,42 +1072,40 @@ WHS_sensor CartridgeWaste2CallBackFunction()
 /*------------------------------- Waste Cartridge + IFS Cartridge    -----------------------------------------*/
 bool InitCartStatus()
 {
-    uint32_t parameter = 6 ;
-
     WHS_info.WHS_sensors.cartridge_cover = RdCartridgeCoverSensor();
 
     /* INK =>  CART_1 */
-    REPORT_MSG(parameter," ------------------------------------------------------------------------------------------ ");
-    REPORT_MSG(parameter," ------------!!!!!!!  at INIT what to do if IFS_INK is presence  !!!!!!!  ----------------- ");
-    REPORT_MSG(parameter," ------------------------------------------------------------------------------------------ ");
+    ReportWithPackageFilter(WasteFilter,"------------------------------------------------------------------------------------------", __FILE__,__LINE__,0, RpMessage, 0, 0);
+    ReportWithPackageFilter(WasteFilter,"------------ !!!!!!!  at INIT what to do if IFS_INK is presence  !!!!!!! -----------------", __FILE__,__LINE__,0, RpMessage, 0, 0);
+    ReportWithPackageFilter(WasteFilter,"------------------------------------------------------------------------------------------", __FILE__,__LINE__,0, RpMessage, 0, 0);
 
     if (RdInkCartridgeSensor())
     {
-       REPORT_MSG(parameter," ------------  INIT : IFS_INK is presence    ----------------- ");
-       IFS_info.IFS_Ink_precense_sensor = CarteidgePrecense;
-       Pannel_Leds( CART_1,  MODE_ON);
-       cart1.color = colorON;
+        IFS_info.IFS_Ink_precense_sensor = CarteidgePrecense;
+        ReportWithPackageFilter(WasteFilter,"------------ INIT : IFS_INK is presence -----------------", __FILE__,__LINE__, IFS_info.IFS_Ink_precense_sensor, RpMessage, 0, 0);
+        Pannel_Leds( CART_1,  MODE_ON);
+        cart1.color = colorON;
     }
     else
     {
-       REPORT_MSG(parameter," ------------  INIT : IFS_INK is NOT presence   ----------------- ");
-       IFS_info.IFS_Ink_precense_sensor = CarteidgeNotPrecense;
-       Pannel_Leds( CART_1,  MODE_OFF);
-       cart1.color = colorOFF;
+        IFS_info.IFS_Ink_precense_sensor = CarteidgeNotPrecense;
+        ReportWithPackageFilter(WasteFilter,"------------ INIT : IFS_INK is NOT presence -----------------", __FILE__,__LINE__, IFS_info.IFS_Ink_precense_sensor, RpMessage, 0, 0);
+        Pannel_Leds( CART_1,  MODE_OFF);
+        cart1.color = colorOFF;
     }
 
     /* waste_cartridge1 => CART_2  */
     if (RdWasteCartridge1Sensor())
     {
-        REPORT_MSG(parameter," ------------  INIT : WHS_waste1 cart is presence   ----------------- ");
         WHS_info.WHS_sensors.waste_cartridge1_precense_sensor = CarteidgePrecense;
+        ReportWithPackageFilter(WasteFilter,"------------ INIT : WHS_waste1 cart is presence -----------------", __FILE__,__LINE__, WHS_info.WHS_sensors.waste_cartridge1_precense_sensor, RpMessage, 0, 0);
         Pannel_Leds( CART_2,  MODE_ON);
         cart2.color = colorON;
     }
     else
     {
-        REPORT_MSG(parameter," ------------  INIT : WHS_waste1 cart is NOT presence !!!     ----------------- ");
         WHS_info.WHS_sensors.waste_cartridge1_precense_sensor = CarteidgeNotPrecense;
+        ReportWithPackageFilter(WasteFilter,"------------ INIT : WHS_waste1 cart is NOT presence !!! -----------------", __FILE__,__LINE__,WHS_info.WHS_sensors.waste_cartridge1_precense_sensor, RpMessage, 0, 0);
         Pannel_Leds( CART_2,  MODE_OFF);
         cart2.color = colorOFF;
     }
@@ -1117,21 +1113,19 @@ bool InitCartStatus()
     /* waste_cartridge2 => CART_3  */
     if (RdWasteCartridge2Sensor())
     {
-        REPORT_MSG(parameter," ------------  INIT : WHS_waste2 cart is presence   ----------------- ");
         WHS_info.WHS_sensors.waste_cartridge2_precense_sensor = CarteidgePrecense;
+        ReportWithPackageFilter(WasteFilter,"------------ INIT : WHS_waste2 cart is presence -----------------", __FILE__,__LINE__, WHS_info.WHS_sensors.waste_cartridge2_precense_sensor, RpMessage, 0, 0);
         Pannel_Leds( CART_3,  MODE_ON);
         cart3.color = colorON;
     }
     else
     {
-        REPORT_MSG(parameter," ------------  INIT : WHS_waste2 cart is NOT presence_sensor !!!     ----------------- ");
         WHS_info.WHS_sensors.waste_cartridge2_precense_sensor = CarteidgeNotPrecense;
+        ReportWithPackageFilter(WasteFilter,"------------ INIT : WHS_waste2 cart is NOT presence_sensor !!! -----------------", __FILE__,__LINE__, WHS_info.WHS_sensors.waste_cartridge2_precense_sensor, RpMessage, 0, 0);
         Pannel_Leds( CART_3,  MODE_OFF);
         cart3.color = colorOFF;
     }
 
-
-
     if (IFS_info.IFS_Ink_precense_sensor == CarteidgePrecense)          CartridgeAuthentication(INK_cartridge);
     if (WHS_info.WHS_sensors.waste_cartridge1_precense_sensor == CarteidgePrecense) CartridgeAuthentication(waste_cartridge1);
     if (WHS_info.WHS_sensors.waste_cartridge2_precense_sensor == CarteidgePrecense) CartridgeAuthentication(waste_cartridge2);
@@ -1139,7 +1133,7 @@ bool InitCartStatus()
 
     if (WHS_info.WHS_sensors.cartridge_cover == WHS_CartridgeCoverOPEN)
     {
-        REPORT_MSG(parameter," ------------ WHS_CartridgeCoverOPEN  : add callback for cart1 and cart 2   ----------------- ");
+        ReportWithPackageFilter(WasteFilter,"------------ WHS_CartridgeCoverOPEN  : add callback for cart1 and cart 2 -----------------", __FILE__,__LINE__, WHS_info.WHS_sensors.cartridge_cover, RpMessage, 0, 0);
         IFS_info.Cartridge_Ink_device_Id    = AddControlCallback("Ink Cartridge CB"   , WasteTankCBFunction, eOneSecond, CartridgeInkCallBackFunction   , 0,0,0 );
         WHS_info.Cartridge_Waste1_device_Id = AddControlCallback("Waste1 Cartridge CB", WasteTankCBFunction, eOneSecond, CartridgeWaste1CallBackFunction, 0,0,0 );
         WHS_info.Cartridge_Waste2_device_Id = AddControlCallback("Waste2 Cartridge CB", WasteTankCBFunction, eOneSecond, CartridgeWaste2CallBackFunction, 0,0,0 );
@@ -1153,8 +1147,6 @@ bool RdInkCartridgeSensor()
 {
     bool ret = notOK;
     WHS_Read_GPI_Registers();
-    //WHS_info.WHS_sensors.waste_cartridge1_precense_sensor = Is_Cartridge_Present(CART_2);
-    //ret = WHS_info.WHS_sensors.waste_cartridge1_precense_sensor;
     ret = Is_Cartridge_Present(CART_1);
     return ret;
 }
@@ -1163,8 +1155,6 @@ bool RdWasteCartridge1Sensor()
 {
     bool ret = notOK;
     WHS_Read_GPI_Registers();
-    //WHS_info.WHS_sensors.waste_cartridge1_precense_sensor = Is_Cartridge_Present(CART_2);
-    //ret = WHS_info.WHS_sensors.waste_cartridge1_precense_sensor;
     ret = Is_Cartridge_Present(CART_2);
     return ret;
 }
@@ -1173,37 +1163,34 @@ bool RdWasteCartridge2Sensor()
 {
     bool ret = notOK;
     WHS_Read_GPI_Registers();
-    //WHS_info.WHS_sensors.waste_cartridge2_precense_sensor = Is_Cartridge_Present(CART_3);
-    //ret = WHS_info.WHS_sensors.waste_cartridge2_precense_sensor;
     ret = Is_Cartridge_Present(CART_3);
     return ret;
 }
 
 bool SetActiveWastCartridge()
 {
-    uint8_t parameter = 5;
-
     bool ret = notOK;
+
     if (( WHS_info.WHS_sensors.waste_cartridge1_precense_sensor == PRECENSE )
          &&   (WHS_info.cartridge_1.autheticate == PASSED)
          &&   (WHS_info.cartridge_1.status == WasteEmpty))
         {
-            REPORT_MSG(parameter," ------------  WHS : active_cartridge = waste_cartridge  1   ----------------- ");
             WHS_info.active_cartridge = waste_cartridge1;
+            ReportWithPackageFilter(WasteFilter,"------------ WHS : active_cartridge = waste_cartridge  1 -----------------", __FILE__,__LINE__, WHS_info.active_cartridge, RpMessage, 0, 0);
             AlarmHandlingSetAlarm( EVENT_TYPE__NO_WASTE_CARTRIDGE_AVAILABLE,  false);
         }
     else if (( WHS_info.WHS_sensors.waste_cartridge2_precense_sensor == PRECENSE)
             && (WHS_info.cartridge_2.autheticate == PASSED)
             && (WHS_info.cartridge_2.status == WasteEmpty))
         {
-            REPORT_MSG(parameter," ------------  WHS : active_cartridge = waste_cartridge  2   ----------------- ");
             WHS_info.active_cartridge = waste_cartridge2;
+            ReportWithPackageFilter(WasteFilter,"------------ WHS : active_cartridge = waste_cartridge  2 -----------------", __FILE__,__LINE__, WHS_info.active_cartridge, RpMessage, 0, 0);
             AlarmHandlingSetAlarm( EVENT_TYPE__NO_WASTE_CARTRIDGE_AVAILABLE,  false);
         }
     else
         {
-            REPORT_MSG(parameter," ------------  WHS : NO active_cartridge   ----------------- ");
             WHS_info.active_cartridge = no_waste_cartridge;
+            ReportWithPackageFilter(WasteFilter,"------------ WHS : NO active_cartridge -----------------", __FILE__,__LINE__, WHS_info.active_cartridge, RpMessage, 0, 0);
             AlarmHandlingSetAlarm( EVENT_TYPE__NO_WASTE_CARTRIDGE_AVAILABLE,  true);
         }
     return ret;