From bdb2ae480c0616dff10deabaa7c8cbb6fa16ffff Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Thu, 30 Jan 2020 16:47:22 +0200 Subject: Version 1.4.6.7 : beginning of removing the #ifdefs. Sylco head and arc head temperature control fixed. new events (version 18), --- Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c | 1 - Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c | 1 + Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c | 11 ++++++++++- 3 files changed, 11 insertions(+), 2 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Modules/IDS') diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c index 1984420f3..f43cf8c56 100644 --- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c +++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c @@ -291,7 +291,6 @@ void IDS_Dispenser_Content_Init (void) Report("IDS_Dispenser load data ",__FILE__,i,(int)IDS_Dispenser_Data[i].totalconsumedinnanolitter,RpWarning,(int)IDS_Dispenser_Data[i].consumedinnanolitter,0); } dispenser_data__free_unpacked(StoredDispenserData,NULL); - free (buffer); } //Report("IDS_Dispenser load data ",__FILE__,__LINE__,(int)Bytes,RpWarning,(int)IDS_Dispenser_Data[0].nanolitterperpulse*100,0); return; diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c index 1ea37a07e..802344bf3 100644 --- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c +++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c @@ -494,6 +494,7 @@ uint32_t IDS_ReCheck_Pressure_Callback(uint32_t DispenserId, uint32_t ReadValue) Report("Pulling dispenser down result",__FILE__,DispenserId,(int)(GetDispenserPressure(DispenserId)*100),RpWarning,200,0); SafeRemoveControlCallback(GetControlLowDevice_i(), IDS_ReCheck_Pressure_Callback ); + return OK; } uint32_t IDS_Check_Pressure_Callback(uint32_t DispenserId, uint32_t ReadValue) { diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c index ad9d75941..708b11342 100644 --- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c +++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c @@ -234,8 +234,17 @@ JobDescriptionFileBrushStop *FirstBrushStop = NULL; DispenserUsedInJob[Dispenser_i] = false; } n_segments = 0; - if (EnableCleaning == true) + if (MotorsCfg[DispenserIdToMotorId[CLEANER_DISPENSER]].hardwaremotortype == DispenserIdToMotorId[CLEANER_DISPENSER]) + { DispenserUsedInJob[CLEANER_DISPENSER] = true; + EnableCleaning = true; + } + else + { + DispenserUsedInJob[CLEANER_DISPENSER] = false; + EnableCleaning = false; + } + if (JobTicket->enablelubrication == true) { //DispenserUsedInJob[LUBRICANT_DISPENSER] = true; -- cgit v1.3.1