Activity dgfirmware/firmware/App/Controllers

9:42 am

Dara Navaei

Merged DEN-13460

- -1
- +1
./TemperatureSensors.c
- History
- Source
- Diff
./TemperatureSensors.c

9:35 am

Dara Navaei

Merge branch 'DEN-13460-dg_hd_dev-hd_dg_dvt-update-part-2' into develop

- -1
- +1
./DialysateFlow.c
- History
- Source
- Diff
./DialysateFlow.c
- -12
- +9
./Heaters.c
- History
- Source
- Diff
./Heaters.c
- -1
- +3
./LoadCell.c
- History
- Source
- Diff
./LoadCell.c
- -1
- +1
./ROPump.c
- History
- Source
- Diff
./ROPump.c
- -70
- +49
./TemperatureSensors.c
- History
- Source
- Diff
./TemperatureSensors.c
… 1 more file in changeset.

5:08 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

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

- -2
- +1
./Heaters.c
- History
- Source
- Diff
./Heaters.c

5:06 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
68b2e13
changed 2 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 185 more DG-DEN-13786-1

DEN-13786 DEN-13573 Correct MIN_INLET_TEMPERATURE_C value and minor logic bug. DEN-13786 DEN-13582 Delta temperature calculation requires fabs.

- -2
- +1
./Heaters.c
- History
- Source
- Diff
./Heaters.c
… 1 more file in changeset.

2:43 pm

Dara Navaei

More
be91166
changed 2 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 189 more DG-DEN-13460-2

DEN-13460 addressed the code review comments

- -1
- +1
./DialysateFlow.c
- History
- Source
- Diff
./DialysateFlow.c
… 1 more file in changeset.

9:27 am

Dara Navaei

More
340d76e
changed 4 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 189 more DG-DEN-13460-2 DG-DEN-13598-2

DEN-13460 updated the heaters driver. Moved the heaters data broadcast structure to the fwcommon so the HD can use it too. Updated the temperature sensors FPGA persistent alarm

- -12
- +9
./Heaters.c
- History
- Source
- Diff
./Heaters.c
- -15
- +0
./Heaters.h
- History
- Source
- Diff
./Heaters.h
- -1
- +1
./ROPump.c
- History
- Source
- Diff
./ROPump.c
- -70
- +49
./TemperatureSensors.c
- History
- Source
- Diff
./TemperatureSensors.c

3:10 pm

Michael Garthwaite

Merge branch 'DEN-13427-sw_dev-sprint-75_mg' into develop

- -0
- +1
./TemperatureSensors.c
- History
- Source
- Diff
./TemperatureSensors.c
- -0
- +1
./TemperatureSensors.h
- History
- Source
- Diff
./TemperatureSensors.h

3:10 pm

Michael Garthwaite

More
5679e6a
changed 2 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 191 more DG-DEN-13427-1

DEN-13427: DIAL-201. Updated temp sensors broadcast message to include thd RTD.

- -0
- +1
./TemperatureSensors.c
- History
- Source
- Diff
./TemperatureSensors.c
- -0
- +1
./TemperatureSensors.h
- History
- Source
- Diff
./TemperatureSensors.h

3:02 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

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

# Conflicts:

# firmware/App/Controllers/DialysateFlow.c

- -1
- +6
./TemperatureSensors.c
- History
- Source
- Diff
./TemperatureSensors.c

2:53 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
7f38146
changed 2 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 185 more DG-DEN-13786-1

DEN-13786 DEN-13770 The persistent alarm interface was changed resulting in the immediate turning off of the UVReactors. Changed to correct function call. DEN-13786 DEN-13558 Correct getRsrvrDrainStatus and getRsrvrFillStatus per modes to Flush mode

- -2
- +2
./UVReactors.c
- History
- Source
- Diff
./UVReactors.c
… 1 more file in changeset.

2:33 pm

Sean Nash

More
7fb16c9
changed 1 file
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 189 more DG-DEN-13460-2

DEN-13460: make boolean explicit, update function header.

- -1
- +3
./LoadCell.c
- History
- Source
- Diff
./LoadCell.c

10:21 am

Dara Navaei

Commented out alarm 196

- -1
- +1
./TemperatureSensors.c
- History
- Source
- Diff
./TemperatureSensors.c

9:57 am

Dara Navaei

Merged DEN-13460

- -2
- +2
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
- -11
- +16
./Heaters.c
- History
- Source
- Diff
./Heaters.c
- -46
- +47
./ROPump.c
- History
- Source
- Diff
./ROPump.c
- -2
- +2
./ROPump.h
- History
- Source
- Diff
./ROPump.h
- -96
- +23
./TemperatureSensors.c
- History
- Source
- Diff
./TemperatureSensors.c
… 2 more files in changeset.

