Fisheye on common/

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

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 — Thu, 10 Aug 2023 08:36:36 -0700

Dara Navaei committed e380d07 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

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

· /HDDefs.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): Merge branch 'DEN-16166-event-message-for-pass-fail-bld-self-test' into staging

Michael Garthwaite — Thu, 10 Aug 2023 08:19:10 -0700

Michael Garthwaite committed b16f2f8 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

Merge branch 'DEN-16166-event-message-for-pass-fail-bld-self-test' into staging

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): Merge branch 'staging' into DEN-16166-event-message-for-pass-fail-bld-self-test

Michael Garthwaite — Thu, 10 Aug 2023 08:18:56 -0700

Michael Garthwaite committed 2deba02 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 88 more in common

Merge branch 'staging' into DEN-16166-event-message-for-pass-fail-bld-self-test

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): Merge branch 'DEN-15634-bad-fill-states-and-signal-updating-inconsistently' into staging

Michael Garthwaite — Thu, 10 Aug 2023 08:16:14 -0700

Michael Garthwaite committed ec93483 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 88 more in common

Merge branch 'DEN-15634-bad-fill-states-and-signal-updating-inconsistently' into staging

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): DEN-14815: Added new message IDs for request/response for post-tx next button.

Sean Nash — Wed, 09 Aug 2023 17:22:52 -0700

Sean Nash committed 1bcdcce 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: Added new message IDs for request/response for post-tx next button.

· /MsgDefs.h

(-2, +2)

| History

| Source

| Diff

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): DEN-16166: updated hd defs for blood leak self test event.

Michael Garthwaite — Wed, 09 Aug 2023 13:37:11 -0700

Michael Garthwaite committed 4cd4c19 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 88 more in common

DEN-16166: updated hd defs for blood leak self test event.

· /HDDefs.h

(-0, +1)

| History

| Source

| Diff

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): Merge branch 'staging' into DEN-15634-bad-fill-states-and-signal-updating-inconsistently

Michael Garthwaite — Tue, 08 Aug 2023 13:12:35 -0700

Michael Garthwaite committed e63916a 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 89 more in common

Merge branch 'staging' into DEN-15634-bad-fill-states-and-signal-updating-inconsistently

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): DEN-15634: added override for drain mode broadcast interval override.

Michael Garthwaite — Tue, 08 Aug 2023 13:12:25 -0700

Michael Garthwaite committed d8e3fad 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 89 more in common

DEN-15634: added override for drain mode broadcast interval override.

· /MsgDefs.h

(-0, +1)

| 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, 08 Aug 2023 13:05:35 -0700

Dara Navaei committed 48f7b5d 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 89 more in common

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

· /AlarmDefs.h

(-1, +1)

| History

| Source

| Diff

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): Merge branch 'staging' of ssh://dvm-linux02:7999/comm/common into staging

Dara Navaei — Tue, 08 Aug 2023 10:37:35 -0700

Dara Navaei committed 87cbca9 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 89 more in common

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

· /AlarmDefs.h

(-2, +2)

| History

| Source

| Diff

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

Dara Navaei — Tue, 08 Aug 2023 10:37:28 -0700

Dara Navaei committed e16d717 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 89 more in common

Merged DEN-15885

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): DEN-15885 updated the code

Dara Navaei — Tue, 08 Aug 2023 10:31:22 -0700

Dara Navaei committed 4d4b31f 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 90 more in common

DEN-15885 updated the code

· /AlarmDefs.h

(-1, +1)

| History

| Source

| Diff

common (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): Merge branch 'staging' into DEN-15634-bad-fill-states-and-signal-updating-inconsistently

Michael Garthwaite — Tue, 08 Aug 2023 10:29:03 -0700

Michael Garthwaite committed 9c680aa 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 89 more in common

Merge branch 'staging' into DEN-15634-bad-fill-states-and-signal-updating-inconsistently