dialin

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge master into develop

    • -1330
    • +0
    /dialin/squish/denaliMessages.py
Merge branch 'DEN-3504-dg-dialysate-composition-1-of-2' into develop

Merge branch 'DEN-5802-Sprint-33' into develop

Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into 2020_EOY_DEMO

DEN-5833: Implementation

- added the message id 80 for pTx uf adj rsp.

DEN-3421 fixed temperature sensors unit test python script

Merge branch 'DEN-5830_AlarmDesign' into 2020_EOY_DEMO

DEN-5833: Implementation

- Added API for the message 63 : Alarm Condition Cleared

DEN-3504: Fixed spelling

DEN-3504: Added concentrate pump measured speed and broadcast interval override commands

DEN-3421 updated the documentation of the code

DEN-3421 addressed a code review comment

Addressed code review comments

Merge branch 'develop' into DEN-3421-dg-heat-disinfection

DEN-3421 addressed code reivew comments

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.