Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-2004 closed loop implementation

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

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

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

Merged staging and resolved the conflicts

    • -28
    • +19
    ./Controllers/ConcentratePumps.c
Bamboo Commit: Updated DDCommon.h with build versions from Bamboo.

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

Merged LDT-3750

Merged LDT-3750

LDT-3750 updated the balancing chamber and concentrate pumps

Merged LDT-3750

LDT-3750 added math library

Merged LDT-3750

LDT-3750 added code from staging HEAD

    • -205
    • +47
    ./Drivers/ConductivityTeensy.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.

Merge branch 'LDT-3218-update-iofp-permeate-target-flow' into develop

LDT-3218: fixed fpga post test by adding L15 fpgaID header

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