Fisheye on common/

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

Fri, 25 Aug 2023 17:21:41 -0700

Bill Bracken committed 4fde850 on branch DEN-15792-hd-software-design-description, DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment and 73 more in common

DEN-15973 Merge staging

· /AlarmDefs.h

(-1, +1)

| History

| Source

| Diff

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

Fri, 25 Aug 2023 17:20:58 -0700

Bill Bracken committed cdc5ec5 on branch DEN-15792-hd-software-design-description, DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment and 73 more in common

Merge branch 'staging' into DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment

# Conflicts:

# AlarmDefs.h

· /AlarmDefs.h

(-341, +343)

| 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, 24 Aug 2023 15:49:27 -0700

Dara Navaei committed 9d81f44 on branch DEN-15792-hd-software-design-description, DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment and 80 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 DENBUG-59 to staging.

Sean Nash — Thu, 24 Aug 2023 13:51:02 -0700

Sean Nash committed e2e92e0 on branch DEN-15792-hd-software-design-description, DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment and 80 more in common

Merged DENBUG-59 to staging.

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DENBUG-59: Fixed merge conflicts.

Sean Nash — Thu, 24 Aug 2023 10:53:12 -0700

Sean Nash committed 4925a79 on branch DEN-15792-hd-software-design-description, DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment and 81 more in common

DENBUG-59: Fixed merge conflicts.

· /AlarmDefs.h

(-6, +11)

| History

| Source

| Diff

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

Wed, 23 Aug 2023 11:00:13 -0700

Bill Bracken committed 740dbe5 on branch DEN-15792-hd-software-design-description, DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment and 73 more in common

DEN-15973 Update alarm tables

· /AlarmDefs.h

(-3, +3)

| 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, 21 Aug 2023 11:48:24 -0700

Dara Navaei committed 50a2db0 on branch DEN-15792-hd-software-design-description, DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment and 81 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-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked' into st...

Michael Garthwaite — Mon, 21 Aug 2023 11:23:41 -0700

Michael Garthwaite committed 895f04d on branch DEN-15792-hd-software-design-description, DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment and 81 more in common

Merge branch 'DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked' into staging

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

Fri, 18 Aug 2023 13:53:10 -0700

Bill Bracken committed 8b80a3b on branch DEN-15792-hd-software-design-description, DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment and 73 more in common

DEN-15973 Rename alarm

· /AlarmDefs.h

(-4, +4)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-15973 Add RO Pump max PWM alarm. NOTE: Descriptive text needs to be verified

Fri, 18 Aug 2023 13:32:39 -0700

Bill Bracken committed 2860c68 on branch DEN-15792-hd-software-design-description, DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment and 73 more in common

DEN-15973 Add RO Pump max PWM alarm. NOTE: Descriptive text needs to be verified

· /AlarmDefs.h

(-4, +4)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14706: MSG IDs for upcoming overrides

Michael Garthwaite — Thu, 17 Aug 2023 18:21:54 -0700

Michael Garthwaite committed fe3359b on branch DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked, DEN-15792-hd-software-design-description and 82 more in common

DEN-14706: MSG IDs for upcoming overrides

· /MsgDefs.h

(-0, +3)

| 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, 16 Aug 2023 11:06:01 -0700

Dara Navaei committed 459e42d on branch DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked, DEN-15792-hd-software-design-description and 83 more in common

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

· /DGDefs.h

(-1, +1)

| History

| Source

| Diff

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

Dara Navaei — Wed, 16 Aug 2023 10:38:14 -0700

Dara Navaei committed 66a10cc on branch DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked, DEN-15792-hd-software-design-description and 83 more in common

Merged DEN-16215

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): Merge branch 'staging' into DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state

Dara Navaei — Wed, 16 Aug 2023 10:30:54 -0700

Dara Navaei committed 52aac96 on branch DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked, DEN-15792-hd-software-design-description and 84 more in common

Merge branch 'staging' into DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Wed, 16 Aug 2023 10:22:00 -0700

Dara Navaei committed 6c8c013 on branch DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked, DEN-15792-hd-software-design-description and 84 more in common

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

· /MsgDefs.h

(-2, +2)

| History

| Source

| Diff

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): DEN-16215 removed the start state of mode fill

Dara Navaei — Wed, 16 Aug 2023 10:12:49 -0700

Dara Navaei committed 7162193 on branch DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked, DEN-15792-hd-software-design-description and 84 more in common

DEN-16215 removed the start state of mode fill

