Index: firmware/App/Controllers/Ejector.c
===================================================================
diff -u -r959f16a2530e68b517cbb5c12c430d5aef4c5f9d -r82bb2222f791a434d22921e2fe4f5edd7e74776d
--- firmware/App/Controllers/Ejector.c	(.../Ejector.c)	(revision 959f16a2530e68b517cbb5c12c430d5aef4c5f9d)
+++ firmware/App/Controllers/Ejector.c	(.../Ejector.c)	(revision 82bb2222f791a434d22921e2fe4f5edd7e74776d)
@@ -30,13 +30,13 @@
 
 // ********** private definitions **********
 
-#define EJECTOR_RETRACT_OP_INTERVAL         ( ( MS_PER_SECOND * 5 ) / TASK_GENERAL_INTERVAL )   ///< Ejector retract operation interval.
-#define EJECTOR_EXTEND_OP_INTERVAL          ( ( MS_PER_SECOND * 5 ) / TASK_GENERAL_INTERVAL )   ///< Ejector extend operation interval.
+#define EJECTOR_RETRACT_OP_TIME             ( ( MS_PER_SECOND * 5 ) / TASK_GENERAL_INTERVAL )   ///< Ejector retract operation interval.
+#define EJECTOR_EXTEND_OP_TIME              ( ( MS_PER_SECOND * 5 ) / TASK_GENERAL_INTERVAL )   ///< Ejector extend operation interval.
 #define EJECTOR_DATA_PUB_INTERVAL           ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )           ///< Ejector data publish interval.
 #define DATA_PUBLISH_COUNTER_START_COUNT    13                                                  ///< Ejector data publish start counter.
 
-#define EJECTOR_RETRACT_MOTOR_SPEED_RPM     -5000.0F                                            ///< Ejector motor retract speed (in RPM).
-#define EJECTOR_EXTEND_MOTOR_SPEED_RPM      5000.0F                                             ///< Ejector motor extend speed (in RPM).
+#define EJECTOR_RETRACT_MOTOR_SPEED_RPM     -350.0F                                             ///< Ejector motor retract speed (in RPM).
+#define EJECTOR_EXTEND_MOTOR_SPEED_RPM      350.0F                                              ///< Ejector motor extend speed (in RPM).
 #define EJECTOR_OFF_MOTOR_SPEED_RPM         0.0F                                                ///< Ejector motor extend speed (in RPM).
 
 /// Enumeration of ejector states.
@@ -121,7 +121,7 @@
 {
     BOOL result = FALSE;
 
-    if ( currentEjectorState > EJECTOR_STATE_HOMING )
+    if ( EJECTOR_STATE_INIT == currentEjectorState )
     {
         ejectorHomeRequested = TRUE;
         result = TRUE;
@@ -263,7 +263,7 @@
 {
     EJECTOR_STATE_T state = EJECTOR_STATE_HOMING;
 
-    if ( ++ejectorOperationTimerCounter >= EJECTOR_RETRACT_OP_INTERVAL )
+    if ( ++ejectorOperationTimerCounter >= EJECTOR_RETRACT_OP_TIME )
     {
         ejectorOperationTimerCounter = 0;
         setEjectorMotorSpeed( EJECTOR_OFF_MOTOR_SPEED_RPM );
@@ -329,7 +329,7 @@
 {
     EJECTOR_STATE_T state = EJECTOR_STATE_RETRACTING;
 
-    if ( ++ejectorOperationTimerCounter >= EJECTOR_RETRACT_OP_INTERVAL )
+    if ( ++ejectorOperationTimerCounter >= EJECTOR_RETRACT_OP_TIME )
     {
         ejectorOperationTimerCounter = 0;
         setEjectorMotorSpeed( EJECTOR_OFF_MOTOR_SPEED_RPM );
@@ -351,7 +351,7 @@
 {
     EJECTOR_STATE_T state = EJECTOR_STATE_EXTENDING;
 
-    if ( ++ejectorOperationTimerCounter >= EJECTOR_RETRACT_OP_INTERVAL )
+    if ( ++ejectorOperationTimerCounter >= EJECTOR_RETRACT_OP_TIME )
     {
         ejectorOperationTimerCounter = 0;
         setEjectorMotorSpeed( EJECTOR_OFF_MOTOR_SPEED_RPM );