hdfirmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'develop' of ssh://dvm-linux02:7999/hd/hdfirmware into develop

DEN-12441 Resolve conflicts for merge with Develop.

    • -15
    • +0
    /firmware/App/Modes/ModeTreatment.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Fixed merge conflicts.

    • -96
    • +323
    /firmware/App/Controllers/BloodLeak.c
    • -4
    • +6
    /firmware/App/Controllers/SyringePump.c
    • -12
    • +20
    /firmware/App/Services/SystemComm.c
DEN-12224: Fixes to Tx log event logging.

    • -2
    • +4
    /firmware/App/Controllers/SyringePump.c
DEN-12224: Added message support for UI to request going to service mode. Allow faults to be minimized.

    • -21
    • +25
    /firmware/App/Services/SystemComm.c
DEN-12224 updated the blood leak embedded mode driver

    • -23
    • +179
    /firmware/App/Controllers/BloodLeak.c
Merge branch 'DEN-12224-dg_hd_dev-switches-monitor' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-12224-dg_hd_dev-switches-monitor

    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
DEN-12224 updated the blood leak embedded mode commands

    • -97
    • +168
    /firmware/App/Controllers/BloodLeak.c
    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
    • -0
    • +11
    /firmware/App/Services/SystemComm.c
DEN-12224: Trigger service mode alarm when transitioning to service mode. Do not go to fault mode on fault if in service mode.

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

Merge branch 'DEN-12609-sw_dev-sprint-69_mg' into develop

    • -7
    • +32
    /firmware/App/Controllers/PresOccl.c
    • -7
    • +18
    /firmware/App/Services/Reservoirs.c
DEN-12704: DEN-12332 Reworked timer for reservoir depletion alarm.

    • -19
    • +27
    /firmware/App/Services/Reservoirs.c
Merge branch 'DEN-12224-dg_hd_dev-switches-monitor' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-12224-dg_hd_dev-switches-monitor

    • -1
    • +0
    /firmware/App/Controllers/SyringePump.c
DEN-12224: Add 0.2 mL of Heparin prime volume to coat dialyzer and blood side circuit tubing.

    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
DEN-12704: DEN-12344: Included selftests.h to presoccl.c

Merge branch 'DEN-12441-sw_dev_sprint_67_darren' into develop

    • -0
    • +17
    /firmware/App/Modes/ModeTreatment.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'DEN-12224-dg_hd_dev-switches-monitor' into develop

    • -56
    • +330
    /firmware/App/Controllers/BloodLeak.c
    • -1
    • +0
    /firmware/App/Controllers/SyringePump.c
Merge branch 'DEN-12224-dg_hd_dev-switches-monitor' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-12224-dg_hd_dev-switches-monitor

DEN-12224 updated the blood leak driver

    • -56
    • +330
    /firmware/App/Controllers/BloodLeak.c
    • -1
    • +0
    /firmware/App/Controllers/SyringePump.c
    • -0
    • +13
    /firmware/App/Modes/OperationModes.c
DEN-12704: DEN-12344: Fixed alarm 142 to not be checked outside of treatment and pre-treatment mode. specific conditions apply to when the alarm is monitored for each op mode. pre-treatment wont check after pressure settle time. treatment wont check when in tx_stop

    • -6
    • +30
    /firmware/App/Controllers/PresOccl.c
Merge branch 'DEN-12224-dg_hd_dev-switches-monitor' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-12224-dg_hd_dev-switches-monitor

DEN-12224: update pre-treatment reservoir mgmt handling of fill command.

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

Merge branch 'DEN-12224-dg_hd_dev-switches-monitor' into develop

    • -1
    • +1
    /firmware/App/Controllers/SyringePump.c
    • -3
    • +2
    /firmware/App/Modes/ConsumableSelfTest.c
DEN-12224, DEN-12642 updated the software configuration in post treatment.

    • -1
    • +2
    /firmware/App/Modes/ConsumableSelfTest.c
    • -4
    • +16
    /firmware/App/Modes/ModePostTreat.c
DEN-12635: Fixed init prime() to only initialize values. Removed duplicate init call for consumable self tests

    • -2
    • +0
    /firmware/App/Modes/ConsumableSelfTest.c
DEN-12224 merged CodeClinic VectorCAST code

Merge branch 'DEN-12224-dg_hd_dev-switches-monitor' of ssh://dvm-linux02:7999/hd/hdfirmware into DEN-12224-dg_hd_dev-switches-monitor