leahi-dialin

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'LDT-332-basic-dialysis-treatment-fp-' into staging

Main Treatment Screen - SW - Diagnostics Screen - 05: DEV - Feature Implement

- Add TD valve messaging to ui messaging

Main Treatment Screen - SW - Diagnostics Screen - 05: DEV - Feature Implementation

- Added all messaging needed for diagnostics except TD versions

    • -61
    • +105
    /leahi_dialin/ui/td_messaging.py
Merge remote-tracking branch 'origin/master'

LDT-332: updated dd op modes. updated fp op modes.

LDT-332: updated alarm ids, msg_ids, td and dd defs. fixed td pressure sensors using correct msg id

WIP on staging

LDT-332: implemented TD treatment module. implemented td op mode broadcast interval.

    • -0
    • +212
    /leahi_dialin/td/modules/treatment.py
    • -1
    • +46
    /leahi_dialin/td/treatment_delivery.py
Base TD messaging for diagnostics screen

    • -0
    • +176
    /leahi_dialin/ui/td_messaging.py
Base TD messaging for diagnostics screen

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

    • -248
    • +0
    /leahi_dialin/fp/reverse_osmosis.py
Merge branch 'LDT-237-MainTreatmentScreen-SW-SimulatorCleanup' into staging

    • -248
    • +0
    /leahi_dialin/fp/reverse_osmosis.py
Merge branch staging into master

    • -248
    • +0
    /leahi_dialin/fp/reverse_osmosis.py
test

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

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

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

This reverts commit 2ef54f5cc7ef9ce2cf49c528a6205f77933d8a77, reversing

changes made to 9403e6711adf53da699ff25b4b7342286bf49b92.

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

leahi-261: code review

    • -1
    • +6
    /leahi_dialin/fp/filtration_purification.py
LDT-242 Main Treatment Screen - SW - Simulator Cleanup - 05: DEV - Feature Implementation

- Rename the RO to FP.

    • -0
    • +22
    /leahi_dialin/fp/__init__.py
    • -0
    • +0
    /leahi_dialin/fp/modules/__init__.py
    • -0
    • +255
    /leahi_dialin/fp/modules/boost_pump.py
    • -0
    • +230
    /leahi_dialin/fp/modules/conductivity_sensors.py
    • -0
    • +18
    /leahi_dialin/fp/modules/constants.py
    • -0
    • +175
    /leahi_dialin/fp/modules/flow_sensors.py
    • -0
    • +128
    /leahi_dialin/fp/modules/levels.py
    • -0
    • +220
    /leahi_dialin/fp/modules/pressure_sensors.py
    • -0
    • +294
    /leahi_dialin/fp/modules/valves.py
    • -0
    • +248
    /leahi_dialin/fp/reverse_osmosis.py
    • -255
    • +0
    /leahi_dialin/ro/modules/boost_pump.py
    • -230
    • +0
    /leahi_dialin/ro/modules/conductivity_sensors.py
    • -18
    • +0
    /leahi_dialin/ro/modules/constants.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

Merge remote-tracking branch 'origin/LEAH-261-fw-ro-flow-sensor-driver' into LDT-261-MainTreatmentScreen-SW-DiagnosticsScreen

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

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

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
    /leahi_dialin/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.

    • -4
    • +22
    /leahi_dialin/protocols/__init__.py