Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.

DEN-9906 Added dialysate flow rate out of range alarm

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

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

Merge branch 'staging' of ssh://dvm-linux02:7999/dg/dgfirmware into staging

Removed the DEBUG_DENALI comment

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: Added publication of DG alarm info (safety line status) and override of its broadcast interval.

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

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

  1. … 78 more files in changeset.
DEN-9480 updated documentation

DEN-9906 added self test for the dialysate flow sensor and removed its broadcast function

DEN-9906: DIAL-138 - Added DG alarm condition status and Dialin cmd to clear all DG alarms.

DEN-9906 Removed code added to collect unfiltered dialysate flow data

DEN-9480 addressed the code review comments

DEN-9480 addressed the code review comment

DEN-9480 addressed the code review comments

DEN-9480 updated the InternalADC to add the RO pump feedback duty cycle

DEN-9906 Added code to collect unfiltered dialysate flow data

DEN-9906 updated the dialysate flow sensor driver with the calibration data

DEN-9480, DEN-9130 aadded code to monitor the RO pump duty cycle using the feedback data from FPGA

DEN-9480 addressed the code review comments

  1. … 16 more files in changeset.
DEN-9480 tested RTC stop clock and drain mode

DEN-9906 Added new alarm ID for dialysate flow out of range

DEN-9480, DEN-10788 continued working on the heaters control and added code to be able override the drain pump RPM once the pump is in the open loop mode

  1. … 3 more files in changeset.
DEN-9480 added trimmer heater states and implemented the primary heater's efficiency code

DEN-9480 added stop drain mode command and stop RTC clock command