Index: firmware/App/Modes/Dialysis.c =================================================================== diff -u -rf326ce71744dca862c186bc00795e84562e80936 -r69ed3f91919e50b68ea448a70db81456fb4946a0 --- firmware/App/Modes/Dialysis.c (.../Dialysis.c) (revision f326ce71744dca862c186bc00795e84562e80936) +++ firmware/App/Modes/Dialysis.c (.../Dialysis.c) (revision 69ed3f91919e50b68ea448a70db81456fb4946a0) @@ -238,7 +238,7 @@ } #endif - setDialInPumpTargetFlowRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, mode ); + setDialInPumpTargetFlowRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, mode, 0.0F ); setDialOutPumpTargetRate( setDialysateFlowRate + (S32)setUFRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP ); // Start Heparin pump as appropriate @@ -327,7 +327,7 @@ mode = PUMP_CONTROL_MODE_OPEN_LOOP; } #endif - setDialInPumpTargetFlowRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, mode ); + setDialInPumpTargetFlowRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, mode, 0.0F ); setDialOutPumpTargetRate( setDialysateFlowRate + (S32)setUFRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP ); } @@ -867,7 +867,7 @@ salineBolusStartRequested = FALSE; // Cmd all pumps to stop setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP ); - setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP ); + setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP, 0.0F ); setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP ); stopSyringePump(); // Begin saline bolus @@ -909,9 +909,9 @@ #endif // Start dialysate inlet pump at re-circ rate #ifndef RUN_PUMPS_OPEN_LOOP - setDialInPumpTargetFlowRate( DIALYSATE_FLOW_RATE_FOR_RECIRC, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP ); + setDialInPumpTargetFlowRate( DIALYSATE_FLOW_RATE_FOR_RECIRC, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP, 0.0F ); #else - setDialInPumpTargetFlowRate( DIALYSATE_FLOW_RATE_FOR_RECIRC, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP ); + setDialInPumpTargetFlowRate( DIALYSATE_FLOW_RATE_FOR_RECIRC, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP, 0.0F ); #endif // Begin saline bolus result = SALINE_BOLUS_STATE_IN_PROGRESS; @@ -1264,15 +1264,15 @@ loadCellBackupWeight = getReservoirBackupWeightLargeFilter( reservoirID ); loadCellCurrentDrift = loadCellPrimaryWeight - loadCellBackupWeight; - if ( ( RESERVOIR_STEADY_CYCLE_FINAL == cycle ) && ( lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][lcPrimaryIndex] > (LOAD_CELL_ILLEGAL_WEIGHT_VALUE + 1) ) ) + if ( ( RESERVOIR_STEADY_CYCLE_FINAL == cycle ) && ( lcLastSteadyWeight[ RESERVOIR_STEADY_CYCLE_START ][ lcPrimaryIndex ] > ( LOAD_CELL_ILLEGAL_WEIGHT_VALUE + 1 ) ) ) { // Start Weight has been previously saved, ok to test - loadCellPreviousDrift = lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][lcPrimaryIndex] - lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][lcBackupIndex]; + loadCellPreviousDrift = lcLastSteadyWeight[ RESERVOIR_STEADY_CYCLE_START ][ lcPrimaryIndex ] - lcLastSteadyWeight[ RESERVOIR_STEADY_CYCLE_START ][ lcBackupIndex ]; driftDiff = fabs ( loadCellCurrentDrift - loadCellPreviousDrift ); } // Save latest reading for next test time - lcLastSteadyWeight[cycle][lcPrimaryIndex] = loadCellPrimaryWeight; - lcLastSteadyWeight[cycle][lcBackupIndex] = loadCellBackupWeight; + lcLastSteadyWeight[ cycle ][ lcPrimaryIndex ] = loadCellPrimaryWeight; + lcLastSteadyWeight[ cycle ][ lcBackupIndex ] = loadCellBackupWeight; #ifndef _RELEASE_ if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ULTRAFILTRATION_ALARMS ) != SW_CONFIG_ENABLE_VALUE )