Activity dgfirmware/firmware/App/Controllers/ROPump.c

2:13 pm

Dara Navaei

More
b8f2985
changed 24 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 170 more DG-DEN-13946-1

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

- -1
- +1
./ROPump.c
- History
- Source
- Diff
./ROPump.c
… 23 more files in changeset.

10:32 am

Dara Navaei

More
5c430c3
changed 24 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 171 more DG-DEN-14497-1

Merge branch 'staging' into DEN-14497-dg_hd_dev-hd_dg_dvt-update-part-7

- -1
- +1
./ROPump.c
- History
- Source
- Diff
./ROPump.c
… 23 more files in changeset.

10:32 am

Dara Navaei

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

DEN-14497 addressed the code review comments

- -2
- +1
./ROPump.c
- History
- Source
- Diff
./ROPump.c
… 6 more files in changeset.

10:10 am

Dara Navaei

More
6499ea2
changed 99 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 174 more DG-DEN-14497-1 DG-DEN-14433-1 DG-DEN-15336-1

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

- -1
- +1
./ROPump.c
- History
- Source
- Diff
./ROPump.c
… 98 more files in changeset.

7:37 pm

Dara Navaei

More
4b9ae4e
changed 12 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 171 more DG-DEN-14497-1

DEN-14497, DIAL-222 updated the drain pump's control to control the pump to flow in heat disinfect. Added a command to be able to override the heaters duty cycle and reset it. Made the set RO pump to an open loop with a duty cycle a punlic function

- -25
- +37
./ROPump.c
- History
- Source
- Diff
./ROPump.c
… 11 more files in changeset.

3:02 pm

Dara Navaei

More
81769c6
changed 27 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 175 more DG-DEN-14101-1

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

- -2
- +2
./ROPump.c
- History
- Source
- Diff
./ROPump.c
… 26 more files in changeset.

2:30 pm

Dara Navaei

More
eceb190
changed 17 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 175 more DG-DEN-14307-1 DG-DEN-14101-1

Merged staging

- -67
- +186
./ROPump.c
- History
- Source
- Diff
./ROPump.c
… 16 more files in changeset.

4:51 pm

Dara Navaei

More
5e8f96e
changed 13 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 179 more DG-DEN-14307-1 DG-UCOMMITS-37 DG-DEN-14101-1 DG-DEN-14316-1 DG-DEN-14000-1 (+2 more)

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

- -2
- +2
./ROPump.c
- History
- Source
- Diff
./ROPump.c
… 12 more files in changeset.

3:29 pm

Michael Garthwaite

More
28b75f3
changed 4 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 180 more DG-DEN-14197-1

DEN-14197: Code review changes. Pre-merge fixes.

- -1
- +1
./ROPump.c
- History
- Source
- Diff
./ROPump.c
… 3 more files in changeset.

3:17 pm

Michael Garthwaite

More
f565edd
changed 6 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 180 more DG-DEN-14197-1

Merge branch 'staging' into DEN-14197-sw-s83-mg-pi-optimizations

- -3
- +4
./ROPump.c
- History
- Source
- Diff
./ROPump.c
… 5 more files in changeset.

2:55 pm

Michael Garthwaite

More
432b2a6
changed 1 file
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 180 more DG-DEN-14197-1

DEN-14197: Addressed code review comments.

- -3
- +2
./ROPump.c
- History
- Source
- Diff
./ROPump.c

2:43 pm

Michael Garthwaite

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

DEN-14197: Addressed code review comments.

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

2:27 pm

Michael Garthwaite

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

DEN-14197: Addressed code review comments.

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

1:53 pm

Michael Garthwaite

More
e832be5
changed 5 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 180 more DG-DEN-14197-1

DEN-14197: Addressed code review comments.

- -8
- +10
./ROPump.c
- History
- Source
- Diff
./ROPump.c
… 4 more files in changeset.

1:48 pm

Michael Garthwaite

More
a04e9df
changed 3 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 180 more DG-DEN-14197-1

DEN-14197: Created a set pwm step limit for PI controllers. Updated RO pump profiles to contain a max set step limit. Removed unused #defines for ro pump.

- -11
- +12
./ROPump.c
- History
- Source
- Diff
./ROPump.c
… 2 more files in changeset.

1:48 pm

Michael Garthwaite

More
1adf632
changed 3 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 180 more DG-DEN-14197-1

