aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2018-08-05 11:14:09 +0300
committerShlomo Hecht <shlomo@twine-s.com>2018-08-05 11:14:09 +0300
commit9cdd202a86fec153935637fc43eef428fced2fd6 (patch)
tree06952dbfeefb104053e88e09a5feb390891f3b8d /Software/Embedded_SW/Embedded
parenta377e13f8f71e88ad5989569e0fb2851662228d9 (diff)
downloadTango-9cdd202a86fec153935637fc43eef428fced2fd6.tar.gz
Tango-9cdd202a86fec153935637fc43eef428fced2fd6.zip
remove has_direction check
Diffstat (limited to 'Software/Embedded_SW/Embedded')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c11
1 files changed, 4 insertions, 7 deletions
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
{