· /DGDefs.h

(-2, +1)

| History

| Source

| Diff

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): Merge remote-tracking branch 'origin/DEN-15996-over-ride-commands-duplicates-the-id-msg_id_valves_states_publish_interva...

Wed, 16 Aug 2023 10:00:46 -0700

James Walter Taylor committed 043a630 on branch DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked, DEN-15792-hd-software-design-description and 84 more in common

Merge remote-tracking branch 'origin/DEN-15996-over-ride-commands-duplicates-the-id-msg_id_valves_states_publish_interval_override' into staging

· /MsgDefs.h

(-1, +2)

| History

| Source

| Diff

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Wed, 16 Aug 2023 09:43:44 -0700

Dara Navaei committed 29f5e7b on branch DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked, DEN-15792-hd-software-design-description and 84 more in common

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

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

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): Merge branch 'DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error' into staging

Michael Garthwaite — Wed, 16 Aug 2023 09:03:13 -0700

Michael Garthwaite committed e5fc54b on branch DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked, DEN-15792-hd-software-design-description and 84 more in common

Merge branch 'DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error' into staging

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): DEN-14692: Changed stop property for alarm 216 to true

Michael Garthwaite — Wed, 16 Aug 2023 08:17:41 -0700

Michael Garthwaite committed f7eb9c9 on branch DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 85 more in common

DEN-14692: Changed stop property for alarm 216 to true

· /AlarmDefs.h

(-1, +1)

| History

| Source

| Diff

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): DEN-14692: fixed DG RAM status override message ID.

Michael Garthwaite — Tue, 15 Aug 2023 15:39:43 -0700

Michael Garthwaite committed eb2e0d9 on branch DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 85 more in common

DEN-14692: fixed DG RAM status override message ID.

· /MsgDefs.h

(-1, +1)

| History

| Source

| Diff

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): DEN-14692: RAM status override message IDs for HD and DG.

Michael Garthwaite — Tue, 15 Aug 2023 13:58:26 -0700

Michael Garthwaite committed 006da41 on branch DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 85 more in common

DEN-14692: RAM status override message IDs for HD and DG.

· /MsgDefs.h

(-0, +2)

| History

| Source

| Diff

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Tue, 15 Aug 2023 09:08:26 -0700

Dara Navaei committed e10e8dd on branch DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 85 more in common

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

· /MsgDefs.h

(-1, +1)

| History

| Source

| Diff

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): Merge branch 'DIAL-269-pure-water-mode-not-able-to-turn-on-off' into staging

Michael Garthwaite — Tue, 15 Aug 2023 08:45:36 -0700

Michael Garthwaite committed 3b1603d on branch DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 85 more in common

Merge branch 'DIAL-269-pure-water-mode-not-able-to-turn-on-off' into staging

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): Merge branch 'staging' into DIAL-269-pure-water-mode-not-able-to-turn-on-off

Michael Garthwaite — Mon, 14 Aug 2023 15:33:17 -0700

Michael Garthwaite committed 8aac4d6 on branch DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 86 more in common

Merge branch 'staging' into DIAL-269-pure-water-mode-not-able-to-turn-on-off

· /MsgDefs.h

(-4, +4)

| History

| Source

| Diff

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Mon, 14 Aug 2023 14:05:30 -0700

Dara Navaei committed ccea08d on branch DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 86 more in common

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

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

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): Merged DEN-14815 to staging.

Sean Nash — Mon, 14 Aug 2023 13:45:10 -0700

Sean Nash committed 408afb1 on branch DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 86 more in common

Merged DEN-14815 to staging.

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): Merging staging to DEN-14815.

Sean Nash — Mon, 14 Aug 2023 13:35:57 -0700

Sean Nash committed ea9e516 on branch DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 87 more in common

Merging staging to DEN-14815.

· /MsgDefs.h

(-2, +4)

| History

| Source

| Diff

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): DEN-14815: Addressed DEN-15885.

Sean Nash — Fri, 11 Aug 2023 16:00:36 -0700

Sean Nash committed b0b74fa on branch DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 87 more in common

DEN-14815: Addressed DEN-15885.

· /AlarmDefs.h

(-1, +1)

| History

| Source

| Diff

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): DIAL-269: added DG dialin get ro only mode.

Michael Garthwaite — Fri, 11 Aug 2023 14:12:49 -0700

Michael Garthwaite committed 9020fed on branch DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 86 more in common

DIAL-269: added DG dialin get ro only mode.

· /MsgDefs.h

(-0, +1)

| History

| Source

| Diff