firmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
resolved merge conflicts

LDT-3344 WIP for rinsepump implementations

LDT-2030 addressed code review comments

LDT-3344 fixed the issue of conductive level sensor response

LDT-2030 addressed code review comments

LDT-2030 addressed code review comments

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

LDT3344 updated rinsepump to work for beta1 and beta2

LDT-3344- f/w changes for integrating beta 2 h/w

LDT-3352 resolving merge conflicts

Revert "Merge branch 'staging' into LDT-2004-v2-conductivity-sensors"

This reverts commit 1c4e2ce92ecb2e4b4301aba7bd2b869f1116d0f6, reversing

changes made to 7ec185a54b1c51b69dd0937b45d24a485d2aeef5.

    • -28
    • +36
    ./App/Controllers/BalancingChamber.c
    • -22
    • +31
    ./App/Controllers/ConcentratePumps.c
    • -19
    • +6
    ./App/Controllers/Ultrafiltration.c
Merge branch 'staging' into LDT-2004-v2-conductivity-sensors

LDT-3344 removed extra spaces

LDT-3103 special build enabling new D48 pump changes

    • -26
    • +34
    ./App/Controllers/BalancingChamber.c
    • -17
    • +79
    ./App/Controllers/DialysatePumps.c
Bamboo Commit: Updated DDCommon.h with build versions from Bamboo.

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

Merge branch 'staging' into LDT-2990-iofp-fw-and-fpga-version

LDT-1473 code review comments

LDT-2990: removed duplicate structure. code review comments.

LDT-1473 resolving code review comments

LDT-1473 resolving merge conflicts

    • -172
    • +204
    ./App/Controllers/BalancingChamber.c
LDT-1473 code review comments

Merge branch 'staging' into LDT-2004-v2-conductivity-sensors

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.

Merge branch 'LDT-2990-iofp-fw-and-fpga-version' into develop

LDT-2990: added fp version response to the dd handle version request message.

Merge branch 'staging' into LDT-2004-v2-conductivity-sensors

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