hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-11089 Correction - dialyzer dialysate bypass priming path uses R1 instead of R2 and dialyzer dialysate priming path uses R2 instead of R1

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

DEN-11114: Added comment.

    • -1
    • +1
    /firmware/App/Controllers/DialOutFlow.c
Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2

    • -1
    • +16
    /firmware/App/Modes/ModeTreatment.c
DEN-11114 initial commit of the reservoirs module. Continued with implementing the reservoir management

    • -19
    • +120
    /firmware/App/Controllers/DGInterface.c
    • -3
    • +4
    /firmware/App/Controllers/DGInterface.h
    • -0
    • +407
    /firmware/App/Services/Reservoirs.c
    • -0
    • +38
    /firmware/App/Services/Reservoirs.h
DEN-11114: Updated UF control to included estimated UF flow as input.

    • -4
    • +5
    /firmware/App/Controllers/DialInFlow.c
    • -40
    • +106
    /firmware/App/Controllers/DialOutFlow.c
    • -0
    • +1
    /firmware/App/Controllers/DialOutFlow.h
    • -1
    • +16
    /firmware/App/Modes/ModeTreatment.c
DEN-11089 Incorporated peer review comments

Done

Done

Fixed

Fixed

I believe reservoir 2 is used. static PRE_TREATMENT_RESERVOIR_MGMT_STATE_T handlePreTreatmentReservoirMgmtStartState( void ) { PRE_TREATMENT_RESERVOIR_MGMT_STATE_T state = PRE_TREATMENT_RESERVOIR_...

I believe reservoir 2 is used.

static PRE_TREATMENT_RESERVOIR_MGMT_STATE_T handlePreTreatmentReservoirMgmtStartState( void )
{
PRE_TREATMENT_RESERVOIR_MGMT_STATE_T state = PRE_TREATMENT_RESERVOIR_MGMT_START_STATE;

if ( TRUE == fillReservoirOneStartRequested )

Unknown macro: { fillReservoirOneStartRequested = FALSE; state = PRE_TREATMENT_RESERVOIR_MGMT_DRAIN_CMD_STATE; cmdSetDGActiveReservoir( DG_RESERVOIR_2 ); }


return state;
}

Fixed

Fixed

Done

Done

Done

Done

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

Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' into develop

    • -1
    • +1
    /firmware/App/Controllers/DialInFlow.c
    • -1
    • +1
    /firmware/App/Controllers/DialOutFlow.c
DEN-11114: Restored previous motor controller speed feedback conversion to RPM - it was right before.

    • -1
    • +1
    /firmware/App/Controllers/DialInFlow.c
    • -1
    • +1
    /firmware/App/Controllers/DialOutFlow.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' into develop

    • -6
    • +8
    /firmware/App/Controllers/DialInFlow.c
    • -4
    • +4
    /firmware/App/Controllers/DialOutFlow.c
This might be reservoir 1 - there is a pre-treatment reservoir mgmt function handling this - check to see which reservoir is active at beginning of prime here.

This might be reservoir 1 - there is a pre-treatment reservoir mgmt function handling this - check to see which reservoir is active at beginning of prime here.

Why reset start time here?

Why reset start time here?

I think this needs to be closed or saline will not be forced across dialyzer into dialysate flow path.

I think this needs to be closed or saline will not be forced across dialyzer into dialysate flow path.

Make it clearer that this is for prime dialyzer state.

Make it clearer that this is for prime dialyzer state.

Dialyzer is spelled with a "z" not "s".

Dialyzer is spelled with a "z" not "s".

I would rename to something like prime dialyzer stop weight.

I would rename to something like prime dialyzer stop weight.

DEN-11114: Fixed conversion issue for pump speed ADC voltage levels.

    • -6
    • +8
    /firmware/App/Controllers/DialInFlow.c
    • -4
    • +4
    /firmware/App/Controllers/DialOutFlow.c
DEN-11114: Changed syringe ID measurement to median between min and max ID given by manufacturer. Included prime volume in calculation of volume needed to meet needs of treatment.

    • -2
    • +2
    /firmware/App/Controllers/SyringePump.c
DEN-11089 if priming for the 1st time, transition to the HD_PRIME_SALINE_SETUP_STATE

DEN-11089 In hadlePrimeDialysateBypassState, state should be HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE

DEN-11089 Swapped the dialysate priming circuit - prime the R2 circuit first then prime the R1 circuit

DEN-11089 Implemented new saline dialyzer priming state to purge air from the dialyzer path