leahi-dialin

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'LDT-607-td-add-command-to-override-tmp' into develop

Merge branch 'feature/LDT-3139-blood-set-auto-load' into staging

Merge branch 'staging' into feature/LDT-3139-blood-set-auto-load

    • -60
    • +561
    /leahi_dialin/ui/td_messaging.py
Added calling the defeatured command on initialization of FP

    • -0
    • +2
    /leahi_dialin/fp/filtration_purification.py
LDT-3202: Isolated UF - SW - 01 - R&I - 08: DEV - Dialin Implementation

- Added support for Isolated UF data and adjustment messages.

LDT-3114: Blood Prime - SW - 01 - R&I - 08: DEV - Dialin Implementation

- Added support for Blood Prime Progress Data message.

Merge branch 'feature/LDT-2805-edit-treatment-parameters' into staging

    • -60
    • +86
    /leahi_dialin/ui/td_messaging.py
LDT-3159 - Added FP Defeatured MSG IDs - Added function for FP defeatured request - Added handler for FP defeatured response - Removed publish from FP non handler function

    • -14
    • +59
    /leahi_dialin/fp/filtration_purification.py
Merge branch 'LDT-1195-dd-request-for-a-variable-for-b' into staging

Merge branch 'LDT-1195-dd-request-for-a-variable-for-b' into develop

    • -2
    • +18
    /leahi_dialin/dd/modules/gen_dialysate.py
- Added new test config - Merged DD and FP test config enums

    • -10
    • +6
    /leahi_dialin/common/test_config_defs.py
LDT-2004 dialin implementation for drybicart statemachines

    • -5
    • +3
    /leahi_dialin/common/test_config_defs.py
    • -9
    • +44
    /leahi_dialin/dd/modules/drybicart.py
name update

- Fixed namin typos - Reworked dd temperature broadcast to address new values

    • -56
    • +44
    /leahi_dialin/dd/modules/temperature_sensors.py
    • -2
    • +2
    /leahi_dialin/fp/modules/temperatures.py
- Fixed typos and missing imports

    • -10
    • +10
    /leahi_dialin/td/modules/ejector.py
- Updated modules to use the new enum structure

    • -2
    • +2
    /leahi_dialin/dd/dialysate_delivery.py
    • -2
    • +2
    /leahi_dialin/dd/modules/blood_leak.py
    • -56
    • +56
    /leahi_dialin/dd/modules/concentrate_pump.py
    • -15
    • +21
    /leahi_dialin/dd/modules/conductivity_sensors.py
    • -40
    • +40
    /leahi_dialin/dd/modules/events.py
    • -28
    • +28
    /leahi_dialin/dd/modules/heaters.py
    • -11
    • +18
    /leahi_dialin/dd/modules/pressure_sensors.py
    • -45
    • +45
    /leahi_dialin/dd/modules/temperature_sensors.py
    • -45
    • +45
    /leahi_dialin/dd/modules/valves.py
    • -11
    • +11
    /leahi_dialin/dd/modules/voltages.py
    • -17
    • +17
    /leahi_dialin/td/modules/air_trap.py
  1. … 11 more files in changeset.
Changed dd_defs and td_defs to create enums dynamically

    • -370
    • +643
    /leahi_dialin/common/dd_defs.py
    • -157
    • +63
    /leahi_dialin/common/fp_defs.py
    • -332
    • +555
    /leahi_dialin/common/td_defs.py
    • -2
    • +2
    /leahi_dialin/fp/filtration_purification.py
- Updated FP modules to use the new enum structure

    • -20
    • +20
    /leahi_dialin/fp/modules/boost_pump.py
    • -15
    • +15
    /leahi_dialin/fp/modules/conductivity_sensors.py
    • -38
    • +38
    /leahi_dialin/fp/modules/events.py
    • -5
    • +5
    /leahi_dialin/fp/modules/flow_sensors.py
    • -12
    • +15
    /leahi_dialin/fp/modules/pressure_sensors.py
    • -22
    • +20
    /leahi_dialin/fp/modules/ro_pump.py
    • -25
    • +25
    /leahi_dialin/fp/modules/temperatures.py
    • -12
    • +12
    /leahi_dialin/fp/modules/valves.py
