Fisheye on common/

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): Merge branch 'staging' into DEN-12121-sw_dev-sprint-65-michael-garthwaite

Michael Garthwaite — Wed, 09 Mar 2022 12:14:57 -0800

Michael Garthwaite committed 62fa9e4 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 202 more in common

Merge branch 'staging' into DEN-12121-sw_dev-sprint-65-michael-garthwaite

· /MsgDefs.h

(-7, +12)

| History

| Source

| Diff

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): DEN-12121: Updated HD communication status override to use message id 0xA008 per peer review

Michael Garthwaite — Wed, 09 Mar 2022 11:49:39 -0800

Michael Garthwaite committed 20814b9 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 202 more in common

DEN-12121: Updated HD communication status override to use message id 0xA008 per peer review

· /MsgDefs.h

(-1, +1)

| History

| Source

| Diff

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): DEN-12224 moved the wet self tests to HDDefs.h

Dara Navaei — Wed, 09 Mar 2022 11:41:46 -0800

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

DEN-12224 moved the wet self tests to HDDefs.h

· /HDDefs.h

(-0, +21)

| History

| Source

| Diff

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): DEN-12224 updated the DG fans RPM alarm start time offset message ID.

Dara Navaei — Tue, 08 Mar 2022 21:27:24 -0800

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

DEN-12224 updated the DG fans RPM alarm start time offset message ID.

· /MsgDefs.h

(-1, +1)

| History

| Source

| Diff

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): DEN-12224, DEN-12232 added a message ID to set the fans RPM alarm start time offset

Dara Navaei — Tue, 08 Mar 2022 15:45:53 -0800

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

DEN-12224, DEN-12232 added a message ID to set the fans RPM alarm start time offset

· /MsgDefs.h

(-2, +4)

| History

| Source

| Diff

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): DEN-12224 removed the heaters' internal temperatuer alarms

Dara Navaei — Mon, 07 Mar 2022 20:19:05 -0800

Dara Navaei committed 220bfef on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 202 more in common

DEN-12224 removed the heaters' internal temperatuer alarms

· /AlarmDefs.h

(-12, +12)

| History

| Source

| Diff

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): DEN-12224: Removed No New Treatment alarm property and cleaned up alarm table.

Sean Nash — Mon, 07 Mar 2022 14:33:52 -0800

Sean Nash committed f1859ad on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 202 more in common

DEN-12224: Removed No New Treatment alarm property and cleaned up alarm table.

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

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): DEN-10974 Added new Alarm for Pump Track Lever open. Added new message for Confirm Installation.

Thu, 03 Mar 2022 17:05:10 -0800

Darren Cox committed 13d6de3 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 202 more in common

DEN-10974 Added new Alarm for Pump Track Lever open. Added new message for Confirm Installation.

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

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Thu, 03 Mar 2022 16:46:45 -0800

Dara Navaei committed b9965ff on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 202 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-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): DEN-11928 Reverted the conductivity changes

Thu, 03 Mar 2022 16:36:56 -0800

Hung Nguyen committed 9204954 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 202 more in common

DEN-11928 Reverted the conductivity changes

· /AlarmDefs.h	(-9, +9)	\| History	\| Source	\| Diff
· /DGDefs.h	(-191, +189)	\| History	\| Source	\| Diff

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Thu, 03 Mar 2022 15:21:22 -0800

Dara Navaei committed 68e9e9b on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 202 more in common

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

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

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): Merge branch 'staging' into DEN-12121-sw_dev-sprint-65-michael-garthwaite

Michael Garthwaite — Thu, 24 Feb 2022 18:27:45 -0800

Michael Garthwaite committed 8dd4938 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 202 more in common

Merge branch 'staging' into DEN-12121-sw_dev-sprint-65-michael-garthwaite

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): Merge branch 'staging' of ssh://dvm-linux02:7999/comm/common into staging

Dara Navaei — Thu, 24 Feb 2022 11:14:51 -0800

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

Merge branch 'staging' of ssh://dvm-linux02:7999/comm/common into staging

· /AlarmDefs.h

(-9, +9)

| History

| Source

| Diff

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): DEN-12225 updated the alarm 184 property to make sure HD is not at fault

Dara Navaei — Thu, 24 Feb 2022 11:14:44 -0800

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

DEN-12225 updated the alarm 184 property to make sure HD is not at fault

· /AlarmDefs.h

(-1, +1)

| History

| Source

| Diff

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): DEN-11928 Updated alarms properties

Wed, 23 Feb 2022 16:40:44 -0800

Hung Nguyen committed 0c85a1e on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 203 more in common

DEN-11928 Updated alarms properties

· /AlarmDefs.h

(-6, +6)

| History

| Source

