leahi-dialin

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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
LDT-2735 Service - SW - 01 - Service - R&I - 08: DEV - Dialin Implementation

DD and TD sim messaging finished

LDT-2715: Trends and Screensaver Screens - SW - 01 - Trends Screen - R&I - 08: DEV - Dialin Implementation

- Updated msg_ids.py to add MSG_ID_TD_TREATMENT_LOG_ALARM_EVENT and MSG_ID_TD_TREATMENT_LOG_EVENT.

- Updated td_messaging.py to add support for Treatment Log Alarm and Treatment Log Event.

LDT-2735 Service - SW - 01 - Service - R&I - 08: DEV - Dialin Implementation

add TD and DD message IDs

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

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

LDT-1886 updated the DD level sensors sync function

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
LDT-1886 addressed the code review comments

    • -1
    • +1
    /leahi_dialin/dd/modules/blood_leak.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-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