Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch staging into LDT-4183-dialysate-composition-dry-bicar

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

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

  1. … 4 more files in changeset.
Bamboo Commit: Updated DDCommon.h with build versions from Bamboo.

resolved merge conflicts and merged LDT-3963

    • -40
    • +19
    ./Controllers/BalancingChamber.c
Merge branch 'staging' into feature/LDT-3963-dialysate-flow-rate---fw-implem

LDT-4183-dry bicart firmeware implementation2/1: addressing review comments

LDT-4183-dry bicart firmeware implementation2/1: for dialysis calculator

Merge branch 'staging' into LDT-3272-software-update---dd-firmware

LDT-3963 addressed code review comments

restored

restored

Not sure why Crucible is showing it this way. Let's just re-review these diffs.

Not sure why Crucible is showing it this way. Let's just re-review these diffs.

Should be #ifndef

Should be #ifndef

Should be #ifndef I think.

Should be #ifndef I think.

Can we make these low priority and 999 rank?

Can we make these low priority and 999 rank?

LDT-3963 addressed code review comments and restored the fault mode transition

    • -40
    • +19
    ./Controllers/BalancingChamber.c
Merge branch 'staging' into LDT-4000-hdf-fw-implementation-1

Merge branch 'staging' into LDT-3975-Boost-Pump

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

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

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

resolved merge conflict for LDT-4413 into develop in handleRinsePumpOffState

Fixed broadcast issue for rinse pump PWM

LDT-4414 added fix to update the pwm value in broadcast and changed setpwm from count to percentage

It is weird that we're responding so far from request. It is not clear to me that Dialin has requested anything at this point.

It is weird that we're responding so far from request. It is not clear to me that Dialin has requested anything at this point.