Fisheye on dgfirmware/firmware/App/Controllers/Heaters.c

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-15375, DEN-15374, DEN-15378 fixed release build software fault

Dara Navaei — Sat, 20 May 2023 15:26:41 -0700

Dara Navaei committed dae35bc on branch DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 114 more in dgfirmware

DEN-15375, DEN-15374, DEN-15378 fixed release build software fault

· /firmware/App/Controllers/ConductivitySensors.c	(-1, +2)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/FlowSensors.c	(-0, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Heaters.c	(-5, +8)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Valves.c	(-0, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemComm.c	(-0, +2)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.c	(-0, +2)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.h	(-0, +2)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-15375 updated the heaters control

Dara Navaei — Sat, 20 May 2023 10:28:25 -0700

Dara Navaei committed 2bf612e on branch DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 114 more in dgfirmware

DEN-15375 updated the heaters control

· /firmware/App/Controllers/Heaters.c

(-1, +11)

| History

| Source

| Diff

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

Dara Navaei — Fri, 19 May 2023 16:58:28 -0700

Dara Navaei committed e87de1c on branch DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 114 more in dgfirmware

DEN-15375 updated the code

· /firmware/App/Controllers/Heaters.c

(-3, +3)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-15375 addressed the heaters fixes

Dara Navaei — Fri, 19 May 2023 12:31:32 -0700

Dara Navaei committed b909022 on branch DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 114 more in dgfirmware

DEN-15375 addressed the heaters fixes

· /firmware/App/Controllers/Heaters.c	(-3, +8)	\| History	\| Source	\| Diff
· /firmware/App/Services/Reservoirs.c	(-1, +4)	\| 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, 17 May 2023 17:38:35 -0700

Dara Navaei committed 5109bb9 on branch DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 116 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/ConductivitySensors.h

(-1, +1)

| 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/LoadCell.h

(-2, +2)

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

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Modes/ModeFill.c

(-2, +2)

| History

| Source

| Diff

· /firmware/App/Modes/ModeFlush.c

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Modes/ModeGenIdle.c

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Modes/ModeGenIdle.h

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Modes/ModeHeatDisinfect.c

(-2, +2)

| History

| Source

| Diff

· /firmware/App/Modes/ModeHeatDisinfectActiveCool.c

(-1, +1)

| History

| Source

| Diff

… 5 more files in changeset.

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

Dara Navaei — Wed, 17 May 2023 08:20:36 -0700

Dara Navaei committed 3d87e97 on branch DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 117 more in dgfirmware

DEN-15274 addressed the code review comments

· /firmware/App/Controllers/Heaters.c	(-4, +4)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/LoadCell.c	(-0, +3)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeHeatDisinfect.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/Reservoirs.c	(-3, +4)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-15274 updated the heaters control code

Dara Navaei — Mon, 15 May 2023 17:08:11 -0700

Dara Navaei committed 1ac1699 on branch DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 117 more in dgfirmware

DEN-15274 updated the heaters control code

· /firmware/App/Controllers/Heaters.c	(-3, +3)	\| History	\| Source	\| Diff
· /firmware/App/Services/Reservoirs.c	(-5, +8)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-15274, DEN-15246 Added code to not lose the commanded fill volume from HD due to multiple bad fill modes. Updated th...

Dara Navaei — Sun, 14 May 2023 10:09:28 -0700

Dara Navaei committed 7e1358a on branch DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 117 more in dgfirmware

DEN-15274, DEN-15246 Added code to not lose the commanded fill volume from HD due to multiple bad fill modes. Updated the heaters code to keep getting the dialysate the flow for the trimmer control. Updated the drain to volume function

· /firmware/App/Controllers/Heaters.c	(-6, +6)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeFill.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeGenIdle.c	(-5, +16)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeGenIdle.h	(-0, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/Reservoirs.c	(-16, +16)	\| History	\| Source	\| Diff
· /firmware/App/Services/Reservoirs.h	(-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 — Fri, 07 Apr 2023 17:10:39 -0700

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

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

· /firmware/App/Controllers/ConcentratePumps.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/ConductivitySensors.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/DrainPump.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/FlowSensors.h	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/FluidLeak.c	(-2, +2)	\| 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/ROPump.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/TemperatureSensors.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeFill.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeGenIdle.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeStandby.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/FPGA.c	(-2, +2)	\| 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

Dara Navaei — Fri, 07 Apr 2023 13:10:38 -0700

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

DEN-14999 updated the code based on the alarms table

· /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	(-18, +18)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeGenIdle.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeStandby.c	(-7, +7)	\| 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 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 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-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 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): 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): 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): 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): 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-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): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Tue, 07 Mar 2023 11:34:14 -0800

Dara Navaei committed b4f8e22 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14316-chemical-disinfect and 148 more in dgfirmware

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

· /firmware/App/Controllers/DrainPump.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Heaters.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/TemperatureSensors.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeDrain.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeFill.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeGenIdle.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/Reservoirs.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/Reservoirs.h	(-1, +1)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14834 updated the code to just send the heater command in Idle and Drain if the primary heater is not on. Addressed ...

Dara Navaei — Tue, 07 Mar 2023 11:06:35 -0800

Dara Navaei committed 3efd50b on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14316-chemical-disinfect and 149 more in dgfirmware

DEN-14834 updated the code to just send the heater command in Idle and Drain if the primary heater is not on. Addressed the code review comments

· /firmware/App/Controllers/Heaters.c	(-6, +6)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeDrain.c	(-2, +6)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeGenIdle.c	(-2, +6)	\| History	\| Source	\| Diff
· /firmware/App/Services/Reservoirs.c	(-4, +4)	\| History	\| Source	\| Diff
· /firmware/App/Services/Reservoirs.h	(-10, +0)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'staging' into DEN-14834-ro-flow-drops-to-zero-and-cp-measured-speed-1500-temporarily-during-pre-treatment

Dara Navaei — Mon, 06 Mar 2023 15:23:17 -0800

Dara Navaei committed 45a4cb0 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14316-chemical-disinfect and 149 more in dgfirmware

Merge branch 'staging' into DEN-14834-ro-flow-drops-to-zero-and-cp-measured-speed-1500-temporarily-during-pre-treatment

· /firmware/App/Controllers/Heaters.c

(-2, +7)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14834 updated that get target primary heater function to accomodate the changes from pre-treatment. Removed the rang...

Dara Navaei — Mon, 06 Mar 2023 14:50:39 -0800

Dara Navaei committed 3012a33 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14316-chemical-disinfect and 149 more in dgfirmware

DEN-14834 updated that get target primary heater function to accomodate the changes from pre-treatment. Removed the range check from the drain pump measured RPM

· /firmware/App/Controllers/DrainPump.c	(-10, +6)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Heaters.c	(-15, +17)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/TemperatureSensors.c	(-14, +17)	\| History	\| Source	\| Diff
· /firmware/App/Services/Reservoirs.c	(-29, +44)	\| History	\| Source	\| Diff
· /firmware/App/Services/Reservoirs.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, 03 Mar 2023 14:34:38 -0800

Dara Navaei committed dc6dc71 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14316-chemical-disinfect and 149 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
· /firmware/App/Modes/ModeFlush.c	(-2, +2)	\| History	\| Source	\| Diff

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

Michael Garthwaite — Wed, 01 Mar 2023 14:49:27 -0800

Michael Garthwaite committed 0d61b45 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14316-chemical-disinfect and 150 more in dgfirmware

DEN-14788: code review comments

· /firmware/App/Controllers/Heaters.c

(-1, +1)

| History

| Source

| Diff