Fisheye on dgfirmware/firmware/App

dgfirmware (DEN-14999-alarm-table-updates): DEN-14999 merged staging

Dara Navaei — Fri, 07 Apr 2023 16:49:18 -0700

Dara Navaei committed 05120b7 on branch DEN-14999-alarm-table-updates in dgfirmware

DEN-14999 merged staging

· /firmware/App/Controllers/ConcentratePumps.c	(-6, +6)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/ConductivitySensors.c	(-9, +9)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/DrainPump.c	(-9, +9)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Heaters.c	(-6, +6)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Pressures.c	(-6, +6)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/ROPump.c	(-11, +11)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/TemperatureSensors.c	(-6, +6)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeFill.c	(-19, +19)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeGenIdle.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeStandby.c	(-8, +8)	\| 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 — Mon, 03 Apr 2023 09:48:17 -0700

Dara Navaei committed 39f1617 on branch DEN-14316-chemical-disinfect, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 135 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 DGCommon.h with build versions from Bamboo

Dara Navaei — Fri, 31 Mar 2023 19:40:35 -0700

Dara Navaei committed d78844c on branch DEN-14316-chemical-disinfect, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 136 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, 31 Mar 2023 19:40:26 -0700

Dara Navaei committed e12f1b3 on branch DEN-14316-chemical-disinfect, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 136 more in dgfirmware

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

· /firmware/App/Controllers/ConductivitySensors.c

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Controllers/Heaters.c

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Controllers/Pressures.c

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Controllers/TemperatureSensors.c

(-2, +2)

| History

| Source

| Diff

· /firmware/App/Controllers/Voltages.c

(-2, +2)

| History

| Source

| Diff

· /firmware/App/Controllers/Voltages.h

(-2, +2)

| 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/ModeFill.c

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Modes/ModeFill.h

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Modes/ModeFlush.c

(-2, +2)

| History

| Source

| Diff

· /firmware/App/Modes/ModeHeatDisinfect.c

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Modes/ModeHeatDisinfectActiveCool.c

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Modes/ModeStandby.c

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Services/Reservoirs.c

(-1, +1)

| History

| Source

| Diff

… 3 more files in changeset.

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

Dara Navaei — Fri, 31 Mar 2023 19:17:41 -0700

Dara Navaei committed 4176311 on branch DEN-14316-chemical-disinfect, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 136 more in dgfirmware

DEN-14999: merged staging

· /firmware/App/Controllers/ConductivitySensors.c	(-25, +49)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Heaters.c	(-27, +31)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/TemperatureSensors.c	(-26, +21)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Voltages.c	(-14, +14)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Voltages.h	(-4, +5)	\| History	\| Source	\| Diff
· /firmware/App/Services/WatchdogMgmt.c	(-7, +9)	\| 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 — Fri, 31 Mar 2023 16:03:04 -0700

Dara Navaei committed 9ae7856 on branch DEN-14316-chemical-disinfect, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 137 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, 31 Mar 2023 16:02:52 -0700

Dara Navaei committed 30bf930 on branch DEN-14316-chemical-disinfect, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 137 more in dgfirmware

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

· /firmware/App/Controllers/ConductivitySensors.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Heaters.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/LoadCell.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/TemperatureSensors.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Valves.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Voltages.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Voltages.h	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Services/FPGA.c	(-2, +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): Merge branch 'staging' into DEN-14646-fpga-alarm-properties-and-timing-3

Fri, 31 Mar 2023 15:55:50 -0700

Bill Bracken committed 0393f47 on branch DEN-14316-chemical-disinfect, DEN-14646-fpga-alarm-properties-and-timing-3 and 138 more in dgfirmware

Merge branch 'staging' into DEN-14646-fpga-alarm-properties-and-timing-3

· /firmware/App/Controllers/Heaters.c

(-23, +28)

| 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 — Fri, 31 Mar 2023 15:27:15 -0700

Dara Navaei committed bfd3fdf on branch DEN-14316-chemical-disinfect, DEN-14646-fpga-alarm-properties-and-timing-3 and 138 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, 31 Mar 2023 15:27:07 -0700

Dara Navaei committed a779231 on branch DEN-14316-chemical-disinfect, DEN-14646-fpga-alarm-properties-and-timing-3 and 138 more in dgfirmware

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

· /firmware/App/Services/SystemComm.c

(-2, +2)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14646 Correction per code review comments

