Index: firmware/App/Controllers/MixingControl.c =================================================================== diff -u -rc7d90a953d526f987d4f41f24b59ed64548e6fee -rca64c6349b6388b515ebf7087b0e80e0bd41bad4 --- firmware/App/Controllers/MixingControl.c (.../MixingControl.c) (revision c7d90a953d526f987d4f41f24b59ed64548e6fee) +++ firmware/App/Controllers/MixingControl.c (.../MixingControl.c) (revision ca64c6349b6388b515ebf7087b0e80e0bd41bad4) @@ -397,6 +397,42 @@ /*********************************************************************//** * @brief + * The getTotalConductivity function gets the total conductivity of bicarb and acid + * @details \b Inputs: none + * @details \b Outputs: none + * @return conductivity + *************************************************************************/ +F32 getTotalConductivity( void ) +{ + return TOTAL_CONDUCTIVITY; +} + +/*********************************************************************//** + * @brief + * The getAcidConducivityPost function gets the acid conductivity post + * @details \b Inputs: none + * @details \b Outputs: none + * @return conductivity + *************************************************************************/ +F32 getAcidConducivityPost( void ) +{ + return ACID_CONDUCTIVITY_POST; +} + +/*********************************************************************//** + * @brief + * The getBicarbConductivityPost function gets the bicarb conductivity post + * @details \b Inputs: none + * @details \b Outputs: none + * @return conductivity + *************************************************************************/ +static F32 getBicarbConductivityPost( void ) +{ + return BICARB_CONDUCTIVITY_PRE; +} + +/*********************************************************************//** + * @brief * The setAcidMixVol function sets acid mix volume provided by the controller * flag value to be True. * @details \b Inputs: none @@ -568,42 +604,6 @@ /*********************************************************************//** * @brief - * The getTotalConductivity function gets the total conductivity of bicarb and acid - * @details \b Inputs: none - * @details \b Outputs: none - * @return conductivity - *************************************************************************/ -F32 getTotalConductivity( void ) -{ - return TOTAL_CONDUCTIVITY; -} - -/*********************************************************************//** - * @brief - * The getAcidConducivityPost function gets the acid conductivity post - * @details \b Inputs: none - * @details \b Outputs: none - * @return conductivity - *************************************************************************/ -F32 getAcidConducivityPost( void ) -{ - return ACID_CONDUCTIVITY_POST; -} - -/*********************************************************************//** - * @brief - * The getBicarbConductivityPost function gets the bicarb conductivity post - * @details \b Inputs: none - * @details \b Outputs: none - * @return conductivity - *************************************************************************/ -static F32 getBicarbConductivityPost( void ) -{ - return BICARB_CONDUCTIVITY_PRE; -} - -/*********************************************************************//** - * @brief * The getBicarbConductivityPre function gets the bicarb conductivity pre * @details \b Inputs: none * @details \b Outputs: none