Fisheye on dgfirmware/

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): Merge branch 'staging' into DIAL-285-event-log-15-missing-fill-prime-concentrate-state

Michael Garthwaite — Mon, 18 Sep 2023 08:53:29 -0700

Michael Garthwaite committed e2dabfc on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

Merge branch 'staging' into DIAL-285-event-log-15-missing-fill-prime-concentrate-state

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): DIAL-285: fix to ensure we see transitions of submode.

Michael Garthwaite — Mon, 18 Sep 2023 08:53:20 -0700

Michael Garthwaite committed 8a25d57 on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

DIAL-285: fix to ensure we see transitions of submode.

· /firmware/App/Modes/OperationModes.c

(-0, +3)

| History

| Source

| Diff

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Dara Navaei — Fri, 15 Sep 2023 16:38:43 -0700

Dara Navaei committed b220330 on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

· /firmware/App/DGCommon.h

(-1, +1)

| History

| Source

| Diff

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Fri, 15 Sep 2023 16:38:36 -0700

Dara Navaei committed 8ee0169 on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

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

· /firmware/App/Modes/ModeFill.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Services/Reservoirs.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Services/Reservoirs.h	(-2, +2)	\| History	\| Source	\| Diff

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): Merge remote-tracking branch 'origin/DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high...

Fri, 15 Sep 2023 16:18:13 -0700

James Walter Taylor committed 64d4526 on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

Merge remote-tracking branch 'origin/DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low' into staging

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): Merge branch 'staging' into DIAL-285-event-log-15-missing-fill-prime-concentrate-state

Michael Garthwaite — Fri, 15 Sep 2023 16:06:48 -0700

Michael Garthwaite committed 16a7935 on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

Merge branch 'staging' into DIAL-285-event-log-15-missing-fill-prime-concentrate-state

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Dara Navaei — Fri, 15 Sep 2023 15:32:53 -0700

Dara Navaei committed 57a6c33 on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

· /firmware/App/DGCommon.h

(-1, +1)

| History

| Source

| Diff

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Fri, 15 Sep 2023 15:32:40 -0700

Dara Navaei committed becd984 on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

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

· /firmware/App/Controllers/Pressures.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeChemicalDisinfect.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeHeatDisinfect.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeStandby.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/OperationModes.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/OperationModes.h	(-2, +2)	\| History	\| Source	\| Diff

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): Merged DEN-15973

Dara Navaei — Fri, 15 Sep 2023 15:31:08 -0700

Dara Navaei committed 8ccf333 on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

Merged DEN-15973

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): DEN-15973 updated the chemical disinfect

Dara Navaei — Fri, 15 Sep 2023 08:50:56 -0700

Dara Navaei committed 3223b2c on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

DEN-15973 updated the chemical disinfect

· /firmware/App/Modes/ModeChemicalDisinfect.c

(-1, +7)

| History

| Source

| Diff

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): DEN-15973 updated chem disinfect

Dara Navaei — Thu, 14 Sep 2023 18:04:08 -0700

Dara Navaei committed 3835a00 on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

DEN-15973 updated chem disinfect

· /firmware/App/Modes/ModeChemicalDisinfect.c

(-1, +3)

| History

| Source

| Diff

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): DEN-15973 updated chemical disinfect

Dara Navaei — Thu, 14 Sep 2023 17:37:21 -0700

Dara Navaei committed e6ecfc3 on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

DEN-15973 updated chemical disinfect

· /firmware/App/Modes/ModeChemicalDisinfect.c

(-1, +1)

| History

| Source

| Diff

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): DEN-16432 fixed the heat disinfect temperature out of range trial count error

Dara Navaei — Thu, 14 Sep 2023 17:01:11 -0700

Dara Navaei committed efa2127 on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

DEN-16432 fixed the heat disinfect temperature out of range trial count error

· /firmware/App/Modes/ModeHeatDisinfect.c

(-2, +3)

| History

| Source

| Diff

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): DEN-15973 updated the chemical disinfect

Dara Navaei — Thu, 14 Sep 2023 15:35:48 -0700

Dara Navaei committed 719abb7 on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

DEN-15973 updated the chemical disinfect

· /firmware/App/Modes/ModeChemicalDisinfect.c

(-2, +3)

| History

| Source

| Diff

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): DEN-15973 updated chemical disinfect

Dara Navaei — Thu, 14 Sep 2023 13:26:44 -0700

Dara Navaei committed ddad43b on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

DEN-15973 updated chemical disinfect

· /firmware/App/Modes/ModeChemicalDisinfect.c

(-1, +1)

| History

| Source

| Diff

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): Merge branch 'staging' into DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment-2

Dara Navaei — Thu, 14 Sep 2023 10:27:49 -0700

Dara Navaei committed 2ac9985 on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

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

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): DEN-15973 addressed the code review comments

Dara Navaei — Thu, 14 Sep 2023 10:27:29 -0700

Dara Navaei committed c47dc63 on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

