Services

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

# Conflicts:

# firmware/App/Controllers/BloodFlow.c

  1. … 4 more files in changeset.
DEN-15014 Changes to support FPGA testing. Move FE and OE SCI faults to FPGA communications alarm.

  1. … 5 more files in changeset.
DEN-15274 added code to support the test configurations

  1. … 2 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

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

Fixed merge conflict.

  1. … 2 more files in changeset.
DEN-15060: Addressed DEN-15060 issue re: new alarms ending alarm silence.

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

  1. … 1 more file in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 10 more files in changeset.
DEN-15245: Addressed DEN-15245.

Merged DEN-15199

  1. … 3 more files in changeset.
DEN-15199 merged staging

  1. … 3 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 9 more files in changeset.
Merge branch 'DEN-15267-request-create-dialin-command-to-enable-air-bubble-alarm-in-service-mode-air-bubble' into develop

DEN-15267: Addressed code review comment.

Fixed merge conflict from DEN-15267.

  1. … 1 more file in changeset.
DEN-15267: Refactored bubble detector driver to allow modes to push enable/disable instead of determining based on current op mode. Added support for new Dialin command to enable/disable venous bubble alarm detection.

  1. … 9 more files in changeset.
DEN-15104 Update for FE and OE errors. Minor correction to bloodLeakEmbModeCmd array. Enable venous pressure alarm which was commented out.

  1. … 2 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 8 more files in changeset.
DEN-14262: Added a/c power loss flag to alarm info broadcast.

  1. … 1 more file in changeset.
DEN-15199 work in progress continued implementing the test configurations code

  1. … 9 more files in changeset.
Fixed missing merge change.

DEN-16565 cherry picked Sunrise commit ID cc51e5f0c0b18d1011e7b4949fcffac019e09292 by Dara Navaei

DEN-16565 cherry picked Sunrise commit ID 199502232e53e78651a65c4cfbfcee27379d4f56 by Dara Navaei

merge fixes

  1. … 2 more files in changeset.
merge fixes

merge fixes

Update messaging and project

  1. … 4 more files in changeset.
DEN-16565 cherry picked Sunrise commit ID 5fee19014b35574d67b210f71581a6013650528e by Dara Navaei

  1. … 2 more files in changeset.
Update messaging and project

  1. … 4 more files in changeset.