leahi-dialin

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merged staging and resolved the conflicts

    • -14
    • +11
    /leahi_dialin/fp/modules/temperatures.py
Merged LDT-2303

Merge branch 'staging' into bugfix/LDT-2303-td-dialin-leahi-dialin-command-

Merged LDT-2662

Merge branch 'staging' into LDT-2662-beta-1.0-fw-integration-part2--

Merged LDT-1886

Merge branch 'staging' into LDT-1886-blood-set-auto-load-and-auto-eject-td

LDT-1886 addressed the code review comments. Initial commit of the TD temperature sensors.

    • -0
    • +136
    /leahi_dialin/td/modules/temperature_sensors.py
LDT-1886 added baro pressure sensor and replace the blood flow's current field with torque

    • -5
    • +2
    /leahi_dialin/td/modules/blood_flow.py
Merge branch 'feature/LDT-2686-patient-vitals-enhancement' into staging

Merge branch 'staging' into LDT-1886-blood-set-auto-load-and-auto-eject-td

LDT-2655: Updated enumeration references to handle integer arguments

LDT-1886 updated the DD level sensors sync function

LDT-2662: Updated P46 temperature sensor handling

    • -12
    • +14
    /leahi_dialin/fp/modules/temperatures.py
LDT-1886 addressed the code review comments

    • -1
    • +1
    /leahi_dialin/dd/modules/blood_leak.py
LDT-2662: Removed M1 and added P46 pressure sensor

LDT-2303/LDT-2656: Merged staging

    • -10
    • +14
    /leahi_dialin/dd/dialysate_delivery.py
    • -7
    • +11
    /leahi_dialin/fp/filtration_purification.py
    • -15
    • +53
    /leahi_dialin/td/treatment_delivery.py
LDT-2764: Corrected offset

LDT-2662: Addressed code review comments (aligned fp_valves to current FP implementation

    • -19
    • +16
    /leahi_dialin/ui/fp_messaging.py
Merged LDT-2428 to staging.

LDT-2428: Fixed merge conflict.

LDT-2764: Added offset to translate Dialin valve enumeration to beta DD firmware valve enumeration

LDT-2662 updated the FP valves

    • -40
    • +39
    /leahi_dialin/fp/modules/valves.py
LDT-2662 changed the P43 valve to M12 valve in the modules

    • -27
    • +27
    /leahi_dialin/ui/fp_messaging.py
LDT-2658: Removed flow sensor attributes enum import

    • -1
    • +1
    /leahi_dialin/fp/modules/flow_sensors.py
LDT-2658: Organized temperature functionality to temperatures module for DD and IOFP

    • -41
    • +0
    /leahi_dialin/dd/modules/conductivity_sensors.py
    • -6
    • +53
    /leahi_dialin/dd/modules/temperature_sensors.py
    • -14
    • +4
    /leahi_dialin/fp/modules/flow_sensors.py
    • -5
    • +20
    /leahi_dialin/fp/modules/temperatures.py
LDT-2656 updated the variable names

LDT-2656 renamed a blood leak varaible name to match everywhere.

    • -2
    • +3
    /leahi_dialin/dd/modules/blood_leak.py
Merged LDT-2352/LDT-1201

LDT-2352: Addressed code review comments

    • -2
    • +0
    /leahi_dialin/dd/dialysate_delivery.py
    • -207
    • +0
    /leahi_dialin/dd/modules/piston_pump.py