Index: firmware/App/Modes/ModeFill.c =================================================================== diff -u -r2b6abbe347b2da260a4d46aca233bbfb6a59bf04 -re832be54a818fe1af79b225e4b43cd148be89fa4 --- firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision 2b6abbe347b2da260a4d46aca233bbfb6a59bf04) +++ firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision e832be54a818fe1af79b225e4b43cd148be89fa4) @@ -327,7 +327,7 @@ /*********************************************************************//** * @brief * The getIntegratedVolumeML function returns the integrated volume in mL - * @details Inputs: none + * @details Inputs: integratedVolumeML * @details Outputs: integrated volume * @return integrated volume *************************************************************************/ @@ -400,8 +400,6 @@ return volume; } - - /*********************************************************************//** * @brief * The resetChemicalUsedVolumeML function resets the used volume of a chemical @@ -797,7 +795,7 @@ // If we've reached our target fill to volume (by weight), we're done filling - go back to generation idle mode // SRSDG 398 if ( TRUE == hasTargetFillVolumeBeenReached( inactiveReservoir ) ) { - F32 filledVolumeML = getReservoirWeight( inactiveRsrvr ) - reservoirBaseWeight; + F32 filledVolumeML = getReservoirWeight( inactiveReservoir ) - reservoirBaseWeight; F32 integratedVolumeToLoadCellReadingPercent = fabs( 1.0F - ( filledVolumeML / getIntegratedVolumeML() ) ); F32 avgAcidConductivity = acidConductivityTotal / conductivitySampleCount; F32 avgBicarbConductivity = bicarbConductivityTotal / conductivitySampleCount; @@ -1013,8 +1011,8 @@ * @brief * The publishFillModeData function publishes fill mode data * at the set interval. - * @details Inputs: fillModeDataPublicationTimerCounter - * @details Outputs: fillModeDataPublicationTimerCounter + * @details Inputs: fillModeDataPublicationTimerCounter, fillModeDataPublishInterval + * @details Outputs: fillModeData * @return none *************************************************************************/ static void publishFillModeData( void ) @@ -1189,11 +1187,11 @@ /*********************************************************************//** * @brief - * The testSetFillModeDataPublishIntervalOverride function overrides the - * fill mode data publish interval. - * @details Inputs: FillModeDataPublishInterval - * @details Outputs: FillModeDataPublishInterval - * @param: value override fill mode data publish interval with (in ms) + * The testSetIntegratedVolumeOverride function overrides the + * integrated volume. + * @details Inputs: value + * @details Outputs: integratedVolumeML + * @param: value integrated volume in mL * @return TRUE if override successful, FALSE if not *************************************************************************/ BOOL testSetIntegratedVolumeOverride( U32 value ) @@ -1212,10 +1210,10 @@ /*********************************************************************//** * @brief - * The testResetFillModeDataPublishIntervalOverride function resets the - * override of the fill mode data publish interval. - * @details Inputs: FillModeDataPublishInterval - * @details Outputs: FillModeDataPublishInterval + * The testResetIntegratedVolumeOverride function resets the + * override of integrated volume. + * @details Inputs: none + * @details Outputs: integratedVolumeML * @return TRUE if override reset successful, FALSE if not *************************************************************************/ BOOL testResetIntegratedVolumeOverride( void )