AlarmDefs.h

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-14999-alarm-table-updates' of ssh://devapps.diality.us:7999/comm/common into DEN-14999-alarm-table-updates

DEN-14999 updated the alarms table

Merge branch 'DEN-14999-alarm-table-updates' of ssh://dvm-linux02:7999/comm/common into DEN-14999-alarm-table-updates

DEN-14999: removed alarms 273, 274.

Merge branch 'DEN-14999-alarm-table-updates' of ssh://dvm-linux02:7999/comm/common into DEN-14999-alarm-table-updates

DEN-14999 updated the alarms table

  1. … 1 more file in changeset.
DEN-14999 updated the alarms table

Merge branch 'DEN-14999-alarm-table-updates' into develop

Merge branch 'staging' into DEN-14830-incorrect-dialysate-temperature-alarm-triggered

DEN-14646 Update removed alarms to available

DEN-14999: Removed obsolete/redundant alarms.

DEN-14999: Removed alarm 116 - redundant with alarm 115.

DEN-14999: Updated properties for blood leak alarm. Removed alarm 203.

Merge branch 'DEN-14999-alarm-table-updates' into develop

Merge branch 'staging' into DEN-14646-fpga-alarm-properties-and-timing-3

# Conflicts:

# AlarmDefs.h

DEN-14999: No resume or RB for alarm venous bubble detected alarms.

Merge branch 'staging' into DEN-14999-alarm-table-updates

DEN-14999: Removed alarm 306. Changed alarm 141 to not clear immediately.

Fixed merge conflicts from DEN-14999.

Merge branch 'staging' into develop

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

  1. … 2 more files in changeset.
Merge branch 'staging' into DEN-14999-alarm-table-updates

DEN-14999: Fixed alarms 171,172 text not fitting on screen issue.

Merge remote-tracking branch 'origin/DEN-10155-treatment-end-paused-state-not-displaying-resume-option' into staging

Merge remote-tracking branch 'origin/DEN-10155-treatment-end-paused-state-not-displaying-resume-option' into develop

DEN-14999: Removed alarm ID 258 (made available) as it was obsolete.

DEN-14999: Split alarm 46 (no ACK) into 2 alarms. 46 is for msg to UI w/ no ACK. 18 is for msg to DG w/ no ACK.

DEN-14646 Remove alarm 92

Merge branch 'staging' into DEN-14830-incorrect-dialysate-temperature-alarm-triggered

DEN-14999: Resolved contention of use of available alarm ID. Repurposed alarm 101 to UI POST failure for HD comm.