Fisheye on common/

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'staging' into DEN-15105-dialyzer-flip

Sean Nash — Mon, 17 Apr 2023 08:56:10 -0700

Sean Nash committed 7ef4a15 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 136 more in common

Merge branch 'staging' into DEN-15105-dialyzer-flip

· /AlarmDefs.h

(-11, +11)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-15105: Updated pre-tx patient connection states enum.

Sean Nash — Fri, 14 Apr 2023 09:07:57 -0700

Sean Nash committed 86d34a5 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 136 more in common

DEN-15105: Updated pre-tx patient connection states enum.

· /HDDefs.h	(-0, +1)	\| History	\| Source	\| Diff
· /MsgDefs.h	(-1, +1)	\| History	\| Source	\| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Fri, 14 Apr 2023 08:43:54 -0700

Dara Navaei committed 994ca4e on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 136 more in common

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

· /AlarmDefs.h

(-2, +2)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-13677 updated the alarm properties of alarms 147 and 97

Dara Navaei — Thu, 13 Apr 2023 13:48:29 -0700

Dara Navaei committed 931dd88 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 137 more in common

DEN-13677 updated the alarm properties of alarms 147 and 97

· /AlarmDefs.h

(-2, +2)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-15152 updated the alarms table properties

Dara Navaei — Thu, 13 Apr 2023 13:03:57 -0700

Dara Navaei committed 8f14007 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 137 more in common

DEN-15152 updated the alarms table properties

· /AlarmDefs.h

(-5, +5)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Thu, 13 Apr 2023 11:12:23 -0700

Dara Navaei committed 045602d on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 138 more in common

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

· /AlarmDefs.h

(-2, +2)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-15105: Updates to alarm properties. Added state enum for pre-tx patient connect sub-mode.

Sean Nash — Thu, 13 Apr 2023 10:55:01 -0700

Sean Nash committed ed662ba on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 136 more in common

DEN-15105: Updates to alarm properties. Added state enum for pre-tx patient connect sub-mode.

· /AlarmDefs.h	(-4, +4)	\| History	\| Source	\| Diff
· /HDDefs.h	(-0, +18)	\| History	\| Source	\| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'DEN-15095-fw-system-faults-during-treatment-then-returns-to-the-standby-screen-reopen-1' into staging

Wed, 12 Apr 2023 12:27:35 -0700

James Walter Taylor committed 2899e95 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 138 more in common

Merge branch 'DEN-15095-fw-system-faults-during-treatment-then-returns-to-the-standby-screen-reopen-1' into staging

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-15105: Removed alarm 227 (prime timeout).

Sean Nash — Tue, 11 Apr 2023 09:07:22 -0700

Sean Nash committed be5237f on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 136 more in common

DEN-15105: Removed alarm 227 (prime timeout).

· /AlarmDefs.h

(-4, +4)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): HD-DEN-15095_FW System Faults During Treatment Then Returns TO The Standby Screen Reopen...

Mon, 10 Apr 2023 14:29:16 -0700

James Walter Taylor committed 282bcf0 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 139 more in common

HD-DEN-15095_FW System Faults During Treatment Then Returns TO The Standby Screen Reopen

Corectly ordered the table, updated the flags per Sean Nash

· /AlarmDefs.h

(-3, +3)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge remote-tracking branch 'origin/staging' into DEN-15095-fw-system-faults-during-treatment-then-returns-to-the-stand...

Mon, 10 Apr 2023 14:01:42 -0700

James Walter Taylor committed 37f8642 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 139 more in common

Merge remote-tracking branch 'origin/staging' into DEN-15095-fw-system-faults-during-treatment-then-returns-to-the-standby-screen-reopen-1

· /AlarmDefs.h

(-922, +917)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Fri, 07 Apr 2023 17:01:49 -0700

Dara Navaei committed 8442b1c on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 140 more in common

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

· /AlarmDefs.h	(-1, +1)	\| History	\| Source	\| Diff
· /MsgDefs.h	(-1, +1)	\| History	\| Source	\| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merged DEN-14999

Dara Navaei — Fri, 07 Apr 2023 16:57:55 -0700

Dara Navaei committed 67fa4c6 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 140 more in common

Merged DEN-14999

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999 merged staging

Dara Navaei — Fri, 07 Apr 2023 16:40:28 -0700

Dara Navaei committed 42087c6 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 141 more in common

DEN-14999 merged staging

· /AlarmDefs.h

(-384, +380)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Fri, 07 Apr 2023 14:12:25 -0700

Dara Navaei committed 6363161 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 141 more in common

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

· /AlarmDefs.h

