Index: firmware/App/Services/FpgaRO.c =================================================================== diff -u -rd4d21b42ee8bd292a6d9f7966fe37abe0271dfda -r3edf8084a5028ee0d00a3fba496284e593e4254d --- firmware/App/Services/FpgaRO.c (.../FpgaRO.c) (revision d4d21b42ee8bd292a6d9f7966fe37abe0271dfda) +++ firmware/App/Services/FpgaRO.c (.../FpgaRO.c) (revision 3edf8084a5028ee0d00a3fba496284e593e4254d) @@ -116,11 +116,11 @@ U16 conductSensor2Temp; ///< Reg 352. Conductivity sensor 2 temperature. U08 conductSensor2ReadCount; ///< Reg 354. Conductivity sensor 2 read counter. U08 conductSensor2ErrorCount; ///< Reg 355. Conductivity sensor 2 error counter. - U16 flowRateCountFmp; ///< Reg 356. FMP flow sensor pulse counter. - U16 flowTemp; ///< Reg 358. FMP flow sensor temperature. + U16 flowRateFmp; ///< Reg 356. FMP flow sensor rate. + U16 flowTempFmp; ///< Reg 358. FMP flow sensor temperature. U16 roPumpTachCount; ///< Reg 360. ROP tachometer counter. U16 dsPumpTachCount; ///< Reg 362. DSP tachometer counter. - U16 flowIntTemp; ///< Reg 364. FMP flow sensor internal temperature. + U16 flowIntTempFmp; ///< Reg 364. FMP flow sensor internal temperature. U08 valveControlReadback; ///< Reg 366. Valve control bits read back. U08 valvePWMEnableReadback; ///< Reg 367. Valve PWM enable read back. U16 roPumpPWMReadback; ///< Reg 368. ROP PWM read back. @@ -667,4 +667,29 @@ return fpgaSensorReadings.levelSwitch; } +/*********************************************************************//** + * @brief + * The getFPGAFlowFMP function gets the FMP flow rate (in mL/min). + * @details \b Inputs: fpgaSensorReadings.flowRateFmp + * @details \b Outputs: none + * @return FMP flow rate (in mL/min) + *************************************************************************/ +U16 getFPGAFlowFMP( void ) +{ + return fpgaSensorReadings.flowRateFmp; +} + +/*********************************************************************//** + * @brief + * The getFPGAFlowFMPTemp function gets the FMP flow sensor temperature, the + * temperature of the fluid flowing through the sensor. + * @details \b Inputs: fpgaSensorReadings.flowTempFmp + * @details \b Outputs: none + * @return FMP fluid temperature + *************************************************************************/ +U16 getFPGAFlowFMPTemp( void ) +{ + return fpgaSensorReadings.flowTempFmp; +} + /**@}*/