Fisheye on common/

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

Dara Navaei — Fri, 31 Mar 2023 19:13:17 -0700

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

DEN-14999: merged staging

· /AlarmDefs.h

(-10, +10)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999 updated the ranks of the alarms table and changed the FW compatibility rev to 3

Dara Navaei — Fri, 31 Mar 2023 18:55:52 -0700

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

DEN-14999 updated the ranks of the alarms table and changed the FW compatibility rev to 3

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

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999: Updates to alarm rank table.

Sean Nash — Fri, 31 Mar 2023 18:44:25 -0700

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

DEN-14999: Updates to alarm rank table.

· /AlarmDefs.h

(-62, +62)

| History

| Source

| Diff

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

Dara Navaei — Fri, 31 Mar 2023 18:26:48 -0700

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

DEN-14999 updated the alarms table

· /AlarmDefs.h

(-5, +5)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999: Updates to alarm rank table.

Sean Nash — Fri, 31 Mar 2023 18:10:45 -0700

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

DEN-14999: Updates to alarm rank table.

· /AlarmDefs.h

(-176, +176)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999: Alarm rank table updates.

Sean Nash — Fri, 31 Mar 2023 17:27:52 -0700

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

DEN-14999: Alarm rank table updates.

· /AlarmDefs.h

(-106, +104)

| History

| Source

| Diff

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

Dara Navaei — Fri, 31 Mar 2023 16:13:23 -0700

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

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

· /AlarmDefs.h

(-1, +1)

| History

| Source

| Diff

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

Dara Navaei — Fri, 31 Mar 2023 16:13:06 -0700

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

DEN-14999 updated the alarms table of properties

· /AlarmDefs.h

(-64, +64)

| 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, 31 Mar 2023 16:02:52 -0700

Dara Navaei committed 3d089c4 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 145 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): Merge branch 'DEN-14646-fpga-alarm-properties-and-timing-3' into staging

Fri, 31 Mar 2023 16:00:23 -0700

Bill Bracken committed cdce857 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 145 more in common

Merge branch 'DEN-14646-fpga-alarm-properties-and-timing-3' into staging

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

Sean Nash — Fri, 31 Mar 2023 15:18:00 -0700

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

DEN-14999: fixed typo.

· /AlarmDefs.h

(-1, +1)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999: Updates to alarm properties.

Sean Nash — Fri, 31 Mar 2023 11:27:20 -0700

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

DEN-14999: Updates to alarm properties.

· /AlarmDefs.h

(-173, +173)

| History

| Source

| Diff

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

Dara Navaei — Thu, 30 Mar 2023 21:01:30 -0700

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

Merge branch 'DEN-14999-alarm-table-updates' of ssh://devapps.diality.us:7999/comm/common into DEN-14999-alarm-table-updates

· /AlarmDefs.h

(-12, +12)

| History

| Source

| Diff

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

Dara Navaei — Thu, 30 Mar 2023 21:01:24 -0700

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

DEN-14999 updated the alarms table

· /AlarmDefs.h

(-10, +10)

| History

| Source

| Diff

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

Sean Nash — Thu, 30 Mar 2023 20:52:33 -0700

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

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

· /AlarmDefs.h

(-4, +4)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999: removed alarms 273, 274.

Sean Nash — Thu, 30 Mar 2023 20:52:27 -0700

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

DEN-14999: removed alarms 273, 274.

· /AlarmDefs.h

(-8, +8)

| History

| Source

| Diff

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

Dara Navaei — Thu, 30 Mar 2023 20:19:15 -0700

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

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

· /AlarmDefs.h

(-16, +16)

| History

| Source

| Diff

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

Dara Navaei — Thu, 30 Mar 2023 20:19:13 -0700

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

DEN-14999 updated the alarms table

· /AlarmDefs.h	(-4, +4)	\| History	\| Source	\| Diff
· /HDDefs.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 — Thu, 30 Mar 2023 20:18:03 -0700

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

DEN-14999 updated the alarms table

· /AlarmDefs.h

(-16, +16)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'staging' into DEN-14646-fpga-alarm-properties-and-timing-3

Thu, 30 Mar 2023 13:43:30 -0700

Bill Bracken committed b8b6479 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 146 more in common

Merge branch 'staging' into DEN-14646-fpga-alarm-properties-and-timing-3

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14646 Update removed alarms to available

Thu, 30 Mar 2023 13:33:57 -0700

Bill Bracken committed f8a29b0 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 146 more in common

DEN-14646 Update removed alarms to available

· /AlarmDefs.h

(-8, +8)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999: Removed obsolete/redundant alarms.

Sean Nash — Thu, 30 Mar 2023 09:41:08 -0700

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

DEN-14999: Removed obsolete/redundant alarms.

· /AlarmDefs.h

(-12, +12)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999: Removed alarm 116 - redundant with alarm 115.

Sean Nash — Wed, 29 Mar 2023 23:23:33 -0700

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

DEN-14999: Removed alarm 116 - redundant with alarm 115.

· /AlarmDefs.h

(-4, +4)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999: Updated properties for blood leak alarm. Removed alarm 203.

Sean Nash — Wed, 29 Mar 2023 23:08:15 -0700

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

DEN-14999: Updated properties for blood leak alarm. Removed alarm 203.

· /AlarmDefs.h

(-5, +5)

| History

| Source

| Diff

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

Dara Navaei — Wed, 29 Mar 2023 08:47:30 -0700

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

Merge branch 'staging' into DEN-14999-alarm-table-updates

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, 29 Mar 2023 08:39:09 -0700

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

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

· /MsgDefs.h

(-1, +1)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'staging' into DEN-14646-fpga-alarm-properties-and-timing-3...

Tue, 28 Mar 2023 17:29:22 -0700

Bill Bracken committed 8814e04 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 146 more in common

Merge branch 'staging' into DEN-14646-fpga-alarm-properties-and-timing-3

# Conflicts:

# AlarmDefs.h

· /AlarmDefs.h

(-14, +14)

| History

| Source

| Diff

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

Dara Navaei — Tue, 28 Mar 2023 17:02:30 -0700

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

DEN-15014 merged staging

· /MsgDefs.h

(-3, +4)

| History

| Source

| Diff

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

Dara Navaei — Tue, 28 Mar 2023 16:48:15 -0700

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

DEN-15014 addressed the code review comments

· /MsgDefs.h

(-1, +1)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999: No resume or RB for alarm venous bubble detected alarms.

Sean Nash — Tue, 28 Mar 2023 13:32:42 -0700

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

DEN-14999: No resume or RB for alarm venous bubble detected alarms.

· /AlarmDefs.h

(-2, +2)

| History

| Source

| Diff