ink fill minimal level 0.6 (PP)

5 files changed, 28 insertions, 15 deletions

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 fa584a683..d7f0c8277 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
@@ -6,6 +6,7 @@
  */
 #include "include.h"
 #include "Head_EEPROM.h"
+#include "modules/AlarmHandling/AlarmHandling.h"
 #include <Drivers/I2C_Communication/I2C.h>
 #include "PMR/Diagnostics/EventType.pb-c.h"
 #include "../I2C_Head_Mux.h"
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 04410cc6f..06c24d351 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
@@ -24,6 +24,18 @@
 #include "PMR/Hardware/HardwarePidControl.pb-c.h"
 
 #include "StateMachines/Initialization/InitSequence.h"
+typedef struct
+{
+    bool                m_isEnabled;
+    float            m_SetParam;
+    float            m_mesuredParam;
+    float               m_preError;
+    float               m_integral;
+    float               m_calculatedError;
+    bool                m_isReady;
+    PID_Config_Params   m_params;
+}WhsControlConfig_t;
+WhsControlConfig_t WHS_ControlData = {0};
 
 bool Read_Max5805_device_ID();
 double calc_Q_average(WHS_Flow_Meter ORF_id,double Q_temp);
@@ -557,18 +569,6 @@ uint16_t WHS_Get_Volt_Blower_Control()
     return g_MAX5805_device.CODE;
 }
 HardwarePidControl WHS_ControlInfo;
-typedef struct
-{
-    bool                m_isEnabled;
-    float            m_SetParam;
-    float            m_mesuredParam;
-    float               m_preError;
-    float               m_integral;
-    float               m_calculatedError;
-    bool                m_isReady;
-    PID_Config_Params   m_params;
-}WhsControlConfig_t;
-WhsControlConfig_t WHS_ControlData = {0};
 char whs_str[150];
 uint32_t WHS_Pid_Testing_Func(double setParam,double measuredParam)
 {
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.c
index 4e889f58c..c3f91775a 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.c
@@ -12,6 +12,7 @@
 #include "Drivers/I2C_Communication/WHS_Card/WHS_data.h"
 #include <Drivers/I2C_Communication/I2C_Task.h>
 #include "driverlib/i2c.h"
+#include "modules/AlarmHandling/AlarmHandling.h"
 
 #include "PMR/stubs/StubWhsEEpromData.pb-c.h"
 #include "PMR/stubs/StubWhsEEpromRequest.pb-c.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h
index e89efdb13..7baced344 100644
--- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h
+++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h
@@ -24,6 +24,7 @@
 #define CartridgeInkTimeOutCallBackTime (eOneSecond * SECONDS_5)
 #define CartridgeInkCallBackTime        eOneSecond
 #define MidTank_Pressure_EMPTY          0.3  //todo get from Moti the correct number  (Oleg -> 300cc)
+#define MidTank_PP_Pressure_EMPTY       0.6  //todo get from Moti the correct number  (Oleg -> 300cc)
 #define CARTRIDGE_CAPATICY 1500 //todo get from Moti the correct number
 #define FULL 1000   //todo get from Moti the correct number
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c
index 906a0d458..cf9fb3b7b 100644
--- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c
@@ -38,6 +38,7 @@
 #define STOPCOUNT   0
 #define PUMPTIMEOUT 1200 //  seconds; 20 minutes, per Moty,  15/4/19
 
+float MidTankEmptyLimit = MidTank_Pressure_EMPTY;
 
 /*------------Waste Tank function-----------------------*/
 bool initWHS_WasteTank();
@@ -775,16 +776,16 @@ bool WasteTankCBFunction()
                     ReportWithPackageFilter(WasteFilter,"------------ WHS, change INK cartridge status to color Used -------------", __FILE__, __LINE__, IFS_info.INK_isOK_flag, RpMessage, 0, 0);
                     // test the Mid-tank capacity is not at Nadav sequence
                     MidTank_Pressure = Get_MidTank_Pressure_Sensor(IFS_info.Ink.cart_color);
-                    if ( MidTank_Pressure > MidTank_Pressure_EMPTY )
+                    if ( MidTank_Pressure > MidTankEmptyLimit )
                     {
-                        ReportWithPackageFilter(WasteFilter,"------------ close door  MidTank_Pressure > MidTank_Pressure_EMPTY -----------------", __FILE__,__LINE__,(int)(MidTank_Pressure_EMPTY*1000), RpMessage, (int)(MidTank_Pressure*1000), 0);
+                        ReportWithPackageFilter(WasteFilter,"------------ close door  MidTank_Pressure > MidTankEmptyLimit -----------------", __FILE__,__LINE__,(int)(MidTankEmptyLimit*1000), RpMessage, (int)(MidTank_Pressure*1000), 0);
                         MidTankValvesAction(Cartridge_MidTank_OFF);
                         //Disable_MidTank_Pressure_Reading(IFS_info.Ink.cart_color);
                         ReportWithPackageFilter(WasteFilter,"------------ WHS, Mid-tank not empty -------------", __FILE__, __LINE__, 0, RpMessage, 0, 0);
                         break;
                     }
                     IFS_info.MidTank_capacity = MidTank_Pressure;
-                    ReportWithPackageFilter(WasteFilter,"------------ Mid-tank filling in process -----------------", __FILE__,__LINE__,(int)(MidTank_Pressure_EMPTY*1000), RpMessage, (int)(MidTank_Pressure*1000), 0);
+                    ReportWithPackageFilter(WasteFilter,"------------ Mid-tank filling in process -----------------", __FILE__,__LINE__,(int)(MidTankEmptyLimit*1000), RpMessage, (int)(MidTank_Pressure*1000), 0);
                     Pannel_Leds(CART_1, MODE_ON);
                     cart1.color  = BLINK;
                     MidTankValvesAction(Cartridge_MidTank_ON);
@@ -1271,6 +1272,15 @@ U8 WHS_init(void)
     InitCartStatus();
     initWHS_WasteTank();
 
+    if (Is_PP_Machine())
+    {
+        MidTankEmptyLimit = MidTank_PP_Pressure_EMPTY;
+    }
+    else
+    {
+        MidTankEmptyLimit = MidTank_Pressure_EMPTY;
+    }
+
     return 0;
 }