Activity dialin/

7:51 pm

Behrouz NematiPour

More
a9bc649
changed 1 file
DEN-12224-dg_hd_dev-switches-monitor, DEN-12258-UI-BN-S66 and 192 more

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

- -9
- +18
/dialin/ui/hd_simulator.py
- History
- Source
- Diff
/dialin/ui/hd_simulator.py

7:51 pm

Behrouz NematiPour

More
835ce06
changed 7 files
DEN-11928-dg-conductivity-update, DEN-12224-dg_hd_dev-switches-monitor and 194 more

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.

- -2
- +13
/dialin/common/msg_defs.py
- History
- Source
- Diff
/dialin/common/msg_defs.py
- -0
- +1
/dialin/dg/events.py
- History
- Source
- Diff
/dialin/dg/events.py
- -1
- +0
/dialin/dg/ro_pump.py
- History
- Source
- Diff
/dialin/dg/ro_pump.py
- -30
- +43
/dialin/hd/ui_proxy.py
- History
- Source
- Diff
/dialin/hd/ui_proxy.py
- -0
- +2
/dialin/protocols/CAN.py
- History
- Source
- Diff
/dialin/protocols/CAN.py
- -9
- +18
/dialin/ui/hd_simulator.py
- History
- Source
- Diff
/dialin/ui/hd_simulator.py
- -1
- +1
/tests/unit_tests/test_ui_proxy.py
- History
- Source
- Diff
/tests/unit_tests/test_ui_proxy.py

6:36 pm

Behrouz NematiPour

More
b26c4ef
changed 4 files
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 127 more

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

- -1
- +1
/dialin/common/hd_defs.py
- History
- Source
- Diff
/dialin/common/hd_defs.py
- -1
- +1
/dialin/common/msg_ids.py
- History
- Source
- Diff
/dialin/common/msg_ids.py
- -2
- +3
/dialin/hd/hemodialysis_device.py
- History
- Source
- Diff
/dialin/hd/hemodialysis_device.py
- -2
- +2
/dialin/ui/hd_simulator.py
- History
- Source
- Diff
/dialin/ui/hd_simulator.py

6:23 pm

Behrouz NematiPour

More
7a35068
changed 2 files
DEN-12224-dg_hd_dev-switches-monitor, DEN-12258-UI-BN-S66 and 192 more DIALIN-DEN-12258-1

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

- -2
- +26
/dialin/ui/dg_simulator.py
- History
- Source
- Diff
/dialin/ui/dg_simulator.py
- -37
- +112
/dialin/ui/hd_simulator.py
- History
- Source
- Diff
/dialin/ui/hd_simulator.py

11:19 am

Michael Garthwaite

More
1bf1193
changed 3 files
DEN-12358-sw_dev-sprint-67_mg, DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device and 128 more DIALIN-DEN-12358-1

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
- History
- Source
- Diff
/dialin/dg/chemical_disinfect.py
- -22
- +92
/dialin/dg/heat_disinfect.py
- History
- Source
- Diff
/dialin/dg/heat_disinfect.py
- -2
- +2
/dialin/ui/dg_simulator.py
- History
- Source
- Diff
/dialin/ui/dg_simulator.py

4:27 pm

Dara Navaei

More
133336a
changed 0 files
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 127 more

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

4:27 pm

Dara Navaei

More
b956f5a
changed 1 file
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 127 more

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

- -1
- +1
/dialin/hd/fans.py
- History
- Source
- Diff
/dialin/hd/fans.py

4:27 pm

Dara Navaei

More
c3fa0bd
changed 6 files
DEN-12224-dg_hd_dev-switches-monitor, DEN-12358-sw_dev-sprint-67_mg and 186 more DIALIN-DEN-12224-1

DEN-12224 updated the fans driver

