leahi-dialin

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
resolving conflicts on develop checkout

    • -1
    • +1
    /leahi_dialin/fp/modules/temperatures.py
Merged LDT-1196

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
Merged LDT-1196

LDT-1196: Corrected typo in gen dialysate data handler

    • -1
    • +1
    /leahi_dialin/dd/modules/gen_dialysate.py
Merged LDT-1196

    • -1
    • +1
    /leahi_dialin/dd/modules/piston_pump.py
    • -1
    • +1
    /leahi_dialin/fp/modules/temperatures.py
Merged LDT-1196

    • -1
    • +1
    /leahi_dialin/dd/modules/piston_pump.py
    • -1
    • +1
    /leahi_dialin/fp/modules/temperatures.py
LDT-1196: Added targetQd to mode gen_dialysate data handler

    • -0
    • +4
    /leahi_dialin/dd/modules/gen_dialysate.py
Merged LDT-2300

Merge branch 'staging' into LDT-2300-dialin-add-a-way-for-a-dialin-u

LDT-2199 added a command to hard stop the TD blood pump

    • -0
    • +24
    /leahi_dialin/td/modules/blood_flow.py
LDT-2300: Resolved code review comments

    • -7
    • +9
    /leahi_dialin/dd/modules/blood_leak.py
    • -2
    • +2
    /leahi_dialin/dd/modules/gen_dialysate.py
    • -1
    • +1
    /leahi_dialin/dd/modules/piston_pump.py
  1. … 26 more files in changeset.
Merged LDT-2352

LDT-2352: Corrected DD Pressure Sensors handler indexing

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

Merged LDT-2352 and resolved conflicts

    • -0
    • +2
    /leahi_dialin/dd/dialysate_delivery.py
    • -52
    • +11
    /leahi_dialin/dd/modules/pressure_sensors.py
    • -16
    • +34
    /leahi_dialin/dd/modules/temperature_sensors.py
    • -39
    • +18
    /leahi_dialin/dd/modules/valves.py
    • -32
    • +17
    /leahi_dialin/fp/modules/temperatures.py
    • -21
    • +12
    /leahi_dialin/fp/modules/valves.py
LDT-2352: Updated DD and FP stacks for beta integration

    • -0
    • +2
    /leahi_dialin/dd/dialysate_delivery.py
    • -52
    • +11
    /leahi_dialin/dd/modules/pressure_sensors.py
    • -16
    • +34
    /leahi_dialin/dd/modules/temperature_sensors.py
    • -39
    • +18
    /leahi_dialin/dd/modules/valves.py
    • -0
    • +170
    /leahi_dialin/dd/modules/voltages.py
    • -32
    • +17
    /leahi_dialin/fp/modules/temperatures.py
    • -21
    • +12
    /leahi_dialin/fp/modules/valves.py
LDT-2352: Updated comment for DDOpModes

LDT-2272 Patient Vitals - SW - 01 - R&I - 08: DEV - Dialin Implementation

update message id comment

Merged LDT-2329

LDT-2272 Patient Vitals - SW - 01 - R&I - 08: DEV - Dialin Implementation

update CAN.py per behrouz 9/19 1:25

LDT-2329: Updated Diener Pump Test Config comment

    • -1
    • +1
    /leahi_dialin/common/test_config_defs.py
Merged LDT-2199

    • -1
    • +75
    /leahi_dialin/td/modules/air_trap.py
LDT-2199 added two override commands for the air trap air pump raise/lower power

    • -1
    • +75
    /leahi_dialin/td/modules/air_trap.py
Merged LDT-2300

    • -7
    • +9
    /leahi_dialin/dd/dialysate_delivery.py
    • -7
    • +11
    /leahi_dialin/fp/filtration_purification.py
    • -9
    • +12
    /leahi_dialin/td/treatment_delivery.py
LDT-2300: Updated handlers in module classes and addressed Zoltan's comments

    • -7
    • +9
    /leahi_dialin/dd/dialysate_delivery.py
    • -7
    • +11
    /leahi_dialin/fp/filtration_purification.py
    • -9
    • +12
    /leahi_dialin/td/treatment_delivery.py
Merged LDT-2303