Fisheye on dialin/

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'staging' into DEN-15274-hd_dg_test_configuration_setup

Dara Navaei — Tue, 16 May 2023 17:09:17 -0700

Dara Navaei committed b81eef2 on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 119 more in dialin

Merge branch 'staging' into DEN-15274-hd_dg_test_configuration_setup

· /dialin/hd/ui_proxy.py

(-2, +68)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Bamboo Commit: generated the code change report

Dara Navaei — Tue, 16 May 2023 16:35:48 -0700

Dara Navaei committed 0f5ebac on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 119 more in dialin

Bamboo Commit: generated the code change report

· /tools/Code_Report.csv

(-0, +7)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Tue, 16 May 2023 16:34:14 -0700

Dara Navaei committed 7daf8b3 on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 119 more in dialin

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

· /dialin/hd/ui_proxy.py

(-2, +2)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'DEN-15196-DIAL-253' into staging

Michael Garthwaite — Tue, 16 May 2023 16:29:33 -0700

Michael Garthwaite committed 8e9b10b on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 119 more in dialin

Merge branch 'DEN-15196-DIAL-253' into staging

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'staging' into DEN-15196-DIAL-253

Michael Garthwaite — Tue, 16 May 2023 16:28:56 -0700

Michael Garthwaite committed 01875d0 on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 120 more in dialin

Merge branch 'staging' into DEN-15196-DIAL-253

dialin (DEN-16693-institutional-settings-implementation-2): Bamboo Commit: generated the code change report

Dara Navaei — Tue, 16 May 2023 16:28:47 -0700

Dara Navaei committed 5c6420d on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 119 more in dialin

Bamboo Commit: generated the code change report

· /tools/Code_Report.csv

(-2, +9)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Tue, 16 May 2023 16:27:13 -0700

Dara Navaei committed 2e20a6d on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 120 more in dialin

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

· /dialin/common/dg_defs.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/common/hd_defs.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/dg/events.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/hd/hd_events.py	(-1, +1)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'DEN-15196-DIAL-251' into staging

Michael Garthwaite — Tue, 16 May 2023 16:25:28 -0700

Michael Garthwaite committed 813a29c on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 120 more in dialin

Merge branch 'DEN-15196-DIAL-251' into staging

· /dialin/common/dg_defs.py

(-1, +2)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Tue, 16 May 2023 16:24:01 -0700

Dara Navaei committed 0188c0a on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 120 more in dialin

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

· /dialin/common/dg_defs.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/dg/chemical_disinfect.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/dg/dialysate_generator.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/hd/hemodialysis_device.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/protocols/CAN.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/utils/base.py	(-2, +2)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'DEN-15196-DIAL-250' into staging

Michael Garthwaite — Tue, 16 May 2023 16:12:27 -0700

Michael Garthwaite committed cf58be2 on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 120 more in dialin

Merge branch 'DEN-15196-DIAL-250' into staging

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'staging' into DEN-15196-DIAL-250

Michael Garthwaite — Tue, 16 May 2023 14:05:08 -0700

Michael Garthwaite committed faffee3 on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 121 more in dialin

Merge branch 'staging' into DEN-15196-DIAL-250

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'staging' into DEN-15196-DIAL-251

Michael Garthwaite — Tue, 16 May 2023 14:05:03 -0700

Michael Garthwaite committed 54e33a3 on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 121 more in dialin

Merge branch 'staging' into DEN-15196-DIAL-251

dialin (DEN-16693-institutional-settings-implementation-2): DIAL-253: created handler for alarm list response.

Michael Garthwaite — Tue, 16 May 2023 13:49:13 -0700

Michael Garthwaite committed d1534b2 on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 120 more in dialin

DIAL-253: created handler for alarm list response.

· /dialin/hd/ui_proxy.py

(-0, +53)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DIAL-250: Fixed timer objects preventing code from exiting properly

Michael Garthwaite — Tue, 16 May 2023 13:29:29 -0700

Michael Garthwaite committed e69898c on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 121 more in dialin

DIAL-250: Fixed timer objects preventing code from exiting properly

· /dialin/dg/dialysate_generator.py	(-4, +4)	\| History	\| Source	\| Diff
· /dialin/hd/hemodialysis_device.py	(-4, +4)	\| History	\| Source	\| Diff
· /dialin/utils/base.py	(-0, +1)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DIAL-251: updated timestamp on operation events.

Michael Garthwaite — Tue, 16 May 2023 11:31:07 -0700

Michael Garthwaite committed 95d73d5 on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 121 more in dialin

DIAL-251: updated timestamp on operation events.

· /dialin/dg/events.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/hd/hd_events.py	(-2, +2)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DIAL-251: event handling for event id 23.

Michael Garthwaite — Tue, 16 May 2023 10:50:03 -0700

Michael Garthwaite committed 53cbfce on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 121 more in dialin

DIAL-251: event handling for event id 23.

· /dialin/common/dg_defs.py	(-1, +2)	\| History	\| Source	\| Diff
· /dialin/common/hd_defs.py	(-1, +2)	\| History	\| Source	\| Diff
· /dialin/dg/events.py	(-17, +43)	\| History	\| Source	\| Diff
· /dialin/hd/hd_events.py	(-16, +43)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DIAL-250: Fix for removing check in feature

Michael Garthwaite — Tue, 16 May 2023 09:12:17 -0700

Michael Garthwaite committed b8a31f4 on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 121 more in dialin

