AlarmMgmt.h

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Resolved merge conflicts from DENBUG-318

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

  1. … 19 more files in changeset.
Merged release/p1b/staging

  1. … 17 more files in changeset.
DENBUG-298 updated the code from staging

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

  1. … 19 more files in changeset.
Merge branch 'DENBUG-298-user-unable-to-deliver-saline-bolus-during-alarm-conditions-where-the-blood-pump-is-recirculating' into develop

  1. … 1 more file in changeset.
DENBUG-298 changed the block saline bolus to rinse back from dialysate recirculation

  1. … 2 more files in changeset.
DENBUG-298 addressed the code review comment

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

  1. … 116 more files in changeset.
Merged DEN-17208

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

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

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

  1. … 116 more files in changeset.
DEN-16518 resolve merge issue

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

  1. … 116 more files in changeset.
Fixed merge conflict.

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

  1. … 24 more files in changeset.
Merge branch 'DEN-15792-hd-software-design-description' into develop

  1. … 6 more files in changeset.
DEN-15792: More doxygen comment fixes.

  1. … 6 more files in changeset.
Merge branch 'STT-1965-srshd-1395-the-hd-software-shall-trigger-alarm-98-if-an-error-is-detected-on-the-battery' into develop

# Conflicts:

# firmware/App/Controllers/DGInterface.c

# firmware/App/HDCommon.h

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

  1. … 13 more files in changeset.
Fixed merge conflicts.

  1. … 3 more files in changeset.
DENBUG-59: distinguish between alarms originating from outside.

  1. … 3 more files in changeset.
Merge remote-tracking branch 'origin/DEN-15893-cartridge-lever-is-open-alarm-when-cartridge-lever-is-closed' into develop

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

  1. … 3 more files in changeset.
Merge remote-tracking branch 'origin/DEN-15719-blood-pump-stopped-alarms-211-212-124-125-not-relevant-for-alarms-that-force-tx-to' into develop

  1. … 2 more files in changeset.
DEN-15719-blood-pump-stopped-alarms-211-212-124-125-not-relevant-for-alarms-that-force-tx-to

Retrigger blocked, alarms directly blocked during stop

  1. … 3 more files in changeset.
Merge branch 'DEN-15306-hd-fault-valve-position-alarm-after-restoring-ac-power' into develop

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

  1. … 5 more files in changeset.
DEN-15317: Added alarm re-trigger blocked flag to alarm status broadcast msg.

  1. … 2 more files in changeset.