dialin

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bamboo Commit: Updated the Copyright with the current year and replaced tabs with 4 spaces

Merge branch 'DEN-4691_InLineBloodPressureAdjustments'

Merge branch 'master' into DEN-4691_InLineBloodPressureAdjustments

Fixed merge conflicts.

DEN-4640: Fixed DPo publish interval override command.

DEN-3421 merged develop into this branch

    • -10
    • +10
    /dialin/hd/dialysate_inlet_flow.py
    • -3
    • +119
    /dialin/hd/hemodialysis_device.py
DEN-5638, DIAL-16: Added ability to switch reservoirs.

DEN-3421 merged master into the branch

    • -38
    • +79
    /dialin/dg/dialysate_generator.py
    • -68
    • +124
    /dialin/hd/dialysate_inlet_flow.py
    • -21
    • +39
    /dialin/hd/hemodialysis_device.py
    • -125
    • +704
    /dialin/squish/denaliMessages.py
DEN-3504: Use Dialin Enum

Merge branch 'DEN-5638-Sprint-32' into develop

DEN-5638: Fixed incorrect channel for ui set treatment parameters handler. Cleaned up ui_proxy.py

Merge branch 'DEN-4640-hd-firmware-saline-bolus' into develop

DEN-4640: Added handling of Dialin requests to get, erase calibration data.

DEN-3421 worked on the drivers scripts

    • -0
    • +142
    /dialin/dg/fans.py
    • -0
    • +124
    /dialin/dg/heat_disinfection.py
    • -0
    • +182
    /dialin/dg/thermistors.py
    • -0
    • +218
    /dialin/dg/uv_reactors.py
    • -0
    • +88
    /tests/dg_heat_disinfect_test.py
DEN-3504: Combine cmd turn on/off concentrate pumps

DEN-5638: Added ui proxy test script, remove print statements, refactoring

Merge branch 'DEN-5328-Sprint-30' into develop

DEN-5638: Removed print statements, fixed typo

DEN-5638: Continued refactoring

    • -1274
    • +1158
    /dialin/ui/hd_simulator.py
DEN-5638: Began migrating squish to ui folder

    • -1330
    • +0
    /dialin/squish/denaliMessages.py
    • -0
    • +18
    /dialin/ui/globals.py
    • -0
    • +94
    /dialin/ui/messageBuilder.py
    • -0
    • +82
    /dialin/ui/unittests.py
    • -0
    • +139
    /dialin/ui/utils.py
Merge branch 'master' into develop

  1. … 5 more files in changeset.
DEN-5637: Renamed MsgFldPositions to MsgFieldPositions

    • -13
    • +13
    /dialin/dg/temperature_sensors.py
  1. … 4 more files in changeset.
Added space between functions

Bamboo Commit: Updated the Copyright with the current year and replaced tabs with 4 spaces

Updated version.py

Merge branch 'master' of ssh://dvm-linux02:7999/vv/dialin

Updated version

Bamboo Commit: Updated the Copyright with the current year and replaced tabs with 4 spaces

  1. … 23 more files in changeset.
Merge master into DEN-5328-Sprint-30

  1. … 6 more files in changeset.
DEN-4698: Code Review 0