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

Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' into develop

DEN-1111: Fix dry pressure test. Fix wet flow vs. res test. Adjust test code patch for PBA in BP flow estimator.

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Enabled build switches

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'develop' of ssh://dvm-linux02:7999/hd/hdfirmware into develop

Enabled cartridge prime.

DEN-11098 Uncommented the last three priming related switches

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'develop' of ssh://dvm-linux02:7999/hd/hdfirmware into develop

Merged DEN-11114

DEN-11114 added blood leak alarms

Merge branch 'develop' of ssh://dvm-linux02:7999/hd/hdfirmware into develop

DEN-11098 Updated prime time limit for the saline dialyzer state

DEN-11114: Fixed AC POST test.

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merged DEN-11114 and resolved merge conflict

DEN-11114 added header to the functions in FPGA

DEN-11114: Removed arterial bubble sensor.

DEN-11114 worked on the reservoirs and blood leak detector

Merge branch 'develop' of ssh://dvm-linux02:7999/hd/hdfirmware into develop

DEN-11098 Converted from seconds to milliseconds fix

Fixed merge conflict

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'develop' of ssh://dvm-linux02:7999/hd/hdfirmware into develop

Enabled the skip reservoirs alarm

DEN-11114: Fixed mid-treatment changes not immediately sending new ranges to UI problem.

DEN-11098 Corrected state transition and changed blood pump speed from 400 to 300 per system specification

DEN-11114: ifdef'd dead code in alarm lamp driver. Clear POR bit after logging reset in POST.