Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Revert "Merge remote-tracking branch 'origin/staging' into LDT-627-Main-Treatment-Screen-SW-Messaging-Broadcast"

This reverts commit 50cfafb2d49deeb742310635413c14604e1dc0ad, reversing

changes made to 1de45e3e0c294d35982514d1c52e2bad87d0a4b2.

    • -0
    • +256
    ./modules/boost_pump.py
  1. … 33 more files in changeset.
LDT-566: added op mode broadcast interval override. added missing msg ids

  1. … 1 more file in changeset.
Merge branch 'LDT-566-water-treatment-and-degassing-fp-' into develop

WIP on develop

LDT-566: Updated unit testing to be configured for the leahi dialin project. Various fixes around the project to ensure passing unit tests.

  1. … 10 more files in changeset.
LDT-566: fixed login msg ids naming.

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

LDT-566: fixed fp module to have the fp op mode variable

LEAHI-566: fixes for fp bring up

  1. … 1 more file in changeset.
Merge branch 'LDT-566-water-treatment-and-degassing-fp-' into develop

    • -0
    • +248
    ./modules/water_pumps.py
LDT-566: Renamed boost pump module to water pumps

    • -0
    • +246
    ./modules/water_pumps.py
Merge branch 'LDT-566-water-treatment-and-degassing-fp-' into develop

LDT-566: fixed levels override not showing the correctly parameters

Merge branch 'LDT-566-water-treatment-and-degassing-fp-' into develop

WIP on develop

LDT-566: fixed pumps having a tuple

Merge branch 'LDT-566-water-treatment-and-degassing-fp-' into develop

  1. … 1 more file in changeset.
LDT-556: Added pre and post gen delivery modules. removed obsolete temperature sensors for dd. Renamed pumps for FP. added X series pressure sensors for fp

  1. … 3 more files in changeset.
LDT-566: Fixed attribute error raised with fp levels override

Merge branch 'LDT-237-MainTreatmentScreen-SW-SimulatorCleanup' into develop

Merge branch 'LDT-237-MainTreatmentScreen-SW-SimulatorCleanup' into staging

  1. … 1 more file in changeset.
Merge branch staging into master

  1. … 1 more file in changeset.
test

    • -0
    • +230
    ./modules/conductivity_sensors.py
  1. … 10 more files in changeset.
leahi-261: code review

LDT-242 Main Treatment Screen - SW - Simulator Cleanup - 05: DEV - Feature Implementation

- Rename the RO to FP.

    • -0
    • +255
    ./modules/boost_pump.py
    • -0
    • +230
    ./modules/conductivity_sensors.py
    • -0
    • +18
    ./modules/constants.py
    • -0
    • +175
    ./modules/flow_sensors.py
    • -0
    • +128
    ./modules/levels.py
    • -0
    • +220
    ./modules/pressure_sensors.py
    • -0
    • +294
    ./modules/valves.py
    • -0
    • +248
    ./reverse_osmosis.py
  1. … 10 more files in changeset.
Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop

LEAHI-261: fixed fp valve naming

fixed init for fp. fixed dd naming

  1. … 1 more file in changeset.
Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop

LEAHI-261: updated valve naming. Added FP temperature sensor module, monitoring only.

    • -0
    • +114
    ./modules/temperatures.py
  1. … 4 more files in changeset.
Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop

updated naming to be in line with leahi component naming

LEAHI-261: fixes to variable naming

  1. … 4 more files in changeset.