firmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'LDT-2977-iofp-update' into develop

LDT-2977: proof of concept for changing initial guess on flow control based on valve configuration.

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

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

LDT-2185 iofp alpha update , adding separate API for calculated RO duticycle

    • -2
    • +19
    ./App/Monitors/WaterQualityMonitor.c
LDT-2185 iofp defeatured filter flush state machine implementation

    • -0
    • +473
    ./App/Modes/FPModes/FlushFilterDefeatured.c
    • -0
    • +57
    ./App/Modes/FPModes/FlushFilterDefeatured.h
LDT-2185 added mini flow check on RO pump and addressed code comments

    • -14
    • +14
    ./App/Modes/FPModes/ModeGenPermeate.c
Bamboo Commit: Updated DDCommon.h with build versions from Bamboo.

LDT-2004 rebuild develop

LDT-2004 changes made regarding fill chamber request flag

    • -1
    • +19
    ./App/Controllers/BalancingChamber.c
LDT-2004 drybicarb code update

LDT-2185- iofp update, incorporated review comments

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

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

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.
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