Index: firmware/App/Modes/ModeInitPOST.c =================================================================== diff -u -r5a29e093e8a11f971c312cab5f6e7fedae2953db -rf054fdd3579dacb03b5b41a363e259949ff63965 --- firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 5a29e093e8a11f971c312cab5f6e7fedae2953db) +++ firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision f054fdd3579dacb03b5b41a363e259949ff63965) @@ -54,9 +54,6 @@ /// Maximum wait time for UI to send its final POST result. #define POST_UI_MAX_WAIT_TIME ( 2 * MS_PER_SECOND / TASK_GENERAL_INTERVAL ) -/// Ejector homing post test time interval (ms/task time) -#define EJECTOR_HOME_POST_TIMEOUT ( 10 * MS_PER_SECOND / TASK_GENERAL_INTERVAL ) - // ********** private data ********** static TD_POST_STATE_T postState; ///< Current state of initialize and POST mode. @@ -70,7 +67,6 @@ static BOOL dgPOSTResultReceived; ///< Have we received a final POST result from the DG? static U32 waitForUIPostTimerCtr; ///< Timer counter to limit wait for UI final POST result. static U32 postCompleteDelayTimerCtr; ///< Timer counter for 2 second delay after POST completes and before transitioning to Standbymode. -static U32 ejectorHomePostTimerCounter; ///< TImer counter for ejector homing POST test. static UI_VERSIONS_T uiVersion = { 0, 0, 0, 0, 0 }; ///< Version and compatibility information reported by UI. static DD_VERSIONS_T dgVersion = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }; ///< Version and compatibility information reported by DG. @@ -84,7 +80,6 @@ static TD_POST_STATE_T handlePOSTStateStart( void ); static SELF_TEST_STATUS_T execFWCompatibilityTest( void ); static SELF_TEST_STATUS_T execUITest( void ); -static SELF_TEST_STATUS_T execEjectorHomingTest( void ); /*********************************************************************//** * @brief @@ -106,7 +101,6 @@ waitForUIPostTimerCtr = 0; postCompleteDelayTimerCtr = 0; startPOSTDelayCounter = 0; - ejectorHomePostTimerCounter = 0; } /*********************************************************************//** @@ -261,6 +255,7 @@ testStatus = execEjectorHomingTest(); postState = handlePOSTStatus( testStatus ); break; + // Should be last POST (and last POST test must be a test that completes in a single call) case POST_STATE_FPGA: // testStatus = execFPGATest(); @@ -575,34 +570,4 @@ return result; } -/*********************************************************************//** - * @brief - * The execEjectorHomingTest function executes the ejector homing POST test. - * Commands the ejector to home on first call. - * @details \b Inputs: ejectorHomePostTimerCounter - * @details \b Outputs: ejectorHomePostTimerCounter - * @return in progress, passed, or failed - *************************************************************************/ -static SELF_TEST_STATUS_T execEjectorHomingTest( void ) -{ - SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS; - - if ( 0U == ejectorHomePostTimerCounter ) - { - homeEjector(); - } - - if ( ++ejectorHomePostTimerCounter >= EJECTOR_HOME_POST_TIMEOUT ) - { - SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_EJECTOR_POST_TEST_FAILED, (U32)getEjectorState() ); - result = SELF_TEST_STATUS_FAILED; - } - else if ( EJECTOR_STATE_RETRACTED == getEjectorState() ) - { - result = SELF_TEST_STATUS_PASSED; - } - - return result; -} - /**@}*/