Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Fix for RO Pump override set and reset.

Modified handlers to change state based on data value rather than using get functions.

Fixed the override reset behavior in test function

Merge branch 'staging' into feature/LDT-1809-iofp-ws-setup-and-bug-fixing

Changes for RO pump override reset.

Updated code for multiple override.

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

WIP for setting multiple overrides

removed check for zero flow rate

Added backup variable for pump data and fixed set function behavior

LDT-566: code review comments.

LDT-566: code review comments

    • -1
    • +0
    ./Modes/ModePreGenPermeateDefeatured.h
LDT-566: code review comments.

    • -4
    • +8
    ./Modes/ModePreGenPermeateDefeatured.c
    • -6
    • +6
    ./Modes/ModePreGenPermeateDefeatured.h
  1. … 1 more file in changeset.
LDT-566: Code review comments. added reset calls in ro pump controllers when leaving off states. removed pressure check for boost pump.

LDT-566: fixed macro calls

LDT-566: changed permeate flush to target flow. fixed output scaling for fluid pump. Target flow fixes

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

  1. … 5 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
    ./Modes/ModePreGenPermeateDefeatured.c
  1. … 6 more files in changeset.
LDT-566: fixed messaging ACK

LDT-566: Implemented FP fault mode. Removed math includes from flush modes.

LDT-566: FP Safety shutdown override. fixed includes.

WIP on develop

LDT-566: develop fixes

    • -3
    • +3
    ./Modes/ModePreGenPermeateDefeatured.c
WIP on develop

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

    • -0
    • +88
    ./Modes/FPModeFault.c
    • -0
    • +40
    ./Modes/FPModeFault.h
    • -0
    • +66
    ./Modes/FPModeInitPOST.c
    • -0
    • +44
    ./Modes/FPModeInitPOST.h
    • -0
    • +149
    ./Modes/FPModeStandby.c
    • -0
    • +47
    ./Modes/FPModeStandby.h
    • -0
    • +475
    ./Modes/FPOperationModes.c
    • -0
    • +62
    ./Modes/FPOperationModes.h
  1. … 25 more files in changeset.
LDT-566: fixed valve order

LDT-566: fixed valve ordering

Revert "LDT-566: permeate tank file creation"

This reverts commit 6e65344e6675394118806ce98dc428c27920e1cb.

LDT-566: permeate tank file creation

    • -0
    • +428
    ./Controllers/PermeateTank.c
    • -0
    • +60
    ./Controllers/PermeateTank.h
LDT-566: partial rework of alarm monitoring for water quality based on code review. updated valves to be in sync with latest HDD

    • -0
    • +9
    ./Modes/ModePreGenPermeateDefeatured.c
  1. … 6 more files in changeset.
WIP on develop

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

LDT-566: fixes for removing P22 and P23. fix warnings

  1. … 1 more file in changeset.