dialin

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-5830_AlarmDesign' into 2020_EOY_DEMO

DEN-5833: Implementation

- Added AlarmFlags

DIAL-31: DG Software reset will not require response

Fixed valves state override message

Fixed incorrect message name for DG pressure override

DEN-5802: Continued migrating to denali can messenger.

    • -0
    • +30
    /dialin/common/hd_defs.py
    • -0
    • +32
    /tests/test_debug_text.py
Merge branch 'DEN-5830_AlarmDesign' into DEN-5751_Pre-TreatmentUltrafiltration

DEN-5833: Implementation

- Added Alarms Priority enums in the common folder.

- Updated the CANBus test function test_can0 to be able to be used out side of the SquishQt (ex. Simulator) and moved the common portion in the utils.py

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

Merge branch 'DEN-5736_UI_Heparin_Bolus'

DEN-5638: Continued squish migration, refactored hd_simulator.py

    • -670
    • +377
    /dialin/ui/hd_simulator.py
DEN-3421 updated the drivers. Merged develop into the branch

    • -47
    • +99
    /dialin/dg/temperature_sensors.py
Merge branch 'DEN-3504-dg-dialysate-composition-1-of-2' into develop

DEN-3504: Added tare option to drain command

DEN-5739: Implementation

- Fixed the API bug when implementing the request.

DEN-5741 Integration Testing

- Added Heparin Data/Response messages API

    • -13
    • +91
    /dialin/squish/denaliMessages.py
Bamboo Commit: Updated the Copyright with the current year and replaced tabs with 4 spaces

DEN-5638: Removed globals import test from test_squish

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