Index: firmware/App/Controllers/Ejector.c =================================================================== diff -u -r1c6d80a873aa1bd11e28a8955ff38866fc5717f4 -ra0b8983fa00aa8e2e8ec74744978cffaa4011dcd --- firmware/App/Controllers/Ejector.c (.../Ejector.c) (revision 1c6d80a873aa1bd11e28a8955ff38866fc5717f4) +++ firmware/App/Controllers/Ejector.c (.../Ejector.c) (revision a0b8983fa00aa8e2e8ec74744978cffaa4011dcd) @@ -103,37 +103,6 @@ /*********************************************************************//** * @brief - * The resetEjectorFlags function resets the ejector flags to FALSE. - * @details \b Inputs: none - * @details \b Outputs: ejectorHomeRequested, ejectorRetractRequested, - * ejectorExtendRequested, ejectorAbortRequested - * @return none - *************************************************************************/ -static void resetEjectorFlags( void ) -{ - ejectorHomeRequested = FALSE; - ejectorRetractRequested = FALSE; - ejectorExtendRequested = FALSE; - ejectorAbortRequested = FALSE; -} - -/*********************************************************************//** - * @brief - * The setEjectorSpeed function records the requested ejector speed and - * sets the ejector motor speed to that speed. - * @details \b Inputs: none - * @details \b Outputs: currentEjectorSetSpeed - * @param speed Target speed for ejector motor. - * @return none - *************************************************************************/ -static void setEjectorSpeed( F32 speed ) -{ - currentEjectorSetSpeed = speed; - setEjectorMotorSpeed( currentEjectorSetSpeed ); -} - -/*********************************************************************//** - * @brief * The homeEjector function requests an ejector home operation. * @details \b Inputs: currentEjectorState * @details \b Outputs: ejectorHomeRequested @@ -512,6 +481,37 @@ /*********************************************************************//** * @brief + * The resetEjectorFlags function resets the ejector flags to FALSE. + * @details \b Inputs: none + * @details \b Outputs: ejectorHomeRequested, ejectorRetractRequested, + * ejectorExtendRequested, ejectorAbortRequested + * @return none + *************************************************************************/ +static void resetEjectorFlags( void ) +{ + ejectorHomeRequested = FALSE; + ejectorRetractRequested = FALSE; + ejectorExtendRequested = FALSE; + ejectorAbortRequested = FALSE; +} + +/*********************************************************************//** + * @brief + * The setEjectorSpeed function records the requested ejector speed and + * sets the ejector motor speed to that speed. + * @details \b Inputs: none + * @details \b Outputs: currentEjectorSetSpeed + * @param speed Target speed for ejector motor. + * @return none + *************************************************************************/ +static void setEjectorSpeed( F32 speed ) +{ + currentEjectorSetSpeed = speed; + setEjectorMotorSpeed( currentEjectorSetSpeed ); +} + +/*********************************************************************//** + * @brief * The publishEjectorData function constructs and sends the air pump data * broadcast message. * @details \b Message \b Sent: MSG_ID_TD_EJECTOR_DATA