Clone
 

sean nash <snash@diality.com> in leahi-dialin

Merged LDT-2428 to staging.

LDT-2428: Fixed merge conflict.

Merged LDT-2199 to staging.

Merged staging to LDT-2199.

    • -3
    • +3
    /leahi_dialin/td/modules/blood_flow.py
LDT-2428: Added training test script.

    • -0
    • +41
    /tests/test_training.py
Fixed merge conflict.

    • -6
    • +41
    /leahi_dialin/td/treatment_delivery.py
LDT-2428: Fixed bug.

    • -5
    • +5
    /leahi_dialin/td/treatment_delivery.py
LDT-2428: Added training test override msg and cmd.

    • -1
    • +36
    /leahi_dialin/td/treatment_delivery.py
TEST: Added new DD override for all balancing chamber valves in one command.

TEST: Fixed bug in DD valve sync function.

    • -0
    • +13
    /leahi_dialin.egg-info/PKG-INFO
    • -0
    • +74
    /leahi_dialin.egg-info/SOURCES.txt
    • -0
    • +1
    /leahi_dialin.egg-info/dependency_links.txt
    • -0
    • +13
    /leahi_dialin.egg-info/requires.txt
    • -0
    • +1
    /leahi_dialin.egg-info/top_level.txt
    • -25
    • +24
    /leahi_dialin/dd/modules/valves.py
Merge branch 'develop' of bitbucket.org:diality-cloud/leahi-dialin into develop

Added new RO Dialin message IDs.

TEST: fixes to RO levels and flow sensors.

    • -6
    • +6
    /leahi_dialin/ro/modules/flow_sensors.py
    • -11
    • +16
    /leahi_dialin/ro/modules/levels.py
TEST: Adjustments to RO valves class.

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

TEST: Add valves to RO test script.

TEST: Simplified update to valve_states_all variable.

TEST: Fixed sensed valve state issue. Populated valve_states_all in broadcast msg handler.

    • -10
    • +30
    /leahi_dialin/ro/modules/valves.py
Merge branch 'develop' of bitbucket.org:diality-cloud/leahi-dialin into develop

TEST: Fixed bit masks for reported RO valve commanded states.

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

TEST: Added PPi pressure sensor to ro.

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

TEST: Changed valve swap per Haiwen.

    • -12
    • +12
    /leahi_dialin/ro/modules/valves.py
TEST: More on swapped valve positions for VCr and VROD.

TEST: Swapped valve positions for VCr and VROD.

    • -1
    • +1
    /leahi_dialin/ro/modules/boost_pump.py
TEST: Update to RO test script.

TEST: misc RO test script changes.

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

    • -1
    • +2
    /leahi_dialin/ro/modules/boost_pump.py
TEST: Added pump enum to boost_pump class. Updates to RO test script.

    • -0
    • +2
    /leahi_dialin/ro/modules/boost_pump.py