dialin

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-11114: Fixed merge conflicts.

DEN-11114: Updated air_bubbles class to remove arterial bubble detector sensor. Updated UF test script to include HD valves, bubble detector and air trap level sensors.

Merge branch 'DEN-10602_UI_DEV_PatientID' into develop

DEN-10602: UI_DEV PatientID

- Updated the dialin ui_proxy to add the heparin for the treatment parameters messages.

Merge remote-tracking branch 'origin/develop' into develop

Merge branch 'DEN-10602_UI_DEV_PatientID' into develop

cleaned up the code while merging.

cleaned up the code while merging.

Merge branch 'DEN-10602_UI_DEV_PatientID' into develop

Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' into develop

Renamed the fans enums in HD and DG

Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' into develop

DEN-11114 fixed the unit test

Merge branch 'develop' into DEN-10602_UI_DEV_PatientID

Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' into develop

    • -13
    • +42
    /tests/dg_heat_and_chemical_disinfect_test.py
DEN-11114, DEN-11374 fixed the DG temperature sensors mismatch by adding the heat disinfect sensor ID.

    • -13
    • +42
    /tests/dg_heat_and_chemical_disinfect_test.py
Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' into develop

    • -11
    • +13
    /tests/dg_heat_and_chemical_disinfect_test.py
DEN-11114 renamed some of the functions and variables

    • -11
    • +13
    /tests/dg_heat_and_chemical_disinfect_test.py
Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' into develop

    • -1
    • +1
    /tests/dg_heat_and_chemical_disinfect_test.py
DIAL-140 renamed the temperature_sensors file to temperatures

    • -294
    • +0
    /dialin/dg/temperature_sensors.py
    • -0
    • +294
    /dialin/dg/temperatures.py
    • -1
    • +1
    /tests/dg_heat_and_chemical_disinfect_test.py
Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' into develop

    • -14
    • +17
    /tests/dg_heat_and_chemical_disinfect_test.py
DEN-11114 and DIAL-140 renamed some of the methods in DG and HD to have consistent naming

    • -40
    • +40
    /dialin/dg/temperature_sensors.py
    • -10
    • +10
    /tests/dg_heat_and_chemical_disinfect_test.py
Fixed merge conflicts.

    • -10
    • +23
    /tests/dg_heat_and_chemical_disinfect_test.py
Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' of ssh://dvm-linux02:7999/vv/dialin into DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2

DEN-11114 modified the script to collect data

    • -4
    • +7
    /tests/dg_heat_and_chemical_disinfect_test.py
Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' of ssh://dvm-linux02:7999/vv/dialin into DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2

DEN-11114: Updates to alarm enum. Added hall-sensor based pump speed to UF test script.

DIALIN-DEN-10602: DIALIN-DEN-10602-1

- Addressed the code review comment.

DEN-11114 updated the HD reservoirs with more reservoirs publications

    • -8
    • +19
    /tests/dg_heat_and_chemical_disinfect_test.py
DEN-11114 initial commit of the HD reservoirs module

    • -0
    • +56
    /dialin/hd/reservoirs.py
    • -6
    • +8
    /tests/dg_heat_and_chemical_disinfect_test.py