Index: firmware/App/Controllers/DGInterface.c =================================================================== diff -u -r6811f0251b0fa7d27c3e6d5eb16ade2bc88a3204 -r174c9ba02da6790f01ea9141ab1cc1d28388f2f8 --- firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision 6811f0251b0fa7d27c3e6d5eb16ade2bc88a3204) +++ firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision 174c9ba02da6790f01ea9141ab1cc1d28388f2f8) @@ -452,13 +452,13 @@ /*********************************************************************//** * @brief - * The getLoadCellWeightInGrams function gets the load cell weight. + * The getLoadCellWeight function gets the current load cell weight. * @details Inputs: loadCellWeightInGrams * @details Outputs: none * @param loadCellID ID of load cell to get * @return the current load cell weight in grams *************************************************************************/ -F32 getLoadCellWeightInGrams( LOAD_CELL_ID_T loadCellID ) +F32 getLoadCellWeight( LOAD_CELL_ID_T loadCellID ) { F32 result = 0.0; Index: firmware/App/Controllers/DGInterface.h =================================================================== diff -u -r6811f0251b0fa7d27c3e6d5eb16ade2bc88a3204 -r174c9ba02da6790f01ea9141ab1cc1d28388f2f8 --- firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision 6811f0251b0fa7d27c3e6d5eb16ade2bc88a3204) +++ firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision 174c9ba02da6790f01ea9141ab1cc1d28388f2f8) @@ -131,7 +131,7 @@ U32 getDGROPumpPressureSetPt( void ); F32 getDGROPumpFlowRateMlMin( void ); U32 getDGDrainPumpRPMSetPt( void ); -F32 getLoadCellWeightInGrams( LOAD_CELL_ID_T loadCellID ); +F32 getLoadCellWeight( LOAD_CELL_ID_T loadCellID ); F32 getReservoirWeightLargeFilter( DG_RESERVOIR_ID_T resID ); void setDGOpMode( U32 opMode, U32 subMode ); Index: firmware/App/Modes/Dialysis.c =================================================================== diff -u -rdb22e9d530c5c9d62b02e6dcc72ed96fb67c165a -r174c9ba02da6790f01ea9141ab1cc1d28388f2f8 --- firmware/App/Modes/Dialysis.c (.../Dialysis.c) (revision db22e9d530c5c9d62b02e6dcc72ed96fb67c165a) +++ firmware/App/Modes/Dialysis.c (.../Dialysis.c) (revision 174c9ba02da6790f01ea9141ab1cc1d28388f2f8) @@ -1053,7 +1053,7 @@ { DG_RESERVOIR_ID_T activeRes = getDGActiveReservoir(); LOAD_CELL_ID_T lc = ( activeRes == DG_RESERVOIR_1 ? LOAD_CELL_RESERVOIR_1_PRIMARY : LOAD_CELL_RESERVOIR_2_PRIMARY ); - F32 latestResVolume = getLoadCellWeightInGrams( lc ); + F32 latestResVolume = getLoadCellWeight( lc ); #ifndef DISABLE_UF_ALARMS F32 deltaVolume = latestResVolume - resFinalVolume[ activeRes ]; Index: firmware/App/Modes/Prime.c =================================================================== diff -u -r6811f0251b0fa7d27c3e6d5eb16ade2bc88a3204 -r174c9ba02da6790f01ea9141ab1cc1d28388f2f8 --- firmware/App/Modes/Prime.c (.../Prime.c) (revision 6811f0251b0fa7d27c3e6d5eb16ade2bc88a3204) +++ firmware/App/Modes/Prime.c (.../Prime.c) (revision 174c9ba02da6790f01ea9141ab1cc1d28388f2f8) @@ -633,7 +633,7 @@ { HD_PRE_TREATMENT_PRIME_STATE_T state = HD_PRIME_DIALYSATE_DIALYZER_STATE; - F32 const loadcellWeight = getLoadCellWeightInGrams( LOAD_CELL_RESERVOIR_1_PRIMARY ); + F32 const loadcellWeight = getLoadCellWeight( LOAD_CELL_RESERVOIR_1_PRIMARY ); F32 const weightChange = fabs( 1.0 - ( previousLoadCellReading / loadcellWeight ) ); if ( weightChange < LOAD_CELL_VOLUME_NOISE_TOLERANCE ) @@ -701,7 +701,7 @@ static HD_PRE_TREATMENT_PRIME_STATE_T handlePrimeDialysateBypassState( void ) { HD_PRE_TREATMENT_PRIME_STATE_T state = HD_PRIME_DIALYSATE_BYPASS_STATE; - F32 const loadcellWeight = getLoadCellWeightInGrams( LOAD_CELL_RESERVOIR_2_PRIMARY ); + F32 const loadcellWeight = getLoadCellWeight( LOAD_CELL_RESERVOIR_2_PRIMARY ); F32 const weightChange = fabs( 1.0 - ( previousLoadCellReading / loadcellWeight ) ); if ( weightChange < LOAD_CELL_VOLUME_NOISE_TOLERANCE )