leahi-dialin

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merged LDT-2662

LDT-2662: Removed M1 and added P46 pressure sensor

Merged LDT-2303/LDT-2656

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-2658: Addressed code review comments

    • -119
    • +31
    /leahi_dialin/dd/modules/temperature_sensors.py
    • -8
    • +8
    /leahi_dialin/fp/modules/temperatures.py
LDT-2658: Reorganized temperature readings and overrides for alpha

    • -110
    • +7
    /leahi_dialin/dd/modules/pressure_sensors.py
    • -2
    • +113
    /leahi_dialin/dd/modules/temperature_sensors.py
    • -70
    • +2
    /leahi_dialin/fp/modules/flow_sensors.py
    • -4
    • +63
    /leahi_dialin/fp/modules/temperatures.py
Merged LDT-2662/LDT-2764

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.

Merged LDT-2662/2764

    • -12
    • +12
    /leahi_dialin/fp/modules/valves.py
LDT-2764: Added offset to translate Dialin valve enumeration to beta DD firmware valve enumeration

LDT-2658: Moved conductivity sensor override to DD temperatures module

    • -41
    • +0
    /leahi_dialin/dd/modules/conductivity_sensors.py
LDT-2662 updated the FP valves

    • -40
    • +39
    /leahi_dialin/fp/modules/valves.py
Merge branch 'LDT-1886-blood-set-auto-load-and-auto-eject-td' into develop

LDT-2662 changed the P43 valve to M12 valve in the modules

    • -27
    • +27
    /leahi_dialin/ui/fp_messaging.py
Merged LDT-2658 and resolved conflicts

    • -2
    • +0
    /leahi_dialin/dd/dialysate_delivery.py
    • -5
    • +20
    /leahi_dialin/fp/modules/temperatures.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-2253: Removed duplicate FP flow sensor temperature functionality from temperatures module

    • -18
    • +4
    /leahi_dialin/fp/modules/temperatures.py
LDT-2656 updated the variable names

LDT-2658: Moved pressure sensor temperature functionality to FP pressure_sensors module

    • -16
    • +110
    /leahi_dialin/fp/modules/pressure_sensors.py
    • -25
    • +1
    /leahi_dialin/fp/modules/temperatures.py
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
Merged LDT-2352/LDT-1201

LDT-1201: Updated valve enumeration and rinse pump module

    • -40
    • +2
    /leahi_dialin/dd/modules/rinse_pump.py
Merge branch 'LDT-1886-blood-set-auto-load-and-auto-eject-td' into develop

LDT-1886 added blood pump torque

    • -1
    • +4
    /leahi_dialin/td/modules/blood_flow.py