common

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

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

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

Removed the venous temperature alarm

Merge branch 'DEN-11980-sw_dev-sprint-64' into staging

Merge branch 'DEN-11980-sw_dev-sprint-64' into develop

Fixed merge conflicts for staging and heparin bolus

Merge branch 'DEN-11980-sw_dev-sprint-64' into develop

Fixed Current Treatment Parameters to have the correct sequence in the MSG_ID list.

DEN-11250 Implemented heprin bolus target rate override

Updated HDDefs.h

Merge branch 'DEN-11980-sw_dev-sprint-64' into develop

Fixed Current Treatment Parameter Enum values

Merge branch 'DEN-11980-sw_dev-sprint-64' into develop

DEN-11980: Reverted msg_ids that were previously available for current treatment parameters.

Removed the new POSTs

Merge branch 'staging' into develop

DEN-11750 added fans POST state'

Added HD temperatures POST state

DEN-11980: msg id's for dialin's get current treatment parameters.

Merge branch 'staging' into develop

DEN-11750 added a messge ID

Added more POST states

DEN-11750 added concentrate pumps alarm

Merge branch 'staging' into develop

DEN-11250 Added new state to trigger an occlusion alarm

Merge branch 'staging' into develop

DEN-11750 added message IDs to override the fans duty cycle

Merge branch 'staging' into develop

DEN-11750: Reverted last property change to insufficient Heparin alarm - do not clear condition immediately.