Index: firmware/App/Controllers/RinsePump.c =================================================================== diff -u -r97a3e2ca15b28aef843b1dee750d5a911afb0a18 -refed7af60250e1d877aa8eb8833829ef65f6a01d --- firmware/App/Controllers/RinsePump.c (.../RinsePump.c) (revision 97a3e2ca15b28aef843b1dee750d5a911afb0a18) +++ firmware/App/Controllers/RinsePump.c (.../RinsePump.c) (revision efed7af60250e1d877aa8eb8833829ef65f6a01d) @@ -125,7 +125,7 @@ void calculateRinsePumpSpeed( void ) { // Pulse width in 10us resolution - U16 pumpPulseWidth = getFPGAD79RinsePumpSpeed(); + U16 pumpPulseWidth = getFPGAD79RinsePumpPulseWidth(); U32 pumpSpeedPerSec = US_PER_SECOND / ( pumpPulseWidth * RINSE_PUMP_PWM_PULSE_RESOLUTION_US ); //Speed in RPM Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -r97a3e2ca15b28aef843b1dee750d5a911afb0a18 -refed7af60250e1d877aa8eb8833829ef65f6a01d --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 97a3e2ca15b28aef843b1dee750d5a911afb0a18) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision efed7af60250e1d877aa8eb8833829ef65f6a01d) @@ -235,7 +235,7 @@ U16 flowRateP7; ///< Reg 704. P7 flow sensor rate. U16 flowTempP7; ///< Reg 706. P7 flow sensor temperature. U16 p12PumpTachCount; ///< Reg 708. P12 pump tachometer counter. - U16 d79SpeedFeedback; ///< Reg 710. D79 speed feedback. + U16 d79SpeedPulseWidth; ///< Reg 710. D79 pusle width feedback. U16 flowIntTempP7; ///< Reg 712. P7 flow sensor internal temperature. U08 valveIOControlReadback; ///< Reg 714. IO Valve control bits read back. U08 valveFPControlReadback; ///< Reg 715. FP Valve control enable read back. @@ -3080,15 +3080,15 @@ /*********************************************************************//** * @brief - * The getFPGAD79RinsePumpSpeed function returns the 4-wire rinse pump - * speed. - * @details \b Inputs: d79SpeedFeedback + * The getFPGAD79RinsePumpPulseWidth function returns the 4-wire rinse pump + * pulse width. + * @details \b Inputs: d79SpeedPulseWidth * @details \b Outputs: none - * @return fpgaSensorReadings.d79SpeedFeedback + * @return fpgaSensorReadings.d79SpeedPulseWidth *************************************************************************/ -U16 getFPGAD79RinsePumpSpeed( void ) +U16 getFPGAD79RinsePumpPulseWidth( void ) { - return fpgaSensorReadings.d79SpeedFeedback; + return fpgaSensorReadings.d79SpeedPulseWidth; } /*********************************************************************//** Index: firmware/App/Services/FpgaDD.h =================================================================== diff -u -r97a3e2ca15b28aef843b1dee750d5a911afb0a18 -refed7af60250e1d877aa8eb8833829ef65f6a01d --- firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision 97a3e2ca15b28aef843b1dee750d5a911afb0a18) +++ firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision efed7af60250e1d877aa8eb8833829ef65f6a01d) @@ -171,7 +171,6 @@ void setFPGAD11PumpRevolutionCount( U16 count ); void setFPGAD10PumpRevolutionCount( U16 count ); void setFPGAD76PumpRevolutionCount( U16 count ); -void setFPGAD79RinsePumpPWMControl( U08 control ); U08 getFPGAD11PumpControlStatus( void ); U08 getFPGAD10PumpControlStatus( void ); @@ -190,7 +189,6 @@ U16 getFPGAD11PumpRevolutionCountStatus( void ); U16 getFPGAD10PumpRevolutionCountStatus( void ); U16 getFPGAD76PumpRevolutionCountStatus( void ); -U16 getFPGAD79RinsePumpSpeed( void ); void setFPGAD48PumpSpeed( U16 speed ); void setFPGAD12PumpSpeed( U16 speed ); @@ -258,7 +256,7 @@ // Rinse pump void setFPGAD79RinsePumpControl( U08 value ); void setFPGAD79RinsePumpPWMControl( U08 value ); -U16 getFPGAD79RinsePumpSpeed( void ); +U16 getFPGAD79RinsePumpPulseWidth( void ); //*************** IOFP *******************