ro-firmware

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

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
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
Merge branch 'staging' into LDT-1242-iofp-finalize-permeate-tank

    • -1
    • +8
    /firmware/App/Modes/ModePreGenPermeate.c
LDT-1242: reverted RO controller publishing to no longer contain controller debug data

LDT-1242: added TODO for condition check when P7 is no longer available.

    • -2
    • +2
    /firmware/App/Modes/FlushConcentrate.c
LDT-1809 latest from staging

    • -1
    • +8
    /firmware/App/Modes/ModePreGenPermeate.c
Bamboo Commit: Updated FPCommon.h with build versions from Bamboo.

LDT-1928 merge into staging

LDT-1928 latest from staging

LDT-1242: updated pressure sensors to reflect what is inside on alpha units

    • -2
    • +2
    /firmware/App/Drivers/PressureSensor.c
LDT-1242: updates to pre gen mode timeouts

    • -1
    • +1
    /firmware/App/Modes/ModePreGenPermeate.c
LDT-1242: updated tank full timing

    • -2
    • +2
    /firmware/App/Controllers/PermeateTank.c
LDT-1242: reverted flow control output for develop builds as pwm output requires tuning

Updated ToDo check for inletpressurecheck init call

    • -1
    • +1
    /firmware/App/Modes/ModePreGenPermeate.c
LDT-1242: opening P34 on tank full state.

    • -2
    • +2
    /firmware/App/Controllers/PermeateTank.c
LDT-1242: converted RO flow control back to outputting PWM percentages instead of target mL/min.

    • -13
    • +12
    /firmware/App/Controllers/ROPump.c
LDT-1242: updated flow control curve. Renamed fp def op modes. Closing P39 on TANK FULL state

    • -1
    • +1
    /firmware/App/Controllers/PermeateTank.c
    • -6
    • +6
    /firmware/App/Modes/FPOperationModes.c
    • -1
    • +1
    /firmware/App/Modes/ModeGenPermeateDefeatured.c
Fixed indentation and review comments

    • -18
    • +18
    /firmware/App/Controllers/ROPump.c
Addressed review comment to remove flag assignment in paused state.

    • -1
    • +0
    /firmware/App/Modes/InletPressureCheck.c
fixed review comments

    • -30
    • +53
    /firmware/App/Controllers/ROPump.c
Fixed the issue to set targets to zero when a firmware call is made for set functions per review comments.

    • -100
    • +62
    /firmware/App/Controllers/ROPump.c
    • -1
    • +1
    /firmware/App/Modes/FlushConcentrate.c
    • -1
    • +1
    /firmware/App/Modes/ModePreGenPermeate.c
Merge branch 'staging' into LDT-1809-iofp-ws-setup-and-bug-fixing