Index: firmware/App/Controllers/ConcentratePumps.c =================================================================== diff -u -ra06e2c94a2c49609972b28f7ccd0647baabdb9b1 -r5d82009d1baa2b52122065934481745bf4de223b --- firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision a06e2c94a2c49609972b28f7ccd0647baabdb9b1) +++ firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision 5d82009d1baa2b52122065934481745bf4de223b) @@ -100,7 +100,6 @@ static U32 getPublishConcentratePumpDataInterval( void ); static void calcMeasuredPumpsSpeed( CONCENTRATE_PUMPS_T pumpId, U16 pulseWidthCount ); -static F32 getMeasuredPumpSpeed( CONCENTRATE_PUMPS_T pumpId ); /*********************************************************************//** * @brief @@ -295,6 +294,35 @@ /*********************************************************************//** * @brief + * The getMeasuredPumpSpeed function gets the measured concentrate pump flow rate. + * @details Inputs: measuredPumpSpeed + * @details Outputs: none + * @param pumpId concentrate pump id to increase current step speed + * @return the current concentrate pump flow rate (in mL/min). + *************************************************************************/ +F32 getMeasuredPumpSpeed( CONCENTRATE_PUMPS_T pumpId ) +{ + F32 result = 0.0; + + if ( pumpId < NUM_OF_CONCENTRATE_PUMPS ) + { + result = concentratePumps[ pumpId ].measuredPumpSpeed.data; + + if ( OVERRIDE_KEY == concentratePumps[ pumpId ].measuredPumpSpeed.override ) + { + result = concentratePumps[ pumpId ].measuredPumpSpeed.ovData; + } + } + else + { + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_CONCENTRATE_PUMP_INVALID_PUMP_ID, pumpId ); + } + + return result; +} + +/*********************************************************************//** + * @brief * The stopConcentratePump function sets the concentrate pump step speed to zero * and turns off concentrate pumps. * @details Inputs: none @@ -453,36 +481,7 @@ } } -/*********************************************************************//** - * @brief - * The getMeasuredPumpSpeed function gets the measured concentrate pump flow rate. - * @details Inputs: measuredPumpSpeed - * @details Outputs: none - * @param pumpId concentrate pump id to increase current step speed - * @return the current concentrate pump flow rate (in mL/min). - *************************************************************************/ -static F32 getMeasuredPumpSpeed( CONCENTRATE_PUMPS_T pumpId ) -{ - F32 result = 0.0; - if ( pumpId < NUM_OF_CONCENTRATE_PUMPS ) - { - result = concentratePumps[ pumpId ].measuredPumpSpeed.data; - - if ( OVERRIDE_KEY == concentratePumps[ pumpId ].measuredPumpSpeed.override ) - { - result = concentratePumps[ pumpId ].measuredPumpSpeed.ovData; - } - } - else - { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_CONCENTRATE_PUMP_INVALID_PUMP_ID, pumpId ); - } - - return result; -} - - /************************************************************************* * TEST SUPPORT FUNCTIONS *************************************************************************/