leahi-dialin

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/master'

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 '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

- Fixed the issues caused SWVV main test to fail.

WIP on develop

LEAHI-261: code review comments

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

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.

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
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
    /leahi_dialin/ui/TD_Messaging.py
LDT-242 Main Treatment Screen - SW - Simulator Cleanup - 05: DEV - Feature Implementation

- copied the utils.py from Denali.

- it may need cleanup.

    • -0
    • +200
    /leahi_dialin/ui/utils.py
fixed init for fp. fixed dd naming

    • -14
    • +14
    /leahi_dialin/dd/modules/valves.py
    • -0
    • +1
    /leahi_dialin/fp/filtration_purification.py
LEAHI-261: updated valve naming. Added FP temperature sensor module, monitoring only.

    • -0
    • +1
    /leahi_dialin/fp/filtration_purification.py
    • -0
    • +114
    /leahi_dialin/fp/modules/temperatures.py
    • -36
    • +36
    /leahi_dialin/fp/modules/valves.py
updated naming to be in line with leahi component naming

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

fixed dialysate pump handler

LEAHI-261: heater and gen dialysate cmd

    • -0
    • +27
    /leahi_dialin/dd/modules/gen_dialysate.py
    • -0
    • +30
    /leahi_dialin/dd/modules/heaters.py
one more dbg field

added debugging fields in heaters

    • -0
    • +26
    /leahi_dialin/dd/modules/heaters.py
fixed dd set op mode msg id naming

    • -1
    • +1
    /leahi_dialin/dd/dialysate_delivery.py
LEAHI-261: fixes to variable naming

    • -3
    • +3
    /leahi_dialin/fp/modules/flow_sensors.py
    • -12
    • +12
    /leahi_dialin/td/modules/blood_flow.py
LEAHI-261: Updated to automated documenation scripts

WIP on develop

Fixed FP defs being RO defs

    • -0
    • +55
    /leahi_dialin/common/fp_defs.py
WIP on develop

fix on fp valve renaming.

WIP on develop

Renamed RO class and sub modules to use FP to be in line with sub system names

    • -0
    • +1
    /leahi_dialin/fp/__init__.py
    • -0
    • +250
    /leahi_dialin/fp/filtration_purification.py
    • -0
    • +0
    /leahi_dialin/fp/modules/__init__.py
    • -0
    • +256
    /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
    • +135
    /leahi_dialin/fp/modules/levels.py
    • -0
    • +220
    /leahi_dialin/fp/modules/pressure_sensors.py
    • -0
    • +294
    /leahi_dialin/fp/modules/valves.py
    • -255
    • +0
    /leahi_dialin/ro/modules/boost_pump.py
  1. … 9 more files in changeset.
LEAHI-261: fixed temperature sensor naming

    • -12
    • +12
    /leahi_dialin/dd/modules/temperature_sensors.py