DEN-14197: Created a set pwm step limit for PI controllers. Updated RO pump profiles to contain a max set step limit. Removed unused defines for ro pump.

- -11
- +12
./ROPump.c
- History
- Source
- Diff
./ROPump.c
… 2 more files in changeset.

4:38 pm

Dara Navaei

More
eea0132
changed 6 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 175 more DG-DEN-14307-1

DEN-14307 updated the code and updated the checkAlarms.sh to check the alarms manual table upon compilation

- -2
- +2
./ROPump.c
- History
- Source
- Diff
./ROPump.c
… 5 more files in changeset.

2:42 pm

Sean Nash

More
531b1d4
changed 1 file
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 180 more DG-DEN-14197-1

DEN-14197: Removed RO pump ramp state. Tuned RO pump control coefficients.

- -52
- +11
./ROPump.c
- History
- Source
- Diff
./ROPump.c

10:35 am

Dara Navaei

More
9cc5da6
changed 23 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 182 more DG-DEN-14101-1 DG-DEN-14197-1 DG-DEN-14237-1

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

- -2
- +2
./ROPump.c
- History
- Source
- Diff
./ROPump.c
… 22 more files in changeset.

2:05 pm

Michael Garthwaite

More
036a11e
changed 1 file
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 180 more DG-UCOMMITS-38

DEN-14197: build fixes and warnings.

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

1:53 pm

Michael Garthwaite

More
88db2f2
changed 1 file
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 180 more DG-UCOMMITS-38

DEN-14197: Build fixes

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

1:50 pm

Michael Garthwaite

More
900d1b6
changed 1 file
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 180 more DG-UCOMMITS-37

DEN-14197: DIAL-212: Created measured RO pump feedback voltage override. Implemented current RO Pump profile variable.

- -9
- +79
./ROPump.c
- History
- Source
- Diff
./ROPump.c

11:30 am

Michael Garthwaite

More
958fe92
changed 2 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 180 more DG-DEN-14197-1

DEN-14197: Fixed warnings regarding gen idle overrides. Fixed compiler issues when merging into develop.

- -5
- +3
./ROPump.c
- History
- Source
- Diff
./ROPump.c
… 1 more file in changeset.

11:04 am

Michael Garthwaite

More
29a9a5d
changed 5 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 180 more DG-DEN-14197-1

DEN-14197: implemented RO pump profile switching. Implemented Flow to PWM function RO pump with profiles as a parameter. Created a SW fault for PI profiles out of range.

- -38
- +87
./ROPump.c
- History
- Source
- Diff
./ROPump.c
… 4 more files in changeset.

11:39 am

Michael Garthwaite

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

DEN-14197: Initial attempt at PI controller profiles with usage in ro pump

- -0
- +38
./ROPump.c
- History
- Source
- Diff
./ROPump.c
… 2 more files in changeset.

10:03 am

Dara Navaei

More
6f29912
changed 17 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 183 more DG-DEN-14175-1

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.

- -1
- +2
./ROPump.c
- History
- Source
- Diff
./ROPump.c
… 16 more files in changeset.

2:32 pm

Dara Navaei

More
19934ca
changed 6 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 184 more DG-DEN-14175-1

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

- -2
- +2
./ROPump.c
- History
- Source
- Diff
./ROPump.c
… 5 more files in changeset.

2:48 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
b7c391c
changed 5 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 Code review changes

- -1
- +1
./ROPump.c
- History
- Source
- Diff
./ROPump.c
… 4 more files in changeset.

1:28 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
5738118
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-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

# firmware/App/Controllers/ROPump.c

# firmware/App/Controllers/UVReactors.c

# firmware/App/Modes/ModeHeatDisinfect.c

- -16
- +16
./ROPump.c
- History
- Source
- Diff
./ROPump.c
… 2 more files in changeset.

9:44 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
ebd9aed
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-13768 Remove EMC build from ROPump. Don not set cancellationMode when exiting DG_HEAT_DISINFECT_STATE_COOL_DOWN_RO_FILTER.

- -3
- +0
./ROPump.c
- History
- Source
- Diff
./ROPump.c
… 1 more file in changeset.

ROPump.c

Stats

Commits this week: 0

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Dara Navaei

Sean Nash

Dara Navaei

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Dara Navaei

Dara Navaei

Bill Bracken <bill@criticalsoftwaresolutions.com>

Bill Bracken <bill@criticalsoftwaresolutions.com>

Bill Bracken <bill@criticalsoftwaresolutions.com>