dd-firmware

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 the Copyright section and replaced tabs with 4 spaces

Merged LDT-2313

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

Merge branch 'develop' of bitbucket.org:diality-cloud/dd-firmware into develop

LDT-2004 fixing merge issues

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

Merge branch 'develop' of bitbucket.org:diality-cloud/dd-firmware into develop

LDT-2204 liquid bicarb

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

LDT-2004 merge into develop

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

resolved merge conflicts

Resolved merge conflict

    • -1
    • +1
    /firmware/App/Controllers/PermeateTank.c
Merged latest staging into develop

    • -21
    • +67
    /firmware/App/Controllers/PermeateTank.c
    • -28
    • +59
    /firmware/App/Controllers/ROPump.c
    • -4
    • +5
    /firmware/App/Modes/FPModes/FPModeFault.c
    • -14
    • +30
    /firmware/App/Modes/FPModes/FPOperationModes.c
    • -24
    • +36
    /firmware/App/Modes/FPModes/FlushConcentrate.c
    • -21
    • +19
    /firmware/App/Modes/FPModes/FlushFilter.c
    • -12
    • +39
    /firmware/App/Modes/FPModes/FlushPermeate.c
    • -54
    • +177
    /firmware/App/Modes/FPModes/ModeGenPermeate.c
  1. … 19 more files in changeset.
LDT-1773: code review comments

Merge branch 'staging_alpha' into LDT-1773-dd-valve-pwm

Merge branch 'LDT-2185-io-fp-water-treatment-and-degas' of bitbucket.org:diality-cloud/dd-firmware into LDT-2185-io-fp-water-treatment-and-degas

    • -0
    • +2
    /firmware/App/Modes/FPModes/ModeGenPermeate.c
LDT-2185 moved tank full and fill timeout to Gen Permeate

    • -66
    • +3
    /firmware/App/Controllers/PermeateTank.c
    • -0
    • +66
    /firmware/App/Modes/FPModes/ModeGenPermeate.c
Merge branch 'staging' into LDT-1773-dd-valve-pwm-beta

LDT-1773: code review comments

LDT-2185 iofp alpha update incorporated review comments

    • -0
    • +2
    /firmware/App/Modes/FPModes/ModeGenPermeate.c
LDT-2185 -iofp alpha updates, incorporated review comments

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

Merge LDT-618-dd-add-ability-to-override-fixes

    • -19
    • +22
    /firmware/App/Modes/FPModes/FlushFilter.c
LDT-618-dd-add-ability-to-override-fixes

LDT-2030-Changes made according to the comments addressed in the driver file.

    • -347
    • +345
    /firmware/App/Drivers/BloodLeakDriver.c
LDT-2185 Alpha Refinement Updates, inlet pressurecheck for all varaints, RO duticycle monitoring

LDT-618-dd-add-ability-to-override-fixes

    • -30
    • +21
    /firmware/App/Services/TDInterface.c
Bamboo Commit: Updated DDCommon.h with build versions from Bamboo.