Fisheye on dgfirmware/

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'staging' into DIAL-280-reservoir-broadcast-override

Michael Garthwaite — Mon, 21 Aug 2023 11:29:13 -0700

Michael Garthwaite committed a45a2f0 on branch DEN-14706-can-messge-not-acked-fix, DEN-15614-new-updated-disinfect-actuators-requirement-issues-list-4 and 75 more in dgfirmware

Merge branch 'staging' into DIAL-280-reservoir-broadcast-override

· /firmware/App/Services/SystemComm.c	(-1, +50)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.c	(-0, +32)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.h	(-0, +3)	\| History	\| Source	\| Diff

dgfirmware (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:28 -0700

Michael Garthwaite committed 64c0836 on branch DEN-14706-can-messge-not-acked-fix, DEN-15614-new-updated-disinfect-actuators-requirement-issues-list-4 and 75 more in dgfirmware

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

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'staging' into DIAL-280-reservoir-broadcast-override

Michael Garthwaite — Mon, 21 Aug 2023 09:43:35 -0700

Michael Garthwaite committed b48df86 on branch DEN-14706-can-messge-not-acked-fix, DEN-15614-new-updated-disinfect-actuators-requirement-issues-list-4 and 75 more in dgfirmware

Merge branch 'staging' into DIAL-280-reservoir-broadcast-override

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Dara Navaei — Fri, 18 Aug 2023 13:50:35 -0700

Dara Navaei committed de6e8c7 on branch DEN-14706-can-messge-not-acked-fix, DEN-15614-new-updated-disinfect-actuators-requirement-issues-list-4 and 75 more in dgfirmware

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

· /firmware/App/DGCommon.h

(-1, +1)

| History

| Source

| Diff

dgfirmware (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 — Fri, 18 Aug 2023 13:50:28 -0700

Dara Navaei committed b766ff8 on branch DEN-14706-can-messge-not-acked-fix, DEN-15614-new-updated-disinfect-actuators-requirement-issues-list-4 and 75 more in dgfirmware

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

· /firmware/App/Drivers/SafetyShutdown.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeFill.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/WatchdogMgmt.c	(-1, +1)	\| History	\| Source	\| Diff

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

Dara Navaei — Fri, 18 Aug 2023 13:49:20 -0700

Dara Navaei committed 08c35e5 on branch DEN-14706-can-messge-not-acked-fix, DEN-15614-new-updated-disinfect-actuators-requirement-issues-list-4 and 75 more in dgfirmware

Merged DEN-16250

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-16250 updated doxygen comment

Dara Navaei — Fri, 18 Aug 2023 13:45:31 -0700

Dara Navaei committed 5bf4b57 on branch DEN-14706-can-messge-not-acked-fix, DEN-15614-new-updated-disinfect-actuators-requirement-issues-list-4 and 76 more in dgfirmware

DEN-16250 updated doxygen comment

· /firmware/App/Modes/ModeFill.c

(-2, +1)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-16250 removed the voltage check code

Dara Navaei — Fri, 18 Aug 2023 13:39:30 -0700

Dara Navaei committed e5e7a37 on branch DEN-14706-can-messge-not-acked-fix, DEN-15614-new-updated-disinfect-actuators-requirement-issues-list-4 and 76 more in dgfirmware

DEN-16250 removed the voltage check code

· /firmware/App/Drivers/SafetyShutdown.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Services/WatchdogMgmt.c	(-4, +4)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14706: removed #define

Michael Garthwaite — Fri, 18 Aug 2023 12:37:06 -0700

Michael Garthwaite committed ad186fe on branch DEN-14706-can-messge-not-acked-fix, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 76 more in dgfirmware

DEN-14706: removed #define

· /firmware/App/Services/SystemComm.c

(-1, +0)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-16250 updated the voltages in the watchdog and safety shutdown

Dara Navaei — Fri, 18 Aug 2023 11:26:18 -0700

Dara Navaei committed 48fa4e3 on branch DEN-14706-can-messge-not-acked-fix, DEN-15614-new-updated-disinfect-actuators-requirement-issues-list-4 and 76 more in dgfirmware

DEN-16250 updated the voltages in the watchdog and safety shutdown

· /firmware/App/Drivers/SafetyShutdown.c	(-3, +4)	\| History	\| Source	\| Diff
· /firmware/App/Services/WatchdogMgmt.c	(-6, +7)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DIAL-280: code review comments.

Michael Garthwaite — Fri, 18 Aug 2023 10:47:13 -0700

Michael Garthwaite committed 507e340 on branch DEN-14706-can-messge-not-acked-fix, DEN-15614-new-updated-disinfect-actuators-requirement-issues-list-4 and 75 more in dgfirmware

DIAL-280: code review comments.

· /firmware/App/Services/Reservoirs.c	(-0, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.c	(-0, +1)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14706: changed override condition for pending ack

Michael Garthwaite — Fri, 18 Aug 2023 10:42:47 -0700

Michael Garthwaite committed 64f53d7 on branch DEN-14706-can-messge-not-acked-fix, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 76 more in dgfirmware

DEN-14706: changed override condition for pending ack

· /firmware/App/Services/SystemComm.c

(-2, +1)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-16250 fixed the logic in the voltages check in watchdog and safety shutdown

Dara Navaei — Fri, 18 Aug 2023 10:35:02 -0700

Dara Navaei committed d52eeae on branch DEN-14706-can-messge-not-acked-fix, DEN-15614-new-updated-disinfect-actuators-requirement-issues-list-4 and 76 more in dgfirmware

DEN-16250 fixed the logic in the voltages check in watchdog and safety shutdown

· /firmware/App/Drivers/SafetyShutdown.c	(-3, +2)	\| History	\| Source	\| Diff
· /firmware/App/Services/WatchdogMgmt.c	(-2, +2)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-16250 added the isolated voltage to the watchdog and safety shutdown POSTs

Dara Navaei — Fri, 18 Aug 2023 10:25:30 -0700

Dara Navaei committed 3115c2c on branch DEN-14706-can-messge-not-acked-fix, DEN-15614-new-updated-disinfect-actuators-requirement-issues-list-4 and 76 more in dgfirmware

DEN-16250 added the isolated voltage to the watchdog and safety shutdown POSTs

· /firmware/App/Drivers/SafetyShutdown.c	(-4, +8)	\| History	\| Source	\| Diff
· /firmware/App/Services/WatchdogMgmt.c	(-4, +6)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DIAL-280: Reservoir broadcast interval override.

Michael Garthwaite — Thu, 17 Aug 2023 20:16:01 -0700

Michael Garthwaite committed 4375a41 on branch DEN-14706-can-messge-not-acked-fix, DEN-15614-new-updated-disinfect-actuators-requirement-issues-list-4 and 75 more in dgfirmware

DIAL-280: Reservoir broadcast interval override.

· /firmware/App/Services/Reservoirs.c	(-21, +85)	\| History	\| Source	\| Diff
· /firmware/App/Services/Reservoirs.h	(-1, +3)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemComm.c	(-0, +4)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.c	(-0, +31)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.h	(-0, +3)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14706: DG ACK pending override message handling and implementation.

Michael Garthwaite — Thu, 17 Aug 2023 19:59:21 -0700

Michael Garthwaite committed aa1367a on branch DEN-14706-can-messge-not-acked-fix, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 76 more in dgfirmware

DEN-14706: DG ACK pending override message handling and implementation.

· /firmware/App/Services/SystemComm.c	(-1, +52)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemComm.h	(-0, +2)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.c	(-0, +32)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.h	(-0, +3)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-15250 addressed alarm 207

Dara Navaei — Thu, 17 Aug 2023 14:50:39 -0700

Dara Navaei committed bcd5068 on branch DEN-14706-can-messge-not-acked-fix, DEN-15614-new-updated-disinfect-actuators-requirement-issues-list-4 and 76 more in dgfirmware

DEN-15250 addressed alarm 207

· /firmware/App/Modes/ModeFill.c

(-5, +13)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-16250 added the FMP check flag to state transition function in mode fill

Dara Navaei — Thu, 17 Aug 2023 09:48:03 -0700

Dara Navaei committed 2c23724 on branch DEN-14706-can-messge-not-acked-fix, DEN-15614-new-updated-disinfect-actuators-requirement-issues-list-4 and 76 more in dgfirmware

DEN-16250 added the FMP check flag to state transition function in mode fill

· /firmware/App/Modes/ModeFill.c

(-1, +2)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Dara Navaei — Wed, 16 Aug 2023 17:33:00 -0700

Dara Navaei committed 78a62db on branch DEN-14706-can-messge-not-acked-fix, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 78 more in dgfirmware

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

· /firmware/App/DGCommon.h

(-1, +1)

| History

| Source

| Diff

dgfirmware (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 17:32:53 -0700

Dara Navaei committed d0536d7 on branch DEN-14706-can-messge-not-acked-fix, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 78 more in dgfirmware

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

· /firmware/App/Controllers/ConcentratePumps.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeChemicalDisinfect.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeChemicalDisinfectFlush.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeFlush.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeHeatDisinfect.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(-1, +1)	\| History	\| Source	\| Diff

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

Dara Navaei — Wed, 16 Aug 2023 17:31:40 -0700

Dara Navaei committed cadfae7 on branch DEN-14706-can-messge-not-acked-fix, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 78 more in dgfirmware

Merged DEN-15974

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-15974 updated the state of VPo in the cleaning modes' drain to be to fill

Dara Navaei — Wed, 16 Aug 2023 17:27:14 -0700

Dara Navaei committed 213c09d on branch DEN-14706-can-messge-not-acked-fix, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 79 more in dgfirmware

DEN-15974 updated the state of VPo in the cleaning modes' drain to be to fill

· /firmware/App/Modes/ModeChemicalDisinfect.c	(-0, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeChemicalDisinfectFlush.c	(-0, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeFlush.c	(-0, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeHeatDisinfect.c	(-0, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(-0, +1)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-16222 updated the heat disinfect code

Dara Navaei — Wed, 16 Aug 2023 14:37:04 -0700

Dara Navaei committed 1c73626 on branch DEN-14706-can-messge-not-acked-fix, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 79 more in dgfirmware

DEN-16222 updated the heat disinfect code

· /firmware/App/Modes/ModeHeatDisinfect.c

(-8, +7)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-16222 fixed the heat disinfect cancel water path drain R1

Dara Navaei — Wed, 16 Aug 2023 14:32:52 -0700

Dara Navaei committed 2bb5167 on branch DEN-14706-can-messge-not-acked-fix, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 79 more in dgfirmware

DEN-16222 fixed the heat disinfect cancel water path drain R1

· /firmware/App/Modes/ModeHeatDisinfect.c

(-3, +5)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-15974 removed the clearance time of the persistence alarms of the concentrate pumps

Dara Navaei — Wed, 16 Aug 2023 13:27:46 -0700

Dara Navaei committed af18131 on branch DEN-14706-can-messge-not-acked-fix, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 79 more in dgfirmware

DEN-15974 removed the clearance time of the persistence alarms of the concentrate pumps

· /firmware/App/Controllers/ConcentratePumps.c

(-2, +2)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Dara Navaei — Wed, 16 Aug 2023 11:31:06 -0700

Dara Navaei committed 52ae429 on branch DEN-14706-can-messge-not-acked-fix, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 79 more in dgfirmware

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

· /firmware/App/DGCommon.h

(-1, +1)

| History

| Source

| Diff

dgfirmware (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:30:57 -0700

Dara Navaei committed 7f64bdb on branch DEN-14706-can-messge-not-acked-fix, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 79 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

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

Dara Navaei — Wed, 16 Aug 2023 10:39:36 -0700

Dara Navaei committed fb220de on branch DEN-14706-can-messge-not-acked-fix, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 79 more in dgfirmware

DEN-16215

dgfirmware (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:21 -0700

Dara Navaei committed b11681f on branch DEN-14706-can-messge-not-acked-fix, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 80 more in dgfirmware

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

dgfirmware (DEN-16215-srsdg-215-incorrect-fill-mode-starts-in-start-state): DEN-16215 addressed the code review comments

Dara Navaei — Wed, 16 Aug 2023 10:28:37 -0700

Dara Navaei committed d3e1ad2 on branch DEN-14706-can-messge-not-acked-fix, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 80 more in dgfirmware

DEN-16215 addressed the code review comments

· /firmware/App/Modes/ModeFill.c

(-0, +1)

| History

| Source

| Diff