leahi-dialin

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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
LEAHI-139: updated sensor renaming to FW conventions.

    • -50
    • +51
    /leahi_dialin/dd/modules/pressure_sensors.py
LEAHI-139: code review comments.

    • -56
    • +30
    /leahi_dialin/dd/modules/conductivity_sensors.py
    • -19
    • +19
    /leahi_dialin/dd/modules/gen_dialysate.py
    • -36
    • +33
    /leahi_dialin/dd/modules/heaters.py
    • -24
    • +31
    /leahi_dialin/dd/modules/levels.py
    • -6
    • +13
    /leahi_dialin/dd/modules/piston_pump.py
    • -79
    • +77
    /leahi_dialin/dd/modules/pressure_sensors.py
    • -146
    • +147
    /leahi_dialin/dd/modules/valves.py
LEAHI-139: code review comments.

    • -25
    • +43
    /leahi_dialin/dd/modules/temperature_sensors.py
    • -144
    • +144
    /leahi_dialin/dd/modules/valves.py
Merge branch 'LEAH-136-dial-ro-base-object' into staging

LEAHI-136: Code review comments.

LEAHI-139: code review comments. Implemented hydraulic fluid temperature override method.

    • -46
    • +46
    /leahi_dialin/dd/modules/concentrate_pump.py
    • -0
    • +35
    /leahi_dialin/dd/modules/gen_dialysate.py
LEAHI-136: code review comments

LEAHI-139: code review comments

    • -30
    • +28
    /leahi_dialin/dd/modules/concentrate_pump.py
LEAHI-136: code review comments

    • -1
    • +1
    /leahi_dialin/ro/modules/flow_sensors.py
LEAHI-136: addressing code review comments. Updated pressure handler method.

    • -34
    • +32
    /leahi_dialin/ro/modules/boost_pump.py
    • -65
    • +21
    /leahi_dialin/ro/modules/conductivity_sensors.py
    • -30
    • +28
    /leahi_dialin/ro/modules/flow_sensors.py
    • -11
    • +10
    /leahi_dialin/ro/modules/levels.py
    • -35
    • +73
    /leahi_dialin/ro/modules/pressure_sensors.py
    • -54
    • +53
    /leahi_dialin/ro/modules/valves.py
Merge branch 'staging' into LEAH-136-dial-ro-base-object

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

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

DD test update

fixed ordering of piston pump start cmd

    • -1
    • +1
    /leahi_dialin/dd/modules/piston_pump.py
Merge branch 'LEAH-139-dial-dd-base-object' into develop

    • -0
    • +2
    /leahi_dialin/dd/dialysate_delivery.py
DD integration

    • -0
    • +2
    /leahi_dialin/dd/dialysate_delivery.py
Merge branch 'LEAH-139-dial-dd-base-object' into develop

Updated latest dd changes to branch. Implemented Piston Pumps module.

    • -0
    • +164
    /leahi_dialin/dd/modules/piston_pump.py
    • -22
    • +77
    /leahi_dialin/dd/modules/valves.py