Fisheye on common/

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, 21 Apr 2023 14:16:10 -0700

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

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

· /HDDefs.h

(-1, +1)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'staging' into DEN-15183-in-treatment-rinseback-workflow-changes

Sean Nash — Fri, 21 Apr 2023 13:54:17 -0700

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

Merge branch 'staging' into DEN-15183-in-treatment-rinseback-workflow-changes

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, 20 Apr 2023 09:22:17 -0700

Dara Navaei committed abb09c3 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 133 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-14325 merged staging and resolved the conflicts

Dara Navaei — Thu, 20 Apr 2023 08:58:37 -0700

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

DEN-14325 merged staging and resolved the conflicts

· /AlarmDefs.h

(-2, +6)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-15183: Added enum for treatment recirc user confirming patient disconnected.

Sean Nash — Wed, 19 Apr 2023 18:49:20 -0700

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

DEN-15183: Added enum for treatment recirc user confirming patient disconnected.

· /HDDefs.h

(-1, +4)

| 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 — Wed, 19 Apr 2023 13:29:22 -0700

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

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

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

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'staging' into DEN-15166-fw-add-drain-pump-maxon-board-rpm-check-cbit

Dara Navaei — Wed, 19 Apr 2023 12:57:47 -0700

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

Merge branch 'staging' into DEN-15166-fw-add-drain-pump-maxon-board-rpm-check-cbit

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'DEN-14947-UI-VD-S94-Misc' into staging

Behrouz NematiPour — Wed, 19 Apr 2023 12:14:30 -0700

Behrouz NematiPour committed 733a2d5 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 135 more in common

Merge branch 'DEN-14947-UI-VD-S94-Misc' into staging

· /AlarmDefs.h

(-0, +4)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14947 Correct Year check placement per CR feedback

Wed, 19 Apr 2023 11:28:38 -0700

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

DEN-14947 Correct Year check placement per CR feedback

· /AlarmDefs.h

(-1, +1)

| History

| Source

| Diff

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

Dara Navaei — Tue, 18 Apr 2023 14:29:18 -0700

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

DEN-14325 updated the alarms title table

· /AlarmDefs.h

(-322, +322)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-15182 added a new state in DG standby

Dara Navaei — Tue, 18 Apr 2023 10:08:38 -0700

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

DEN-15182 added a new state in DG standby

· /DGDefs.h

(-0, +1)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14947 Update alarm file

Tue, 18 Apr 2023 07:38:11 -0700

Vy committed 431fa65 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 136 more in common

DEN-14947 Update alarm file

· /AlarmDefs.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 — Mon, 17 Apr 2023 10:07:21 -0700

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

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

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

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge DEN-15105 to staging.

Sean Nash — Mon, 17 Apr 2023 09:44:54 -0700

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

Merge DEN-15105 to staging.

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-14947 Update alarmDef to properly include Invalid year POST alarm

Thu, 13 Apr 2023 14:53:51 -0700

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

DEN-14947 Update alarmDef to properly include Invalid year POST alarm

· /AlarmDefs.h

(-1, +4)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14947 Add alarm enum for post year check

Thu, 13 Apr 2023 14:25:33 -0700

Vy committed 0d88ec7 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 136 more in common

DEN-14947 Add alarm enum for post year check

· /AlarmDefs.h

(-0, +1)

| 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