Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -re832be54a818fe1af79b225e4b43cd148be89fa4 -r2ee6757cc12428790724f5a46d689675ea0e4e38 --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision e832be54a818fe1af79b225e4b43cd148be89fa4) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 2ee6757cc12428790724f5a46d689675ea0e4e38) @@ -156,7 +156,7 @@ static void setROPumpControlSignalDutyCycle( F32 dutyCycle ); static void stopROPump( void ); static void publishROPumpData( void ); -static F32 getROFeedbackVoltage( void ); +static F32 getROFeedbackDutyCycle( void ); /*********************************************************************//** * @brief @@ -337,7 +337,7 @@ * The execROPumpMonitor function executes the RO pump monitor. The RO flow * sensor is read, filtered, converted to L/min and calibrated. * @details Inputs: measuredFlowReadingsSum, flowFilterCounter, - * measuredROFlowRateLPM, roPumpState, roFeedbackVoltage, + * measuredROFlowRateLPM, roPumpState, roPumpFeedbackDutyCyclePct, * flowOutOfRangeCounter, roPumpControlMode, Ppo * @details Outputs: measuredFlowReadingsSum, flowFilterCounter, * measuredROFlowRateLPM, roVolumeL, roPumpFeedbackDutyCyclePct @@ -397,7 +397,7 @@ roPumpFeedbackDutyCyclePct.data = 1.0F - ( roFeedbackVoltage / ROP_FEEDBACK_0_PCT_DUTY_CYCLE_VOLTAGE ); isDutyCylceOutOfRange = ( fabs( getROFeedbackVoltage() - roPumpDutyCyclePctSet ) > ROP_DUTY_CYCLE_OUT_OF_RANGE_TOLERANCE ? TRUE : FALSE ); - checkPersistentAlarm( ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE, isDutyCylceOutOfRange, getROFeedbackVoltage(), roPumpDutyCyclePctSet ); + checkPersistentAlarm( ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE, isDutyCylceOutOfRange, getROFeedbackDutyCycle(), roPumpDutyCyclePctSet ); // Check if it the alarm has timed out and if the pump is supposed to be off but it is still on, activate the safety shutdown if ( ( TRUE == isAlarmActive( ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE ) ) && ( FALSE == isROPumpOn ) ) @@ -537,17 +537,17 @@ /*********************************************************************//** * @brief - * The getROFeedbackVoltage function returns the RO pump feedback + * The getROFeedbackDutyCyle function returns the RO pump feedback * voltage. * @details Inputs: roPumpFeedbackDutyCyclePct * @details Outputs: none - * @return ro pump voltage feedback + * @return ro pump feedback duty cycle *************************************************************************/ -static F32 getROFeedbackVoltage( void ) +static F32 getROFeedbackDutyCyle( void ) { - F32 feedbackVotlage = getF32OverrideValue( &roPumpFeedbackDutyCyclePct ); + F32 feedbackdutyCycle = getF32OverrideValue( &roPumpFeedbackDutyCyclePct ); - return feedbackVotlage; + return feedbackdutyCycle; } /*********************************************************************//** @@ -777,7 +777,7 @@ pumpData.roPumpDutyCycle = roPumpDutyCyclePctSet * FRACTION_TO_PERCENT_FACTOR; pumpData.roMeasFlowRateLPM = getMeasuredFlowRateLPM( RO_FLOW_SENSOR ); pumpData.roPumpState = (U32)roPumpState; - pumpData.roPumpFBDutyCycle = getROFeedbackVoltage() * FRACTION_TO_PERCENT_FACTOR; + pumpData.roPumpFBDutyCycle = getROFeedbackDutyCycle() * FRACTION_TO_PERCENT_FACTOR; broadcastData( MSG_ID_RO_PUMP_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&pumpData, sizeof( RO_PUMP_DATA_T ) ); roPumpDataPublicationTimerCounter = 0; @@ -998,14 +998,14 @@ /*********************************************************************//** * @brief - * The testSetDrainPumpMeasuredRPMOverride function overrides the drain pump - * measured RPM data. + * The testSetROPumpMeasuredFeedbackDutyCycleOverride function overrides the + * feedback duty cycle. * @details Inputs: none - * @details Outputs: drainPumpMeasuredRPM - * @param value override drain pump measured data + * @details Outputs: roPumpFeedbackDutyCyclePct + * @param value override feedback duty cycle. * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testSetROPumpMeasuredFeedbackVoltageOverride( F32 value ) +BOOL testSetROPumpMeasuredFeedbackDutyCycleOverride( F32 value ) { BOOL status = FALSE; @@ -1026,13 +1026,13 @@ /*********************************************************************//** * @brief - * The testResetDrainPumpMeasuredRPMOverride function resets the drain pump - * measured RPM data. + * The testResetROPumpMeasuredFeedbackDutyCycleOverride function resets the + * feedback duty cycle. * @details Inputs: none - * @details Outputs: drainPumpMeasuredRPM + * @details Outputs: roPumpFeedbackDutyCyclePct * @return TRUE if override reset successful, FALSE if not *************************************************************************/ -BOOL testResetROPumpMeasuredFeedbackVoltageOverride( void ) +BOOL testResetROPumpMeasuredFeedbackDutyCycleOverride( void ) { BOOL status = FALSE; Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r2830e6300c40e331b274511fa9183937810cc190 -r2ee6757cc12428790724f5a46d689675ea0e4e38 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 2830e6300c40e331b274511fa9183937810cc190) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 2ee6757cc12428790724f5a46d689675ea0e4e38) @@ -3871,11 +3871,11 @@ memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) ); if ( FALSE == payload.reset ) { - result = testSetROPumpMeasuredFeedbackVoltageOverride( payload.state.f32 ); + result = testSetROPumpMeasuredFeedbackDutyCycleOverride( payload.state.f32 ); } else { - result = testResetROPumpMeasuredFeedbackVoltageOverride(); + result = testResetROPumpMeasuredFeedbackDutyCycleOverride(); } }