leahi_dialin

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'LDT-237-MainTreatmentScreen-SW-SimulatorCleanup' into staging

Merge branch staging into master

test

    • -0
    • +230
    ./fp/modules/conductivity_sensors.py
    • -0
    • +220
    ./fp/modules/pressure_sensors.py
    • -230
    • +0
    ./ro/modules/conductivity_sensors.py
  1. … 5 more files in changeset.
Revert "Merge branch 'LDT-237-MainTreatmentScreen-SW-SimulatorCleanup' into develop"

This reverts commit 2ef54f5cc7ef9ce2cf49c528a6205f77933d8a77, reversing

changes made to 9403e6711adf53da699ff25b4b7342286bf49b92.

leahi-261: code review

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

- Rename the RO to FP.

    • -0
    • +0
    ./fp/modules/__init__.py
    • -0
    • +255
    ./fp/modules/boost_pump.py
    • -0
    • +230
    ./fp/modules/conductivity_sensors.py
    • -0
    • +18
    ./fp/modules/constants.py
    • -0
    • +175
    ./fp/modules/flow_sensors.py
    • -0
    • +128
    ./fp/modules/levels.py
    • -0
    • +220
    ./fp/modules/pressure_sensors.py
    • -0
    • +294
    ./fp/modules/valves.py
    • -0
    • +248
    ./fp/reverse_osmosis.py
    • -230
    • +0
    ./ro/modules/conductivity_sensors.py
  1. … 5 more files in changeset.
Merge branch 'LDT-237-MainTreatmentScreen-SW-SimulatorCleanup' into develop

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

- Fixed the issues caused SWVV main test to fail.

WIP on develop

LEAHI-261: code review comments

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

- Refactored HD to TD and simplified the function names that going to use the format later as well.

Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop

LEAHI-261: fixed fp valve naming

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

- Renamed the td_messaging.py to lowercase to match the rest of the modules.

    • -0
    • +54
    ./ui/td_messaging.py
LDT-242 Main Treatment Screen - SW - Simulator Cleanup - 05: DEV - Feature Implementation

- Add a configuration named coinfig.json.

- For now one only SW key to bypass the imports in __init__.py files.

- Added TS_Messaging class.

- Added TD_OpMode message send function.

- Created a simpler singleton with decorator (may need more testing.)

- Updated data_logger to use the relative import.

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

- initial implementation of the TD_Messaging

- need to commit to add the utils/basse.py in sparse

    • -0
    • +45
    ./ui/TD_Messaging.py
  1. … 1 more file in changeset.
LDT-242 Main Treatment Screen - SW - Simulator Cleanup - 05: DEV - Feature Implementation

- copied the utils.py from Denali.

- it may need cleanup.

  1. … 1 more file in changeset.
fixed init for fp. fixed dd naming

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
    ./fp/modules/temperatures.py
Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop

updated naming to be in line with leahi component naming

    • -43
    • +43
    ./fp/modules/pressure_sensors.py
WIP on develop

fixed dialysate pump handler

LEAHI-261: heater and gen dialysate cmd

one more dbg field

added debugging fields in heaters

Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop

fixed dd set op mode msg id naming

LEAHI-261: fixes to variable naming

WIP on develop

Fixed FP defs being RO defs

Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop