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.

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

Merged latest staging into develop

    • -21
    • +67
    ./App/Controllers/PermeateTank.c
    • -14
    • +30
    ./App/Modes/FPModes/FPOperationModes.c
    • -24
    • +36
    ./App/Modes/FPModes/FlushConcentrate.c
    • -21
    • +19
    ./App/Modes/FPModes/FlushFilter.c
    • -12
    • +39
    ./App/Modes/FPModes/FlushPermeate.c
    • -54
    • +177
    ./App/Modes/FPModes/ModeGenPermeate.c
  1. … 19 more files in changeset.
Bamboo Commit: Updated DDCommon.h with build versions from Bamboo.

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

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

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

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

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

  1. … 107 more files in changeset.
Merge LDT-2313 changes

LDT-2004 updated changes

LDT-2004-3 Made chnages top bicarb pressure check state and code adjustments.

LDT-2004 resolving merge issues

LDT-2004 drybicarb changes

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

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

    • -2
    • +2
    ./App/Modes/FPModes/FPOperationModes.c
    • -1
    • +1
    ./App/Modes/FPModes/FlushConcentrate.c
    • -2
    • +2
    ./App/Modes/FPModes/ModePreGenPermeate.c
    • -2
    • +2
    ./App/Modes/FPModes/ModePreGenPermeateDefeatured.c
  1. … 5 more files in changeset.
Resolved merge conflicts

    • -19
    • +65
    ./App/Controllers/PermeateTank.c
    • -4
    • +4
    ./App/Modes/FPModes/FPOperationModes.c
    • -23
    • +35
    ./App/Modes/FPModes/FlushConcentrate.c
    • -19
    • +17
    ./App/Modes/FPModes/FlushFilter.c
    • -10
    • +37
    ./App/Modes/FPModes/FlushPermeate.c
    • -53
    • +176
    ./App/Modes/FPModes/ModeGenPermeate.c
    • -7
    • +23
    ./App/Modes/FPModes/ModePreGenPermeate.c
    • -1
    • +1
    ./App/Modes/FPModes/ModePreGenPermeateDefeatured.c
  1. … 5 more files in changeset.
LDT-2936 fixed macro naming

LDT-2936 fixed macro naming

LDT-2936 fixed the macro comments

Merge branch 'LDT-2936-iofp---update-m12-and-boost-pum' of bitbucket.org:diality-cloud/dd-firmware into LDT-2936-iofp---update-m12-and-boost-pum

    • -9
    • +1
    ./App/Modes/FPModes/ModePreGenPermeate.c
LDT-2936 fixed permeate overfill issue and added tank controls to verify state

    • -50
    • +23
    ./App/Modes/FPModes/FlushConcentrate.c
    • -0
    • +1
    ./App/Modes/FPModes/ModePreGenPermeate.c