Index: firmware/App/Services/FpgaFP.c =================================================================== diff -u -rcf82e0c4128078cce50bd6c7969ea7192ab5be94 -r0362e435bb028b4d9154105e8f386306a89432d5 --- firmware/App/Services/FpgaFP.c (.../FpgaFP.c) (revision cf82e0c4128078cce50bd6c7969ea7192ab5be94) +++ firmware/App/Services/FpgaFP.c (.../FpgaFP.c) (revision 0362e435bb028b4d9154105e8f386306a89432d5) @@ -163,8 +163,8 @@ U16 descalePumpSpeed; ///< Reg 22. Descaler pump speed register. U08 descalePumpControl; ///< Reg 24. Descaler pump control register. U08 p12PumpControl; ///< Reg 25. P12 pump control register. - U16 valveVwiPWMLow; ///< Reg 26. Valve VWi PWM low pulse period in 0.1 uSec. - U16 valveVwiPWMPeriod; ///< Reg 28. Valve VWi PWM full period in 0.1 uSec. + U16 valvePWMLow; ///< Reg 26. Valve VWi PWM low pulse period in 0.1 uSec. + U16 valvePWMPeriod; ///< Reg 28. Valve VWi PWM full period in 0.1 uSec. U16 valvePWMPullIn; ///< Reg 30. Valve PWM high pulse period when valve is on in 0.1 uSec. U16 p12PumpPWMDutyCyclePct; ///< Reg 32. P12 pump PWM duty cycle in percentage. U16 p40PumpPWMDutyCyclePct; ///< Reg 34. P40 pump PWM duty cycle in percentage. @@ -418,24 +418,62 @@ fpgaActuatorSetPoints.valvePWMEnable = valvePWMStates; } +/*********************************************************************//** + * @brief + * The getFPGAValvePWMEnable function gets the RO valve pwm states with + * an 8-bit mask representing the set of states with a 1 meaning "enabled" + * and a 0 meaning "disabled". + * @details \b Inputs: none + * @details \b Outputs: fpgaSensorReadings.valvePWMEnableReadback + * @return none + *************************************************************************/ U16 getFPGAValvePWMEnable( void ) { return fpgaSensorReadings.valvePWMEnableReadback; } + +/*********************************************************************//** + * @brief + * The setFPGAValvePWMPullIn function sets the RO valves Pull-in "strike" + * period where PWM is at 100% in 1ms resolution. + * @details \b Inputs: none + * @details \b Outputs: fpgaActuatorSetPoints.valvePWMPullIn + * @param valvePWMPullIn Pull-in period in 1ms resolution. + * @return none + *************************************************************************/ void setFPGAValvePWMPullIn( U16 valvePWMPullIn ) { fpgaActuatorSetPoints.valvePWMPullIn = valvePWMPullIn; } +/*********************************************************************//** + * @brief + * The setFPGAValvePWMLow function sets the RO valves "low" + * period where PWM is at 0% in 0.1us resolution. + * @details \b Inputs: none + * @details \b Outputs: fpgaActuatorSetPoints.valvePWMLow + * @param valvePWMLow low period in 0.1us resolution. + * @return none + *************************************************************************/ void setFPGAValvePWMLow( U16 valvePWMLow ) { - fpgaActuatorSetPoints.valveVwiPWMLow = valvePWMLow; + fpgaActuatorSetPoints.valvePWMLow = valvePWMLow; } -void setFPGAValvePWMPeroid( U16 valvePWMPeroid ) +/*********************************************************************//** + * @brief + * The setFPGAValvePWMPeriod function sets the RO valves pwm + * period in 0.1us resolution. + * @details \b Inputs: none + * @details \b Outputs: fpgaActuatorSetPoints.valvePWMPeriod + * @param valvePWMPeriod period in 0.1us resolution. + * @return none + *************************************************************************/ +void setFPGAValvePWMPeriod( U16 valvePWMPeriod ) { - fpgaActuatorSetPoints.valveVwiPWMPeriod = valvePWMPeroid; + fpgaActuatorSetPoints.valvePWMPeriod = valvePWMPeriod; } + /*********************************************************************//** * @brief * The setFPGAP12PumpEnable function enables or disables the P12 pump.