Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merged DEN-9480 and resolved the conflicts

DEN-9480 added a build switch to be able to use the smaller or the normal flow sensors K factor

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

Resolved merge conflicts from DEN-9480

DEN-9480 removed a bypass in POST to continuously go through the UV reactors POST

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

DEN-10411 changed the flush dialysate time from 30 seconds to 60 seconds

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

Merge branch 'DEN-9480-dialysate-temperature-control' into develop

DEN-10521 fixed the load cells override issue

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

Merged DEN-9480 and uncommented some of the code that was commented in DEN-9480 for flow testing

Merge branch 'DEN-9480-dialysate-temperature-control' into develop

DEN-9480 modified code to test flow. DEN-10521 removed autocal code from the override function

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

Fixed merge conflicts.

DEN-9906: Fixed merge conflict with message ID name change in common.

DEN-9906: Added build switch to disable fill mode flow sensor alarm.

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

Fixed merge conflicts.

Fixed merge conflicts.

DEN-9906: reversed prior fix to handling of zero flow from sensor - was right before.

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

Fixed bugs

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

Merged DEN-9480 into develop

    • -32
    • +32
    ./Controllers/TemperatureSensors.c
DEN-9480 updated the RO pump flow monitor

DEN-10412 updated the concentrate pumps to convert the values to negative once the direction of the pumps i negative

DEN-9906: Clear pending pump commands if stop cmd given.

DEN-9906: Don't exit fill on integrated volume per flow. Fix RO flow handling when flow is zero.