(-2, +2)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merged DEN-14830

Dara Navaei — Fri, 07 Apr 2023 14:08:53 -0700

Dara Navaei committed 5a6d1cf on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 141 more in common

Merged DEN-14830

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14830: code review fixes.

Michael Garthwaite — Fri, 07 Apr 2023 11:46:16 -0700

Michael Garthwaite committed ddc8ea3 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 142 more in common

DEN-14830: code review fixes.

· /AlarmDefs.h

(-2, +2)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-15095-fw-system-faults-during-treatment-then-returns-to-the-standby-screen-reopen-1...

Fri, 07 Apr 2023 10:49:06 -0700

James Walter Taylor committed 03d57d5 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 139 more in common

DEN-15095-fw-system-faults-during-treatment-then-returns-to-the-standby-screen-reopen-1

Updated venous bubble alarms to match SRSHD

· /AlarmDefs.h

(-2, +2)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999 updated the alarms table

Dara Navaei — Fri, 07 Apr 2023 10:44:12 -0700

Dara Navaei committed c017757 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 141 more in common

DEN-14999 updated the alarms table

· /AlarmDefs.h

(-163, +163)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999 updated the alarms table

Dara Navaei — Fri, 07 Apr 2023 10:19:27 -0700

Dara Navaei committed 24bdec7 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 141 more in common

DEN-14999 updated the alarms table

· /AlarmDefs.h

(-302, +302)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14830: resync'd dialysate temp alarms rank

Michael Garthwaite — Fri, 07 Apr 2023 09:29:01 -0700

Michael Garthwaite committed b1c406f on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 142 more in common

DEN-14830: resync'd dialysate temp alarms rank

· /AlarmDefs.h

(-6, +6)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14830: update alarms to merge over develop pt2

Michael Garthwaite — Fri, 07 Apr 2023 09:24:40 -0700

Michael Garthwaite committed 6cec72d on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 142 more in common

DEN-14830: update alarms to merge over develop pt2

· /AlarmDefs.h

(-3, +3)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14830: update temp alarms to merge over develop pt1

Michael Garthwaite — Fri, 07 Apr 2023 09:23:34 -0700

Michael Garthwaite committed a4dfc57 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 142 more in common

DEN-14830: update temp alarms to merge over develop pt1

· /AlarmDefs.h

(-3, +3)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999 updated the alarms table

Dara Navaei — Thu, 06 Apr 2023 17:09:01 -0700

Dara Navaei committed 47ec136 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 141 more in common

DEN-14999 updated the alarms table

· /AlarmDefs.h

(-24, +24)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999 updated the alarms table

Dara Navaei — Thu, 06 Apr 2023 14:02:01 -0700

Dara Navaei committed 454b38e on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 141 more in common

DEN-14999 updated the alarms table

· /AlarmDefs.h

(-38, +38)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999-2: cosmetic.

Sean Nash — Wed, 05 Apr 2023 17:31:45 -0700

Sean Nash committed 1a9c0f5 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 141 more in common

DEN-14999-2: cosmetic.

· /AlarmDefs.h

(-11, +11)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999-2: Removed alarm escalation feature.

Sean Nash — Wed, 05 Apr 2023 17:24:13 -0700

Sean Nash committed 2a847c8 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 141 more in common

DEN-14999-2: Removed alarm escalation feature.

· /AlarmDefs.h

(-336, +335)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'DEN-14999-alarm-table-updates-part-2' of ssh://dvm-linux02:7999/comm/common into DEN-14999-alarm-table-upd...

Dara Navaei — Wed, 05 Apr 2023 15:24:58 -0700

Dara Navaei committed 7c5d9e1 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 141 more in common

Merge branch 'DEN-14999-alarm-table-updates-part-2' of ssh://dvm-linux02:7999/comm/common into DEN-14999-alarm-table-updates-part-2

· /MsgDefs.h

(-0, +1)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999 updated the alarms with 400 rank

Dara Navaei — Wed, 05 Apr 2023 15:24:51 -0700

Dara Navaei committed 4fd30cc on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 141 more in common

DEN-14999 updated the alarms with 400 rank

· /AlarmDefs.h	(-58, +58)	\| History	\| Source	\| Diff
· /MsgDefs.h	(-1, +1)	\| History	\| Source	\| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999-2: Added new reject reason for blocked treatment resumption.

Sean Nash — Wed, 05 Apr 2023 09:55:25 -0700

Sean Nash committed d129e40 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 141 more in common

DEN-14999-2: Added new reject reason for blocked treatment resumption.

· /MsgDefs.h

(-0, +1)

| History

| Source

| Diff