- -2
- +2
/dialin/dg/chemical_disinfect.py
- History
- Source
- Diff
/dialin/dg/chemical_disinfect.py
- -1
- +1
/dialin/dg/fans.py
- History
- Source
- Diff
/dialin/dg/fans.py
- -6
- +1
/dialin/dg/switches.py
- History
- Source
- Diff
/dialin/dg/switches.py
- -1
- +1
/dialin/hd/fans.py
- History
- Source
- Diff
/dialin/hd/fans.py
- -4
- +5
/tests/dg_tests.py
- History
- Source
- Diff
/tests/dg_tests.py
- -2
- +2
/tests/hd_nvm_scripts.py
- History
- Source
- Diff
/tests/hd_nvm_scripts.py

3:19 pm

Behrouz NematiPour

More
6eee2c8
changed 2 files
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 127 more

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

- -20
- +35
/dialin/ui/dg_simulator.py
- History
- Source
- Diff
/dialin/ui/dg_simulator.py
- -40
- +53
/dialin/ui/hd_simulator.py
- History
- Source
- Diff
/dialin/ui/hd_simulator.py

3:18 pm

Behrouz NematiPour

More
31253b2
changed 3 files
DEN-12224-dg_hd_dev-switches-monitor, DEN-12258-UI-BN-S66 and 192 more DIALIN-DEN-12258-1

DEN-12262: INT: Support and debugging

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

- -20
- +35
/dialin/ui/dg_simulator.py
- History
- Source
- Diff
/dialin/ui/dg_simulator.py
- -38
- +53
/dialin/ui/hd_simulator.py
- History
- Source
- Diff
/dialin/ui/hd_simulator.py
- -1
- +15
/dialin/utils/conversions.py
- History
- Source
- Diff
/dialin/utils/conversions.py

5:44 pm

Dara Navaei

More
4be5709
changed 1 file
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 127 more

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

- -1
- +1
/dialin/hd/fans.py
- History
- Source
- Diff
/dialin/hd/fans.py

5:44 pm

Dara Navaei

More
6a6230a
changed 2 files
DEN-12224-dg_hd_dev-switches-monitor, DEN-12358-sw_dev-sprint-67_mg and 186 more DIALIN-DEN-12224-1

DEN-12224 updated the fans driver

- -1
- +1
/dialin/dg/fans.py
- History
- Source
- Diff
/dialin/dg/fans.py
- -1
- +1
/dialin/hd/fans.py
- History
- Source
- Diff
/dialin/hd/fans.py

5:18 pm

Dara Navaei

More
32cfa9f
changed 1 file
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 127 more

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

- -13
- +14
/dialin/common/hd_defs.py
- History
- Source
- Diff
/dialin/common/hd_defs.py

5:18 pm

Dara Navaei

More
b2b3c36
changed 2 files
DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 127 more

Mereged DEN-12224

- -0
- +17
/dialin/common/hd_defs.py
- History
- Source
- Diff
/dialin/common/hd_defs.py
- -3
- +11
/dialin/hd/fans.py
- History
- Source
- Diff
/dialin/hd/fans.py

5:15 pm

Dara Navaei

More
6052189
changed 6 files
DEN-12224-dg_hd_dev-switches-monitor, DEN-12358-sw_dev-sprint-67_mg and 186 more DIALIN-DEN-12224-1

DEN-12224, DEN-12232 updated the fans driver

- -0
- +17
/dialin/common/hd_defs.py
- History
- Source
- Diff
/dialin/common/hd_defs.py
- -3
- +11
/dialin/dg/fans.py
- History
- Source
- Diff
/dialin/dg/fans.py
- -3
- +11
/dialin/hd/fans.py
- History
- Source
- Diff
/dialin/hd/fans.py
- -0
- +4
/dialin/hd/pretreatment.py
- History
- Source
- Diff
/dialin/hd/pretreatment.py
- -21
- +25
/tests/dg_tests.py
- History
- Source
- Diff
/tests/dg_tests.py
- -4
- +4
/tests/hd_nvm_scripts.py
- History
- Source
- Diff
/tests/hd_nvm_scripts.py

3:56 pm

Hung Nguyen <hnguyen@diality.com>

More
0251ff1
changed 3 files
DEN-11928-dg-conductivity-update, DEN-12224-dg_hd_dev-switches-monitor and 193 more DIALIN-DEN-11928-1 DIALIN-DEN-12716-1

DEN-11928 Added script to override the concentrate volume

