dialin

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-7091: Moved pre-treatment enums to dialin common

DEN-7091: Added pre-treatment consumable self-test sub-mode

    • -16
    • +18
    /dialin/dg/dialysate_generator.py
DEN-7091: Added pretreatment module to HD

DEN-7091: Updated fill command

DEN-7091: Added handler for pre-treatment sub-mode progress

Merge branch 'DEN-6402-hd_dev-pre-treatment-self-tests' into staging

DEN-7091: Added enum for pre-treatment sub-mode states

    • -0
    • +79
    /dialin/dg/samplewater.py
DEN-7091: Added sample water progress handler

    • -0
    • +80
    /dialin/dg/SampleWater.py
DEN-7091: Added ui proxy commands for HD pre-treatment mode

    • -0
    • +156
    /dialin/hd/pretreatment.py
DEN-7043: (BUGFIX) Ensure AlarmID values are cast to int

Merge master into staging

DEN-7043: (BUGFIX) Correct uf pre-treatment msgid in ui_proxy

DEN-7144: Fixed Simulator Alarm plugin

- Added instance count in Alarm Simulator

- Added a getter for alarm simulator from within HDSimulator.

DEN-7144: preTx: Implementation [Simulator/Testing] ( 1 )

- Updated the HDSimulator regarding the enum changes in the msg_defs.py

Merge branch 'staging' into DEN-6078-revisit-safety-functionality-of-pumps-valves

Updated changelog, version.py

DEN-7041: Fixed old treatment states, msg ids.

    • -0
    • +28
    /tests/test_heparin.py
DEN-6078 addressed a code review comment

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

Updated changelog

    • -1479
    • +0
    /dialin/squish/denaliMessages.py
Merge branch 'master' into staging

Removed duplicate version.py

DEN-6078 addressed the code review comments

Fix the merge conflict revert back issue

- During the merging thought the console_out has been renamed to passive_mode but actually passive_mode is another parameter. So it needs to be added back.

DEN-7041: Added changes necessary for testsuites to pass 100%

Merge branch 'DEN-6631_UI_DEV_Post-Treatment_Rinseback' into staging

DEN-6638: ptTx-RB: Code Review 0

- removed extra empty line.

DEN-6638: ptTx-RB: Code Review 0

- made the console out of the received can messages optional in the HDSimulator class constructor.

DEN-6402: Added enum for conductivity sensors and update alarm id

DEN-6869: Added Version Dialin API and a Simulator plugin

- Added two more conversion functions to convert 2 and 1 byte values to byte array.

- used byte_to_bytearray (1 byte value conversion) and short_to_bytearray (2 bytes value conversion) in versions messages.