dd-firmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-3159 fixed return description

    • -2
    • +2
    /firmware/App/Modes/FPModes/FPOperationModes.c
LDT-3159 addressed CR review comments

    • -1
    • +1
    /firmware/App/Modes/FPModes/FPOperationModes.h
LDT-3159 added dialin test funcion to return FP defeatured status

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

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

LDT-3091 merge into staging

LDT-3091 added fw code to skip filters flush with test config

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

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

    • -1
    • +1
    /firmware/App/Controllers/PermeateTank.c
    • -1
    • +1
    /firmware/App/Controllers/PermeateTank.h
  1. … 107 more files in changeset.
Merged LDT-2801

LDT-2801 addressed a code review comment

LDT-2801 addressed the code review comments

LDT-2801 added the rinse pump speed feedback FPGA register

    • -15
    • +18
    /firmware/App/Controllers/RinsePump.c
LDT-2801 merged staging and resolved the conflicts

    • -37
    • +350
    /firmware/App/Services/FpgaDD.c
LDT-2801 added more checks to the rinse pump on/off to the dialin command

LDT-2801 initial commit of the rinse pumps in beta version

    • -12
    • +116
    /firmware/App/Controllers/RinsePump.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 'LDT-1773-dd-valve-pwm-beta' into staging

Merge branch 'staging' into LDT-1773-dd-valve-pwm-beta

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

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

Merged LDT-2313

Merge branch 'staging' into LDT-1773-dd-valve-pwm-beta

LDT-1773: code review comments

Removed Barometric temp from broadcast

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/Controllers/PermeateTank.c
    • -2
    • +2
    /firmware/App/Modes/FPModes/FPModeFault.c
    • -2
    • +2
    /firmware/App/Modes/FPModes/FPOperationModes.c
    • -1
    • +1
    /firmware/App/Modes/FPModes/FlushConcentrate.c
    • -2
    • +2
    /firmware/App/Modes/FPModes/FlushFilter.c
    • -3
    • +3
    /firmware/App/Modes/FPModes/ModeGenPermeate.c
  1. … 5 more files in changeset.
Resolved merge conflicts

    • -19
    • +65
    /firmware/App/Controllers/PermeateTank.c
    • -26
    • +57
    /firmware/App/Controllers/ROPump.c
    • -2
    • +3
    /firmware/App/Modes/FPModes/FPModeFault.c
    • -4
    • +4
    /firmware/App/Modes/FPModes/FPOperationModes.c
    • -23
    • +35
    /firmware/App/Modes/FPModes/FlushConcentrate.c
    • -19
    • +17
    /firmware/App/Modes/FPModes/FlushFilter.c
    • -10
    • +37
    /firmware/App/Modes/FPModes/FlushPermeate.c
    • -53
    • +176
    /firmware/App/Modes/FPModes/ModeGenPermeate.c
    • -2
    • +202
    /firmware/App/Monitors/Conductivity.c
  1. … 5 more files in changeset.
LDT-2936 fixed macro naming

    • -1
    • +1
    /firmware/App/Controllers/PermeateTank.c