leahi-dialin

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'feature/LDT-3174-pre-treatment-foundations' into staging

Merge remote-tracking branch 'origin/staging' into feature/LDT-3174-pre-treatment-foundations

Merge branch 'feature/LDT-3194-isolated-uf-adjustment' into staging

Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-dialin into feature/LDT-3194-isolated-uf-adjustment

    • -30
    • +56
    /leahi_dialin/ui/td_messaging.py
Merge branch 'feature/LDT-3106-blood-prime' into staging

LDT-3202: Isolated UF - SW - 01 - R&I - 08: DEV - Dialin Implementation

- Updated Isolated UF to align field naming with Ultrafiltration.

    • -17
    • +17
    /leahi_dialin/ui/td_messaging.py
LDT-3182 Pre-Treatment - SW - 01 - Foundation - R&I - 08: DEV - Dialin Implementation

remove treatment parameters opmode

Merge remote-tracking branch 'origin/staging' into feature/LDT-3174-pre-treatment-foundations

Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-dialin into feature/LDT-3194-isolated-uf-adjustment

    • -17
    • +80
    /leahi_dialin/ui/td_messaging.py
Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-dialin into feature/LDT-3106-blood-prime

Merge branch 'LDT-3160-beta19-dialin-test-configs-update' into staging

Merge remote-tracking branch 'origin/staging' into feature/LDT-3174-pre-treatment-foundations

Merge branch 'feature/LDT-2937-rinseback' into staging

Updated test configs to match FW

    • -5
    • +6
    /leahi_dialin/common/test_config_defs.py
Removed error message

updated test config names

    • -2
    • +2
    /leahi_dialin/common/test_config_defs.py
Renamed test config

    • -1
    • +1
    /leahi_dialin/common/test_config_defs.py
Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-dialin into feature/LDT-3106-blood-prime

    • -15
    • +34
    /leahi_dialin/ui/td_messaging.py
-Added testconfig placeholders

    • -2
    • +8
    /leahi_dialin/common/test_config_defs.py
Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-dialin into feature/LDT-2937-rinseback

    • -91
    • +670
    /leahi_dialin/ui/td_messaging.py
Merge branch 'LDT-2004-dialysate-composition-dd' into staging

Merge branch 'staging' into LDT-2004-dialysate-composition-dd

spacing fix

    • -1
    • +1
    /leahi_dialin/td/modules/blood_flow.py
bug fix

    • -1
    • +1
    /leahi_dialin/td/modules/blood_flow.py
Merge branch 'staging' into LDT-3160-beta19-dialin-test-configs-update

LDT-2004: updated to use generic override.

fixed variable names for level sensor override

LDT-2004: fixed overrwriting error count override. Renamed set conductivity model method.

    • -1
    • +25
    /leahi_dialin/dd/modules/conductivity_sensors.py
LDT-2004: implementation for set conductivity model

    • -22
    • +21
    /leahi_dialin/dd/modules/conductivity_sensors.py
Updated Test Config to swith to beta 1 HW

    • -6
    • +6
    /leahi_dialin/common/test_config_defs.py