Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-1809 Resolved conflicts while merging staging

  1. … 1 more file in changeset.
LDT-1735: fixed merge conflicts.

    • -0
    • +368
    ./InletPressureCheck.c
  1. … 1 more file in changeset.
LDT-1242: code review comments. comment aligning. fix ro pump control calling set pwm pct when it should have been pwm cnt

  1. … 2 more files in changeset.
Merge branch 'staging' into LDT-1242-iofp-finalize-permeate-tank

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

LDT-1809 latest from staging

LDT-1242: updates to pre gen mode timeouts

Updated ToDo check for inletpressurecheck init call

LDT-1242: updated flow control curve. Renamed fp def op modes. Closing P39 on TANK FULL state

  1. … 3 more files in changeset.
Addressed review comment to remove flag assignment in paused state.

Fixed the issue to set targets to zero when a firmware call is made for set functions per review comments.

  1. … 2 more files in changeset.
Addressed review comments.

  1. … 1 more file in changeset.
Addressed review comments to remove unwanted code lines and handled state assignment.

LDT-566: increased permeate flush timer to 5 minutes to support conductivity testing.

LDT-566: moved valve enum from ro firmware repo to common repo

  1. … 2 more files in changeset.
LDT-566: moved valve enum from ro firmware repo to common repo

  1. … 2 more files in changeset.
Implemented Inlet Pressure check functionality with Boost Pump

    • -0
    • +371
    ./InletPressureCheck.c
    • -0
    • +53
    ./InletPressureCheck.h
  1. … 3 more files in changeset.
LDT-566: code review comments

  1. … 10 more files in changeset.
LDT-566: code review comments.

  1. … 2 more files in changeset.
LDT-566: Code review comments. added reset calls in ro pump controllers when leaving off states. removed pressure check for boost pump.

  1. … 5 more files in changeset.
LDT-566: changed permeate flush to target flow. fixed output scaling for fluid pump. Target flow fixes

  1. … 5 more files in changeset.
LDT-566: code review comments.

  1. … 13 more files in changeset.
LDT-566: Permeate tank implementation. Changed RO control from pressure to flow for various sub modes. Alarm state and clear alarm overrides. Reworked temperature monitor to only publish.

    • -12
    • +12
    ./ModePreGenPermeateDefeatured.c
  1. … 13 more files in changeset.
LDT-566: Implemented FP fault mode. Removed math includes from flush modes.

  1. … 2 more files in changeset.
LDT-566: FP Safety shutdown override. fixed includes.

  1. … 8 more files in changeset.
WIP on develop

LDT-566: develop fixes

WIP on develop

LDT-566: code review comments. updated common naming to have a FP prefix.

    • -0
    • +149
    ./FPModeStandby.c
    • -0
    • +475
    ./FPOperationModes.c
    • -0
    • +62
    ./FPOperationModes.h
  1. … 25 more files in changeset.
LDT-566: partial rework of alarm monitoring for water quality based on code review. updated valves to be in sync with latest HDD

  1. … 12 more files in changeset.
WIP on develop

LDT-566: LDT-676: Removed M7 and P20 valves.

  1. … 1 more file in changeset.
LDT-566: removed unneeded defines. Added percentage values for pwm to RO and boost broadcasts. Removed X5 from pressure sensors. Fixed Pre-Generate mode rushing through sub states.

  1. … 12 more files in changeset.