Fisheye on common/

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'staging' into DEN-14328-hd-event-issues

Michael Garthwaite — Thu, 19 Jan 2023 11:36:33 -0800

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

Merge branch 'staging' into DEN-14328-hd-event-issues

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, 19 Jan 2023 11:22:02 -0800

Dara Navaei committed 9187537 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 162 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): DEN-14414: added sub state enum to event list.

Michael Garthwaite — Thu, 19 Jan 2023 09:44:53 -0800

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

DEN-14414: added sub state enum to event list.

· /HDDefs.h

(-0, +1)

| History

| Source

| Diff

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

Dara Navaei — Thu, 19 Jan 2023 08:15:30 -0800

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

DEN-14559 addressed the code review comment

· /AlarmDefs.h

(-1, +1)

| History

| Source

| Diff

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

Dara Navaei — Wed, 18 Jan 2023 15:37:12 -0800

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

Merge branch 'staging' into DEN-14559-dg_hd_dev-hd_dg_dvt-update-part-8

· /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 — Wed, 18 Jan 2023 14:11:21 -0800

Dara Navaei committed 46451dc on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 163 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

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'DEN-13946-certain-temperature-sensors-trigger-wrong-alarm' into staging

Wed, 18 Jan 2023 13:47:21 -0800

Bill Bracken committed e523ee5 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 163 more in common

Merge branch 'DEN-13946-certain-temperature-sensors-trigger-wrong-alarm' into staging

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-13946 Update per code review

Tue, 17 Jan 2023 14:05:11 -0800

Bill Bracken committed 8f8d4d7 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 164 more in common

DEN-13946 Update per code review

· /DGDefs.h

(-5, +6)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14559, DEN-14565 updated alarm 77 properties to match AE

Dara Navaei — Tue, 17 Jan 2023 08:42:37 -0800

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

DEN-14559, DEN-14565 updated alarm 77 properties to match AE

· /AlarmDefs.h

(-1, +1)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14559 updated the chemical disinfects alarms

Dara Navaei — Sat, 14 Jan 2023 12:42:47 -0800

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

DEN-14559 updated the chemical disinfects alarms

· /AlarmDefs.h

(-3, +11)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14497 added alarms to prompt the user to insert and remove acid bottle in chem disinfect and chem flush

Dara Navaei — Fri, 13 Jan 2023 14:04:05 -0800

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

DEN-14497 added alarms to prompt the user to insert and remove acid bottle in chem disinfect and chem flush

· /AlarmDefs.h

(-9, +10)

| 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, 11 Jan 2023 14:13:49 -0800

Dara Navaei committed 18a4501 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 164 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	(-1, +1)	\| History	\| Source	\| Diff
· /MsgDefs.h	(-1, +1)	\| History	\| Source	\| Diff

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

Dara Navaei — Wed, 11 Jan 2023 08:54:40 -0800

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

Merge branch 'staging' into DEN-14497-dg_hd_dev-hd_dg_dvt-update-part-7

· /AlarmDefs.h	(-7, +11)	\| History	\| Source	\| Diff
· /DGDefs.h	(-1, +1)	\| History	\| Source	\| Diff
· /HDDefs.h	(-1, +1)	\| History	\| Source	\| Diff
· /MsgDefs.h	(-7, +8)	\| History	\| Source	\| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14497 updated the DG voltages alarm table'

Dara Navaei — Wed, 11 Jan 2023 08:50:58 -0800

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

DEN-14497 updated the DG voltages alarm table'

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

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14497 updated the chemical disinfect alarms and defs

Dara Navaei — Tue, 10 Jan 2023 15:24:05 -0800

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

DEN-14497 updated the chemical disinfect alarms and defs

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

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'DEN-14497-dg_hd_dev-hd_dg_dvt-update-part-7' of ssh://dvm-linux02:7999/comm/common into DEN-14497-dg_hd_de...

Dara Navaei — Thu, 05 Jan 2023 16:57:59 -0800

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

Merge branch 'DEN-14497-dg_hd_dev-hd_dg_dvt-update-part-7' of ssh://dvm-linux02:7999/comm/common into DEN-14497-dg_hd_dev-hd_dg_dvt-update-part-7

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14497 updated the order of the HD POST enums

Dara Navaei — Thu, 05 Jan 2023 16:57:55 -0800

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

DEN-14497 updated the order of the HD POST enums

· /HDDefs.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 — Thu, 05 Jan 2023 16:36:18 -0800

Dara Navaei committed 4277e59 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 165 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-14086: Removed obsolete DPi flow vs. motor speed alarm.

Sean Nash — Thu, 05 Jan 2023 15:31:07 -0800

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

DEN-14086: Removed obsolete DPi flow vs. motor speed alarm.

· /AlarmDefs.h

(-4, +4)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14497 updated the alarms table per chemical disinfect mode

Dara Navaei — Tue, 03 Jan 2023 16:49:29 -0800

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

DEN-14497 updated the alarms table per chemical disinfect mode

· /AlarmDefs.h

(-16, +16)

| 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, 03 Jan 2023 16:28:56 -0800

Dara Navaei committed c3d8ad0 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 166 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): Merge branch 'staging' into DEN-14344-sw-s85-mg-air-pump

Dara Navaei — Tue, 03 Jan 2023 16:01:12 -0800

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

Merge branch 'staging' into DEN-14344-sw-s85-mg-air-pump

· /AlarmDefs.h	(-1, +1)	\| History	\| Source	\| Diff
· /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 — Tue, 03 Jan 2023 10:10:53 -0800

Dara Navaei committed e6aa813 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 167 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): DEN-14101 merged staging

Dara Navaei — Mon, 02 Jan 2023 17:03:15 -0800

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

DEN-14101 merged staging

· /MsgDefs.h

(-6, +26)

| 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, 02 Jan 2023 15:47:14 -0800

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

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

· /AlarmDefs.h	(-1, +1)	\| History	\| Source	\| Diff
· /Compatible.h	(-1, +1)	\| History	\| Source	\| Diff
· /DGDefs.h	(-1, +1)	\| History	\| Source	\| Diff
· /HDDefs.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): DEN-14497, DEN-13675 updated the drain pump target pressure to flow. Updated the acid conductivity alarm property

Dara Navaei — Fri, 30 Dec 2022 19:30:12 -0800

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

DEN-14497, DEN-13675 updated the drain pump target pressure to flow. Updated the acid conductivity alarm property

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

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'staging' into DEN-14344-sw-s85-mg-air-pump

Michael Garthwaite — Thu, 22 Dec 2022 08:50:28 -0800

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

Merge branch 'staging' into DEN-14344-sw-s85-mg-air-pump

· /AlarmDefs.h	(-29, +47)	\| History	\| Source	\| Diff
· /MsgDefs.h	(-8, +22)	\| 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, 21 Dec 2022 14:54:39 -0800

Dara Navaei committed 89ec2be on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 168 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

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

Dara Navaei — Wed, 21 Dec 2022 13:52:32 -0800

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

DEN-14307 merged staging

· /DGDefs.h	(-25, +60)	\| History	\| Source	\| Diff
· /MsgDefs.h	(-4, +13)	\| 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, 21 Dec 2022 13:40:13 -0800

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

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

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