dialin

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-9906 Code updated per peer review comments

    • -9
    • +12
    /dialin/dg/dialysate_flow_sensor.py
DEN-9906 Added dialysate flow sensor module

    • -0
    • +144
    /dialin/dg/dialysate_flow_sensor.py
Merge branch 'DEN-9906-hd_dev-flow-measurement-changes' of ssh://dvm-linux02:7999/vv/dialin into DEN-9906-hd_dev-flow-measurement-changes

DEN-9906: Added dialysate flow sensor module and updated CAN msg ids

Merge branch 'DEN-9906-hd_dev-flow-measurement-changes' into develop

DEN-9906: Removed commands for obsolete dialysate pump occlusion sensors.

Fixed merge conflicts.

DEN-9906: pulled in ui_proxy fix from Dara's branch.

DEN-9906: Added overrides for blood pump rotor count and arterial pressure offset.

Merge branch 'DEN-9480-dialysate-temperature-control' into develop

    • -3
    • +3
    /tests/dg_heat_and_chemical_disinfect_test.py
DEN-9480, DEN-10410, DEN-10795 worked on the events.py in DG and added the rinse concentrate lines flag to the drain mode

    • -3
    • +3
    /tests/dg_heat_and_chemical_disinfect_test.py
DEN-9480 updated the DG states

Merged DEN-9480

    • -65
    • +76
    /tests/dg_heat_and_chemical_disinfect_test.py
DEN-10410, DEN-10648, DEN-10583 updated events.py to get receive the events from fir mware and added the DG Fault states

DNE-9480 worked on event.py

    • -2
    • +3
    /tests/dg_heat_and_chemical_disinfect_test.py
Updated the test script

    • -14
    • +12
    /tests/dg_heat_and_chemical_disinfect_test.py
DEN-9480 added a function to collect treatment data

    • -57
    • +67
    /tests/dg_heat_and_chemical_disinfect_test.py
Merge branch 'DEN-9480-dialysate-temperature-control' into develop

DEN-10410, DEN-10648, DEN-10583 updated events.py to get receive the events from fir mware and added the DG Fault states

Merged DEN-9480 and resolved the merge conflicts

    • -7
    • +7
    /tests/dg_heat_and_chemical_disinfect_test.py
DEN-10410, DEN-10648, DEN-10583 updated events.py to get receive the events from firmware

    • -8
    • +8
    /tests/dg_heat_and_chemical_disinfect_test.py
DEN-10410, DEN-10648, DEN-10583 updated events.py to get receive the events from firmware

    • -2
    • +3
    /tests/dg_heat_and_chemical_disinfect_test.py
DEN-10410, DEN-10648, DEN-10583 updated events.py to get receive the events from firmware

    • -4
    • +5
    /tests/dg_heat_and_chemical_disinfect_test.py
Merge branch 'DEN-9480-dialysate-temperature-control' into develop

DEN-9480 fixed the RESET in HD script

Merged DEN-9480, DEN-10410 added events.py

    • -43
    • +50
    /dialin/dg/dialysate_generator.py
    • -575
    • +622
    /dialin/ui/hd_simulator.py
DEN-9480 worked on the events.py

    • -2
    • +2
    /tests/dg_heat_and_chemical_disinfect_test.py
DEN-9480 continued working on the events.py

    • -4
    • +6
    /tests/dg_heat_and_chemical_disinfect_test.py
DEN-9480 updated the test scripts

    • -1
    • +1
    /tests/dg_heat_and_chemical_disinfect_test.py
    • -3
    • +14
    /tests/flow_sensor_data_processor.py
DEN-9480 initial commit of the events.py

    • -15
    • +27
    /dialin/dg/calibration_record.py
    • -0
    • +64
    /dialin/dg/events.py
  1. … 13 more files in changeset.