Fri, 31 Mar 2023 13:39:24 -0700

Bill Bracken committed c7471bc on branch DEN-14316-chemical-disinfect, DEN-14646-fpga-alarm-properties-and-timing-3 and 138 more in dgfirmware

DEN-14646 Correction per code review comments

· /firmware/App/Controllers/ConductivitySensors.c

(-3, +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 — Fri, 31 Mar 2023 12:49:52 -0700

Dara Navaei committed 7b3ff8a on branch DEN-14316-chemical-disinfect, DEN-14646-fpga-alarm-properties-and-timing-3 and 138 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, 31 Mar 2023 12:49:43 -0700

Dara Navaei committed d00e9fb on branch DEN-14316-chemical-disinfect, DEN-14646-fpga-alarm-properties-and-timing-3 and 138 more in dgfirmware

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

· /firmware/App/Controllers/Heaters.c

(-1, +1)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DG-DEN-15016_System Faults During Treatment Then Returns TO The Standby Screen...

Fri, 31 Mar 2023 12:30:35 -0700

James Walter Taylor committed e053a89 on branch DEN-14316-chemical-disinfect, DEN-14646-fpga-alarm-properties-and-timing-3 and 139 more in dgfirmware

DG-DEN-15016_System Faults During Treatment Then Returns TO The Standby Screen

Update for code review.

· /firmware/App/Services/SystemComm.c

(-1, +1)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DIAL-222: changed set heater duty cycle to consider overriden values on reset.

Michael Garthwaite — Fri, 31 Mar 2023 09:44:35 -0700

Michael Garthwaite committed de150a6 on branch DEN-14316-chemical-disinfect, DEN-14646-fpga-alarm-properties-and-timing-3 and 138 more in dgfirmware

DIAL-222: changed set heater duty cycle to consider overriden values on reset.

· /firmware/App/Controllers/Heaters.c

(-19, +27)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): HD-DEN-15016_System Faults During Treatment Then Returns TO The Standby Screen...

Fri, 31 Mar 2023 08:59:51 -0700

James Walter Taylor committed 7513288 on branch DEN-14316-chemical-disinfect, DEN-14646-fpga-alarm-properties-and-timing-3 and 139 more in dgfirmware

HD-DEN-15016_System Faults During Treatment Then Returns TO The Standby Screen

Closing code review comments.

· /firmware/App/Services/SystemComm.c

(-9, +7)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999 updated the code based on the alarms table changes

Dara Navaei — Thu, 30 Mar 2023 21:20:21 -0700

Dara Navaei committed ff676a9 on branch DEN-14316-chemical-disinfect, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 136 more in dgfirmware

DEN-14999 updated the code based on the alarms table changes

· /firmware/App/Controllers/Heaters.c	(-1, +0)	\| 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/ModeFill.c	(-15, +28)	\| 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
· /firmware/App/Modes/ModeStandby.c	(-3, +45)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999: Small fix to DG WD POST.

Sean Nash — Thu, 30 Mar 2023 21:18:44 -0700

Sean Nash committed 9bb4c96 on branch DEN-14316-chemical-disinfect, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 136 more in dgfirmware

DEN-14999: Small fix to DG WD POST.

· /firmware/App/Services/WatchdogMgmt.c

(-0, +5)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999 updated the code based on the alarms table update

Dara Navaei — Thu, 30 Mar 2023 20:18:23 -0700

Dara Navaei committed cd7ff56 on branch DEN-14316-chemical-disinfect, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 136 more in dgfirmware

DEN-14999 updated the code based on the alarms table update

