Fisheye on common/

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

Dara Navaei — Wed, 26 Apr 2023 15:46:19 -0700

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

Merge branch 'staging' into DEN-15199-fw_dn_sprint_95

· /AlarmDefs.h

(-6, +6)

| 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, 26 Apr 2023 15:42:26 -0700

Dara Navaei committed 37f001a on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 129 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-15214 to staging.

Sean Nash — Wed, 26 Apr 2023 14:58:57 -0700

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

Merged DEN-15214 to staging.

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-15199 updated the SW Rev number to 4

Dara Navaei — Wed, 26 Apr 2023 14:57:10 -0700

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

DEN-15199 updated the SW Rev number to 4

· /Compatible.h

(-1, +1)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-15214: Removed alarm 47 - UF rate alarm.

Sean Nash — Wed, 26 Apr 2023 11:23:53 -0700

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

DEN-15214: Removed alarm 47 - UF rate alarm.

· /AlarmDefs.h

(-4, +4)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-15199 addressed the code review comments

Dara Navaei — Wed, 26 Apr 2023 08:54:26 -0700

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

DEN-15199 addressed the code review comments

· /AlarmDefs.h

(-1, +1)

| History

| Source

| Diff

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

Dara Navaei — Wed, 26 Apr 2023 08:36:32 -0700

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

DEN-15199, DEN-15215 updated the titles alarms table

· /AlarmDefs.h

(-3, +3)

| History

| Source

| Diff

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

Dara Navaei — Wed, 26 Apr 2023 08:26:54 -0700

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

Merge branch 'staging' into DEN-15199-fw_dn_sprint_95

· /AlarmDefs.h

(-64, +64)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-15199 added HD and DG dialin check in messages

Dara Navaei — Wed, 26 Apr 2023 08:26:40 -0700

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

DEN-15199 added HD and DG dialin check in messages

· /MsgDefs.h

(-0, +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 — Mon, 24 Apr 2023 20:31:25 -0700

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

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

· /AlarmDefs.h

(-1, +1)

| History

| Source

| Diff

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

Dara Navaei — Mon, 24 Apr 2023 20:13:31 -0700

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

Merged DEN-15215

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

Dara Navaei — Mon, 24 Apr 2023 17:52:56 -0700

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

DEN-15215 updated the alarms title table

· /AlarmDefs.h

(-63, +63)

| History

| Source

| Diff

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

Dara Navaei — Mon, 24 Apr 2023 09:15:51 -0700

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

DEN-15199 updated the alarms properties table

· /AlarmDefs.h

(-2, +2)

| 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, 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): DEN-15199 renamed the test configuration message ID

Dara Navaei — Fri, 21 Apr 2023 09:45:15 -0700

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

DEN-15199 renamed the test configuration message ID

· /MsgDefs.h

(-1, +1)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-15199 added a message to receive release software configurations

Dara Navaei — Fri, 21 Apr 2023 08:48:32 -0700

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

DEN-15199 added a message to receive release software configurations

· /MsgDefs.h

(-0, +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 — 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