Fisheye on dialin/

dialin (DEN-16693-institutional-settings-implementation-2): DEN-14549: fixed merge conflict unit test failure.

Sean Nash — Thu, 02 Feb 2023 16:36:54 -0800

Sean Nash committed ea730af on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 155 more in dialin

DEN-14549: fixed merge conflict unit test failure.

· /dialin/common/hd_defs.py

(-1, +0)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'staging' into DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-treatment

Sean Nash — Thu, 02 Feb 2023 13:12:30 -0800

Sean Nash committed cbe0d8a on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 155 more in dialin

Merge branch 'staging' into DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-treatment

· /dialin/common/hd_defs.py	(-9, +8)	\| History	\| Source	\| Diff
· /dialin/hd/alarms.py	(-4, +31)	\| History	\| Source	\| Diff

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

Dara Navaei — Tue, 31 Jan 2023 09:40:03 -0800

Dara Navaei committed 16ca015 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 155 more in dialin

Bamboo Commit: generated the code change report

· /tools/Code_Report.csv

(-2, +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, 31 Jan 2023 09:38:35 -0800

Dara Navaei committed 858a23e on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 155 more in dialin

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

· /dialin/common/hd_defs.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/dg/valves.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/hd/air_trap.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/hd/alarms.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/hd/syringe_pump.py	(-1, +1)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'DEN-14589-DIAL-221-DIAL-224' into staging

Michael Garthwaite — Tue, 31 Jan 2023 09:37:07 -0800

Michael Garthwaite committed ac298c3 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 155 more in dialin

Merge branch 'DEN-14589-DIAL-221-DIAL-224' into staging

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'staging' into DEN-14589-DIAL-221-DIAL-224

Michael Garthwaite — Tue, 31 Jan 2023 09:36:56 -0800

Michael Garthwaite committed 74140c2 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 155 more in dialin

Merge branch 'staging' into DEN-14589-DIAL-221-DIAL-224

dialin (DEN-16693-institutional-settings-implementation-2): DEN-14589: code review comments

Michael Garthwaite — Tue, 31 Jan 2023 08:48:40 -0800

Michael Garthwaite committed d304a13 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 155 more in dialin

DEN-14589: code review comments

· /dialin/dg/valves.py

(-1, +1)

| History

| Source

| Diff

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

Dara Navaei — Mon, 30 Jan 2023 11:22:19 -0800

Dara Navaei committed 36d927b on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 155 more in dialin

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

· /dialin/protocols/CAN.py

(-2, +2)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'DEN-14415-dialin-hd-events-returns-empty' into staging

Michael Garthwaite — Mon, 30 Jan 2023 11:20:53 -0800

Michael Garthwaite committed bbf2144 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 155 more in dialin

Merge branch 'DEN-14415-dialin-hd-events-returns-empty' into staging

dialin (DEN-16693-institutional-settings-implementation-2): DEN-14549: Added preload state to syringe pump enum.

Sean Nash — Fri, 27 Jan 2023 08:16:49 -0800

Sean Nash committed 061202e on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 155 more in dialin

DEN-14549: Added preload state to syringe pump enum.

· /dialin/common/hd_defs.py

(-5, +6)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-14415: DEN-14328: Updated CAN message handler to now have greater than 1 callback function per registered channel_id...

Michael Garthwaite — Thu, 26 Jan 2023 17:18:36 -0800

Michael Garthwaite committed 440d8d8 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 156 more in dialin

DEN-14415: DEN-14328: Updated CAN message handler to now have greater than 1 callback function per registered channel_id, msg_id pair.

· /dialin/protocols/CAN.py

(-9, +14)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'staging' into DEN-14589-DIAL-221-DIAL-224

Michael Garthwaite — Thu, 26 Jan 2023 17:16:31 -0800

Michael Garthwaite committed 33d2551 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 155 more in dialin

Merge branch 'staging' into DEN-14589-DIAL-221-DIAL-224

dialin (DEN-16693-institutional-settings-implementation-2): DEN-14637: updated syringe pump operation documentation to consider treatment parameters before usage.

Michael Garthwaite — Wed, 25 Jan 2023 14:29:58 -0800

Michael Garthwaite committed 56d0b38 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 155 more in dialin

DEN-14637: updated syringe pump operation documentation to consider treatment parameters before usage.

· /dialin/hd/syringe_pump.py

(-0, +6)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-14589: Fixed air trap override to no longer use a float for the detection parameter.

Michael Garthwaite — Wed, 25 Jan 2023 14:25:40 -0800

Michael Garthwaite committed c00b956 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 155 more in dialin

DEN-14589: Fixed air trap override to no longer use a float for the detection parameter.

· /dialin/hd/air_trap.py

(-1, +1)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-14589: Fixed hd events to be in sync with FW

Michael Garthwaite — Wed, 25 Jan 2023 14:25:08 -0800

Michael Garthwaite committed 97b74da on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 155 more in dialin

DEN-14589: Fixed hd events to be in sync with FW

· /dialin/common/hd_defs.py

(-8, +6)

| History

| Source

| Diff

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

Dara Navaei — Wed, 25 Jan 2023 14:01:18 -0800

Dara Navaei committed b8b261d on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 156 more in dialin

Bamboo Commit: generated the code change report

· /tools/Code_Report.csv

(-9, +12)

| History

| Source

| Diff

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

Dara Navaei — Wed, 25 Jan 2023 13:59:52 -0800

Dara Navaei committed 3bffd75 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 156 more in dialin

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

· /dialin/common/alarm_defs.py

(-2, +2)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-14549: Added missing publish references to alarm trigger message capture function.

Sean Nash — Tue, 24 Jan 2023 17:38:05 -0800

Sean Nash committed ab97eb5 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 155 more in dialin

DEN-14549: Added missing publish references to alarm trigger message capture function.

· /dialin/hd/alarms.py

(-1, +1)

| History

| Source

| Diff

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

Michael Garthwaite — Tue, 24 Jan 2023 09:53:42 -0800

Michael Garthwaite committed 2bea66e on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 156 more in dialin

Merge branch 'DEN-14589-DIAL-226' into staging

dialin (DEN-16693-institutional-settings-implementation-2): DEN-14589: DIAL-226: updated alarm list to latest

Michael Garthwaite — Tue, 24 Jan 2023 09:53:23 -0800

Michael Garthwaite committed 2deb7bf on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 157 more in dialin

DEN-14589: DIAL-226: updated alarm list to latest

· /dialin/common/alarm_defs.py

(-12, +14)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-14549: updates to treatment mode state enums.

Sean Nash — Tue, 24 Jan 2023 08:52:46 -0800

Sean Nash committed fe2ca5c on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 155 more in dialin

DEN-14549: updates to treatment mode state enums.

· /dialin/common/hd_defs.py

(-18, +8)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'DIAL-221-and-DIAL-224' into DEN-14589-DIAL-221-DIAL-224

Michael Garthwaite — Fri, 20 Jan 2023 11:32:16 -0800

Michael Garthwaite committed 311b9e4 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 155 more in dialin

Merge branch 'DIAL-221-and-DIAL-224' into DEN-14589-DIAL-221-DIAL-224

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

Dara Navaei — Thu, 19 Jan 2023 16:53:22 -0800

Dara Navaei committed 4332397 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 157 more in dialin

Bamboo Commit: generated the code change report

· /tools/Code_Report.csv

(-0, +1)

| History

| Source

| Diff

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

Dara Navaei — Thu, 19 Jan 2023 16:51:56 -0800

Dara Navaei committed 6f5d1b3 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 157 more in dialin

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

· /dialin/common/hd_defs.py

(-2, +2)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'staging' into DIAL-221-and-DIAL-224

Michael Garthwaite — Thu, 19 Jan 2023 16:51:26 -0800

Michael Garthwaite committed 59e7782 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 155 more in dialin

Merge branch 'staging' into DIAL-221-and-DIAL-224

dialin (DEN-16693-institutional-settings-implementation-2): DIAL-224: fixed alarm handler to decode the data type fields correct to output alarm debug information

Michael Garthwaite — Thu, 19 Jan 2023 16:38:36 -0800

Michael Garthwaite committed 91f2a0b on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 155 more in dialin

DIAL-224: fixed alarm handler to decode the data type fields correct to output alarm debug information

· /dialin/hd/alarms.py

(-2, +29)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DIAL-221: fixed documentation for DG valves

Michael Garthwaite — Thu, 19 Jan 2023 16:37:51 -0800

Michael Garthwaite committed a972d5f on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 155 more in dialin

DIAL-221: fixed documentation for DG valves

· /dialin/dg/valves.py

(-1, +1)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'DEN-14414-dialin-hd-events-missing-substate-transition' into staging

Michael Garthwaite — Thu, 19 Jan 2023 15:32:42 -0800

Michael Garthwaite committed 6b7c3d3 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 157 more in dialin

Merge branch 'DEN-14414-dialin-hd-events-missing-substate-transition' into staging

dialin (DEN-16693-institutional-settings-implementation-2): DEN-14414: updated hd defs to handle sub state event changes.

Michael Garthwaite — Thu, 19 Jan 2023 13:29:53 -0800

Michael Garthwaite committed 5721e7b on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 158 more in dialin

DEN-14414: updated hd defs to handle sub state event changes.

· /dialin/common/hd_defs.py

(-1, +2)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'staging' into DEN-14414-dialin-hd-events-missing-substate-transition

Michael Garthwaite — Thu, 19 Jan 2023 13:27:18 -0800

Michael Garthwaite committed 40c1c47 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14159-hd-air-trap-override-not-working and 158 more in dialin

Merge branch 'staging' into DEN-14414-dialin-hd-events-missing-substate-transition