diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-02-04 18:58:19 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-02-04 18:58:19 +0200 |
| commit | ecc2fd3bbf37b3a26c59fb3bb5df35a73ccea9d5 (patch) | |
| tree | 3e2da4420da76dad47abe00ac93fb4e9c0c69967 /Software/Embedded_SW/Embedded/Modules | |
| parent | bee3522e23c95021a9637669a8091069af98e0c4 (diff) | |
| parent | d942ac7b9d38d7a9afbe0c684ace022f07730f66 (diff) | |
| download | Tango-ecc2fd3bbf37b3a26c59fb3bb5df35a73ccea9d5.tar.gz Tango-ecc2fd3bbf37b3a26c59fb3bb5df35a73ccea9d5.zip | |
merge
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/IFS/ifs.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c index a358bd724..7f99a2a92 100644 --- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c +++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c @@ -104,15 +104,13 @@ bool DetectIfCartridgeFinished(int int_MidTank_Pressure_1000) WHS_sensor CartridgeInkCallBackFunction() { - uint32_t parameter = 6 ; - - WHS_sensor ret = WHS_no_event; + WHS_sensor ret = WHS_no_event; if (IFS_info.IFS_Ink_precense_sensor != RdInkCartridgeSensor()) { - REPORT_MSG(parameter," ------------ find : IFS_Ink_presence_sensor event ----------------- "); WHS_info.event = IFS_INK_presence_sensor; IFS_info.IFS_Ink_precense_sensor = !IFS_info.IFS_Ink_precense_sensor; + ReportWithPackageFilter(WasteFilter,"------------ find : IFS_Ink_presence_sensor event -----------------", __FILE__,__LINE__, IFS_info.IFS_Ink_precense_sensor, RpMessage, 0, 0); ret = IFS_INK_presence_sensor; } return ret; @@ -173,11 +171,10 @@ WHS_sensor CartridgeInkTimeOutCallBackFunction() /*** first TimeOut ***/ if (IFS_info.Ink.time_out == CARTRIDGE_INK_TIMEOUT) { - ReportWithPackageFilter(WasteFilter,"------------ first IFS_info.Ink.time_out -----------------", __FILE__, __LINE__, (IFS_info.Ink.time_out * SECONDS_5), RpMessage, MidTank_Pressure, 0); + ReportWithPackageFilter(WasteFilter,"------------ first IFS_info.Ink.time_out, close valves -----------------", __FILE__, __LINE__, (IFS_info.Ink.time_out * SECONDS_5), RpMessage, (int_MidTank_Pressure_1000), 0); //IFS_info.Ink.time_out = 0; //return IFS_info.event = IFS_Timeout; - REPORT_MSG(WHS_emptying," ------------ IFS_Timeout close valves----------------- "); // try again : // start timeout // close and open the correct valves @@ -189,13 +186,13 @@ WHS_sensor CartridgeInkTimeOutCallBackFunction() if (IFS_info.Ink.time_out == (CARTRIDGE_INK_TIMEOUT + 1)) //need to open the valve for second chance { - ReportWithPackageFilter(WasteFilter,"------------ IFS_Timeout open valves for second timeout -----------------", __FILE__, __LINE__, (IFS_info.Ink.time_out * SECONDS_5), RpMessage, MidTank_Pressure, 0); + ReportWithPackageFilter(WasteFilter,"------------ IFS_Timeout open valves for second timeout -----------------", __FILE__, __LINE__, (IFS_info.Ink.time_out * SECONDS_5), RpMessage, (int_MidTank_Pressure_1000), 0); MidTankValvesAction(Cartridge_MidTank_ON); } if (IFS_info.Ink.time_out >= (CARTRIDGE_INK_TIMEOUTx2 + 1)) { - REPORT_MSG(WHS_full," ------------ IFS_Timeout_Second_Time ----------------- "); + ReportWithPackageFilter(WasteFilter,"------------ IFS_Timeout_Second_Time -----------------", __FILE__, __LINE__, (IFS_info.Ink.time_out * SECONDS_5), RpMessage, (int_MidTank_Pressure_1000), 0); IFS_info.Ink.time_out = 0; MidTankValvesAction(Cartridge_MidTank_OFF); WHS_info.event = IFS_Timeout_Second; @@ -295,7 +292,7 @@ uint32_t ReadCartridgeData(cartridge_name cart_name) //------------------------------------------------------------------------------------------- uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); size_t container_size = message_container__pack(&responseContainer, container_buffer); - REPORT_MSG(WHS_full," ------------ IFS: send message_container__pack ----------------- "); + ReportWithPackageFilter(WasteFilter,"------------ IFS: send message_container__pack -----------------", __FILE__, __LINE__, CARTRIDGE_ACTION__Inserted, RpMessage, 0, 0); my_free(responseContainer.data.data); SendChars((char*)container_buffer, container_size); |