ro-firmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-2116 RO RR and duty cycle to start with has been updated

    • -10
    • +23
    /firmware/App/Modes/ModeGenPermeate.c
LDT-2116: pushed new closed loop coefficients for tgt flow of 750mL

LDT-2116 Added code for RO rejection ratio broadcast and dialin overrides.

    • -2
    • +190
    /firmware/App/Monitors/Conductivity.c
    • -0
    • +18
    /firmware/App/Monitors/Conductivity.h
LDT-2116 changed Gen logic to go open loop for 3 sec and transition to closed loop.

    • -2
    • +2
    /firmware/App/Controllers/PermeateTank.c
    • -1
    • +105
    /firmware/App/Modes/ModeGenPermeate.c
LDT-2116: removed manual level control out of pre gen mode. Permeate tank control will be sub mode specific. implemented in permeate flush to prevent overfill

    • -0
    • +13
    /firmware/App/Modes/FlushPermeate.c
    • -14
    • +1
    /firmware/App/Modes/ModePreGenPermeate.c
LDT-1773: code review comments.

LDT-2116: code review updates. Change target flow rate from 700 to 750 per system spec. Reverted debugging broadcast for RO Pump.

    • -1
    • +1
    /firmware/App/Controllers/PermeateTank.c
    • -10
    • +10
    /firmware/App/Controllers/ROPump.c
    • -2
    • +3
    /firmware/App/Modes/FlushConcentrate.c
    • -1
    • +1
    /firmware/App/Modes/ModePreGenPermeate.c
LDT-2116: fixed handle function call where it shouldnt have been called.

    • -1
    • +1
    /firmware/App/Modes/FlushConcentrate.c
LDT-2116 added private def for RO pump target flow

    • -1
    • +2
    /firmware/App/Controllers/PermeateTank.c
LDT-2116: Updates to pre gen tank control such that it does not recirculate water while in the op mode.

    • -1
    • +1
    /firmware/App/Modes/FlushConcentrate.c
    • -1
    • +15
    /firmware/App/Modes/ModePreGenPermeate.c
LDT-2116: Added concentrate flush changes to keep the permeate tank full in pre-gen

    • -16
    • +57
    /firmware/App/Modes/FlushConcentrate.c
    • -1
    • +1
    /firmware/App/Modes/ModePreGenPermeate.c
LDT-2116: possible fix for open loop to target flow transition.

LDT-2116: updates to ro pump coefficients. updates to permeate tank control while P39 is closed.

    • -2
    • +5
    /firmware/App/Controllers/PermeateTank.c
    • -15
    • +13
    /firmware/App/Controllers/ROPump.c
LDT-1773: updated comments for fpga interface. changed valve pwm period to correct value

LDT-1773: implemented FPGA interface for valve PWM. implemented in valves module

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

LDT-1809 merge into staging

LDT-1809 Resolved conflicts while merging staging

    • -16
    • +35
    /firmware/App/Controllers/ROPump.c
    • -2
    • +2
    /firmware/App/Modes/FlushConcentrate.c
    • -1
    • +1
    /firmware/App/Modes/ModePreGenPermeate.c
Bamboo Commit: Updated FPCommon.h with build versions from Bamboo.

Merge branch 'LDT-1242-iofp-finalize-permeate-tank' into staging

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

Merge branch 'LDT-1242-iofp-finalize-permeate-tank' into develop

Merge branch 'staging' into LDT-1242-iofp-finalize-permeate-tank

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

Merged LDT-1735 to staging.

LDT-1735: fixed merge conflicts.

    • -0
    • +368
    /firmware/App/Modes/InletPressureCheck.c
Bamboo Commit: Updated FPCommon.h with build versions from Bamboo.

Merge branch 'LDT-1242-iofp-finalize-permeate-tank' into develop

LDT-1242: code review comments. comment aligning. fix ro pump control calling set pwm pct when it should have been pwm cnt

    • -8
    • +11
    /firmware/App/Controllers/PermeateTank.c
    • -11
    • +11
    /firmware/App/Controllers/ROPump.c
    • -0
    • +1
    /firmware/App/Modes/InletPressureCheck.c
    • -1
    • +1
    /firmware/App/Modes/ModePreGenPermeate.c
Bamboo Commit: Updated FPCommon.h with build versions from Bamboo.