Index: firmware/App/Controllers/Valves.c =================================================================== diff -u -r337136fc77fe5628fa727aac6252a06238561a10 -r014dc3dfd1d13bf6a53974f6f8a8c1ad7bea42db --- firmware/App/Controllers/Valves.c (.../Valves.c) (revision 337136fc77fe5628fa727aac6252a06238561a10) +++ firmware/App/Controllers/Valves.c (.../Valves.c) (revision 014dc3dfd1d13bf6a53974f6f8a8c1ad7bea42db) @@ -41,7 +41,7 @@ #define DATA_PUBLISH_COUNTER_START_COUNT 50 ///< Data publish counter start count. /// Bits associated with RO valves when interfacing with FPGA to command a valve position. 1=energized, 0=de-energized. -static const U16 ValveBits[ NUM_OF_VALVES ] = { +static const U16 ValveBits[ FP_NUM_OF_VALVES ] = { 0x0001, 0x0002, 0x0004, @@ -59,11 +59,11 @@ static U32 valvesStatesPublicationTimerCounter; ///< Timer counter used to schedule valve state publication to CAN bus. static U16 commandedValvesStates; ///< Initialize commanded valves states bit field. static U32 valveStateMismatchTimerCounter; ///< Initialize valve state mismatch timer. -static U32 pendingValveStateChanges[ NUM_OF_VALVES ]; ///< Delayed (pending) valve state changes. -static U32 pendingValveStateChangeCountDowns[ NUM_OF_VALVES ]; ///< Delayed (pending) valve state change count down timers (in task intervals). +static U32 pendingValveStateChanges[ FP_NUM_OF_VALVES ]; ///< Delayed (pending) valve state changes. +static U32 pendingValveStateChangeCountDowns[ FP_NUM_OF_VALVES ]; ///< Delayed (pending) valve state change count down timers (in task intervals). -static OVERRIDE_U32_T valveStates[ NUM_OF_VALVES ]; ///< Currently commanded valves states. -static OVERRIDE_U32_T valveSensedStates[ NUM_OF_VALVES ]; ///< Valve sensed states override. +static OVERRIDE_U32_T valveStates[ FP_NUM_OF_VALVES ]; ///< Currently commanded valves states. +static OVERRIDE_U32_T valveSensedStates[ FP_NUM_OF_VALVES ]; ///< Valve sensed states override. static OVERRIDE_U32_T valvesStatesPublishInterval; ///< Interval (in ms/task interval) at which to publish valves state to CAN bus. // ********** private function prototypes ********** @@ -82,10 +82,10 @@ *************************************************************************/ void initValves( void ) { - VALVES_T valve; + FP_VALVES_T valve; // initialize valve states - for ( valve = FIRST_VALVE; valve < NUM_OF_VALVES; valve++ ) + for ( valve = FP_FIRST_VALVE; valve < FP_NUM_OF_VALVES; valve++ ) { valveStates[ valve ].data = DEENERGIZED; valveStates[ valve ].ovInitData = DEENERGIZED; @@ -143,7 +143,7 @@ } // Handle pending delayed valve state changes - for ( valve = 0; valve < NUM_OF_VALVES; valve++ ) + for ( valve = 0; valve < FP_NUM_OF_VALVES; valve++ ) { if ( pendingValveStateChangeCountDowns[ valve ] > 0 ) { @@ -181,7 +181,7 @@ commandedValvesStates = ALL_VALVES_DEENERGIZED; // Update sensed valve states from FPGA and commanded valve state bits to FPGA - for ( valve = FIRST_VALVE; valve < NUM_OF_VALVES; valve++ ) + for ( valve = FP_FIRST_VALVE; valve < FP_NUM_OF_VALVES; valve++ ) { valveSensedStates[ valve ].data = ( ( readValveStates & ValveBits[ valve ] ) != 0 ? VALVE_STATE_OPEN : VALVE_STATE_CLOSED ); commandedValvesStates |= ( getValveState( valve ) == ENERGIZED ? ValveBits[ valve ] : 0 ); @@ -228,11 +228,11 @@ * @param valveStateName name of valve state to set given valve to * @return TRUE if new valve state is set for given valve ID, FALSE if not. *************************************************************************/ -BOOL setValveState( VALVES_T valveID, VALVE_STATE_NAMES_T valveStateName ) +BOOL setValveState( FP_VALVES_T valveID, VALVE_STATE_NAMES_T valveStateName ) { BOOL result = FALSE; // initialize result flag to FALSE - if ( valveID < NUM_OF_VALVES ) + if ( valveID < FP_NUM_OF_VALVES ) { if ( valveStateName < NUM_OF_VALVE_STATES ) { @@ -268,11 +268,11 @@ * @param delayMs delay duration (in ms) before actuation * @return TRUE if new valve state is set for given valve ID, FALSE if not. *************************************************************************/ -BOOL setValveStateDelayed( VALVES_T valveID, VALVE_STATE_NAMES_T valveStateName, U32 delayMs ) +BOOL setValveStateDelayed( FP_VALVES_T valveID, VALVE_STATE_NAMES_T valveStateName, U32 delayMs ) { BOOL result = FALSE; // initialize result flag to FALSE - if ( valveID < NUM_OF_VALVES ) + if ( valveID < FP_NUM_OF_VALVES ) { if ( valveStateName < NUM_OF_VALVE_STATES ) { @@ -309,12 +309,12 @@ * @param valveID ID of valve to get state for * @return the current valve state for given valve in enum *************************************************************************/ -VALVE_STATE_NAMES_T getValveStateName( VALVES_T valveID ) +VALVE_STATE_NAMES_T getValveStateName( FP_VALVES_T valveID ) { // Initialized per CppCheck. VALVE_STATE_NAMES_T name = NUM_OF_VALVE_STATES; - if ( valveID < NUM_OF_VALVES ) + if ( valveID < FP_NUM_OF_VALVES ) { U32 valveState = getU32OverrideValue( &valveSensedStates[ valveID ] ); @@ -341,7 +341,7 @@ { U32 valveState = DEENERGIZED; - if ( valveID < NUM_OF_VALVES ) + if ( valveID < FP_NUM_OF_VALVES ) { valveState = getU32OverrideValue( &valveStates[ valveID ] ); } @@ -371,9 +371,9 @@ data.valvesCmdState = commandedValvesStates; - for ( valve = 0; valve < NUM_OF_VALVES; valve++ ) + for ( valve = 0; valve < FP_NUM_OF_VALVES; valve++ ) { - data.valvesSensedState[ valve ] = (U08)getValveStateName( (VALVES_T)valve ); + data.valvesSensedState[ valve ] = (U08)getValveStateName( (FP_VALVES_T)valve ); } broadcastData( MSG_ID_FP_VALVES_STATES_DATA, COMM_BUFFER_OUT_CAN_FP_BROADCAST, (U08*)&data, sizeof( RO_VALVES_DATA_T ) ); @@ -417,7 +417,7 @@ *************************************************************************/ BOOL testValveStateOverride( MESSAGE_T *message ) { - BOOL result = u32ArrayOverride( message, &valveStates[0], NUM_OF_VALVES - 1, 0, NUM_OF_VALVE_STATES - 1 ); + BOOL result = u32ArrayOverride( message, &valveStates[0], FP_NUM_OF_VALVES - 1, 0, NUM_OF_VALVE_STATES - 1 ); return result; } @@ -434,7 +434,7 @@ *************************************************************************/ BOOL testValveSensedStateOverride( MESSAGE_T *message ) { - BOOL result = u32ArrayOverride( message, &valveSensedStates[0], NUM_OF_VALVES - 1, 0, NUM_OF_VALVE_STATES - 1 ); + BOOL result = u32ArrayOverride( message, &valveSensedStates[0], FP_NUM_OF_VALVES - 1, 0, NUM_OF_VALVE_STATES - 1 ); return result; } Index: firmware/App/Controllers/Valves.h =================================================================== diff -u -r9e2a4a80080b685c1afc6283a0ed2b58dd5bd94a -r014dc3dfd1d13bf6a53974f6f8a8c1ad7bea42db --- firmware/App/Controllers/Valves.h (.../Valves.h) (revision 9e2a4a80080b685c1afc6283a0ed2b58dd5bd94a) +++ firmware/App/Controllers/Valves.h (.../Valves.h) (revision 014dc3dfd1d13bf6a53974f6f8a8c1ad7bea42db) @@ -19,6 +19,7 @@ #define __VALVES_H__ #include "FPCommon.h" +#include "FPDefs.h" /** * @defgroup Valves Valves @@ -28,23 +29,6 @@ * @{ */ -/// Enumeration of valves. -typedef enum Valves -{ - M4_VALV = 0, ///< Valve (M4) - FIRST_VALVE = M4_VALV, ///< First valve - P39_VALV, ///< Valve (P39) - P6_VALV, ///< Valve (P6) - P11_VALV, ///< Valve (P11) - P33_VALV, ///< Valve (P33) - P34_VALV, ///< Valve (P34) - P37_VALV, ///< Valve (P37) - M7_VALV, ///< Valve (M7) - P20_VALV, ///< Valve (P20) - P43_VALV, ///< Valve (P43) - NUM_OF_VALVES ///< Number of valves -} VALVES_T; - /// Enumeration of available valve state names per valve type (from SA and DG SRS documents). typedef enum ValveStateNames { @@ -58,7 +42,7 @@ typedef struct { U16 valvesCmdState; ///< Commanded RO valve states (bits). - U08 valvesSensedState[ NUM_OF_VALVES ]; ///< Sensed RO valve states. + U08 valvesSensedState[ FP_NUM_OF_VALVES ]; ///< Sensed RO valve states. } RO_VALVES_DATA_T; #pragma pack(pop) @@ -67,9 +51,9 @@ void initValves( void ); void execValves( void ); -BOOL setValveState( VALVES_T valve, VALVE_STATE_NAMES_T valveState ); -BOOL setValveStateDelayed( VALVES_T valve, VALVE_STATE_NAMES_T valveState, U32 delayMs ); -VALVE_STATE_NAMES_T getValveStateName( VALVES_T valveID ); +BOOL setValveState( FP_VALVES_T valve, VALVE_STATE_NAMES_T valveState ); +BOOL setValveStateDelayed( FP_VALVES_T valve, VALVE_STATE_NAMES_T valveState, U32 delayMs ); +VALVE_STATE_NAMES_T getValveStateName( FP_VALVES_T valveID ); BOOL testValvesStatesPublishIntervalOverride( MESSAGE_T *message ); BOOL testValveStateOverride( MESSAGE_T *message ); Index: firmware/App/Modes/FPModeFault.c =================================================================== diff -u -r6dd382e3988fac2f9ee041b4738d67305e17a6a2 -r014dc3dfd1d13bf6a53974f6f8a8c1ad7bea42db --- firmware/App/Modes/FPModeFault.c (.../FPModeFault.c) (revision 6dd382e3988fac2f9ee041b4738d67305e17a6a2) +++ firmware/App/Modes/FPModeFault.c (.../FPModeFault.c) (revision 014dc3dfd1d13bf6a53974f6f8a8c1ad7bea42db) @@ -295,9 +295,9 @@ } else { - for ( i = FIRST_VALVE; i <= NUM_OF_VALVES; i++ ) + for ( i = FP_FIRST_VALVE; i <= FP_NUM_OF_VALVES; i++ ) { - setValveState( (VALVES_T)i, VALVE_STATE_CLOSED); + setValveState( (FP_VALVES_T)i, VALVE_STATE_CLOSED); } } }