diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-06-10 14:14:23 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-06-10 14:14:23 +0300 |
| commit | 3b13593f574debc58892a4d61a344624cc8e2b4a (patch) | |
| tree | 60414881871387f29683b47c01c9831895ffd8d1 /Software/Embedded_SW/Embedded/Modules | |
| parent | bb6039826e7b4a90e029b97f4ca2a58fde75635e (diff) | |
| download | Tango-3b13593f574debc58892a4d61a344624cc8e2b4a.tar.gz Tango-3b13593f574debc58892a4d61a344624cc8e2b4a.zip | |
ink fill minimal level 0.6 (PP)
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/IFS/ifs.h | 1 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c | 16 |
2 files changed, 14 insertions, 3 deletions
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; } |