Index: firmware/App/Controllers/Ejector.c
===================================================================
diff -u -r953f886774870b2a3523edcdac030d3e4a4d587d -rcf22584fb68bb29311d81d1e5ad79f8cf064b8fb
--- firmware/App/Controllers/Ejector.c	(.../Ejector.c)	(revision 953f886774870b2a3523edcdac030d3e4a4d587d)
+++ firmware/App/Controllers/Ejector.c	(.../Ejector.c)	(revision cf22584fb68bb29311d81d1e5ad79f8cf064b8fb)
@@ -17,7 +17,6 @@
 
 #include "AlarmMgmtTD.h"
 #include "Ejector.h"
-#include "FpgaTD.h"
 #include "Messaging.h"
 #include "OperationModes.h"
 #include "PersistentAlarm.h"
@@ -41,9 +40,6 @@
 #define EJECTOR_EXTEND_MOTOR_SPEED_RPM      162.5F                                              ///< Ejector motor extend speed (in RPM).
 #define EJECTOR_OFF_MOTOR_SPEED_RPM         0.0F                                                ///< Ejector motor extend speed (in RPM).
 
-#define EJECTOR_OPT_SENSOR_ACTIVE           0                                                   ///< Ejector optical sensor active.
-#define EJECTOR_OPT_SENSOR_INACTIVE         1                                                   ///< Ejector optical sensor inactive.
-
 /// Enumeration of ejector states.
 typedef enum EjectorOperations
 {
@@ -65,8 +61,6 @@
 static BOOL ejectorRetractRequested;                                                            ///< Flag indicating that ejector retract operation is requested.
 static BOOL ejectorExtendRequested;                                                             ///< Flag indicating that ejector extend operation is requested.
 static BOOL ejectorAbortRequested;                                                              ///< Flag indicating that ejector abort operation in requested.
-static OVERRIDE_U32_T ejectorRetractOptSensor;                                                  ///< Ejector retract optical sensor.
-static OVERRIDE_U32_T ejectorEngageOptSensor;                                                   ///< Ejector engage optical sensor.
 
 // ********** private function prototypes **********
 
@@ -105,16 +99,6 @@
     ejectorDataPublishInterval.ovData = EJECTOR_DATA_PUB_INTERVAL;
     ejectorDataPublishInterval.ovInitData = EJECTOR_DATA_PUB_INTERVAL;
     ejectorDataPublishInterval.override = OVERRIDE_RESET;
-
-    ejectorRetractOptSensor.data       = (U32)getFPGAEjectorRetractOpticalSensor();
-    ejectorRetractOptSensor.ovData     = 0;
-    ejectorRetractOptSensor.ovInitData = 0;
-    ejectorRetractOptSensor.override   = OVERRIDE_RESET;
-
-    ejectorEngageOptSensor.data        = (U32)getFPGAEjectorEngageOpticalSensor();
-    ejectorEngageOptSensor.ovData      = 0;
-    ejectorEngageOptSensor.ovInitData  = 0;
-    ejectorEngageOptSensor.override    = OVERRIDE_RESET;
 }
 
 /*********************************************************************//**
@@ -265,10 +249,6 @@
         currentEjectorState = EJECTOR_STATE_ABORT;
     }
 
-    // Update the optical sensor values
-    ejectorRetractOptSensor.data = (U32)getFPGAEjectorRetractOpticalSensor();
-    ejectorEngageOptSensor.data  = (U32)getFPGAEjectorEngageOpticalSensor();
-
     switch( currentEjectorState )
     {
         case EJECTOR_STATE_INIT:
@@ -430,7 +410,7 @@
 {
     EJECTOR_STATE_T state = EJECTOR_STATE_RETRACTING;
 
-    if ( ( ++ejectorOperationTimerCounter >= EJECTOR_RETRACT_OP_TIME ) || ( EJECTOR_OPT_SENSOR_ACTIVE == getU32OverrideValue( &ejectorRetractOptSensor ) ) )
+    if ( ( ++ejectorOperationTimerCounter >= EJECTOR_RETRACT_OP_TIME ) || ( TRUE == isEjectorOpticalSensorActive( EJECTOR_OPT_SENSOR_RETRACT ) ) )
     {
         ejectorOperationTimerCounter = 0;
         setEjectorSpeed( EJECTOR_OFF_MOTOR_SPEED_RPM );
@@ -496,7 +476,7 @@
 {
     EJECTOR_STATE_T state = EJECTOR_STATE_EXTENDING;
 
-    if ( ( ++ejectorOperationTimerCounter >= EJECTOR_EXTEND_OP_TIME ) || ( EJECTOR_OPT_SENSOR_ACTIVE == getU32OverrideValue( &ejectorEngageOptSensor ) ) )
+    if ( ( ++ejectorOperationTimerCounter >= EJECTOR_EXTEND_OP_TIME ) || ( TRUE == isEjectorOpticalSensorActive( EJECTOR_OPT_SENSOR_ENGAGE ) ) )
     {
         ejectorOperationTimerCounter = 0;
         setEjectorSpeed( EJECTOR_OFF_MOTOR_SPEED_RPM );
@@ -546,8 +526,8 @@
 
         data.h5State              = getEjectorState();
         data.h5SetSpeed           = currentEjectorSetSpeed;
-        data.retractOpticalSensor = getU32OverrideValue( &ejectorRetractOptSensor );
-        data.engageOpticalSensor  = getU32OverrideValue( &ejectorEngageOptSensor );
+        data.retractOpticalSensor = (U32)isEjectorOpticalSensorActive( EJECTOR_OPT_SENSOR_RETRACT );
+        data.engageOpticalSensor  = (U32)isEjectorOpticalSensorActive( EJECTOR_OPT_SENSOR_ENGAGE );
 
         broadcastData( MSG_ID_TD_EJECTOR_DATA, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08*)&data, sizeof( EJECTOR_PAYLOAD_T ) );
         ejectorDataPublicationTimerCounter = 0;
@@ -627,39 +607,5 @@
     return result;
 }
 
-/*********************************************************************//**
- * @brief
- * The testEjectorRetractOpticalSensorOverride function overrides the retract
- * optical sensor.
- * @details \b Inputs: none
- * @details \b Outputs: ejectorRetractOptSensor
- * @param message Override message from Dialin which includes the retract
- * optical sensor value.
- * @return TRUE if override request is successful, FALSE if not
- *************************************************************************/
-BOOL testEjectorRetractOpticalSensorOverride( MESSAGE_T *message )
-{
-    BOOL result = u32Override( message, &ejectorRetractOptSensor, EJECTOR_OPT_SENSOR_ACTIVE, EJECTOR_OPT_SENSOR_INACTIVE );
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testEjectorEngageOpticalSensorOverride function overrides the engage
- * optical sensor.
- * @details \b Inputs: none
- * @details \b Outputs: ejectorEngageOptSensor
- * @param message Override message from Dialin which includes the engage
- * optical sensor value.
- * @return TRUE if override request is successful, FALSE if not
- *************************************************************************/
-BOOL testEjectorEngageOpticalSensorOverride( MESSAGE_T *message )
-{
-    BOOL result = u32Override( message, &ejectorEngageOptSensor, EJECTOR_OPT_SENSOR_ACTIVE, EJECTOR_OPT_SENSOR_INACTIVE );
-
-    return result;
-}
-
 /**@}*/