dialin

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-12358-sw_dev-sprint-67_mg' into develop

DEN-12358: Added additional alarm properties and get functions for them.

DEN-12358: DIAL-152: Updated class properties and hd.treatment.reset() to be in sync with latest firmware changes.

Merge branch 'DEN-12358-sw_dev-sprint-67_mg' into develop

DEN-12358: DIAL-152 and DIAL-138: Updated names in dg alarms to be similiar to HD's. Added remaining alarm flags to HD alarms.

Merge branch 'DEN-12358-sw_dev-sprint-67_mg' into develop

DEN-12358: DIAL-150: renamed get_current_alarms_state to get_current_alarm_priority. Renamed get_alarm_status to get_all_alarm_states.

Merge branch 'DEN-12358-sw_dev-sprint-67_mg' into develop

    • -31
    • +113
    /dialin/dg/chemical_disinfect.py
DEN-12358: DIAL-152. Implemented Alarm properties

Merge branch 'DEN-12258-UI-BN-S66' into develop

DEN-12426 LTS: Working on reported malfunctions / Code Review

- Fixed a minor bug in treatment log review api

Merge branch 'staging' into DEN-12258-UI-BN-S66

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

Merge branch 'staging' into DEN-12258-UI-BN-S66

Merge branch 'DEN-10602_UI_DEV_PatientID' into staging

- this branch wasn't merged after the code review and caused inconsistency between Dialin and Simulator.

Merge branch 'DEN-12258-UI-BN-S66' into develop

Merge branch 'staging' into DEN-12258-UI-BN-S66

DEN-12358: DIAL-151. Added getters heat and chem disinfection properties. Fixed dg_sim having sg in a method name.

    • -33
    • +115
    /dialin/dg/chemical_disinfect.py
Merge branch 'develop' of ssh://dvm-linux02:7999/vv/dialin into develop

Merge branch 'DEN-12224-dg_hd_dev-switches-monitor' into develop

DEN-12224 updated the fans driver

Merge branch 'DEN-12258-UI-BN-S66' into develop

DEN-12262: INT: Support and debugging

- Fixed and updated the Dialin [hd/dg]_simulator APIs for the recent changes in the UI.

Merge branch 'DEN-12224-dg_hd_dev-switches-monitor' into develop

DEN-12224 updated the fans driver

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

Mereged DEN-12224

DEN-12224, DEN-12232 updated the fans driver

DEN-11928 Added script to override the concentrate volume

    • -0
    • +187
    /dialin/dg/dialysate_fill.py
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces