leahi-dialin

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into LDT-4734-temp-comp-conductivity

Merge branch 'LDT-4733-request-add-variables' into staging

Merge branch 'staging' into LDT-4733-request-add-variables

Merge branch 'staging' into LDT-4733-request-add-variables

Added test config for conductivity alarm

    • -2
    • +3
    /leahi_dialin/common/test_config_defs.py
LDT-4734: code review comments

Merge branch 'staging' into LDT-4734-temp-comp-conductivity

Merge branch 'LDT-4505' into staging

LDT-4734: updates to conductivity message

    • -14
    • +8
    /leahi_dialin/fp/modules/conductivity_sensors.py
Merge branch 'LDT-4878-buildsh' into staging

Type change

    • -1
    • +1
    /leahi_dialin/td/modules/blood_flow.py
Added comments

LDT-4734: updates to conductivity messaging.

    • -59
    • +22
    /leahi_dialin/dd/modules/conductivity_sensors.py
    • -6
    • +27
    /leahi_dialin/fp/modules/conductivity_sensors.py
fixed tagging issue

fix

fix

Merge branch 'feature/LDT-4787-enhancement-power-off' into staging

Merge branch 'feature/LDT-4747-fp-diagnostics' into staging

LDT-4795 NON-FEATURE: SW Misc & Enhc - SW - 01 - Power Control - Shutdown - R&I - 08: DEV - Dialin Implementation

fix msg id

Merge remote-tracking branch 'origin/staging' into feature/LDT-4787-enhancement-power-off

LDT-4795 NON-FEATURE: SW Misc & Enhc - SW - 01 - Power Control - Shutdown - R&I - 08: DEV - Dialin Implementation

address cr commetns

Merge branch 'LDT-4878-buildsh' into staging

Merge branch 'LDT-4539-event_on_service_change' into staging

Merge branch 'LDT-4160-alarm_table' into staging

    • -2
    • +2
    /leahi_dialin/utils/abstract_classes.py
Updated build.sh

fixed indexing for eventlist enum

Updated Alarm Priority data type

Merge branch LDT-4612-dialysate-composition-dialin-fix-for-mixing-control into staging

LDt-4733: fixed typo in voltage module

LDT-4733: voltage monitoring updates.

    • -9
    • +17
    /leahi_dialin/dd/modules/voltages.py