DIAL-250: Fix for removing check in feature

· /dialin/dg/dialysate_generator.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/hd/hemodialysis_device.py	(-2, +2)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DIAL-250: removed interval timer calls due to scripts not exiting

Michael Garthwaite — Mon, 15 May 2023 16:44:12 -0700

Michael Garthwaite committed 4e69a37 on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 121 more in dialin

DIAL-250: removed interval timer calls due to scripts not exiting

· /dialin/dg/dialysate_generator.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/hd/hemodialysis_device.py	(-2, +2)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-15274 added a command to be able to set the conductivity sensors calibration table

Dara Navaei — Mon, 15 May 2023 11:28:31 -0700

Dara Navaei committed 54b1635 on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 119 more in dialin

DEN-15274 added a command to be able to set the conductivity sensors calibration table

· /dialin/common/msg_ids.py	(-0, +1)	\| History	\| Source	\| Diff
· /dialin/dg/conductivity_sensors.py	(-0, +59)	\| History	\| Source	\| Diff
· /tests/tx_test_config_tests.py	(-89, +122)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DIAL-253: implemented ui proxy cmd to request active alarm list.

Michael Garthwaite — Mon, 15 May 2023 10:46:42 -0700

Michael Garthwaite committed cc42a03 on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 120 more in dialin

DIAL-253: implemented ui proxy cmd to request active alarm list.

· /dialin/hd/ui_proxy.py

(-0, +13)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-15274 updated the scripts for expedite pre-treatment test configuration

Dara Navaei — Sun, 14 May 2023 20:55:38 -0700

Dara Navaei committed 2dbb3b0 on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 119 more in dialin

DEN-15274 updated the scripts for expedite pre-treatment test configuration

· /dialin/dg/load_cells.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/hd/ui_proxy.py	(-7, +7)	\| History	\| Source	\| Diff
· /tests/dg_tests.py	(-3, +3)	\| History	\| Source	\| Diff
· /tests/tx_test_config_tests.py	(-6, +19)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-15274 updated the treatment test config script

Dara Navaei — Sun, 14 May 2023 15:30:53 -0700

Dara Navaei committed d107357 on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 119 more in dialin

DEN-15274 updated the treatment test config script

· /tests/hd_nvm_scripts.py	(-2, +2)	\| History	\| Source	\| Diff
· /tests/tx_test_config_tests.py	(-14, +39)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-15274 added a new script to test the pre-treatment expedited command. Added the get load cells tare command to the l...

Dara Navaei — Sun, 14 May 2023 10:02:43 -0700

Dara Navaei committed 23e83ee on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 119 more in dialin

DEN-15274 added a new script to test the pre-treatment expedited command. Added the get load cells tare command to the load cells

· /dialin/dg/load_cells.py	(-4, +30)	\| History	\| Source	\| Diff
· /tests/dg_tests.py	(-2, +14)	\| History	\| Source	\| Diff
· /tests/tx_test_config_tests.py	(-0, +118)	\| History	\| Source

dialin (DEN-16693-institutional-settings-implementation-2): DIAL-250: fixed unit test locking due to timer thread. moved start call to hd/dg log in functions. removed auto start fe...

Michael Garthwaite — Fri, 12 May 2023 14:20:53 -0700

Michael Garthwaite committed 1695d3e on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 121 more in dialin

DIAL-250: fixed unit test locking due to timer thread. moved start call to hd/dg log in functions. removed auto start feature.

· /dialin/dg/dialysate_generator.py	(-2, +8)	\| History	\| Source	\| Diff
· /dialin/hd/hemodialysis_device.py	(-4, +9)	\| History	\| Source	\| Diff
· /dialin/protocols/CAN.py	(-0, +2)	\| History	\| Source	\| Diff
· /dialin/utils/base.py	(-1, +1)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-15274 added new DG/HD test configurations

Dara Navaei — Fri, 12 May 2023 14:15:46 -0700

Dara Navaei committed 7608e52 on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 119 more in dialin

DEN-15274 added new DG/HD test configurations

· /dialin/common/test_config_defs.py

(-2, +7)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'staging' into DEN-15274-hd_dg_test_configuration_setup

Dara Navaei — Fri, 12 May 2023 10:27:40 -0700

Dara Navaei committed f2afb5b on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 119 more in dialin

Merge branch 'staging' into DEN-15274-hd_dg_test_configuration_setup

dialin (DEN-16693-institutional-settings-implementation-2): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Fri, 12 May 2023 10:24:48 -0700

Dara Navaei committed 17a693f on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 123 more in dialin

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

· /dialin/dg/calibration_record.py

(-2, +2)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'staging' into DEN-15196-DIAL-251

Michael Garthwaite — Fri, 12 May 2023 10:17:18 -0700

Michael Garthwaite committed 5aa3650 on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 121 more in dialin

Merge branch 'staging' into DEN-15196-DIAL-251

dialin (DEN-16693-institutional-settings-implementation-2): Merged DEN-15246

Dara Navaei — Fri, 12 May 2023 10:06:52 -0700

Dara Navaei committed aa9145d on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 123 more in dialin

Merged DEN-15246

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'staging' into DEN-15246-active-reservoir-empty-post-concentrate-alarm-recovery

Dara Navaei — Fri, 12 May 2023 10:06:06 -0700

Dara Navaei committed f5cc60d on branch DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 124 more in dialin

Merge branch 'staging' into DEN-15246-active-reservoir-empty-post-concentrate-alarm-recovery