leahi-dialin

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Added comments

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

    • -59
    • +22
    /leahi_dialin/dd/modules/conductivity_sensors.py
    • -7
    • +27
    /leahi_dialin/fp/modules/conductivity_sensors.py
    • -46
    • +30
    /leahi_dialin/ui/fp_messaging.py
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

fixes

fixed renaming

build.sh fix

fix versioning for soft linking

fixed versioning issue when soft linked

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

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

updated

Fix

Renamed msg ids

    • -31
    • +139
    /leahi_dialin/dd/modules/records.py
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 'staging' into LDT-3735-non-volatile-memory

    • -30
    • +2
    /leahi_dialin/dd/dialysate_delivery.py
    • -10
    • +14
    /leahi_dialin/td/treatment_delivery.py
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
Merge branch 'LDT-4539-event_on_service_change' into develop

Merge branch 'LDT-4160-alarm_table' into develop

    • -42
    • +109
    /leahi_dialin/td/modules/alarms.py
    • -2
    • +2
    /leahi_dialin/utils/abstract_classes.py
Merge branch 'LDT-4878-buildsh' into develop

Updated build.sh

fixed indexing for eventlist enum

docu header

Merge branch 'staging' into LDT-4484-dry_self_test

    • -10
    • +14
    /leahi_dialin/td/treatment_delivery.py