· /firmware/App/Controllers/ConductivitySensors.c	(-2, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Heaters.c	(-12, +0)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Pressures.c	(-2, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/TemperatureSensors.c	(-2, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeChemicalDisinfect.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeChemicalDisinfectFlush.c	(-1, +6)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeFlush.c	(-2, +6)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeHeatDisinfect.c	(-2, +6)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(-2, +6)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999 fixed the pressures self test

Dara Navaei — Thu, 30 Mar 2023 18:34:56 -0700

Dara Navaei committed b68997b on branch DEN-14316-chemical-disinfect, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 136 more in dgfirmware

DEN-14999 fixed the pressures self test

· /firmware/App/Controllers/Pressures.c

(-0, +1)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-15016-system-faults-during-treatment-then-returns-to-the-standby-screen...

Thu, 30 Mar 2023 17:56:56 -0700

James Walter Taylor committed 5245b97 on branch DEN-14316-chemical-disinfect, DEN-14646-fpga-alarm-properties-and-timing-3 and 139 more in dgfirmware

DEN-15016-system-faults-during-treatment-then-returns-to-the-standby-screen

Updates to hold off processing retries until after INIT, and after communication with HD started.

· /firmware/App/Services/SystemComm.c

(-7, +20)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'DEN-14999-alarm-table-updates' of ssh://dvm-linux02:7999/dg/dgfirmware into DEN-14999-alarm-table-updates

Sean Nash — Thu, 30 Mar 2023 17:11:12 -0700

Sean Nash committed d2f699d on branch DEN-14316-chemical-disinfect, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 136 more in dgfirmware

Merge branch 'DEN-14999-alarm-table-updates' of ssh://dvm-linux02:7999/dg/dgfirmware into DEN-14999-alarm-table-updates

· /firmware/App/Services/SystemCommMessages.c

(-5, +5)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Fixed handling of HD cmd to change DG reservoir valve config.

Sean Nash — Thu, 30 Mar 2023 17:11:10 -0700

Sean Nash committed 3af0043 on branch DEN-14316-chemical-disinfect, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 136 more in dgfirmware

Fixed handling of HD cmd to change DG reservoir valve config.

· /firmware/App/Services/SystemCommMessages.c

(-2, +2)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999, DEN-15030 updated the start DG command function

Dara Navaei — Thu, 30 Mar 2023 17:10:34 -0700

Dara Navaei committed b77ac4c on branch DEN-14316-chemical-disinfect, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 136 more in dgfirmware

DEN-14999, DEN-15030 updated the start DG command function

· /firmware/App/Services/SystemCommMessages.c

(-5, +5)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999: Updated 24V range alarms.

Sean Nash — Thu, 30 Mar 2023 17:06:33 -0700

Sean Nash committed 9d81cf1 on branch DEN-14316-chemical-disinfect, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 136 more in dgfirmware

DEN-14999: Updated 24V range alarms.

· /firmware/App/Controllers/Voltages.c	(-9, +17)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Voltages.h	(-1, +1)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999, DEN-15031 added code to receive and support different types of acid and bicarb in the treatment

Dara Navaei — Thu, 30 Mar 2023 14:37:13 -0700

Dara Navaei committed d51921b on branch DEN-14316-chemical-disinfect, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 136 more in dgfirmware

DEN-14999, DEN-15031 added code to receive and support different types of acid and bicarb in the treatment

· /firmware/App/Modes/ModeFill.c	(-6, +47)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeFill.h	(-0, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeStandby.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/Reservoirs.c	(-0, +18)	\| History	\| Source	\| Diff
· /firmware/App/Services/Reservoirs.h	(-0, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.c	(-5, +7)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14646 Changes per code review

Thu, 30 Mar 2023 14:36:22 -0700

Bill Bracken committed 9488cd5 on branch DEN-14316-chemical-disinfect, DEN-14646-fpga-alarm-properties-and-timing-3 and 138 more in dgfirmware

DEN-14646 Changes per code review

· /firmware/App/Controllers/ConductivitySensors.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Valves.c	(-3, +3)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'staging' into DEN-14646-fpga-alarm-properties-and-timing-3

Thu, 30 Mar 2023 13:42:32 -0700

Bill Bracken committed f448119 on branch DEN-14316-chemical-disinfect, DEN-14646-fpga-alarm-properties-and-timing-3 and 138 more in dgfirmware

Merge branch 'staging' into DEN-14646-fpga-alarm-properties-and-timing-3

· /firmware/App/Controllers/ConductivitySensors.c

(-4, +26)

| History

| Source

| Diff

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

Thu, 30 Mar 2023 13:35:16 -0700

Bill Bracken committed 9485204 on branch DEN-14316-chemical-disinfect, DEN-14646-fpga-alarm-properties-and-timing-3 and 138 more in dgfirmware

DEN-14646 Update per code review

· /firmware/App/Controllers/ConductivitySensors.c

(-1, +1)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14999 merged the remote changes and updated the fill mode with the acid conductivity values

Dara Navaei — Thu, 30 Mar 2023 11:35:08 -0700

Dara Navaei committed a069a79 on branch DEN-14316-chemical-disinfect, DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error and 136 more in dgfirmware

DEN-14999 merged the remote changes and updated the fill mode with the acid conductivity values

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