hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Resolved the merge conflicts

Removed the extra blood leak call

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Enabled Syringe Pump

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Fixed merge conflicts

Enabled/Disabled the appropriate flags in HDCommon.h for Syringe Pump Testing

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'develop' of ssh://dvm-linux02:7999/hd/hdfirmware into develop

Enabled build switches

Merge branch 'DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up

DEN-11750: added TODO.

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Disabled the blood leak alarms

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

DEN-11250 Merged to develop

DEN-11250 Fixed merge conflicts

    • -171
    • +180
    /firmware/App/Controllers/SyringePump.c
DEN-11250 Updated per peer review comments

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.

DEN-11250 Fixed compile errors

DEN-11250 Updated handPOSTStateStart with same function from DEN-11750 branch

DEN-11250 Updated per peer review comments

    • -2
    • +2
    /firmware/App/Controllers/SyringePump.c
    • -1
    • +1
    /firmware/App/Controllers/SyringePump.h
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.