- -0
- +2
/dialin/common/msg_ids.py
- History
- Source
- Diff
/dialin/common/msg_ids.py
- -0
- +187
/dialin/dg/dialysate_fill.py
- History
- Source
/dialin/dg/dialysate_fill.py
- -3
- +33
/tests/test_conductivity.py
- History
- Source
- Diff
/tests/test_conductivity.py

1:14 pm

Dara Navaei

More
8c1ae1a
changed 8 files
DEN-11928-dg-conductivity-update, DEN-12224-dg_hd_dev-switches-monitor and 194 more DIALIN-DEN-12224-1 DIALIN-DEN-11928-1

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

- -1
- +1
/dialin/common/hd_defs.py
- History
- Source
- Diff
/dialin/common/hd_defs.py
- -1
- +1
/dialin/common/msg_ids.py
- History
- Source
- Diff
/dialin/common/msg_ids.py
- -2
- +2
/dialin/dg/hd_proxy.py
- History
- Source
- Diff
/dialin/dg/hd_proxy.py
- -2
- +2
/dialin/hd/hemodialysis_device.py
- History
- Source
- Diff
/dialin/hd/hemodialysis_device.py
- -4
- +4
/dialin/hd/post_treatment.py
- History
- Source
- Diff
/dialin/hd/post_treatment.py
- -2
- +2
/dialin/hd/treatment.py
- History
- Source
- Diff
/dialin/hd/treatment.py
- -2
- +2
/dialin/ui/dg_simulator.py
- History
- Source
- Diff
/dialin/ui/dg_simulator.py
- -1
- +1
/dialin/ui/hd_simulator.py
- History
- Source
- Diff
/dialin/ui/hd_simulator.py

1:13 pm

Michael Garthwaite

More
DIALIN-DEN-12121-1
Closed

1:12 pm

Michael Garthwaite

More
eef137b
changed 0 files
DEN-11928-dg-conductivity-update, DEN-12224-dg_hd_dev-switches-monitor and 194 more

Merge branch 'DEN-12121-sw_dev-sprint-65' into staging

12:35 pm

Behrouz NematiPour and Dara Navaei

More
DIALIN-DEN-12121-1
finished reviewing

12:33 pm

Dara Navaei

RESOLVED.

12:33 pm

Dara Navaei

RESOLVED.

12:29 pm

Behrouz NematiPour

Later please be consistent with types, (int) is used everywhere RESOLVED Thanks,

Later please be consistent with types, (int) is used everywhere

RESOLVED
Thanks,

12:28 pm

Behrouz NematiPour

RESOLVED Thanks,

RESOLVED
Thanks,

12:27 pm

Behrouz NematiPour

RESOLVED Thanks,

RESOLVED
Thanks,

12:27 pm

Behrouz NematiPour

RESOLVED Thanks,

RESOLVED
Thanks,

12:26 pm

Behrouz NematiPour

Please remove the state in the @param state docstring. RESOLVED Thanks,

Please remove the state in the @param state docstring.

RESOLVED
Thanks,

12:24 pm

Behrouz NematiPour

RESOLVED Thanks,

RESOLVED
Thanks,

12:24 pm

Behrouz NematiPour

RESOLVED Thanks,

RESOLVED
Thanks,

12:20 pm

Behrouz NematiPour

RESOLVED Thanks,

RESOLVED
Thanks,

dialin

Stats

Commits this week: 0

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

Behrouz NematiPour

Behrouz NematiPour

Behrouz NematiPour

Behrouz NematiPour

Michael Garthwaite

Dara Navaei

Dara Navaei

Dara Navaei

Behrouz NematiPour

Behrouz NematiPour

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Hung Nguyen <hnguyen@diality.com>

Dara Navaei

Michael Garthwaite

Michael Garthwaite

Behrouz NematiPour and Dara Navaei

Dara Navaei

Dara Navaei

Behrouz NematiPour

Behrouz NematiPour

Behrouz NematiPour

Behrouz NematiPour

Behrouz NematiPour

Behrouz NematiPour

Behrouz NematiPour

Behrouz NematiPour