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

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

Merge branch 'DEN-14830-incorrect-dialysate-temperature-alarm-triggered' into develop

more compiler fixes

DEN-14830: compiler fixes for develop.

DEN-14830: Implemented temperature recovery to be set at +-2 C of target temp. Implemented dialysate temperature alarms to have a clear period of 30s.

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

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

DEN-13154: Use raw FMD measured flow for alarm 312. Added capture of raw dialysate flow to facilitate this.

DEN-13154: Add syringe pump stall check to preload and seek states.

Merge branch 'staging' into DEN-14763-dg_hd_dev-hd_dg_dvt-update-part-10

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

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

DEN-14834 updated the code to control the primary heater

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

Merge branch 'DEN-13154-heparin-syringe-empty-position-incorrect' into develop

DEN-13154: Further fix to DEN-14814 re: do not require syringe removal to re-do preload operation.

DEN-14834 changed one of the pre-treatment target fills from 600 to 750mL Changed the reservoir's upper limit in treatment from 1950 to 1900mL

HD-DEN-14457_Reservoir Drains Before Treatment With Pre Treatment Build Flags Off

Address comment

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

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

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

Fixed merge conflicts.

DEN-13154: Removed dry self-test timeout alarm. Fixed bug DEN-14884.

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

Merge branch 'DEN-13154-heparin-syringe-empty-position-incorrect' into develop

DEN-13154: Removed obsolete pressure data from broadcast. Tightened no cartridge pressure range for PBA and PBo.

DEN-14834 added code to calculate the heating parameters in pre-treatment and send it to DG in the pre-treatment reservoir management

DEN-14830: reworked dialysate temp timeouts and conditions. Restored previous persistence alarms. added below 33 degC alarm

Merge branch 'staging' into DEN-14830-incorrect-dialysate-temperature-alarm-triggered