Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'develop' of ssh://dvm-linux02:7999/dg/dgfirmware into develop

Merged DEN-9480 and resolved merge conflicts

DEN-9480 tested RTC stop clock and drain mode

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

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

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

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

Removed a commented line with DEBUG_DENALI

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

Merged DEN-9480

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

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

Fixed merge conflict

    • -187
    • +308
    ./Services/SystemCommMessages.c
DEN-9906: changed no ack timeout to 150ms.

DEN-9480, DEN-10409 addressed the DG fault and removed the extra flow sensor check'

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

Merged DEN-9480 and resolved the merge conflicts

DEN-9480 removed the small k factor conversion of the Ro pump

DEN-10410, DEN-10648 addressed events feature's issues

DEN-9906: Corrected getFPGADialysateFlowRate function Inputs Outputs description

DEN-9480 added the return state to all the modes' transition function

  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

    • -215
    • +277
    ./Services/SystemCommMessages.c
DEN-9906: Misc changes to messaging.

DEN-9966: Resolved peer code review comments and added functions to handle sensor override reset

    • -215
    • +277
    ./Services/SystemCommMessages.c
  1. … 1 more file in changeset.
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

Disabled the small flow sensor

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