diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-05-08 13:35:44 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-05-08 13:35:44 +0300 |
| commit | 5217f784963202cdf07b05930f17ced91d423652 (patch) | |
| tree | 4f73d0032e28dbf56b6545068857a89c8db6ce04 /Software/Embedded_SW/Embedded/Modules | |
| parent | a46fd6cec3dc8aa99e7a3067de4c0617b232ff88 (diff) | |
| parent | 4d2d05e80dc56983ec86eb622cf5230498cfd5d6 (diff) | |
| download | Tango-5217f784963202cdf07b05930f17ced91d423652.tar.gz Tango-5217f784963202cdf07b05930f17ced91d423652.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
3 files changed, 22 insertions, 6 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c index e6b643903..f0edc56ab 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c +++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c @@ -129,7 +129,7 @@ void LoadConfigurationParameters(ConfigurationParameters *Params) EmbeddedParameters.has_openvalvetimeout = true; EmbeddedParameters.openvalvetimeout = 250; EmbeddedParameters.has_initialdispenserpressure = true; - EmbeddedParameters.initialdispenserpressure = 0.08; + EmbeddedParameters.initialdispenserpressure = 1.08; EmbeddedParameters.has_initialdispensertimeout = true; EmbeddedParameters.initialdispensertimeout = 60000; EmbeddedParameters.has_initialdispensertimelag = true; diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c index af2ca0a13..75542744f 100644 --- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c +++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c @@ -214,7 +214,7 @@ void FreeBrushStopFileData(JobDescriptionFileBrushStop *BrushStop); DispenserUsedInJob[CLEANER_DISPENSER] = true; if (JobTicket->enablelubrication == true) { - DispenserUsedInJob[LUBRICANT_DISPENSER] = true; + //DispenserUsedInJob[LUBRICANT_DISPENSER] = true; lookForLubrication = true; } @@ -329,7 +329,7 @@ c. Go to step 2.a x Segment.BrushStopsCount. DispenserUsedInJob[CLEANER_DISPENSER] = true; if (JobTicket->enablelubrication == true) { - DispenserUsedInJob[LUBRICANT_DISPENSER] = true; + //DispenserUsedInJob[LUBRICANT_DISPENSER] = true; lookForLubrication = true; } if (JobTicket->uploadstrategy == JOB_UPLOAD_STRATEGY__JobDescriptionFile) diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c index 8aa358e32..7d24f9618 100644 --- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c +++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c @@ -269,7 +269,7 @@ U8 CartridgeWasteFilling(bool status) //Pannel_Leds(PANEL_BUTTON_OR_CRAT_ID Pannel_Led_Id, OPERATION_MODE LED_Mode); //set cartridge led color slow blink //write RFID status } - SetWastePump(OPEN); + // close that line for only ITMA !!! SetWastePump(OPEN); ToDo //WHS_info.WHS_pump.time = 0; REPORT_MSG(WHS_empty," ------------ WHS WHS_empty start PUMP ----------------- "); ret=OK; @@ -278,8 +278,24 @@ U8 CartridgeWasteFilling(bool status) { SetWastePump(CLOSE); Valve_Set(VALVE_WASTE_TANK, waste_cartridge2); //set the valve direction set to low POWER !!! - Pannel_Leds( CART_2, MODE_OFF); //set led color - Pannel_Leds( CART_3, MODE_OFF); //set led color + + switch (WHS_info.active_cartridge) + { + case waste_cartridge1: + Pannel_Leds( CART_2, MODE_OFF); //set led color + REPORT_MSG(WHS_empty," ------------ WHS waste_cartridge1 is used please replace it ----------------- "); + break; + case waste_cartridge2: + Pannel_Leds( CART_3, MODE_OFF); //set led color + REPORT_MSG(WHS_empty," ------------ WHS waste_cartridge2 is used please replace it ----------------- "); + break; + case no_waste_cartridge: + + break; + default: + break; + } + //write RFID status } |