leahi-dialin

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Revert "Merge remote-tracking branch 'origin/staging' into LDT-627-Main-Treatment-Screen-SW-Messaging-Broadcast"

This reverts commit 50cfafb2d49deeb742310635413c14604e1dc0ad, reversing

changes made to 1de45e3e0c294d35982514d1c52e2bad87d0a4b2.

    • -5
    • +1
    /leahi_dialin/dd/dialysate_delivery.py
    • -66
    • +44
    /leahi_dialin/dd/modules/concentrate_pump.py
    • -30
    • +0
    /leahi_dialin/dd/modules/gen_dialysate.py
    • -132
    • +0
    /leahi_dialin/dd/modules/pre_gen_dialysate.py
    • -12
    • +7
    /leahi_dialin/dd/modules/temperature_sensors.py
    • -26
    • +2
    /leahi_dialin/dd/proxies/td_proxy.py
    • -48
    • +4
    /leahi_dialin/fp/filtration_purification.py
    • -0
    • +256
    /leahi_dialin/fp/modules/boost_pump.py
    • -1
    • +1
    /leahi_dialin/fp/modules/flow_sensors.py
  1. … 25 more files in changeset.
Merge remote-tracking branch 'origin/staging' into LDT-627-Main-Treatment-Screen-SW-Messaging-Broadcast

Merge branch 'LDT-627-Main-Treatment-Screen-SW-Messaging-Broadcast' into staging

Merge branch 'staging' into LDT-566-water-treatment-and-degassing-fp-2

Merge branch 'LDT-566-water-treatment-and-degassing-fp-' into staging

LDT-630: Main Treatment Screen - SW - Messaging Broadcast - 08: DEV - Dialin Implementation

- Fix common .py pressure ranges format

- Adjust TD messaging doxygen comments and correct payload for ejector, switches, and battery to unsigned int

    • -32
    • +31
    /leahi_dialin/ui/td_messaging.py
LDT-630: Main Treatment Screen - SW - Messaging Broadcast - 08: DEV - Dialin Implementation

removing TD bubbles and air pump for future implementation

LDT-630: Main Treatment Screen - SW - Messaging Broadcast - 08: DEV - Dialin Implementation

- Adjust pressure limits in common.py

- Adjust GenDialysate payload naming

- Change TD blood pump to blood flow

    • -27
    • +27
    /leahi_dialin/ui/dd_messaging.py
    • -10
    • +10
    /leahi_dialin/ui/td_messaging.py
Merge branch 'LDT-566-water-treatment-and-degassing-fp-' into develop

LDT-566: updated msg_ids

LDT-630: Main Treatment Screen - SW - Messaging Broadcast - 08: DEV - Dialin Implementation

- Add TX State message

LDT-566: code review comments

    • -1
    • +1
    /leahi_dialin/td/modules/blood_flow.py
Merge branch 'develop' of bitbucket.org:diality-cloud/leahi-dialin into develop

Merge branch 'LDT-566-water-treatment-and-degassing-fp-' into develop

LDT-566: fixed msg ids

Merge branch 'develop' of bitbucket.org:diality-cloud/leahi-dialin into develop

Merge branch 'LDT-566-water-treatment-and-degassing-fp-' into develop

LDT-566: added op mode broadcast interval override. added missing msg ids

    • -0
    • +44
    /leahi_dialin/fp/filtration_purification.py
Merge branch 'LDT-566-water-treatment-and-degassing-fp-' into develop

WIP on develop

LDT-566: Updated unit testing to be configured for the leahi dialin project. Various fixes around the project to ensure passing unit tests.

    • -10
    • +7
    /tests/unit_tests/test_constructors.py
    • -56
    • +90
    /tests/unit_tests/test_imports.py
    • -122
    • +0
    /tests/unit_tests/test_ui_proxy.py
LDT-566: implemented blood pump homing cmd.

    • -0
    • +25
    /leahi_dialin/td/modules/blood_flow.py
LDT-566: updated bubble detector documentation. Updated pre gen dialysate to no longer have depreciated overrides

Merge branch 'LDT-566-water-treatment-and-degassing-fp-' into develop

LDT-566: added a set air trap control. fixed ejector broadcast interval override.

    • -0
    • +25
    /leahi_dialin/td/modules/air_trap.py
    • -1
    • +43
    /leahi_dialin/td/modules/ejector.py
LDT-630: Main Treatment Screen - SW - Messaging Broadcast - 08: DEV - Dialin Implementation

- Adjust DD/TD Payload naming to have FW valve naming scheme

    • -27
    • +27
    /leahi_dialin/ui/dd_messaging.py
    • -88
    • +109
    /leahi_dialin/ui/td_messaging.py
Merge branch 'LDT-566-water-treatment-and-degassing-fp-' into develop

LDT-566: Pre-gen dialysate request message handler implementation

Merge branch 'LDT-566-water-treatment-and-degassing-fp-' into develop

LDT-566: fixed ejector handler creating tuples

LDT-566: Code review comments

    • -50
    • +11
    /leahi_dialin/td/modules/ejector.py