Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-15274, DEN-15246 Added code to not lose the commanded fill volume from HD due to multiple bad fill modes. Updated the heaters code to keep getting the dialysate the flow for the trimmer control. Updated the drain to volume function

  1. … 5 more files in changeset.
Merged staging and resolved the conflicts

  1. … 3 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 12 more files in changeset.
DEN-14999 merged staging

  1. … 9 more files in changeset.
DEN-14999 updated the code based on the alarms table

  1. … 9 more files in changeset.
Merged staging

  1. … 5 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 17 more files in changeset.
DEN-14999: merged staging

  1. … 5 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 8 more files in changeset.
Merge branch 'staging' into DEN-14646-fpga-alarm-properties-and-timing-3

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

Merge branch 'DEN-14788-DIAL-222-heater-duty-cycles' into develop

DIAL-222: changed set heater duty cycle to consider overriden values on reset.

DEN-14999 updated the code based on the alarms table changes

  1. … 7 more files in changeset.
DEN-14999 updated the code based on the alarms table update

  1. … 8 more files in changeset.
DIAL-222: removed heater check for reset override command.

Merge branch 'staging' into DEN-14646-fpga-alarm-properties-and-timing-3

  1. … 4 more files in changeset.
Merged staging

  1. … 7 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Merge branch 'DIAL-222-sys-request' into develop

DIAL-222: fixed heaters override reset.

DEN-14646 Update per code review comments.

  1. … 5 more files in changeset.
Merge branch 'staging' into DEN-14646-fpga-alarm-properties-and-timing-3

# Conflicts:

# firmware/App/Controllers/TemperatureSensors.c

  1. … 1 more file in changeset.
Merge branch 'DEN-14689-messaging-bugs' into develop

  1. … 6 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 7 more files in changeset.
DEN-14834 updated the code to just send the heater command in Idle and Drain if the primary heater is not on. Addressed the code review comments

  1. … 4 more files in changeset.
Merge branch 'staging' into DEN-14834-ro-flow-drops-to-zero-and-cp-measured-speed-1500-temporarily-during-pre-treatment

DEN-14834 updated that get target primary heater function to accomodate the changes from pre-treatment. Removed the range check from the drain pump measured RPM

  1. … 4 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 1 more file in changeset.
DEN-14788: code review comments