Index: firmware/App/Modes/Dialysis.c =================================================================== diff -u -r1017bbc5760a50e20357da1e4f705b3e6157375e -r2112e3143003eaf9584d4be068f7ca89b33c941a --- firmware/App/Modes/Dialysis.c (.../Dialysis.c) (revision 1017bbc5760a50e20357da1e4f705b3e6157375e) +++ firmware/App/Modes/Dialysis.c (.../Dialysis.c) (revision 2112e3143003eaf9584d4be068f7ca89b33c941a) @@ -89,8 +89,8 @@ refUFVolume = 0.0; measUFVolume = 0.0; - resStartVolume[ DG_RESERVOIR_1 ] = 0.0; - resStartVolume[ DG_RESERVOIR_2 ] = 0.0; +// resStartVolume[ DG_RESERVOIR_1 ] = 0.0; +// resStartVolume[ DG_RESERVOIR_2 ] = 0.0; resFinalVolume[ DG_RESERVOIR_1 ] = 0.0; resFinalVolume[ DG_RESERVOIR_2 ] = 0.0; measUFVolumeFromPriorReservoirs = 0.0; @@ -163,14 +163,14 @@ *************************************************************************/ void startDialysis( void ) { - U32 tempDPORate = (setDialysateFlowRate * 6) / 10; // TODO - temporary fudge factor - remove later +// U32 tempDPORate = (setDialysateFlowRate * 6) / 10; // TODO - temporary fudge factor - remove later lastUFTimeStamp = getMSTimerCount(); setDialOutUFVolumes( refUFVolume, measUFVolume ); setBloodPumpTargetFlowRate( setBloodFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP ); setDialInPumpTargetFlowRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP ); - // setDialOutPumpTargetRate( setDialysateFlowRate + (S32)setUFRate), MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP ); // TODO - restore later - setDialOutPumpTargetRate( tempDPORate + (S32)setUFRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP ); // TODO - test code - remove later + setDialOutPumpTargetRate( setDialysateFlowRate + (S32)setUFRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP ); // TODO - restore later + //setDialOutPumpTargetRate( tempDPORate + (S32)setUFRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP ); // TODO - test code - remove later // TODO - Heparin pump } @@ -306,7 +306,7 @@ void execDialysis( void ) { // check ultrafiltration max rate and accuracy during dialysis (even when ultrafiltration is paused). - checkUFAccuracyAndVolume(); +// checkUFAccuracyAndVolume(); // dialysis state machine switch ( currentDialysisState )