dd-firmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'LDT-3777-sprint-25-fixes' into develop

WIP on develop

LDT-3777: updated d50 avg temp to not be calculated twice per interval.

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

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

Merge branch LDT-2004-dialysate-composition-fix-merge--issue---dd into staging

LDT-3352 heater control update

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

Merged staging and resolved the conflicts

    • -23
    • +23
    /firmware/App/Controllers/Heaters.c
    • -2
    • +4
    /firmware/App/Modes/ModeGenDialysate.c
    • -9
    • +22
    /firmware/App/Monitors/Temperature.c
Bamboo Commit: Updated DDCommon.h with build versions from Bamboo.

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

    • -2
    • +2
    /firmware/App/Modes/ModeGenDialysate.c
Merged LDT-3750

Merged LDT-3750

LDT-3750 updated the balancing chamber and concentrate pumps

Merged LDT-3750

    • -0
    • +1
    /firmware/App/Modes/ModeGenDialysate.c
LDT-3750 added math library

    • -0
    • +1
    /firmware/App/Modes/ModeGenDialysate.c
Merged LDT-3750

    • -3
    • +2
    /firmware/App/Modes/ModeGenDialysate.c
LDT-3750 added code from staging HEAD

    • -205
    • +47
    /firmware/App/Drivers/ConductivityTeensy.c
    • -3
    • +12
    /firmware/App/Monitors/Temperature.c
Merged git_cherry_pick local branch

LDT-2004 dialysate dosing control closed loop implementation

    • -47
    • +833
    /firmware/App/Controllers/DryBiCart.c
    • -0
    • +46
    /firmware/App/Controllers/DryBiCart.h
LDT-3603 added condition to reset and start sub mode in signal function

    • -1
    • +1
    /firmware/App/Modes/FPModes/FPOperationModes.c
Bamboo Commit: Updated DDCommon.h with build versions from Bamboo.

LDT- 3628 resolved merge conflicts

LDT-3628 updated code

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

Merge branch 'LDT-3628-request-to-change-the-target-re' into develop

LDT 3628 fixes for develop

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

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

LDT-2004: reverted init fpga to 1.9 config on default

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