Index: firmware/App/Modes/ModePreTreat.c =================================================================== diff -u -rdb291cc22fd8f10e6e47cad468e14ed5590a94f2 -ra3f4042b73d09dd6dac075937878685f26053c0a --- firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision db291cc22fd8f10e6e47cad468e14ed5590a94f2) +++ firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision a3f4042b73d09dd6dac075937878685f26053c0a) @@ -143,7 +143,6 @@ static PRE_TREATMENT_RESERVOIR_MGMT_STATE_T handlePreTreatmentReservoirMgmtWaitReservoirSwitchState( void ); static void handlePreTreatmentReservoirMgmtCompleteState( void ); static U32 getPreTreatmentFillVolume( DG_RESERVOIR_ID_T inactiveRes ); -static void setPreTreatmentHeatingParams( F32 targetTempC, U32 targetVolML, F32 targetFillFlowLPM, U32 dialysateFlowMLPM ); // Test configuration test function and final drain correction at patient connect static void execPreTreatmentTestConfigReservoirMgmt( void ); @@ -613,6 +612,32 @@ /*********************************************************************//** * @brief + * The setPreTreatmentHeatingParams function calculates and set the heating + * parameters to be sent to DG. + * @details Inputs: none + * @details Outputs: none + * @param targetTempC target temperature in C + * @param targetVolML target fill volume in milliliters + * @param targetFillFlowLPM target fill flow rate in L/min + * @param dialysateFlowMLPM dialysate flow in mL/min + * @return none + *************************************************************************/ +void setPreTreatmentHeatingParams( F32 targetTempC, U32 targetVolML, F32 targetFillFlowLPM, U32 dialysateFlowMLPM ) +{ + DG_CMD_DIALYSATE_HEATING_PARAMS_T params; + F32 fillTimeMS = ( (F32)targetVolML / ( targetFillFlowLPM * ML_PER_LITER ) ) * SEC_PER_MIN * MS_PER_SECOND; + + params.trimmerTargetTemperature = targetTempC; + params.timeReservoirWait2SwitchMS = 0; + params.timeReservoirFillMS = fillTimeMS; + params.timeReservoirCycleMS = (U32)fillTimeMS; + params.dialysateFlowLPM = ( (F32)dialysateFlowMLPM ) / ML_PER_LITER; + params.usePriTargetTempEquation = FALSE; + cmdSetDGDialysateHeatingParams( params ); +} + +/*********************************************************************//** + * @brief * The publishPreTreatmentState function broadcasts pre-treatment sub-mode * and current sub-mode state. * @details Inputs: pre-treatment sub-mode, state @@ -1622,32 +1647,6 @@ return volume; } -/*********************************************************************//** - * @brief - * The setPreTreatmentHeatingParams function calculates and set the heating - * parameters to be sent to DG. - * @details Inputs: none - * @details Outputs: none - * @param targetTempC target temperature in C - * @param targetVolML target fill volume in milliliters - * @param targetFillFlowLPM target fill flow rate in L/min - * @param dialysateFlowMLPM dialysate flow in mL/min - * @return none - *************************************************************************/ -static void setPreTreatmentHeatingParams( F32 targetTempC, U32 targetVolML, F32 targetFillFlowLPM, U32 dialysateFlowMLPM ) -{ - DG_CMD_DIALYSATE_HEATING_PARAMS_T params; - F32 fillTimeMS = ( (F32)targetVolML / ( targetFillFlowLPM * ML_PER_LITER ) ) * SEC_PER_MIN * MS_PER_SECOND; - - params.trimmerTargetTemperature = targetTempC; - params.timeReservoirWait2SwitchMS = 0; - params.timeReservoirFillMS = fillTimeMS; - params.timeReservoirCycleMS = (U32)fillTimeMS; - params.dialysateFlowLPM = ( (F32)dialysateFlowMLPM ) / ML_PER_LITER; - params.usePriTargetTempEquation = FALSE; - cmdSetDGDialysateHeatingParams( params ); -} - /************************************************************************* * TEST SUPPORT FUNCTIONS *************************************************************************/