Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-4183 fixing compilation error

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

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

LDT-3272 updated the size of the comm buffers

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

merged LDT-3963 and resolved merge conflicts

LDT-3963 added potential fix for RO loop study issue for drybicarb

LDT-3958 heater control update

Merge branch 'staging' into feature/LDT-3963-dialysate-flow-rate---fw-implem

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

merged LDT-3963 into develop

    • -92
    • +219
    ./Controllers/BalancingChamber.c
LDT-3963 commented fault mode transition for merging to develop

LDT-3963 code changes and addressed ccode review comments

    • -11
    • +15
    ./Controllers/BalancingChamber.c