Services

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-11250 Fixed merge conflicts

  1. … 4 more files in changeset.
Done. Called checkForPrimeOcclusion(); with no parameters.

Done. Called checkForPrimeOcclusion(); with no parameters.

Line 489 F32 bolusVol = getTreatmentParameterF32() was moved. it is no longer here.

Line 489 F32 bolusVol = getTreatmentParameterF32() was moved. it is no longer here.

Updated handlePOSTStateStart( ) function with the handlePOSTStateStart( ) used in DEN-11750.

Updated handlePOSTStateStart( ) function with the handlePOSTStateStart( ) used in DEN-11750.

Changed function prototype from BOOL checkForPrimeOcclusion( BOOL stopPump ) to BOOL checkForPrimeOcclusion( void );

Changed function prototype from BOOL checkForPrimeOcclusion( BOOL stopPump ) to BOOL checkForPrimeOcclusion( void );

We don't need this here. startHeparinBolus() was moved to handleWetSeltTestStartState(void) function. F32 bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME ); setDialInPum...

We don't need this here. startHeparinBolus() was moved to handleWetSeltTestStartState(void) function.

F32 bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );

setDialInPumpTargetFlowRate( DIP_FLOW_RATE_SETUP_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
fmdIntegratedVolume = 0.0;

if ( ( bolusVol > 0.0 ) && ( getSyringePumpVolumeDelivered() < bolusVol ) )

Unknown macro: { startHeparinBolus(); // moved here from startHeparinPump() in Dialysis.c }
DEN-11750 made changes for the reservoir test

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

No parameter needed in this function.

No parameter needed in this function.

Not sure why we need stopPump flag - can't we just call the check function w/ no parameters?

Not sure why we need stopPump flag - can't we just call the check function w/ no parameters?

Changed the reservoirs management for testing

Moved startHeparinBolus() in transitionToWetSelfTests() to handleWetSelfTestStartState().

Moved startHeparinBolus() in transitionToWetSelfTests() to handleWetSelfTestStartState().

Reversed the code to the original. Uncommented result = SYRINGE_PUMP_OFF_STATE;

Reversed the code to the original.
Uncommented result = SYRINGE_PUMP_OFF_STATE;

Reversed the code to the original. Now, implemented check for occlusion in SelfTests.c

Reversed the code to the original.
Now, implemented check for occlusion in SelfTests.c

Removed bolus range check.

Removed bolus range check.

Renamed SYRINGE_FORCE_OCCLUSION_THRESHOLD_VOLT to SYRINGE_FORCE_OCCLUSION_DIFF_V

Renamed SYRINGE_FORCE_OCCLUSION_THRESHOLD_VOLT to SYRINGE_FORCE_OCCLUSION_DIFF_V