Clone
 

dara navaei <dnavaei@diality.com> in leahi-dialin

Merged staging

    • -3
    • +0
    /leahi_dialin/fp/modules/temperatures.py
Merged LDT-2658

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 'staging' into LDT-1886-blood-set-auto-load-and-auto-eject-td

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

LDT-1886 updated the DD level sensors sync function

LDT-1886 addressed the code review comments

    • -1
    • +1
    /leahi_dialin/dd/modules/blood_leak.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
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
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
LDT-1448: Ultrafiltration - SW - 01 - R&I - 08: DEV - Dialin Implementation

- Updated to add definitions for IDs MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE_REQUEST and MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE.

LDT-2199 added a command to hard stop the TD blood pump

    • -0
    • +24
    /leahi_dialin/td/modules/blood_flow.py
Merged LDT-2199

    • -1
    • +75
    /leahi_dialin/td/modules/air_trap.py
LDT-2199 added two override commands for the air trap air pump raise/lower power

    • -1
    • +75
    /leahi_dialin/td/modules/air_trap.py
Merged LDT-2030

LDT-2030 updated the MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST message ID

Merged LDT-2030

LDT-2030 merged staging

    • -39
    • +225
    /leahi_dialin/common/dd_defs.py
    • -0
    • +2
    /leahi_dialin/dd/dialysate_delivery.py
    • -0
    • +1
    /leahi_dialin/dd/modules/blood_leak.py