Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.

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

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

LDT-3628 aadressed code review comments

LDt-3749 WIP initial draft for DD set sub mode request

LDT-3628 fixed fpga mapping issues

LDT 3627 updated valves based on the readback from FPGA

LDT-3218: control coefficients for beta 2.0

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

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

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

LDT-3628 changed piston pump target rev counts from 2 to 4 bytes

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

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

    • -48
    • +65
    ./Controllers/BalancingChamber.c
LDT-2004: reverted fpga init to be reflective in staging. setting raw resistance values to 1 when we see 0 to prevent nan's being injected into rolling average.

LDT-2004: fixed build errors from merging staging into working branch.

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

    • -279
    • +375
    ./Controllers/BalancingChamber.c
Merge branch 'staging' into LDT-3372-add-ability-to-override-teensy

    • -108
    • +52
    ./Drivers/ConductivityTeensy.c