From 9cdd202a86fec153935637fc43eef428fced2fd6 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Sun, 5 Aug 2018 11:14:09 +0300 Subject: remove has_direction check --- .../Embedded/Modules/Diagnostics/DiagnosticsHoming.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Modules') diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c index b70c5a744..9760b1715 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c @@ -170,7 +170,7 @@ uint32_t DispenserHomingRequestFunc(MessageContainer* requestContainer) Valve_Set((Valves_t) (request->index+VALVE_2W_MID_AIR_LF), Atm_MidTank_ON); - MotorMovetoLimitSwitch (MotorId,1-MotorsCfg[MotorId].directionthreadwize, /*request->speed*/1200, Motor_Id_to_LS_Id[MotorId], DispenserHomingRequestCallback); + MotorMovetoLimitSwitch (MotorId,1-MotorsCfg[MotorId].directionthreadwize, /*request->speed*/1000, Motor_Id_to_LS_Id[MotorId], DispenserHomingRequestCallback); ustrncpy (HomingToken[MotorId], requestContainer->token,36); return OK; } @@ -254,20 +254,17 @@ uint32_t DispenserJoggingRequestFunc(MessageContainer* requestContainer) { if (JobIsActive() == false) { - if (request->has_direction) + switch (request->direction) { - switch (request->direction) - { case MOTOR_DIRECTION__Forward: Control3WayValvesWithCallback ((Valves_t) request->index, Dispenser_Mixer, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer break; case MOTOR_DIRECTION__Backward: Control3WayValvesWithCallback ((Valves_t) request->index, MidTank_Dispenser, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer break; - } - MotorSetDirection(MotorId,request->direction); - MotorSetSpeed(MotorId, /*request->speed*/150); } + MotorSetDirection(MotorId,request->direction); + MotorSetSpeed(MotorId, /*request->speed*/150); } else { -- cgit v1.3.1