Fisheye on dgfirmware/firmware/App/Controllers

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): 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 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): 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): 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): DIAL-222: removed heater check for reset override command.

Michael Garthwaite — Thu, 30 Mar 2023 08:46:56 -0700

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

DIAL-222: removed heater check for reset override command.

· /firmware/App/Controllers/Heaters.c

(-4, +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, 29 Mar 2023 08:39:09 -0700

Dara Navaei committed 5652568 on branch DEN-14316-chemical-disinfect, DEN-14646-fpga-alarm-properties-and-timing-3 and 139 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/ROPump.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeFill.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeFill.h	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeInitPOST.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemComm.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.h	(-1, +1)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN14646 - Valves variable renamed.

Tue, 28 Mar 2023 17:28:35 -0700

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

DEN14646 - Valves variable renamed.

· /firmware/App/Controllers/Valves.c

(-6, +6)

| 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

Tue, 28 Mar 2023 17:27:30 -0700

Bill Bracken committed 47ac2ff 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	(-7, +15)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Heaters.c	(-2, +7)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/LoadCell.c	(-3, +3)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/TemperatureSensors.c	(-1, +2)	\| 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): DEN-15014 addressed the code review comment

Dara Navaei — Tue, 28 Mar 2023 16:59:29 -0700

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

DEN-15014 addressed the code review comment

· /firmware/App/Controllers/ROPump.c

(-1, +1)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-15014 addressed the code review comments

Dara Navaei — Tue, 28 Mar 2023 16:48:39 -0700

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

DEN-15014 addressed the code review comments

· /firmware/App/Controllers/ConductivitySensors.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/ROPump.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeFill.c	(-7, +5)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeFill.h	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemComm.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.c	(-9, +7)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-15014 added code to support RO only mode

Dara Navaei — Mon, 27 Mar 2023 11:29:42 -0700

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

DEN-15014 added code to support RO only mode

· /firmware/App/Controllers/ConductivitySensors.c	(-3, +25)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeFill.c	(-2, +32)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeFill.h	(-4, +4)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeInitPOST.c	(-0, +2)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemComm.c	(-0, +4)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.c	(-1, +106)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.h	(-0, +13)	\| 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 — Thu, 23 Mar 2023 09:18:39 -0700

Dara Navaei committed 60e80a2 on branch DEN-14316-chemical-disinfect, DEN-14646-fpga-alarm-properties-and-timing-3 and 140 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

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, 22 Mar 2023 14:37:05 -0700

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

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

· /firmware/App/Controllers/Heaters.c

(-2, +2)

| History

| Source

| Diff

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

Wed, 22 Mar 2023 14:23:30 -0700

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

DEN-14646 Updates per code review.

· /firmware/App/Controllers/ConductivitySensors.c

(-7, +3)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14817: fixed persistence holder to consider overriden park bit values

Michael Garthwaite — Wed, 22 Mar 2023 11:15:54 -0700

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

DEN-14817: fixed persistence holder to consider overriden park bit values

· /firmware/App/Controllers/ConcentratePumps.c

(-2, +2)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14817: added persistence holding for beta hw

Michael Garthwaite — Wed, 22 Mar 2023 09:19:56 -0700

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

DEN-14817: added persistence holding for beta hw

· /firmware/App/Controllers/ConcentratePumps.c

(-0, +2)

| 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 — Tue, 21 Mar 2023 16:48:33 -0700

Dara Navaei committed c230be1 on branch DEN-14316-chemical-disinfect, DEN-14646-fpga-alarm-properties-and-timing-3 and 142 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/DrainPump.c

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Controllers/Pressures.c

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Controllers/ROPump.c

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Controllers/TemperatureSensors.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/ModeChemicalDisinfectFlush.h

(-2, +2)

| History

| Source

| Diff

· /firmware/App/Modes/ModeFill.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/ModeHeatDisinfectActiveCool.h

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Modes/ModeStandby.c

(-2, +2)

| History

| Source

| Diff

