Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Removed DEBUG_DENALI from the comments

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

Merged DEN-11114 and resolved merge conflicts

DEN-11114 work in progress worked on the reservoirs and heaters

DEN-11114 continued working on the dialysate heating feature

Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' of ssh://dvm-linux02:7999/dg/dgfirmware into DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2

DEN-11114 continued working on the the heaters target calculations

DEN-11114: Addressed DENDRAI-33 to remove debug UART support.

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

Fixed merge conflicts.

DEN-11114 updated task priority to report the dialysate flow all the time

DEN-11114 updated DG to send the concentrate mixing information to HD per request and receive the target fill flow rate

    • -10
    • +10
    ./Controllers/ConcentratePumps.h
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

DEN-11202, DEN-11114 added time constants of the ultrafilter and the reservoirs to the heater module. Chnaged the drain pump RPM out of range from 5 seconds to 10 seconds

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

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

DEN-11114 updated the safety shutdown broadcast channel and set the safety shutdown active boolean variable to be TRUE once it is set.

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

Merged DEN-11114 and resolved the merge conflicts

    • -112
    • +89
    ./Services/SystemCommMessages.c
DEN-11001 addressed the drain pump RPM set bug.

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

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

  1. … 11 more files in changeset.
DEN-9906: Fixed code review issue.

DEN-9906: Fixed merge conflicts from staging.

    • -11
    • +22
    ./Controllers/ConcentratePumps.c
  1. … 9 more files in changeset.
Merge branch 'DEN-9906-hd_dev-flow-measurement-changes' of ssh://dvm-linux02:7999/dg/dgfirmware into DEN-9906-hd_dev-flow-measurement-changes

DEN-9906: Fixed doxygen comments and group for dialysate flow module.

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

Merged staging and resolved merge conflicts

  1. … 15 more files in changeset.