Index: firmware/App/Controllers/Valves.c =================================================================== diff -u -r47ac2fffcf33a27396bc924068d9e320cd1cd684 -r0740e7887bf345f77c9421a4f64716307e74abb8 --- firmware/App/Controllers/Valves.c (.../Valves.c) (revision 47ac2fffcf33a27396bc924068d9e320cd1cd684) +++ firmware/App/Controllers/Valves.c (.../Valves.c) (revision 0740e7887bf345f77c9421a4f64716307e74abb8) @@ -53,7 +53,7 @@ static U32 valvesStatesPublicationTimerCounter; ///< Timer counter used to schedule valve state publication to CAN bus. static U16 commandedValvesStates = ALL_VALVES_DEENERGIZED; ///< Initialize commanded valves states bit field. -static U32 valveStateMismatchCounter; ///< Initialize valve state mismatch counter. +static U32 valveStateMismatchTimerCounter; ///< Initialize valve state mismatch counter. 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). @@ -102,8 +102,8 @@ memset( &vpiTime, 0, sizeof( VPI_OPEN_CLOSE_TIME_T ) ); - valveStateMismatchCounter = 0; - commandedValvesStates = fromU32ArrayToU16(); + valveStateMismatchTimerCounter = 0; + commandedValvesStates = fromU32ArrayToU16(); setFPGAValveStates( commandedValvesStates ); // initially set all valves to de-energized state via FPGA valvesStatesPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT; // reset valves states publication timer @@ -124,15 +124,15 @@ // Verify read back FPGA valve states match last commanded valve states if ( readValvesStates != commandedValvesStates ) { - valveStateMismatchCounter++; // increment valve state mismatch counter by 1 - if ( valveStateMismatchCounter > MAX_VALVE_STATE_MISMATCH_COUNT ) + valveStateMismatchTimerCounter++; // increment valve state mismatch counter by 1 + if ( valveStateMismatchTimerCounter > MAX_VALVE_STATE_MISMATCH_COUNT ) { activateAlarmNoData( ALARM_ID_DG_VALVE_CONTROL_FAILURE ); } } else { - valveStateMismatchCounter = 0; + valveStateMismatchTimerCounter = 0; } // Handle pending delayed valve state changes