HD-DEN-7860

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

Merge branch 'DENBUG-335-air-trap-fill-design-improvem' into develop

DENBUG-335: run BP in open loop during blood prime for air trap fill.

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

Merge branch 'DENBUG-335-air-trap-fill-design-improvem' into develop

DENBUG-335: aligned air trap fill approach in RB and Tx:End states with the other Tx states.

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

Merge branch 'DENBUG-335-air-trap-fill-design-improvem' into develop

DENBUG-335: Reset time window of new alarm after alarm is triggered so it doesn't interfere with alarm recovery. Fix time window from 1 to 5 minutes.

DENBUG-335: Added check for air trap activity too frequent.

    • -6
    • +15
    /firmware/App/Controllers/AirTrap.c
DENBUG-335: reduced minimum venous pressure limit to -100 while in rinseback state.

    • -2
    • +13
    /firmware/App/Modes/ModeTreatmentParams.c
DENBUG-335: Add air trap fill handling in Dialysis: BLD Zeroing state.

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

DENBUG-335: fixed merge conflict.

    • -2
    • +2
    /firmware/App/Controllers/DGInterface.c
    • -1
    • +1
    /firmware/App/Controllers/DGInterface.h
    • -3
    • +3
    /firmware/App/Controllers/SyringePump.c
    • -1
    • +1
    /firmware/App/Controllers/Temperatures.c
    • -11
    • +37
    /firmware/App/Controllers/Valves.c
    • -1
    • +1
    /firmware/App/Modes/ConsumableSelfTest.c
DENBUG-335: more air trap fill tuning.

DENBUG-335: air trap fill refinements.

DENBUG-335: First cut at new air trap fill approach with closing of VBV and slowing of BP.

    • -2
    • +29
    /firmware/App/Controllers/AirTrap.c
    • -34
    • +67
    /firmware/App/Modes/TreatmentStop.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -2
    • +2
    /firmware/App/Controllers/DGInterface.c
  1. … 104 more files in changeset.
Merged release/p1b/staging

    • -0
    • +4
    /firmware/App/Controllers/DGInterface.c
    • -11
    • +29
    /firmware/App/Controllers/PresOccl.c
    • -1
    • +0
    /firmware/App/Controllers/SyringePump.c
Merged DENBUG-334

DENBUG-334 added the changes from staging

    • -0
    • +4
    /firmware/App/Controllers/DGInterface.c
    • -11
    • +29
    /firmware/App/Controllers/PresOccl.c
    • -1
    • +0
    /firmware/App/Controllers/SyringePump.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -2
    • +2
    /firmware/App/Controllers/DGInterface.c
  1. … 104 more files in changeset.
Merged DENBUG-334

DENBUG-334 updated the VectorCAST test cases

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

Merged DENBUG-334

    • -0
    • +4
    /firmware/App/Controllers/DGInterface.c
    • -11
    • +29
    /firmware/App/Controllers/PresOccl.c
    • -1
    • +0
    /firmware/App/Controllers/SyringePump.c
DENBUG-334 updated the code to initialize the variables in between the treatments without a need to power cycle the unit

    • -0
    • +4
    /firmware/App/Controllers/DGInterface.c
    • -11
    • +29
    /firmware/App/Controllers/PresOccl.c
    • -1
    • +0
    /firmware/App/Controllers/SyringePump.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo