common

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Fixed merge conflicts.

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

DEN-7605: Added new HD pump alarm for FPGA reported direction error. Added enum for HD pumps.

DEN:7860: Resolved merge conflicts

DEN-7860: Finished implementing HD Air Bubble Detectors

DEN-7605: Fixed merge conflicts.

DEN-7605: Added more flow sensor faults.

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

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

DEN-7860: First pass at HD air bubble detectors code

DEN-8103: Added battery comm fault

DEN-8103: Removed unused alarms

DEN-7860: Updated alarm table

DEN-7860: Updated alarm table

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

Merge branch 'staging' into develop

Merge branch 'staging' into develop

DEN-8030 updated the alarm table

DEN-8030 updated alarm table

DEN-8103: Added new alarms property

Merge branch 'staging' into develop

DEN-7860: Updated alarm table for HD air bubble detectors

Merge branch 'staging' into develop

DEN-7605: Reduced minimum HD FPGA minor rev.

Merge branch 'staging' into develop

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

DEN-7605: Re-ordered HD POST tests.

DEN-7605: Re-ordered s/w compatibility POST.

DEN-7605: Renamed Compatibility.h to Compatible.h - must have been a conflict.

DEN-7605: Added FPGA compatibility definitions. Added s/w compatibility POST test. Split FPGA POST test into HD and DG alarm IDs.