Fisheye on dgfirmware/firmware

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

Dara Navaei — Thu, 10 Nov 2022 09:10:45 -0800

Dara Navaei committed 985bd4c on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dgfirmware

DEN-14175 addressed the code review comments

· /firmware/App/Modes/ModeHeatDisinfect.c	(-3, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/FPGA.c	(-1, +1)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14175 created a getHWConfig in FPGA

Dara Navaei — Wed, 09 Nov 2022 13:24:12 -0800

Dara Navaei committed 9ad9ebf on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dgfirmware

DEN-14175 created a getHWConfig in FPGA

· /firmware/App/Services/FPGA.c	(-6, +10)	\| History	\| Source	\| Diff
· /firmware/App/Services/FPGA.h	(-1, +4)	\| History	\| Source	\| Diff

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

Dara Navaei — Wed, 09 Nov 2022 13:04:24 -0800

Dara Navaei committed d28018e on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dgfirmware

DEN-14175 merged staging

· /firmware/App/Modes/ModeHeatDisinfect.c

(-10, +17)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14175 uncommented the code that was commented to test heat disinfect drain/RO pumps

Dara Navaei — Wed, 09 Nov 2022 13:02:13 -0800

Dara Navaei committed 7cc7794 on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dgfirmware

DEN-14175 uncommented the code that was commented to test heat disinfect drain/RO pumps

· /firmware/App/Modes/ModeHeatDisinfect.c

(-17, +9)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14175 updated the extra temperature to 0.0 from 2.0

Dara Navaei — Tue, 08 Nov 2022 12:51:58 -0800

Dara Navaei committed a4c308b on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dgfirmware

DEN-14175 updated the extra temperature to 0.0 from 2.0

· /firmware/App/Services/Reservoirs.h

(-1, +1)

| History

| Source

| Diff

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

Dara Navaei — Mon, 07 Nov 2022 10:33:38 -0800

Dara Navaei committed 27e2d12 on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dgfirmware

DEN-14175 addressed the code review comments

· /firmware/App/Modes/ModeFill.h	(-3, +3)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeHeatDisinfect.c	(-35, +50)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14175 added trimmer heater use last duty cycle to the broadcast data

Dara Navaei — Thu, 03 Nov 2022 15:53:58 -0700

Dara Navaei committed 8e0041d on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dgfirmware

DEN-14175 added trimmer heater use last duty cycle to the broadcast data

· /firmware/App/Controllers/Heaters.c

(-4, +5)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14175 addressed the code review comments and replaced the V3 enable software configuration flag with the hardware co...

Dara Navaei — Thu, 03 Nov 2022 10:03:17 -0700

Dara Navaei committed 6f29912 on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dgfirmware

DEN-14175 addressed the code review comments and replaced the V3 enable software configuration flag with the hardware configuration flag from FGPA. Updated the trimmer heater's ramp state to check the use previous duty cycle flag instead of estimating the duty cycle.

· /firmware/App/Controllers/ConcentratePumps.c	(-4, +5)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/ConductivitySensors.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/DrainPump.c	(-5, +6)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Fans.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Heaters.c	(-7, +30)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Heaters.h	(-0, +2)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Pressures.c	(-9, +7)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/ROPump.c	(-1, +2)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/TemperatureSensors.c	(-9, +5)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Thermistors.c	(-1, +2)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Valves.c	(-9, +71)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Valves.h	(-1, +3)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeFill.c	(-3, +4)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeFill.h	(-0, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/FPGA.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Services/Reservoirs.c	(-1, +2)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.c	(-6, +7)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14175, DEN-13999 uncommented DG pressure sensors alarm

Dara Navaei — Mon, 31 Oct 2022 14:17:41 -0700

Dara Navaei committed 7ffa5c7 on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dgfirmware

DEN-14175, DEN-13999 uncommented DG pressure sensors alarm

· /firmware/App/Controllers/Pressures.c

(-2, +1)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14175, DEN-13999 updated the pressure sensors persitent alarm. Added hardware configuration functions to check the s...

Dara Navaei — Sun, 30 Oct 2022 20:58:59 -0700

Dara Navaei committed cff72ec on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dgfirmware

DEN-14175, DEN-13999 updated the pressure sensors persitent alarm. Added hardware configuration functions to check the status of the device (i.e. BETA, DVT)

· /firmware/App/Controllers/DrainPump.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Pressures.c	(-31, +61)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/TemperatureSensors.c	(-1, +2)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Valves.c	(-17, +8)	\| History	\| Source	\| Diff
· /firmware/App/Services/FPGA.c	(-1, +14)	\| History	\| Source	\| Diff
· /firmware/App/Services/FPGA.h	(-0, +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, 28 Oct 2022 18:14:08 -0700

Dara Navaei committed c362d42 on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 183 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, 28 Oct 2022 18:13:58 -0700

Dara Navaei committed e308299 on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dgfirmware

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

· /firmware/App/Modes/ModeHeatDisinfect.c

(-2, +2)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14232 updated the VPo status to prevent filling the reservoirs at the end of heat disinfect

Dara Navaei — Fri, 28 Oct 2022 10:57:44 -0700

Dara Navaei committed c7b6129 on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 184 more in dgfirmware

DEN-14232 updated the VPo status to prevent filling the reservoirs at the end of heat disinfect

· /firmware/App/Modes/ModeHeatDisinfect.c

(-8, +8)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'staging' into DEN-14175-dg_hd_dev-hd_dg_dvt-update-part-5

Dara Navaei — Fri, 28 Oct 2022 09:56:55 -0700

Dara Navaei committed 0516c80 on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dgfirmware

Merge branch 'staging' into DEN-14175-dg_hd_dev-hd_dg_dvt-update-part-5

· /firmware/App/Controllers/Heaters.c

(-3, +3)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14175, DIAL-213 added drain pump current and direction override commands, updated the heaters driver with the latest...

Dara Navaei — Fri, 28 Oct 2022 09:56:32 -0700

Dara Navaei committed 2b9d106 on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dgfirmware

DEN-14175, DIAL-213 added drain pump current and direction override commands, updated the heaters driver with the latest optimization requirements, added a DG valves sensed states override command

· /firmware/App/Controllers/DrainPump.c	(-2, +98)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/DrainPump.h	(-1, +6)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Heaters.c	(-26, +46)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Valves.c	(-14, +95)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Valves.h	(-30, +37)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeFill.c	(-10, +17)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemComm.c	(-0, +12)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.c	(-3, +97)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.h	(-0, +9)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14232 Turn off trimmer heater before switching to FILL_R2_WITH_HOT_WATER and then back on when switching to HEAT_DIS...

Fri, 28 Oct 2022 08:56:30 -0700

Bill Bracken committed cce2284 on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 184 more in dgfirmware

DEN-14232 Turn off trimmer heater before switching to FILL_R2_WITH_HOT_WATER and then back on when switching to HEAT_DISINFECT_R2_TO_R1.

· /firmware/App/Modes/ModeHeatDisinfect.c

(-1, +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 — Wed, 26 Oct 2022 14:32:28 -0700

Dara Navaei committed 149a225 on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 184 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, 26 Oct 2022 14:32:16 -0700

Dara Navaei committed 19934ca on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 184 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/Controllers/ROPump.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/TemperatureSensors.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeChemicalDisinfect.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeFlush.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeHeatDisinfect.c	(-2, +2)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'staging' into DEN-13786-hd_dg_dev-s78_bb

Wed, 26 Oct 2022 10:32:51 -0700

Bill Bracken committed ea6c53a on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 185 more in dgfirmware

Merge branch 'staging' into DEN-13786-hd_dg_dev-s78_bb

· /firmware/App/Controllers/TemperatureSensors.c	(-4, +4)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeHeatDisinfect.c	(-2, +2)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14175 added alarms to check the conductivity sensor's bad received hex characters

Dara Navaei — Tue, 25 Oct 2022 15:39:18 -0700

Dara Navaei committed a8ea22d on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more in dgfirmware

DEN-14175 added alarms to check the conductivity sensor's bad received hex characters

· /firmware/App/Controllers/ConductivitySensors.c

(-15, +28)

| History

| Source

| Diff

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

Tue, 25 Oct 2022 11:02:41 -0700

Bill Bracken committed 56e5490 on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 185 more in dgfirmware

DEN-13786 Correct VPo

· /firmware/App/Modes/ModeHeatDisinfect.c

(-1, +1)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-13786 Correct heater PWM and proper position of VPo for Drain_R2

Tue, 25 Oct 2022 10:52:35 -0700

Bill Bracken committed e9ba2b6 on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 185 more in dgfirmware

DEN-13786 Correct heater PWM and proper position of VPo for Drain_R2

· /firmware/App/Controllers/Heaters.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeHeatDisinfect.c	(-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 — Tue, 25 Oct 2022 09:37:40 -0700

Dara Navaei committed 9258256 on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 185 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 — Mon, 24 Oct 2022 16:00:10 -0700

Dara Navaei committed ec4ef01 on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 186 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 — Mon, 24 Oct 2022 16:00:02 -0700

Dara Navaei committed 61fc45d on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 186 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/LoadCell.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Pressures.c	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/TemperatureSensors.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/Thermistors.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeFill.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeHeatDisinfect.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/FPGA.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/FPGA.h	(-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): DEN-13786 Code review changes

Mon, 24 Oct 2022 14:59:26 -0700

Bill Bracken committed 5715610 on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 185 more in dgfirmware

DEN-13786 Code review changes

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

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-13786 Code review changes

Mon, 24 Oct 2022 14:48:58 -0700

Bill Bracken committed b7c391c on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 185 more in dgfirmware

DEN-13786 Code review changes

· /firmware/App/Controllers/ROPump.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/TemperatureSensors.c	(-1, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeChemicalDisinfect.c	(-0, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeFlush.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeHeatDisinfect.c	(-53, +5)	\| History	\| Source	\| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14166 updated the heat disinfect temperature gradient out of range

Dara Navaei — Mon, 24 Oct 2022 14:47:37 -0700

Dara Navaei committed 4453c65 on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 187 more in dgfirmware

DEN-14166 updated the heat disinfect temperature gradient out of range

· /firmware/App/Modes/ModeHeatDisinfect.c

(-1, +1)

| History

| Source

| Diff

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

Dara Navaei — Mon, 24 Oct 2022 14:24:17 -0700

Dara Navaei committed 589df03 on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 187 more in dgfirmware

Merged staging

· /firmware/App/Controllers/Pressures.c

(-2, +2)

| History

| Source

| Diff

dgfirmware (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'staging' into DEN-13786-hd_dg_dev-s78_bb...

Mon, 24 Oct 2022 13:28:42 -0700

Bill Bracken committed 5738118 on branch DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 185 more in dgfirmware

Merge branch 'staging' into DEN-13786-hd_dg_dev-s78_bb

# Conflicts:

# firmware/App/Controllers/DialysateFlow.c

# firmware/App/Controllers/Heaters.c

# firmware/App/Controllers/ROPump.c

# firmware/App/Controllers/UVReactors.c

# firmware/App/Modes/ModeHeatDisinfect.c

· /firmware/App/Controllers/ROPump.c	(-16, +16)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/TemperatureSensors.c	(-186, +91)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeHeatDisinfect.c	(-7, +26)	\| History	\| Source	\| Diff