Index: firmware/App/Controllers/Valves.c =================================================================== diff -u -r5e92cbb2c29854fb60a91dc4abafeb9b08d3272c -r200dfbd12ee14a4dbe5ee1daaece7bfce9e8a104 --- firmware/App/Controllers/Valves.c (.../Valves.c) (revision 5e92cbb2c29854fb60a91dc4abafeb9b08d3272c) +++ firmware/App/Controllers/Valves.c (.../Valves.c) (revision 200dfbd12ee14a4dbe5ee1daaece7bfce9e8a104) @@ -54,18 +54,18 @@ static U08 commandedBCValveStates; ///< Initialize balancing chamber commanded valves states bit field. static U08 commandedUFValveStates; ///< Initialize ultra filtration 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[ DD_NUM_OF_VALVES ]; ///< Delayed (pending) valve state changes. +static U32 pendingValveStateChangeCountDowns[ DD_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[ DD_NUM_OF_VALVES ]; ///< Currently commanded valves states. +static OVERRIDE_U32_T valveSensedStates[ DD_NUM_OF_VALVES ]; ///< Valve sensed states override. static OVERRIDE_U32_T valvesStatesPublishInterval = { VALVES_STATE_PUB_INTERVAL, VALVES_STATE_PUB_INTERVAL, 0, 0 }; ///< Interval (in ms/task interval) at which to publish valves state to CAN bus. // ********** private function prototypes ********** static void publishValvesStates( void ); static void readCommandedValveStates( void ); -static BOOL checkValveStateName( VALVES_T valveID, VALVE_STATE_NAMES_T valveStateName ); +static BOOL checkValveStateName( DD_VALVES_T valveID, VALVE_STATE_NAMES_T valveStateName ); static U32 convertValveStateNameToValveState( VALVE_STATE_NAMES_T valveStateName ); static U32 getValveState( U32 valveID ); @@ -83,7 +83,7 @@ U32 i; // initialize commanded valve states - for ( i = 0; i < NUM_OF_VALVES; i++ ) + for ( i = 0; i < DD_NUM_OF_VALVES; i++ ) { valveStates[ i ].data = DEENERGIZED; valveStates[ i ].ovInitData = DEENERGIZED; @@ -148,7 +148,7 @@ } // Handle pending delayed valve state changes - for ( i = 0; i < NUM_OF_VALVES; i++ ) + for ( i = 0; i < DD_NUM_OF_VALVES; i++ ) { if ( pendingValveStateChangeCountDowns[ i ] > 0 ) { @@ -219,7 +219,7 @@ * @param valveStateName valve state name to check for given valve ID * @return TRUE if given valveStateName is appropriate for given valve ID, FALSE if not. *************************************************************************/ -static BOOL checkValveStateName( VALVES_T valveID, VALVE_STATE_NAMES_T valveStateName ) +static BOOL checkValveStateName( DD_VALVES_T valveID, VALVE_STATE_NAMES_T valveStateName ) { BOOL result = FALSE; // initialize result flag to FALSE @@ -229,7 +229,7 @@ case VALVE_STATE_CLOSED: if ( ( D53_VALV == valveID ) || ( D52_VALV == valveID ) || ( D8_VALV == valveID ) || ( D54_VALV == valveID ) || ( D14_VALV == valveID ) || ( D65_VALV == valveID ) || ( D64_VALV == valveID ) || ( D31_VALV == valveID ) || ( D34_VALV == valveID ) || ( D35_VALV == valveID ) || - ( D40_VALV == valveID ) || ( D47_VALV == valveID ) || ( D3_VALV == valveID ) || ( M4_VALV == valveID ) || ( D23_VALV == valveID ) || + ( D40_VALV == valveID ) || ( D47_VALV == valveID ) || ( D3_VALV == valveID ) || ( DD_M4_VALV == valveID ) || ( D23_VALV == valveID ) || #ifdef __PUMPTEST__ ( UF1 == valveID ) || ( UF2 == valveID ) || #endif @@ -291,11 +291,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( DD_VALVES_T valveID, VALVE_STATE_NAMES_T valveStateName ) { BOOL result = FALSE; // initialize result flag to FALSE - if ( valveID < NUM_OF_VALVES ) + if ( valveID < DD_NUM_OF_VALVES ) { if ( TRUE == checkValveStateName( valveID, valveStateName ) ) { @@ -326,11 +326,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( DD_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 < DD_NUM_OF_VALVES ) { if ( TRUE == checkValveStateName( valveID, valveStateName ) ) { @@ -362,12 +362,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( DD_VALVES_T valveID ) { // Initialized per CppCheck. VALVE_STATE_NAMES_T name = NUM_OF_VALVE_STATES; - if ( valveID < NUM_OF_VALVES ) + if ( valveID < DD_NUM_OF_VALVES ) { U32 valveState = getU32OverrideValue( &valveSensedStates[ valveID ] ); @@ -394,7 +394,7 @@ { U32 valveState = DEENERGIZED; - if ( valveID < NUM_OF_VALVES ) + if ( valveID < DD_NUM_OF_VALVES ) { valveState = getU32OverrideValue( &valveStates[ valveID ] ); } @@ -416,7 +416,7 @@ *************************************************************************/ void setHydValvesStatetoClosedState( void ) { - VALVES_T valve; + DD_VALVES_T valve; // Set all Hydraulics valves to closed state for ( valve = FIRST_HYD_VALVE; valve < LAST_HYD_VALVE; valve++ ) @@ -435,7 +435,7 @@ *************************************************************************/ void setUFValvesStatetoClosedState( void ) { - VALVES_T valve; + DD_VALVES_T valve; // Set all UF valves to closed state for ( valve = FIRST_UF_VALVE; valve <= LAST_UF_VALVE; valve++ ) @@ -464,9 +464,9 @@ data.valvesBCStatus = getFPGAValveBCStates(); data.valvesUFStatus = getFPGAValveUFStates(); - for ( i = 0; i < NUM_OF_VALVES; i++ ) + for ( i = 0; i < DD_NUM_OF_VALVES; i++ ) { - data.valvesSensedState[ i ] = (U08)getValveStateName( (VALVES_T)i ); + data.valvesSensedState[ i ] = (U08)getValveStateName( (DD_VALVES_T)i ); } broadcastData( MSG_ID_DD_VALVES_STATES_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( DD_VALVES_DATA_T ) ); @@ -510,7 +510,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], DD_NUM_OF_VALVES - 1, 0, NUM_OF_VALVE_STATES - 1 ); return result; } @@ -529,7 +529,7 @@ BOOL testBCValveStatesOverride( MESSAGE_T *message ) { DD_BC_VALVE_OVERRIDE_PAYLOAD_T payload; - VALVES_T valve; + DD_VALVES_T valve; BOOL result = FALSE; memcpy( (U08*)(&payload), message->payload, sizeof( DD_BC_VALVE_OVERRIDE_PAYLOAD_T ) ); @@ -556,7 +556,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], DD_NUM_OF_VALVES - 1, 0, NUM_OF_VALVE_STATES - 1 ); return result; } @@ -585,10 +585,10 @@ memcpy( &payload, message->payload, sizeof(VALVE_CMD_PAYLOAD_T) ); - if ( ( (VALVES_T)payload.valveID < NUM_OF_VALVES ) && + if ( ( (DD_VALVES_T)payload.valveID < DD_NUM_OF_VALVES ) && ( (VALVE_STATE_NAMES_T)payload.valveState < NUM_OF_VALVE_STATES ) ) { - setValveState( (VALVES_T)payload.valveID, (VALVE_STATE_NAMES_T)payload.valveState ); + setValveState( (DD_VALVES_T)payload.valveID, (VALVE_STATE_NAMES_T)payload.valveState ); result = TRUE; } }