FP enum refactor to be dynamic

    • -206
    • +531
    /leahi_dialin/common/fp_defs.py
    • -0
    • +43
    /leahi_dialin/common/global_vars.py
    • -46
    • +46
    /leahi_dialin/fp/modules/temperatures.py
Merge branch 'staging' into LDT-611-fp-add-ability-to-override-tempe

    • -46
    • +43
    /leahi_dialin/fp/modules/temperatures.py
- Updated temperatur override logic for FP and DD

    • -7
    • +10
    /leahi_dialin/dd/modules/temperature_sensors.py
    • -3
    • +1
    /leahi_dialin/fp/modules/temperatures.py
- Removed unique tag from enus that contains duplicates

    • -7
    • +6
    /leahi_dialin/fp/modules/temperatures.py
-Renamed DDConductivitySensorsEnum to DDConductivitySensorNames - Updated overrides in FP Module - Updated offset calculations in FP_Defs

    • -14
    • +14
    /leahi_dialin/dd/modules/conductivity_sensors.py
    • -102
    • +61
    /leahi_dialin/fp/filtration_purification.py
    • -123
    • +55
    /leahi_dialin/fp/modules/boost_pump.py
    • -104
    • +52
    /leahi_dialin/fp/modules/conductivity_sensors.py
    • -18
    • +0
    /leahi_dialin/fp/modules/constants.py
    • -82
    • +59
    /leahi_dialin/fp/modules/flow_sensors.py
    • -47
    • +28
    /leahi_dialin/fp/modules/levels.py
    • -32
    • +18
    /leahi_dialin/fp/modules/permeate_tank.py
    • -75
    • +40
    /leahi_dialin/fp/modules/pressure_sensors.py
    • -121
    • +55
    /leahi_dialin/fp/modules/ro_pump.py
    • -71
    • +45
    /leahi_dialin/fp/modules/temperatures.py
  1. … 3 more files in changeset.
- Removed some empty lines to have the same formating throgh the files

    • -9
    • +0
    /leahi_dialin/dd/dialysate_delivery.py
    • -1
    • +0
    /leahi_dialin/dd/modules/blood_leak.py
    • -6
    • +0
    /leahi_dialin/dd/modules/gen_dialysate.py
  1. … 39 more files in changeset.
Removed FP valves from DD Valves enum as it is stored in separate enum

LDT-2787 - Added opmode change request to dd_proxy - Updated overrides in TD module

    • -41
    • +81
    /leahi_dialin/fp/modules/alarms.py
    • -62
    • +40
    /leahi_dialin/td/modules/air_pump.py
    • -153
    • +90
    /leahi_dialin/td/modules/air_trap.py
    • -274
    • +149
    /leahi_dialin/td/modules/alarms.py
    • -254
    • +131
    /leahi_dialin/td/modules/blood_flow.py
    • -51
    • +29
    /leahi_dialin/td/modules/buttons.py
    • -83
    • +41
    /leahi_dialin/td/modules/ejector.py
  1. … 5 more files in changeset.
Merge branch 'LDT-2998-update-dialin-to-support-any-b1' into develop

    • -28
    • +16
    /leahi_dialin/dd/modules/pressure_sensors.py
LDT-2787 - Added opmode change request to dd_proxy

    • -1
    • +2
    /leahi_dialin/fp/filtration_purification.py
    • -1
    • +2
    /leahi_dialin/fp/modules/temperatures.py
    • -5
    • +28
    /leahi_dialin/fp/proxies/dd_proxy.py
Override refactor for TD modules

    • -28
    • +25
    /leahi_dialin/td/modules/treatment.py
    • -103
    • +69
    /leahi_dialin/td/modules/valves.py
    • -73
    • +40
    /leahi_dialin/td/modules/voltages.py
    • -6
    • +14
    /leahi_dialin/td/proxies/ui_proxy.py
LDT-2813: Edit Treatment Parameters During Treatment - SW - 01 - Edit Treatment Parameters During Treatment - R&I - 08: DEV - Dialin Implementation

- Updated for changes to treatment adjustment messages (removed extra parameters in response messages).

    • -171
    • +0
    /leahi_dialin/ui/td_messaging.py