Clone
 

jonny paguio <jpaguio@diality.com> in leahi-dialin

LDT-2787: Implemented updated FP proxy

    • -14
    • +9
    /leahi_dialin/dd/proxies/ro_proxy.py
    • -11
    • +7
    /leahi_dialin/fp/proxies/dd_proxy.py
LDT-2655: Updated enumeration references to handle integer arguments

Resolved LDT-2662 merge conflicts

    • -12
    • +12
    /leahi_dialin/fp/modules/temperatures.py
LDT-2662: Updated P46 temperature sensor handling

    • -12
    • +14
    /leahi_dialin/fp/modules/temperatures.py
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-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
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-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
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
Merged LDT-2352

    • -1
    • +3
    /leahi_dialin/dd/dialysate_delivery.py
Resolved Msg ID conflicts

LDT-2352: Corrected D21 and D26 indexing

LDT-2352: Added rinse pump implementation

    • -3
    • +3
    /leahi_dialin/fp/modules/temperatures.py
LDT-2352: Implemented rinse pump

    • -1
    • +2
    /leahi_dialin/common/test_config_defs.py
    • -8
    • +12
    /leahi_dialin/dd/dialysate_delivery.py
    • -0
    • +140
    /leahi_dialin/dd/modules/rinse_pump.py