Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -r7d963ca43801628920617ce0b904a62effcd2722 -r8c070c7bf525b5f7f5e3fbc9dba1873c1d7be545 --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 7d963ca43801628920617ce0b904a62effcd2722) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 8c070c7bf525b5f7f5e3fbc9dba1873c1d7be545) @@ -295,7 +295,7 @@ U08 fpgaD42FIFOTx; ///< Reg 48. Blood leak sensor FIFO transmit control U08 fpgaD5HeaterPWMControl; ///< Reg 49. Primary heater PWM control U08 fpgaD45HeaterPWMControl; ///< Reg 50. Trimmer heater PWM control - U08 fpgaNotUsed; ///< Reg 51. Not used + U08 fpgaD79PWMPumpCtl; ///< Reg 51. Rinse pump PWM control U16 fpgaVBCPWMLow; ///< Reg 52. VBC PWM low ( Balancing chamber valves) U16 fpgaVBCPWMPeriod; ///< Reg 54. VBC PWM period U16 fpgaVBCPWMPullIn; ///< Reg 56. VBC PWM pull in @@ -3054,6 +3054,32 @@ /*********************************************************************//** * @brief + * The setFPGAD79RinsePumpControl function sets the control bit of the rinse + * pump to turn it on or off. + * @details \b Inputs: none + * @details \b Outputs: fpgaActuatorSetPoints.fpgaDDSpareValveControl + * @return none + *************************************************************************/ +void setFPGAD79RinsePumpControl( U08 value ) +{ + fpgaActuatorSetPoints.fpgaDDSpareValveControl &= value; +} + +/*********************************************************************//** + * @brief + * The setFPGAD79RinsePumpPWMControl function sets the PWM value of the rinse + * pump to turn it on or off. + * @details \b Inputs: none + * @details \b Outputs: fpgaActuatorSetPoints.fpgaD79PWMPumpCtl + * @return none + *************************************************************************/ +void setFPGAD79RinsePumpPWMControl( U08 value ) +{ + fpgaActuatorSetPoints.fpgaD79PWMPumpCtl = value; +} + +/*********************************************************************//** + * @brief * The setFPGAFPValveStates function sets the FP valve states with an 8-bit * mask of states - one bit per valve, with a 1 meaning "energized" and a 0 * meaning "de-energized". The bit positions for these bit states are as follows: Index: firmware/App/Services/FpgaDD.h =================================================================== diff -u -r7d963ca43801628920617ce0b904a62effcd2722 -r8c070c7bf525b5f7f5e3fbc9dba1873c1d7be545 --- firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision 7d963ca43801628920617ce0b904a62effcd2722) +++ firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision 8c070c7bf525b5f7f5e3fbc9dba1873c1d7be545) @@ -171,6 +171,7 @@ void setFPGAD11PumpRevolutionCount( U16 count ); void setFPGAD10PumpRevolutionCount( U16 count ); void setFPGAD76PumpRevolutionCount( U16 count ); +void setFPGAD79RinsePumpPWMControl( U08 control ); U08 getFPGAD11PumpControlStatus( void ); U08 getFPGAD10PumpControlStatus( void ); @@ -189,6 +190,7 @@ U16 getFPGAD11PumpRevolutionCountStatus( void ); U16 getFPGAD10PumpRevolutionCountStatus( void ); U16 getFPGAD76PumpRevolutionCountStatus( void ); +U16 getFPGAD79RinsePumpSpeed( void ); void setFPGAD48PumpSpeed( U16 speed ); void setFPGAD12PumpSpeed( U16 speed ); @@ -253,6 +255,10 @@ U08 getFPGABloodLeakRxErrorCount( void ); U08 getFPGABloodLeakRxFIFODataOut( void ); +// Rinse pump +void setFPGAD79RinsePumpControl( U08 value ); +void setFPGAD79RinsePumpPWMControl( U08 value ); + //*************** IOFP ******************* void setFPGAFPValveStates( U08 valveStates );