dd-firmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-2185 iofp alpha updates + review comment implementation

    • -4
    • +0
    /firmware/App/Modes/FPModes/ModeGenPermeate.c
LDT-2185 iofp alpha updates + review comments implementation

    • -0
    • +6
    /firmware/App/Modes/FPModes/ModeGenPermeate.c
LDT-2185 iofp alpha update , adding separate API for calculated RO duticycle

LDT-2185 iofp defeatured filter flush state machine implementation

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

    • -2
    • +0
    /firmware/App/Controllers/PermeateTank.c
    • -12
    • +21
    /firmware/App/Controllers/ROPump.c
    • -14
    • +14
    /firmware/App/Modes/FPModes/ModeGenPermeate.c
LDT-2185- iofp update, incorporated review comments

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
LDT-2185 iofp alpha update incorporated review comments

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

LDT-2185 Alpha Refinement Updates, inlet pressurecheck for all varaints, RO duticycle monitoring

Fixed indentation

    • -1
    • +0
    /firmware/App/Modes/FPModes/FlushConcentrate.c
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
LDT-2936 fixed macro naming

    • -3
    • +3
    /firmware/App/Controllers/PermeateTank.c
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

LDT-2936 fixed permeate overfill issue and added tank controls to verify state

    • -2
    • +2
    /firmware/App/Controllers/PermeateTank.c
    • -50
    • +23
    /firmware/App/Modes/FPModes/FlushConcentrate.c
    • -0
    • +1
    /firmware/App/Modes/FPModes/FlushFilter.c
Bamboo Commit: Updated DDCommon.h with build versions from Bamboo.

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

Merged LDT-2030

LDT-2936 iofp update for verify permeate conductivity timeout LDT-1236

LDT-2936-iofp RO permeate flush timeout LDT-1755

LDT-2030 updated the function that TD operation modes is received in the blood leak module

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

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

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

LDT-2936 Updated tank full/fill timeout alarms logic

    • -17
    • +63
    /firmware/App/Controllers/PermeateTank.c