hdfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into DEN-15104-hd-fpga-communications

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
    • -2
    • +2
    /firmware/App/Controllers/SyringePump.h
Merged DEN-15245-2 to staging.

DEN-15245: Fixed issue with syringe occlusion check potentially overriding a previously set stop pump flag.

    • -3
    • +4
    /firmware/App/Controllers/SyringePump.c
    • -1
    • +1
    /firmware/App/Controllers/SyringePump.h
DEN-15104 Update per code review

DEN-15104 Updates per code review.

DEN-15104 Updates per code review.

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
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

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

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.

Merge branch 'staging' into DEN-15245-heparin-empty-syringe-alarm-notification-not-displayed-to-user-if-another-alarm-is

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/DialInFlow.c
DEN-15245: Addressed DEN-14818.

Merged DEN-15199

DEN-15199 addressed the code review comments

DEN-15245: Addressed DEN-15245.

DEN-15199 addressed the code review comment