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.

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
Bamboo Commit: Updated DDCommon.h with build versions from Bamboo.

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

LDT-3103 resolved merge conflicts

LDT-3103 updated fill timeout alarm logic and handling

LDT-1195: Updated function comments and requestBalChamberSwitching

LDY-3103 addressed code review comments

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

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

LDT-3103 addressed code review comments

Fix getFreshDialPumpInitialRpm function name and brief inputs comment

LDT-3103 addressed code review comments

Set D12 pump to 1250 RPM for beta 1.9 and 2.0 during dialysate generation mode.

Heater control update

LDT-2004: fix for 1.9 changes

LDT-2004: reverted 2.0 fpga init changes.

LDT-2004: override fixes for v1 and v2 sensors.

    • -135
    • +12
    ./Drivers/ConductivitySensors.c
LDT-3603 changed code to return false when pause state is requested.

LDT-3103 addressed code review comments and changes

    • -27
    • +26
    ./Controllers/BalancingChamber.c
LDT-2004: fixes to v2 conductivity sensors during unit 5 bring up

LDT-3603 addressed review comments and added missing code

    • -88
    • +103
    ./Modes/FPModes/FPOperationModes.c
    • -48
    • +55
    ./Modes/FPModes/ModeGenPermeate.c
    • -61
    • +67
    ./Modes/FPModes/ModePreGenPermeate.c
    • -51
    • +57
    ./Modes/FPModes/ModePreGenPermeateDefeatured.c