leahi-dialin

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
WIP on develop

Fixed FP defs being RO defs

    • -0
    • +55
    /leahi_dialin/common/fp_defs.py
Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop

WIP on develop

fix on fp valve renaming.

Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop

    • -0
    • +258
    /leahi_dialin/fp/modules/boost_pump.py
    • -0
    • +135
    /leahi_dialin/fp/modules/levels.py
    • -0
    • +294
    /leahi_dialin/fp/modules/valves.py
WIP on develop

Renamed RO class and sub modules to use FP to be in line with sub system names

    • -0
    • +1
    /leahi_dialin/fp/__init__.py
    • -0
    • +250
    /leahi_dialin/fp/filtration_purification.py
    • -0
    • +0
    /leahi_dialin/fp/modules/__init__.py
    • -0
    • +256
    /leahi_dialin/fp/modules/boost_pump.py
    • -0
    • +230
    /leahi_dialin/fp/modules/conductivity_sensors.py
    • -0
    • +18
    /leahi_dialin/fp/modules/constants.py
    • -0
    • +175
    /leahi_dialin/fp/modules/flow_sensors.py
    • -0
    • +135
    /leahi_dialin/fp/modules/levels.py
    • -0
    • +220
    /leahi_dialin/fp/modules/pressure_sensors.py
    • -0
    • +294
    /leahi_dialin/fp/modules/valves.py
    • -255
    • +0
    /leahi_dialin/ro/modules/boost_pump.py
  1. … 9 more files in changeset.
Merge branch 'develop' of bitbucket.org:diality-cloud/leahi-dialin into develop

Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop

LEAHI-261: fixed temperature sensor naming

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

Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop

    • -0
    • +32
    /leahi_dialin/dd/modules/piston_pump.py
LEAHI-261: implemented acid dose, bicarb dose, and piston pump dispense override commands.

    • -0
    • +32
    /leahi_dialin/dd/modules/piston_pump.py
Merge branch 'develop' of bitbucket.org:diality-cloud/leahi-dialin into develop

Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop

WIP on develop

LEAHI-261: fixed dd valve variable naming

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

Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop

LEAHI-261: fixed dd valve naming

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

Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop

WIP on develop

LEAHI-261: fixed dup'd MSG_ID

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

update test DD file

Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop

LEAHI-261: updated air trap to use the correct valve names.

    • -14
    • +5
    /leahi_dialin/td/modules/air_trap.py
Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop

    • -6
    • +13
    /leahi_dialin/dd/modules/piston_pump.py
    • -34
    • +32
    /leahi_dialin/ro/modules/boost_pump.py
    • -54
    • +54
    /leahi_dialin/ro/modules/valves.py
WIP on staging

    • -18
    • +26
    /leahi_dialin/common/alarm_defs.py
    • -0
    • +55
    /leahi_dialin/common/ro_defs.py
    • -6
    • +14
    /leahi_dialin/td/modules/air_pump.py
    • -19
    • +25
    /leahi_dialin/td/modules/air_trap.py
    • -9
    • +9
    /leahi_dialin/td/modules/blood_flow.py
    • -12
    • +12
    /leahi_dialin/td/modules/pressure_sensors.py
Merge branch 'LEAH-139-dial-dd-base-object' into staging

LEAHI-139: code review comments

LEAHI-139: code review comments.

    • -1
    • +1
    /leahi_dialin/dd/modules/gen_dialysate.py
LEAHI-139: code review comments.

    • -2
    • +2
    /leahi_dialin/dd/modules/gen_dialysate.py