· /firmware/App/Modes/ModeStandby.h

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Modes/OperationModes.c

(-2, +2)

| History

| Source

| Diff

… 3 more files in changeset.

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14817: updated concentrate pump parking to not consider pump speed alarm until we have received a park bit

Michael Garthwaite — Tue, 21 Mar 2023 11:43:45 -0700

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

DEN-14817: updated concentrate pump parking to not consider pump speed alarm until we have received a park bit

· /firmware/App/Controllers/ConcentratePumps.c

(-1, +35)

| 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 — Mon, 20 Mar 2023 09:33:06 -0700

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

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

· /firmware/App/Controllers/FluidLeak.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/LoadCell.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Valves.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Drivers/CPLD.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeStandby.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/OperationModes.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/AlarmMgmt.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemComm.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.c	(-2, +2)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DIAL-222: fixed heaters override reset.

Michael Garthwaite — Thu, 16 Mar 2023 09:33:25 -0700

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

DIAL-222: fixed heaters override reset.

· /firmware/App/Controllers/Heaters.c

(-0, +5)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14763 addressed the code review comments and added inlet water conditions to the heat disinfect active cool

Dara Navaei — Wed, 15 Mar 2023 17:19:25 -0700

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

DEN-14763 addressed the code review comments and added inlet water conditions to the heat disinfect active cool

· /firmware/App/Controllers/ConductivitySensors.c	(-0, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Pressures.c	(-0, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/ROPump.c	(-1, +5)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/TemperatureSensors.c	(-0, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeHeatDisinfect.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(-43, +210)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeStandby.c	(-4, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/OperationModes.c	(-1, +1)	\| History	\| Source	\| Diff

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

Tue, 14 Mar 2023 16:56:57 -0700

Bill Bracken committed 298eb8e 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 comments.

· /firmware/App/Controllers/Valves.c

(-1, +1)

| History

| Source

| Diff

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

Tue, 14 Mar 2023 13:41:22 -0700

Bill Bracken committed b18590f 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 comments.

· /firmware/App/Controllers/ConductivitySensors.c	(-18, +5)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Heaters.c	(-2, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/TemperatureSensors.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Voltages.h	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Services/FPGA.c	(-0, +6)	\| History	\| Source	\| Diff
· /firmware/App/Services/WatchdogMgmt.c	(-1, +6)	\| 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, 10 Mar 2023 14:16:19 -0800

Bill Bracken committed c4a05fb 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

# Conflicts:

# firmware/App/Controllers/TemperatureSensors.c

· /firmware/App/Controllers/Heaters.c	(-48, +63)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/TemperatureSensors.c	(-1, +5)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14646 - Remove code inserted for debugging. Enable FPGA clock speed check and watchdog check.

Fri, 10 Mar 2023 13:44:25 -0800

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

DEN-14646 - Remove code inserted for debugging. Enable FPGA clock speed check and watchdog check.

· /firmware/App/Controllers/ConductivitySensors.c	(-17, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Voltages.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Voltages.h	(-2, +3)	\| History	\| Source	\| Diff
· /firmware/App/Services/FPGA.c	(-38, +8)	\| History	\| Source	\| Diff
· /firmware/App/Services/WatchdogMgmt.c	(-2, +0)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14646 Use typedefs in voltages.c to improve debugging. Correct counting FPGA timeouts twice if write values ACK not...

Wed, 08 Mar 2023 18:33:13 -0800

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

DEN-14646 Use typedefs in voltages.c to improve debugging. Correct counting FPGA timeouts twice if write values ACK not received. Correct handling of emstat response status values.

· /firmware/App/Controllers/ConductivitySensors.c	(-14, +49)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Voltages.c	(-10, +10)	\| History	\| Source	\| Diff
· /firmware/App/Services/FPGA.c	(-20, +34)	\| 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, 08 Mar 2023 11:09:55 -0800

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

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

· /firmware/App/Controllers/FlowSensors.c

(-2, +2)

| History

| Source

| Diff