Fisheye on common/

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

Sean Nash — Tue, 28 Mar 2023 08:14:24 -0700

Sean Nash committed 322f297 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-14906-dialyzer-de-prime

· /HDDefs.h	(-4, +9)	\| History	\| Source	\| Diff
· /MsgDefs.h	(-77, +82)	\| History	\| Source	\| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge remote-tracking branch 'origin/DEN-10155-treatment-end-paused-state-not-displaying-resume-option' into staging

Mon, 27 Mar 2023 10:07:45 -0700

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

Merge remote-tracking branch 'origin/DEN-10155-treatment-end-paused-state-not-displaying-resume-option' into staging

· /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 — Tue, 21 Mar 2023 16:48:32 -0700

Dara Navaei committed 141571c 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

· /AlarmDefs.h	(-2, +2)	\| History	\| Source	\| Diff
· /DGDefs.h	(-1, +1)	\| 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): DEN-10155-treatment-end-paused-state-not-displaying-resume-option...

Tue, 21 Mar 2023 15:42:43 -0700

James Walter Taylor committed 099bd6d on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 147 more in common

DEN-10155-treatment-end-paused-state-not-displaying-resume-option

Updated END_OF_TREATMENT_WARNING to allow resume, and allow blood recirculation.

· /AlarmDefs.h

(-2, +2)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14763 removed the old heat disinfect active cool

Dara Navaei — Tue, 21 Mar 2023 14:17:27 -0700

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

DEN-14763 removed the old heat disinfect active cool

· /DGDefs.h

(-1, +0)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14763 renamed a message ID

Dara Navaei — Tue, 21 Mar 2023 08:34:27 -0700

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

DEN-14763 renamed a message ID

· /MsgDefs.h

(-1, +1)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14763 updated the messages list

Dara Navaei — Mon, 20 Mar 2023 21:15:17 -0700

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

DEN-14763 updated the messages list

· /MsgDefs.h

(-1, +1)

| History

| Source

| Diff

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

Dara Navaei — Mon, 20 Mar 2023 20:34:30 -0700

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

DEN-14763 merged staging

· /MsgDefs.h

(-72, +72)

| History

| Source

| Diff

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

Dara Navaei — Mon, 20 Mar 2023 09:46:03 -0700

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

DEN-14763 addressed the code review comments

· /HDDefs.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, 20 Mar 2023 09:33:06 -0700

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

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

· /MsgDefs.h

(-2, +2)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'DEN-14763-dg_hd_dev-hd_dg_dvt-update-part-10' of ssh://devapps.diality.us:7999/comm/common into DEN-14763-...

Dara Navaei — Sun, 19 Mar 2023 14:46:42 -0700

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

Merge branch 'DEN-14763-dg_hd_dev-hd_dg_dvt-update-part-10' of ssh://devapps.diality.us:7999/comm/common into DEN-14763-dg_hd_dev-hd_dg_dvt-update-part-10

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14763, DEN-14960 added an event to report the reservoir base weight and filled volume at the end of the fill

Dara Navaei — Sun, 19 Mar 2023 14:46:37 -0700

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

DEN-14763, DEN-14960 added an event to report the reservoir base weight and filled volume at the end of the fill

· /DGDefs.h

(-0, +1)

| History

| Source

| Diff

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

Dara Navaei — Sat, 18 Mar 2023 15:05:24 -0700

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

DEN-14763 merged staging

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

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14763 updated the message name

Dara Navaei — Sat, 18 Mar 2023 15:03:38 -0700

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

DEN-14763 updated the message name

· /MsgDefs.h

(-1, +1)

| History

| Source

| Diff

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

Michael Garthwaite — Fri, 17 Mar 2023 13:56:09 -0700

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

Merge branch 'DEN-14689-messaging-bugs' into staging

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

Michael Garthwaite — Fri, 17 Mar 2023 13:46:31 -0700

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

Merge branch 'staging' into DEN-14689-messaging-bugs

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14763 updated the messages list

Dara Navaei — Fri, 17 Mar 2023 10:48:14 -0700

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

DEN-14763 updated the messages list

· /MsgDefs.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 — Fri, 17 Mar 2023 09:34:56 -0700

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

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

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

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

Sean Nash — Fri, 17 Mar 2023 09:27:41 -0700

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

Merge DEN-14888 to staging

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14763 removed an unused message

Dara Navaei — Fri, 17 Mar 2023 09:06:56 -0700

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

DEN-14763 removed an unused message

· /MsgDefs.h

(-1, +1)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'staging' into DEN-14763-dg_hd_dev-hd_dg_dvt-update-part-10

Dara Navaei — Thu, 16 Mar 2023 20:30:38 -0700

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

Merge branch 'staging' into DEN-14763-dg_hd_dev-hd_dg_dvt-update-part-10

· /AlarmDefs.h

(-8, +8)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14763 added hard stop Dialin commands for the HD pumps

Dara Navaei — Thu, 16 Mar 2023 16:44:45 -0700

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

DEN-14763 added hard stop Dialin commands for the HD pumps

· /MsgDefs.h

(-0, +3)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14906-dialyzer-de-prime. First round of addressing code review comments

Wed, 15 Mar 2023 18:09:34 -0700

Steve Jarpe committed 9936079 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 146 more in common

DEN-14906-dialyzer-de-prime. First round of addressing code review comments

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

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14888: stop pumps on final escalation alarm for prime completed. Do not stop pumps for final escalation alarm for e...

Sean Nash — Wed, 15 Mar 2023 08:38:22 -0700

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

DEN-14888: stop pumps on final escalation alarm for prime completed. Do not stop pumps for final escalation alarm for end treatment.

· /AlarmDefs.h

(-3, +3)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14906-dialyzer-de-prime. Initial implementation of dialyzer reprime

Mon, 13 Mar 2023 14:56:31 -0700

Steve Jarpe committed 23346b3 on branch master, DEN-13865-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow and 146 more in common

DEN-14906-dialyzer-de-prime. Initial implementation of dialyzer reprime

· /HDDefs.h

(-0, +13)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14888: Added treatment end confirmation enumeration.

Sean Nash — Mon, 13 Mar 2023 13:51:27 -0700

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

DEN-14888: Added treatment end confirmation enumeration.

· /HDDefs.h

(-2, +3)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14888: Added HD events for logging reservoir switch ultrafiltration metrics.

Sean Nash — Mon, 13 Mar 2023 09:36:22 -0700

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

DEN-14888: Added HD events for logging reservoir switch ultrafiltration metrics.

· /HDDefs.h

(-0, +2)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14869: removed DG checkin as it is no longer needed.

Michael Garthwaite — Thu, 09 Mar 2023 09:32:08 -0800

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

DEN-14869: removed DG checkin as it is no longer needed.

· /MsgDefs.h

(-1, +1)

| History

| Source

| Diff

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

Michael Garthwaite — Wed, 08 Mar 2023 15:33:29 -0800

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

Merge branch 'staging' into DEN-14689-messaging-bugs

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, 08 Mar 2023 11:00:55 -0800

Dara Navaei committed 2a3f9cb on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 151 more in common

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

· /AlarmDefs.h

(-2, +2)

| History

| Source

| Diff