hdfirmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
undoing DG messaging for door switches

DEN-12845 resolved merge conflicts during cherry picking process

    • -0
    • +98
    /firmware/App/Controllers/Buttons.c
    • -1
    • +12
    /firmware/App/Controllers/Switches.c
    • -0
    • +5
    /firmware/App/Controllers/SyringePump.c
DEN-12847 Load cell drift check for stable reservoirs at full and empty.

    • -0
    • +32
    /firmware/App/Controllers/DGInterface.c
    • -0
    • +2
    /firmware/App/Controllers/DGInterface.h
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 messages

Do not monitor for user limits when in blood prime state

Corrected error in choosing states for applying alarms when not dialyzing

Added alarms for venous and arterial pressure whenn in treatment but not dialyzing

    • -2
    • +26
    /firmware/App/Controllers/PresOccl.c
DEN-12224: Moved some treatment definitions from HDDefs.h to ModeTreatment.h.

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/SyringePump.c
DEN-12441 Merge staging

    • -2
    • +2
    /firmware/App/Controllers/SyringePump.c
Merge branch 'staging' into DEN-12441-sw_dev_sprint_67_darren

DEN012441 Update Selftests for alarms with changed names.

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

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

    • -4
    • +26
    /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

DEN-12224 updated the blood leak with an exit normal state command

    • -4
    • +26
    /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

DEN-12224: Fix to bug DEN-12833.

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

Merged DEN-12224

    • -142
    • +189
    /firmware/App/Controllers/BloodLeak.c
DEN-12224 updated the blood leak emebedded mode

    • -10
    • +12
    /firmware/App/Controllers/BloodLeak.c
DEN-12441 Code review comment updates 2.

DEN-12441 Code review comment updates.

    • -19
    • +18
    /firmware/App/Modes/TreatmentStop.c
DEN-12441 Remove place holder for saving Treatment Time to NVRAM. No longer part of this task set.

    • -17
    • +0
    /firmware/App/Modes/ModeTreatment.c
DEN-12224 updated the blood leak embedded mode

    • -141
    • +186
    /firmware/App/Controllers/BloodLeak.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

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