leahi-dialin

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
TEST: more updates to basic test script for TD.

Merge branch 'LEAH-139-dial-dd-base-object' into develop

WIP on develop

added dialysate start stop override cmd

Merge branch 'LEAH-139-dial-dd-base-object' into develop

fixed dd levels and pressure sensors.

Merge branch 'LEAH-139-dial-dd-base-object' into develop

Updated DD valves

    • -130
    • +126
    /leahi_dialin/dd/modules/valves.py
Merge branch 'develop' of bitbucket.org:diality-cloud/leahi-dialin into develop

Merge branch 'LEAH-142-dial-td-base-object' into develop

updated blood flow handler

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

TEST: updates to basic test script.

Merge branch 'LEAH-142-dial-td-base-object' into develop

fixed air trap handler. moved constants file to be in sync with the rest of the subsystems.

    • -2
    • +12
    /leahi_dialin/td/modules/air_trap.py
    • -2
    • +2
    /leahi_dialin/td/modules/blood_flow.py
    • -0
    • +24
    /leahi_dialin/td/modules/constants.py
Merge branch 'LEAH-139-dial-dd-base-object' into develop

Updated folder naming. Fixed pathing. Fixed relative importing

DD class should now create.

    • -351
    • +0
    /leahi-dialin/dd/modules/concentrate_pump.py
    • -304
    • +0
    /leahi-dialin/dd/modules/conductivity_sensors.py
    • -211
    • +0
    /leahi-dialin/dd/modules/heaters.py
    • -139
    • +0
    /leahi-dialin/dd/modules/levels.py
    • -415
    • +0
    /leahi-dialin/dd/modules/pressure_sensors.py
    • -267
    • +0
    /leahi-dialin/dd/modules/temperature_sensors.py
    • -416
    • +0
    /leahi-dialin/dd/modules/valves.py
    • -0
    • +0
    /leahi_dialin/dd/conductivity_sensors.py
    • -0
    • +254
    /leahi_dialin/dd/dialysate_delivery.py
  1. … 15 more files in changeset.
TEST: started update of basic Leahi test script.

Merge branch 'LEAH-142-dial-td-base-object' into LEAH-136-dial-ro-base-object

Merge branch 'LEAH-142-dial-td-base-object' into LEAH-139-dial-dd-base-object

Merge branch 'LEAH-142-dial-td-base-object' into develop

    • -0
    • +195
    /leahi_dialin/common/msg_ids.py
Fixed syntax naming for project name. Fixed instantiation errors for TD module. Fixed import pathing for TD modules.

    • -111
    • +0
    /leahi-dialin/common/alarm_defs.py
    • -60
    • +0
    /leahi-dialin/common/alarm_priorities.py
    • -136
    • +0
    /leahi-dialin/common/msg_defs.py
    • -40
    • +0
    /leahi-dialin/common/test_config_defs.py
    • -0
    • +0
    /leahi-dialin/dd/conductivity_sensors.py
    • -0
    • +0
    /leahi-dialin/dd/dialysate_delivery.py
  1. … 97 more files in changeset.
Merge branch 'LEAH-136-dial-ro-base-object' into develop

Merge branch 'LEAH-139-dial-dd-base-object' into develop

Merge branch 'LEAH-142-dial-td-base-object' into develop

WIP on LEAH-136-dial-ro-base-object

RO override modules

    • -0
    • +263
    /leahi-dialin/ro/modules/boost_pump.py
    • -0
    • +130
    /leahi-dialin/ro/modules/levels.py
    • -0
    • +173
    /leahi-dialin/ro/modules/pressure_sensors.py
    • -0
    • +0
    /leahi-dialin/ro/modules/valves.py
Merge branch 'LEAH-142-dial-td-base-object' into LEAH-136-dial-ro-base-object

DD temp and valves. updated CAN channels

    • -0
    • +267
    /leahi-dialin/dd/modules/temperature_sensors.py
    • -96
    • +63
    /leahi-dialin/dd/modules/valves.py
Leahi CAN channels and TD changes for them

    • -1
    • +1
    /leahi-dialin/td/treatment_delivery.py
WIP on LEAH-139-dial-dd-base-object

    • -0
    • +351
    /leahi-dialin/dd/modules/concentrate_pump.py
    • -0
    • +304
    /leahi-dialin/dd/modules/conductivity_sensors.py
    • -0
    • +360
    /leahi-dialin/dd/modules/dialysate_pump.py
    • -0
    • +211
    /leahi-dialin/dd/modules/heaters.py
    • -0
    • +139
    /leahi-dialin/dd/modules/levels.py
    • -0
    • +415
    /leahi-dialin/dd/modules/pressure_sensors.py
    • -0
    • +0
    /leahi-dialin/dd/modules/temperature_sensors.py
    • -0
    • +449
    /leahi-dialin/dd/modules/valves.py
addressing code review comments