firmware

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

LDT-2185 moved tank full and fill timeout to Gen Permeate

    • -0
    • +66
    ./App/Modes/FPModes/ModeGenPermeate.c
LDT-1773: code review comments

LDT-2185 iofp alpha update incorporated review comments

    • -0
    • +5
    ./App/Modes/FPModes/ModePreGenPermeate.c
LDT-2185 -iofp alpha updates, incorporated review comments

    • -4
    • +4
    ./App/Modes/FPModes/InletPressureCheck.c
    • -26
    • +4
    ./App/Modes/FPModes/ModePreGenPermeateDefeatured.c
    • -27
    • +34
    ./App/Monitors/WaterQualityMonitor.c
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-2030-Changes made according to the comments addressed in the driver file.

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

    • -19
    • +48
    ./App/Modes/FPModes/InletPressureCheck.c
    • -10
    • +3
    ./App/Modes/FPModes/ModePreGenPermeate.c
    • -15
    • +39
    ./App/Modes/FPModes/ModePreGenPermeateDefeatured.c
    • -3
    • +35
    ./App/Monitors/WaterQualityMonitor.c
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-2030-2 Addressed comments and made changes accordingly.

    • -231
    • +231
    ./App/Drivers/BloodLeakDriver.c
LDT-2004-3 Made chnages top bicarb pressure check state and code adjustments.

Removed Barometric temp from broadcast

LDT-2004 resolving merge issues

LDT-2004 drybicarb changes