Index: firmware/App/Drivers/FlowSensor.c =================================================================== diff -u -r5aaed18e3cd460c091c36c95c81635273bad61c6 -r88185bbc8ba590d1bbbc5642b6c6b94c309bd37b --- firmware/App/Drivers/FlowSensor.c (.../FlowSensor.c) (revision 5aaed18e3cd460c091c36c95c81635273bad61c6) +++ firmware/App/Drivers/FlowSensor.c (.../FlowSensor.c) (revision 88185bbc8ba590d1bbbc5642b6c6b94c309bd37b) @@ -77,11 +77,11 @@ { // Update and convert raw flow rates to mL/min currentFlowReadings[ FLOW_SENSOR_RO_OUTLET ].data = (F32)( (S16)getFPGAFlowFMP() ); - //currentFlowReadings[ FLOW_SENSOR_WATER_INLET ].data = TBD; + currentFlowReadings[ FLOW_SENSOR_WATER_INLET ].data = (F32)( (S16)getFPGAFlowFMS() ); // Update and convert raw flow sensor temperatures to deg C currentFlowTempReadings[ FLOW_SENSOR_RO_OUTLET ].data = (F32)( (S16)getFPGAFlowFMPTemp() ) / FLOW_TEMPERATURE_DIVIDER; - //currentFlowTempReadings[ FLOW_SENSOR_WATER_INLET ].data = TBD + currentFlowTempReadings[ FLOW_SENSOR_WATER_INLET ].data = (F32)( (S16)getFPGAFlowFMSTemp() ) / FLOW_TEMPERATURE_DIVIDER; } /*********************************************************************//** Index: firmware/App/Services/FpgaRO.c =================================================================== diff -u -r4177ffaeab811fbd2acaaeed6bf703500158734e -r88185bbc8ba590d1bbbc5642b6c6b94c309bd37b --- firmware/App/Services/FpgaRO.c (.../FpgaRO.c) (revision 4177ffaeab811fbd2acaaeed6bf703500158734e) +++ firmware/App/Services/FpgaRO.c (.../FpgaRO.c) (revision 88185bbc8ba590d1bbbc5642b6c6b94c309bd37b) @@ -766,6 +766,33 @@ /*********************************************************************//** * @brief + * The getFPGAFlowFMS function gets the FMS flow rate (in mL/min). + * @details \b Inputs: fpgaSensorReadings.flowRateFms + * @details \b Outputs: none + * @return FMS flow rate (in mL/min) + *************************************************************************/ +U16 getFPGAFlowFMS( void ) +{ + //return fpgaSensorReadings.flowRateFms; + return 0; +} + +/*********************************************************************//** + * @brief + * The getFPGAFlowFMSTemp function gets the FMS flow sensor temperature, the + * temperature of the fluid flowing through the sensor. + * @details \b Inputs: fpgaSensorReadings.flowTempFms + * @details \b Outputs: none + * @return FMS fluid temperature + *************************************************************************/ +U16 getFPGAFlowFMSTemp( void ) +{ + //return fpgaSensorReadings.flowTempFms; + return 0; +} + +/*********************************************************************//** + * @brief * The setFPGACPiControl function sets the FPGA CPi sensor control register * to perform a given action. * bit 4..7: unused Index: firmware/App/Services/FpgaRO.h =================================================================== diff -u -rae36722cb762a069233685bb62a63107fd80338e -r88185bbc8ba590d1bbbc5642b6c6b94c309bd37b --- firmware/App/Services/FpgaRO.h (.../FpgaRO.h) (revision ae36722cb762a069233685bb62a63107fd80338e) +++ firmware/App/Services/FpgaRO.h (.../FpgaRO.h) (revision 88185bbc8ba590d1bbbc5642b6c6b94c309bd37b) @@ -83,8 +83,8 @@ U16 getFPGAFlowFMP( void ); U16 getFPGAFlowFMPTemp( void ); -//U16 getFPGAFlowFMS( void ); -//U16 getFPGAFlowFMSTemp( void ); +U16 getFPGAFlowFMS( void ); +U16 getFPGAFlowFMSTemp( void ); void setFPGACPiControl( U08 control ); void setFPGACPiAddress( U16 address );