| Diff

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): Merge branch 'staging' of ssh://dvm-linux02:7999/comm/common into staging

Wed, 23 Feb 2022 14:52:30 -0800

Hung Nguyen committed 6a6a8e5 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 203 more in common

Merge branch 'staging' of ssh://dvm-linux02:7999/comm/common into staging

· /AlarmDefs.h

(-5, +5)

| History

| Source

| Diff

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): DEN-11928 Added states and temperature out of range alarm

Wed, 23 Feb 2022 14:51:45 -0800

Hung Nguyen committed 87c2896 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 203 more in common

DEN-11928 Added states and temperature out of range alarm

· /AlarmDefs.h	(-3, +3)	\| History	\| Source	\| Diff
· /DGDefs.h	(-6, +8)	\| History	\| Source	\| Diff

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): DEN-12225 updated the UV reactors alarm properties

Dara Navaei — Wed, 23 Feb 2022 12:46:58 -0800

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

DEN-12225 updated the UV reactors alarm properties

· /AlarmDefs.h

(-1, +1)

| History

| Source

| Diff

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): DEN-12121: msg id for DIAL-147

Michael Garthwaite — Tue, 22 Feb 2022 15:46:28 -0800

Michael Garthwaite committed 5367f6e on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 202 more in common

DEN-12121: msg id for DIAL-147

· /MsgDefs.h

(-0, +1)

| History

| Source

| Diff

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): DEN-11750 updated the alarms table

Dara Navaei — Tue, 22 Feb 2022 12:57:33 -0800

Dara Navaei committed 48ed2dc on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 203 more in common

DEN-11750 updated the alarms table

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

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): Merge branch 'DEN-11980-sw_dev-sprint-64' into staging

Michael Garthwaite — Tue, 22 Feb 2022 11:26:58 -0800

Michael Garthwaite committed b8e7540 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 203 more in common

Merge branch 'DEN-11980-sw_dev-sprint-64' into staging

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): Merge branch 'staging' into DEN-11980-sw_dev-sprint-64

Michael Garthwaite — Tue, 22 Feb 2022 11:26:49 -0800

Michael Garthwaite committed d33689c on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 204 more in common

Merge branch 'staging' into DEN-11980-sw_dev-sprint-64

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Tue, 15 Feb 2022 16:27:08 -0800

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

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

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

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): Merge branch 'staging' of ssh://dvm-linux02:7999/comm/common into staging

Dara Navaei — Tue, 15 Feb 2022 14:48:28 -0800

Dara Navaei committed 698b8cf on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 204 more in common

Merge branch 'staging' of ssh://dvm-linux02:7999/comm/common into staging

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): Removed the venous temperature alarm

Dara Navaei — Tue, 15 Feb 2022 14:48:24 -0800

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

Removed the venous temperature alarm

· /AlarmDefs.h

(-3, +3)

| History

| Source

| Diff

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): Merge branch 'DEN-11980-sw_dev-sprint-64' into staging

Michael Garthwaite — Mon, 14 Feb 2022 13:32:46 -0800

Michael Garthwaite committed e1d3afa on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 204 more in common

Merge branch 'DEN-11980-sw_dev-sprint-64' into staging

· /MsgDefs.h

(-0, +2)

| History

| Source

| Diff

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): Fixed merge conflicts for staging and heparin bolus

Michael Garthwaite — Mon, 14 Feb 2022 13:32:05 -0800

Michael Garthwaite committed 3a050b5 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 204 more in common

Fixed merge conflicts for staging and heparin bolus

· /MsgDefs.h

(-2, +3)

| History

| Source

| Diff

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): Fixed Current Treatment Parameters to have the correct sequence in the MSG_ID list.

Michael Garthwaite — Mon, 14 Feb 2022 13:29:30 -0800

Michael Garthwaite committed 6aabb33 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 204 more in common

Fixed Current Treatment Parameters to have the correct sequence in the MSG_ID list.

· /MsgDefs.h

(-2, +2)

| History

| Source

| Diff

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): DEN-11250 Implemented heprin bolus target rate override

Fri, 11 Feb 2022 13:10:20 -0800

Hung Nguyen committed d60456d on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 204 more in common

DEN-11250 Implemented heprin bolus target rate override

· /MsgDefs.h

(-0, +1)

| History

| Source

| Diff

common (DEN-14549-system-fault-after-resuming-heparin-then-starting-saline-bolus-during-tx-common-fix): Fixed Current Treatment Parameter Enum values

Michael Garthwaite — Tue, 08 Feb 2022 14:09:32 -0800

Michael Garthwaite committed f245282 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 204 more in common

Fixed Current Treatment Parameter Enum values

· /MsgDefs.h

(-2, +2)

| History

| Source

| Diff