common

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into develop

Merge branch 'staging' of ssh://dvm-linux02:7999/comm/common into staging

DEN-7605: Make treatment completed alarms recoverable.

DEN-7395: Addressed merge conflicts

Merge branch 'staging' into develop

DEN-7605: Fixed merge conflicts.

DEN-7605: Fixed bug DEN-8138.

DEN-5963 fixed the order of the alarms in the alarm table

DEN-5963 updated the alarm table

DEN-7802: Added dialysate temperature high and low alarm

DEN-7802: Added dialysate generation conductivity fault alarm

DEN-5963 added alarm IDs

DEN-5963 added an alarm ID

Merge branch 'staging' into develop

DEN-7605: Added message IDs for Dialin overrides to monitored voltages and alarm info.

DEN-7605: Added new messages and alarms for voltage monitor.

Merge branch 'staging' into develop

DEN-7605: Added sub-modes to HD standby mode.

DEN-7605: Updated clear immediate alarm properties for some alarms.

Updated clear immediate property on some alarms. Will add to staging.

DEN-7395: Addressed code review comments

Merge branch 'develop' of ssh://dvm-linux02:7999/comm/common into develop

DEN-7395: Updated alarm definitions for Blood Leak Detector

DEN-7395: Reverted lumping of overrides for Blood Leak Detector status and state

DEN-7395: Reverted lumping of overrides for Blood Leak Detector status and state

Merge branch 'Sprint37' into staging

Merge branch 'staging' into develop

DEN-7605: Added new alarm status flag indicating whether alarm window should be minimizable.

DEN-7568 renamed a mode flush state

DEN-7395: Removed Detector from names of functions