DEN-15973 addressed the code review comments

· /firmware/App/Modes/ModeStandby.c

(-4, +4)

| History

| Source

| Diff

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): DEN-15973 addressed the code review comments

Dara Navaei — Thu, 14 Sep 2023 09:48:13 -0700

Dara Navaei committed 5379702 on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

DEN-15973 addressed the code review comments

· /firmware/App/Controllers/Pressures.c	(-12, +12)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeStandby.c	(-1, +5)	\| History	\| Source	\| Diff
· /firmware/App/Modes/OperationModes.h	(-1, +1)	\| History	\| Source	\| Diff

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Dara Navaei — Thu, 14 Sep 2023 09:29:42 -0700

Dara Navaei committed dbb4273 on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

· /firmware/App/DGCommon.h

(-1, +1)

| History

| Source

| Diff

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Thu, 14 Sep 2023 09:29:29 -0700

Dara Navaei committed 5459a8a on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

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

· /firmware/App/Modes/ModeChemicalDisinfect.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeChemicalDisinfect.h	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemComm.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.h	(-2, +2)	\| History	\| Source	\| Diff

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): DEN-15973 updated the code

Dara Navaei — Thu, 14 Sep 2023 09:27:33 -0700

Dara Navaei committed 8f3e72f on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

DEN-15973 updated the code

· /firmware/App/Controllers/Pressures.c

(-1, +0)

| History

| Source

| Diff

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): Merge branch 'DIAL-283-no-moving-average-commands-conductivity' into staging

Michael Garthwaite — Thu, 14 Sep 2023 09:08:27 -0700

Michael Garthwaite committed 1b99b32 on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

Merge branch 'DIAL-283-no-moving-average-commands-conductivity' into staging

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): DEN-15973 changed the minimum inlet pressure to be a variable based on the maximum inlet water pressure set

Dara Navaei — Thu, 14 Sep 2023 08:31:22 -0700

Dara Navaei committed 8e4c986 on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

DEN-15973 changed the minimum inlet pressure to be a variable based on the maximum inlet water pressure set

· /firmware/App/Controllers/Pressures.c

(-2, +6)

| History

| Source

| Diff

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): DEN-15973 fixed the inlet water pressure alarm. DEN-16418 added chemical flush done after chemical disinfect prior to st...

Dara Navaei — Wed, 13 Sep 2023 16:47:43 -0700

Dara Navaei committed f5fae90 on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

DEN-15973 fixed the inlet water pressure alarm. DEN-16418 added chemical flush done after chemical disinfect prior to starting RO permeate sample mode

· /firmware/App/Controllers/Pressures.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeStandby.c	(-0, +11)	\| History	\| Source	\| Diff

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): DEN-15973 added the inlet water pressure limit in flush drain in the cleaning modes

Dara Navaei — Wed, 13 Sep 2023 11:04:59 -0700

Dara Navaei committed 93a5ad8 on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 61 more in dgfirmware

DEN-15973 added the inlet water pressure limit in flush drain in the cleaning modes

· /firmware/App/Controllers/Pressures.c	(-2, +24)	\| History	\| Source	\| Diff
· /firmware/App/Modes/OperationModes.c	(-0, +12)	\| History	\| Source	\| Diff
· /firmware/App/Modes/OperationModes.h	(-0, +1)	\| History	\| Source	\| Diff

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): Merge branch 'staging' into DIAL-283-no-moving-average-commands-conductivity

Michael Garthwaite — Wed, 13 Sep 2023 10:01:16 -0700

Michael Garthwaite committed a4226fe on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 62 more in dgfirmware

Merge branch 'staging' into DIAL-283-no-moving-average-commands-conductivity

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low...

Wed, 13 Sep 2023 09:52:18 -0700

James Walter Taylor committed 35a1f7d on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 62 more in dgfirmware

DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low

On Dara's advice, ifdef'ed code for fill state treatment recovery

· /firmware/App/Modes/ModeFill.c

(-17, +12)

| History

| Source

| Diff

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Dara Navaei — Wed, 13 Sep 2023 09:34:10 -0700

Dara Navaei committed 6382121 on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 62 more in dgfirmware

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

· /firmware/App/DGCommon.h

(-1, +1)

| History

| Source

| Diff

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Wed, 13 Sep 2023 09:33:58 -0700

Dara Navaei committed c7d750b on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 62 more in dgfirmware

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

· /firmware/App/Controllers/Pressures.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/ROPump.c	(-2, +2)	\| History	\| Source	\| Diff

dgfirmware (DEN-16499-fw-message-list-testing-issues-2): Merged DEN-15973

Dara Navaei — Wed, 13 Sep 2023 09:17:53 -0700

Dara Navaei committed 5f344d7 on branch DEN-15791-dg-software-design-description, DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging and 62 more in dgfirmware

Merged DEN-15973

· /firmware/App/Controllers/Pressures.c

(-8, +18)

| History

| Source

| Diff