Index: firmware/App/Drivers/FlowSensor.c =================================================================== diff -u -r5aaed18e3cd460c091c36c95c81635273bad61c6 -reaadab648c4c1d6d34f3927df6ce5cfb59cdebb6 --- firmware/App/Drivers/FlowSensor.c (.../FlowSensor.c) (revision 5aaed18e3cd460c091c36c95c81635273bad61c6) +++ firmware/App/Drivers/FlowSensor.c (.../FlowSensor.c) (revision eaadab648c4c1d6d34f3927df6ce5cfb59cdebb6) @@ -15,28 +15,28 @@ * ***************************************************************************/ -#include "AlarmMgmtRO.h" +#include "AlarmMgmtRO.h" #include "FlowSensor.h" -#include "FpgaRO.h" +#include "FpgaRO.h" #include "Messaging.h" #include "PersistentAlarm.h" - -/** - * @addtogroup FlowSensor - * @{ - */ - -// ********** private definitions ********** +/** + * @addtogroup FlowSensor + * @{ + */ + +// ********** private definitions ********** + #define FLOW_TEMPERATURE_DIVIDER 10.0F ///< Divider for converting flow readings to mL/min flow rates. -// ********** private data ********** - +// ********** private data ********** + static OVERRIDE_F32_T currentFlowReadings[ NUM_OF_FLOW_SENSORS ]; ///< Current flow sensor pressure readings (overrideable). static OVERRIDE_F32_T currentFlowTempReadings[ NUM_OF_FLOW_SENSORS ]; ///< Current flow sensor temperature readings (overrideable). -// ********** private function prototypes ********** - +// ********** private function prototypes ********** + /*********************************************************************//** * @brief * The initFlowSensor function initializes the Flow Sensor unit. @@ -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; } /*********************************************************************//** @@ -144,12 +144,12 @@ return result; } - -/************************************************************************* - * TEST SUPPORT FUNCTIONS - *************************************************************************/ +/************************************************************************* + * TEST SUPPORT FUNCTIONS + *************************************************************************/ + /*********************************************************************//** * @brief * The testFlowSensorReadingsOverride function overrides the value of @@ -166,7 +166,7 @@ return result; } - + /*********************************************************************//** * @brief * The testFlowSensorTemperatureReadingsOverride function overrides the @@ -184,4 +184,4 @@ return result; } -/**@}*/ +/**@}*/