hdfirmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-15229-fw-dpi-pump-on-during-inverted-dialyzer' into develop

    • -13
    • +38
    /firmware/App/Modes/ModePreTreat.c
DEN-15229 Only allow open door during dialyzer invert. Warn user of open door by enabling alarm before transition out of patient connect state.

DEN-15274 added test configuration commands

DEN-15104 Updates per code review.

DEN-15229 No door open flag for UF set. Allow door open until user confirm.

DEN-15229 Code review comment update.

Merge branch 'staging' into DEN-15104-hd-fpga-communications

# Conflicts:

# firmware/App/Controllers/BloodFlow.c

    • -9
    • +5
    /firmware/App/Controllers/DialInFlow.c
DEN-15014 Changes to support FPGA testing. Move FE and OE SCI faults to FPGA communications alarm.

    • -1172
    • +1172
    /firmware/App/Controllers/BloodFlow.c
    • -2
    • +12
    /firmware/App/Controllers/BloodLeak.c
    • -1204
    • +1204
    /firmware/App/Controllers/DialInFlow.c
    • -52
    • +49
    /firmware/App/Controllers/Valves.c
    • -16
    • +24
    /firmware/App/Services/Interrupts.c
DIAL-251: reworked events for operation status and operation state transitions

    • -1
    • +1
    /firmware/App/Modes/ConsumableSelfTest.c
    • -5
    • +2
    /firmware/App/Modes/ModeTreatmentParams.c
    • -4
    • +29
    /firmware/App/Modes/OperationModes.c
    • -0
    • +1
    /firmware/App/Modes/PreTreatmentRecirc.c
  1. … 4 more files in changeset.
Merge branch 'staging' into DEN-15274-hd_dg_test_configuration_setup

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

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

Merge branch 'DEN-15196-Alarm-98-rework' into staging

Merge branch 'staging' into DEN-15196-Alarm-98-rework

DEN-15274 updated the test configuration reservoir management

    • -26
    • +14
    /firmware/App/Modes/ModePreTreat.c
DEN-15274 added code to support the test configurations

    • -13
    • +200
    /firmware/App/Modes/ModePreTreat.c
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Fixed merge conflict.

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

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

Merged DEN-15060 to staging.

Merge branch 'staging' into DEN-15060-nfr-alarms-lower-priority-alarm-de-silence-higher-priority-alarm-audio

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

Merge branch 'DEN-15060-nfr-alarms-lower-priority-alarm-de-silence-higher-priority-alarm-audio' into develop

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

Fixed merge conflict.

DEN-15060: Addressed DEN-15060 issue re: new alarms ending alarm silence.

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

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

Merged DEN-15245 to staging.