Clone
 

quang nguyen <qnguyen@diality.com> in dialin

DEN-9633: Updated changelog

DEN-9633: Merge branch 'staging'

Merge branch 'DEN-9633_Sprint51' into staging

    • -43
    • +41
    /dialin/dg/dialysate_generator.py
    • -44
    • +42
    /dialin/hd/hemodialysis_device.py
DEN-9633: Fixed duplicate function name

DEN-9633: Combined command and publish requirements generation

    • -110
    • +102
    /tests/peter/test_gen_requirements.py
DEN-9633: Updated requirements generation list

    • -13
    • +10
    /dialin/dg/dialysate_generator.py
    • -12
    • +12
    /dialin/hd/hemodialysis_device.py
    • -7
    • +41
    /tests/peter/test_gen_requirements.py
DEN-9633: DIAL-133: Added Dialin commands to get recirc progress info

Merge branch 'DEN-8886-hd_dg_dev-self-tests-2-of-2' into staging

    • -1
    • +213
    /dialin/hd/hemodialysis_device.py
Merge branch 'DEN-9480-dialysate-temperature-control' into develop

Merge branch 'DEN-8886-hd_dg_dev-self-tests-2-of-2' into develop

    • -1
    • +213
    /dialin/hd/hemodialysis_device.py
DEN-9633: Standardize imports

DEN-9633: DIAL-128: Updated do_log_can format

Merge branch 'staging' into DEN-9633_Sprint51

Merge branch 'DEN-9411_UI_DEV_POST' into staging

DEN-9633: Re-arrange requirements order

DEN-9633: DIAL-132: Added treatment stop progress sync

DEN-9633: Removed messages defined by Dialin

DEN-9633: DIAL-85: Get UI version

DEN-9633: DIAL-130: Added reset function to treatment module

DEN-9633: DIAL-131: Add functions to get rinseback info

DEN-9633: DIAL-128: Update do_log_can format

DEN-9448: Fixed more PEP8 style on HD folder

DEN-9448: Fixed more PEP8 style on DG folder

    • -10
    • +8
    /dialin/dg/scheduled_runs_record.py
  1. … 8 more files in changeset.
DEN-9448: Removed commas in ui proxy enums

Merge branch 'DEN-8856_Sprint_47' into staging

    • -223
    • +270
    /dialin/common/alarm_defs.py
DEN-8856: Removed CAN frames

Merge branch 'DEN-8886-hd_dg_dev-self-tests-2-of-2' into develop

DEN-8856: Updated water sample state

Merge branch 'DEN-8856_Sprint_47' into develop

DEN-9448: Fix UI folder style

    • -195
    • +199
    /dialin/ui/dg_simulator.py
    • -553
    • +548
    /dialin/ui/hd_simulator.py
    • -137
    • +144
    /dialin/ui/hd_simulator_alarms.py