common

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-11980-sw_dev-sprint-64' into staging

Merge branch 'DEN-11980-sw_dev-sprint-64' into develop

Fixed merge conflicts for staging and heparin bolus

Merge branch 'DEN-11980-sw_dev-sprint-64' into develop

Fixed Current Treatment Parameters to have the correct sequence in the MSG_ID list.

DEN-11250 Implemented heprin bolus target rate override

Updated HDDefs.h

Merge branch 'DEN-11980-sw_dev-sprint-64' into develop

Fixed Current Treatment Parameter Enum values

Merge branch 'DEN-11980-sw_dev-sprint-64' into develop

DEN-11980: Reverted msg_ids that were previously available for current treatment parameters.

Removed the new POSTs

Merge branch 'staging' into develop

DEN-11750 added fans POST state'

Added HD temperatures POST state

DEN-11980: msg id's for dialin's get current treatment parameters.

Merge branch 'staging' into develop

DEN-11750 added a messge ID

Added more POST states

DEN-11750 added concentrate pumps alarm

Merge branch 'staging' into develop

DEN-11250 Added new state to trigger an occlusion alarm

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 }
RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.