common

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

DEN-12224 added an alarm for the conductivity sensors bad status reading

DEN-11928 Updated per peer review comments

DEN-11928 Switched the rank of two alarms

Added more features

DEN-10974 Allow Resume for Door and Pump Track Latch Open alarms.

Merge branch 'staging' into develop

DEN-12224 updated the cap alarm name

DEN-11928 Added average conductivity out of range alarms

DEN-11928 Changed water inlet temperature alarms properties

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

DEN-12224 added cap alarm

Added sub-states in generation idle mode to handle bad dialysate fill

DEN-12224: added available msg ID to enum to fill gap.

DEN-12224 added reject reasons for the caps

Merge branch 'staging' into develop

DEN-11928 Implemented used concentrate volume override

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

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

DEN-12224: Changed user ACK status bit and alarm property to Ok button only status bit and clear only alarm property

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

Merge branch 'DEN-12121-sw_dev-sprint-65-michael-garthwaite' into staging

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

Merge branch 'DEN-12121-sw_dev-sprint-65-michael-garthwaite' into develop

Merge branch 'staging' into DEN-12121-sw_dev-sprint-65-michael-garthwaite

DEN-12121: Updated HD communication status override to use message id 0xA008 per peer review

Merged DEN-12224

DEN-12224 moved the wet self tests to HDDefs.h

DEN-12224 updated the DG fans RPM alarm start time offset message ID.

Merged DEN-12224 and resolved the merge conflicts