6:49 pm

Dara Navaei

More
33d262a
changed 5 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 189 more DG-DEN-13460-2

DEN-13460 updated the FPGA persistent alarm functions

- -3
- +0
./DrainPump.c
- History
- Source
- Diff
./DrainPump.c
- -25
- +24
./ROPump.c
- History
- Source
- Diff
./ROPump.c
- -96
- +23
./TemperatureSensors.c
- History
- Source
- Diff
./TemperatureSensors.c
… 2 more files in changeset.

2:32 pm

Dara Navaei

More
cd3f582
changed 5 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 189 more DG-DEN-13460-2 DG-DEN-13598-2

DEN-13460 updated the trimmer heater's duty cycle cap control

- -9
- +14
./Heaters.c
- History
- Source
- Diff
./Heaters.c
- -16
- +18
./ROPump.c
- History
- Source
- Diff
./ROPump.c
- -1
- +1
./TemperatureSensors.c
- History
- Source
- Diff
./TemperatureSensors.c
- -63
- +68
./Voltages.c
- History
- Source
- Diff
./Voltages.c
… 1 more file in changeset.

9:17 am

Dara Navaei

More
261cfc6
changed 10 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 189 more DG-DEN-13460-2

DEN-13460 merged staging

- -9
- +10
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
- -1
- +1
./DialysateFlow.c
- History
- Source
- Diff
./DialysateFlow.c
- -4
- +4
./DrainPump.c
- History
- Source
- Diff
./DrainPump.c
- -2
- +3
./Heaters.c
- History
- Source
- Diff
./Heaters.c
- -1
- +1
./ROPump.c
- History
- Source
- Diff
./ROPump.c
- -3
- +3
./ROPump.h
- History
- Source
- Diff
./ROPump.h
… 4 more files in changeset.

9:14 am

Dara Navaei

More
cc21792
changed 1 file
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 189 more DG-DEN-13460-2

DEN-13460 updated the RO pump duty cycle feedback

- -4
- +4
./ROPump.c
- History
- Source
- Diff
./ROPump.c

2:36 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
971fc99
changed 11 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 185 more DG-DEN-13786-1

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

# Conflicts:

# firmware/App/Controllers/DialysateFlow.c

# firmware/App/Controllers/Heaters.c

- -9
- +10
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
- -2
- +2
./DialysateFlow.c
- History
- Source
- Diff
./DialysateFlow.c
- -4
- +4
./DrainPump.c
- History
- Source
- Diff
./DrainPump.c
- -2
- +3
./Heaters.c
- History
- Source
- Diff
./Heaters.c
- -1
- +1
./ROPump.c
- History
- Source
- Diff
./ROPump.c
- -3
- +3
./ROPump.h
- History
- Source
- Diff
./ROPump.h
- -5
- +6
./UVReactors.c
- History
- Source
- Diff
./UVReactors.c
… 4 more files in changeset.

2:08 pm

Dara Navaei

More
d7be59e
changed 10 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 191 more DG-DEN-13427-1 DG-DEN-13460-2

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

- -2
- +2
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
- -1
- +1
./DialysateFlow.c
- History
- Source
- Diff
./DialysateFlow.c
- -2
- +2
./DrainPump.c
- History
- Source
- Diff
./DrainPump.c
- -2
- +2
./Heaters.c
- History
- Source
- Diff
./Heaters.c
- -1
- +1
./ROPump.c
- History
- Source
- Diff
./ROPump.c
- -2
- +2
./ROPump.h
- History
- Source
- Diff
./ROPump.h
- -2
- +2
./UVReactors.c
- History
- Source
- Diff
./UVReactors.c
… 3 more files in changeset.

2:07 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
4b9e76a
changed 2 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 191 more

Merge branch 'DEN-12974-miscellaneous-flush-issues_bb' into staging

# Conflicts:

# firmware/App/Controllers/DialysateFlow.c

# firmware/App/Controllers/ROPump.c

- -1
- +1
./DialysateFlow.c
- History
- Source
- Diff
./DialysateFlow.c
- -1
- +1
./ROPump.c
- History
- Source
- Diff
./ROPump.c

1:50 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
d182ea2
changed 3 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 185 more DG-UCOMMITS-37

DEN-13786 DEN-13758 Change RSRVRS_TARGET_VOL_OUT_TIMEOUT_MS to 10 seconds per SRS. NOTE: Firmware had comment to set to 5 seconds. DEN-13786 DEN-13560 Change RSRVRS_500ML_FILL_UP_TIMEOUT_MS to 2 minutes per SRS DEN-13786 DEN-13770 Correct UVReactor to properly control on/off of UVReactors based upon RO flow rate. DEN-13786 DEN-13788 Correct temperature reporting for V3 configurations.