diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-10-22 14:55:32 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-10-22 14:55:32 +0300 |
| commit | 2518548675072802cbe9e193a9c4dfc27979696a (patch) | |
| tree | 9f17e1c5cddf0838310d31e33561d40ead5fe296 | |
| parent | 1c089e07b393722183acaee32b903df630b32862 (diff) | |
| download | Tango-2518548675072802cbe9e193a9c4dfc27979696a.tar.gz Tango-2518548675072802cbe9e193a9c4dfc27979696a.zip | |
dispensers valves handling
| -rw-r--r-- | Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c | 1 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c | 14 |
2 files changed, 10 insertions, 5 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c index 5d58c2cdf..748eb79c7 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c +++ b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c @@ -250,6 +250,7 @@ void Valve_Command(Valves_t Valve_Id) //1 - OPEN, 0 - CLOSE break; case VALVE_DISPENSER_8: Dispenser_Valve_GPO_Reg.bits.F2_DISPENSER_VALVE_C1_8_C2_8= ValveRequest[Valve_Id].Direction; + REPORT_MSG(ValveRequest[Valve_Id].Direction,"Dispenser 8 Set valve direction"); break; default: diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c index 1cf53fd07..462165ee7 100644 --- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c +++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c @@ -880,7 +880,8 @@ bool AdjustDispenserSpeedToPressure(int DispenserId, double RefMaxPressure,doubl if ((HomingActive[i] == false)&&(PrimingActive[i] == false)) { ReportWithPackageFilter(IDSFilter,"Homing Inactive dispenser",__FILE__,i,HomingActive[i],RpWarning,PrimingActive[i],0); - IDS_HomeDispenser (i, 1000 , NULL); + if (IDS_HomeDispenser (i, 1000 , NULL) == ERROR) + Control3WayValvesWithCallback (i, MidTank_Dispenser, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer; } else { @@ -1852,10 +1853,11 @@ uint32_t IDSSegmentState(void *SegmentDetails, int SegmentId) //MotorStop(HW_Motor_Id,Hard_Hiz); if (AutoHoming_Config >= AutoHoming_JobEnd_PowerOn_off) { - ReportWithPackageFilter(IDSFilter,"IDS_Valve_EndValveReady start homing",__FILE__,deviceID,(int)AutoHoming_Config,RpWarning,(int)AutoHoming_JobEnd_PowerOn_off,0); - if (deviceID!=LUBRICANT_DISPENSER) + { + ReportWithPackageFilter(IDSFilter,"IDS_Valve_EndValveReady start homing",__FILE__,deviceID,(int)AutoHoming_Config,RpWarning,(int)AutoHoming_JobEnd_PowerOn_off,0); IDS_HomeDispenser (deviceID, 1000 , NULL); + } } return OK; } @@ -1936,10 +1938,12 @@ uint32_t IDS_StartLubrication(void) } uint32_t IDS_StopLubrication(void) { + REPORT_MSG (lubricant_speed, "IDS_StopLubrication and home dispenser"); Lubricant_2Way_Valve (STOP); - IDS_Dispenser_Close_Valve_And_Stop_Motor(LUBRICANT_DISPENSER,IDS_Valve_EndValveReady); + //IDS_Dispenser_Close_Valve_And_Stop_Motor(LUBRICANT_DISPENSER,IDS_Valve_EndValveReady); + TimerMotors_t HW_Motor_Id = DispenserIdToMotorId[LUBRICANT_DISPENSER]; + MotorStop(HW_Motor_Id,Hard_Hiz); CurrentDispenserSpeed[LUBRICANT_DISPENSER] = 0; IDS_HomeDispenser (LUBRICANT_DISPENSER, 1000 , NULL); - REPORT_MSG (lubricant_speed, "IDS_StopLubrication and home dispenser"); return OK; } |