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

Tree
Accordion

Stats

Commits this week: 0

Total Committers:	10
Last Commit:	19 Nov
Commits this week:	0

Lines of code count not available

Commit Activity

last updated a few minutes ago

Constraints

Constraints: committers

Committer:

Log Comment:

Constraints: files

File Extension:

File Name:

Constraints: dates

Start Date:

End Date:

Friday 10 Feb 2023

3:23 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
56429f9
changed 1 file
DEN-14316-chemical-disinfect, DEN-14646-fpga-alarm-properties-and-timing-3 and 138 more DG-DEN-14646-1

DEN-1646 - Update for conductivity sensor alarms.

- -9
- +26
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c

3:22 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
f93ec3d
changed 4 files
DEN-14316-chemical-disinfect, DEN-14646-fpga-alarm-properties-and-timing-3 and 138 more DG-DEN-14646-1

DEN-14646 - Remove checking the error counter for persistent alarms that previously generated alarms based upon the read counter and the error counter.

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

Monday 06 Feb 2023

1:03 pm

Sean Nash

Fixed merge conflict.

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

Saturday 04 Feb 2023

3:19 pm

Sean Nash

Fixed merge conflicts.

- -5
- +21
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 6 more files in changeset.

Friday 03 Feb 2023

1:48 pm

Dara Navaei

More
56ba1b1
changed 16 files
DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13972-flush-bubbles-ro-pump-state-does-not-match-srsdg-844 and 161 more DG-DEN-14589-1

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

- -1
- +1
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 15 more files in changeset.

Thursday 02 Feb 2023

8:41 am

Dara Navaei

More
e608f0a
changed 7 files
DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13972-flush-bubbles-ro-pump-state-does-not-match-srsdg-844 and 162 more DG-DEN-14604-1

DEN-14604 work in progress. Tested and updated the Nelson support

- -5
- +21
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 6 more files in changeset.

Thursday 19 Jan 2023

11:30 am

Dara Navaei

More
d70d935
changed 5 files
DEN-14902-bootloader-for-dg, develop DG-DEN-14902-1 DG-DEN-15336-1

Merged staging with the latest updates

- -7
- +7
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 4 more files in changeset.

11:22 am

Dara Navaei

More
9e5ee62
changed 23 files
DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13972-flush-bubbles-ro-pump-state-does-not-match-srsdg-844 and 165 more DG-UCOMMITS-38

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

- -1
- +1
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 22 more files in changeset.

Wednesday 18 Jan 2023

3:34 pm

Dara Navaei

More
e107dac
changed 11 files
DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13972-flush-bubbles-ro-pump-state-does-not-match-srsdg-844 and 166 more DG-DEN-14559-1

DEN-14559 updated the code to be able request POST by the Dialin user. Updated the chemical disinfect flush to be able drain the reservoirs all the time

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

Tuesday 17 Jan 2023

10:38 am

Dara Navaei

More
19ddae3
changed 13 files
DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13972-flush-bubbles-ro-pump-state-does-not-match-srsdg-844 and 166 more DG-DEN-14559-1

DEN-14559 added functions to reset the POST states of the drivers that have a POST state machine for the command to request POST again

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

Thursday 12 Jan 2023

5:02 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
e6f434d
changed 9 files
DEN-14902-bootloader-for-dg, develop DG-DEN-14902-1 DG-DEN-15336-1

Merge branch 'DEN-13946-certain-temperature-sensors-trigger-wrong-alarm' into develop

# Conflicts:

# firmware/App/DGCommon.h

- -1
- +1
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 8 more files in changeset.

Wednesday 11 Jan 2023

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
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.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
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 23 more files in changeset.

Tuesday 10 Jan 2023

3:33 pm

Sean Nash

More
2c08db0
changed 23 files
DEN-14902-bootloader-for-dg, develop DG-DEN-14902-1 DG-DEN-15336-1

Fixed merge conflicts.

- -52
- +28
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 22 more files in changeset.

Monday 09 Jan 2023

3:04 pm

Dara Navaei

More
5aee05d
changed 11 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 updated the drain pump flow control algorithm. Fixed the inlet water pressure, temperature, conductivity alarm recovery in treatment modes. Updated chemical disinfect flush mode

- -16
- +27
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 10 more files in changeset.

Friday 06 Jan 2023

5:38 pm

Sean Nash

More
e95b1d3
changed 5 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: Changed CPo and RR alarms to only occur at end of fill based on average conductivity.

- -34
- +0
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 4 more files in changeset.

Thursday 05 Jan 2023

9:56 am

Sean Nash

More
0c66a35
changed 14 files
DEN-14902-bootloader-for-dg, develop DG-DEN-14902-1 DG-DEN-15336-1

Fixed merge conflicts.

- -2
- +2
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 13 more files in changeset.

Tuesday 03 Jan 2023

4:48 pm

Dara Navaei

More
4daa230
changed 6 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 updated the drain pump control for the flow and updating chemical disinfect is in progress

- -1
- +1
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 5 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
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 98 more files in changeset.

Thursday 22 Dec 2022

10:18 am

Dara Navaei

Merged DEN-14307

- -23
- +40
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 8 more files in changeset.

Wednesday 21 Dec 2022

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

- -1
- +1
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 26 more files in changeset.

11:17 am

Dara Navaei

More
5e3a461
changed 13 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 fixed the concentrate pumps' park command ID and addressed the code review comments. Updated heat disinfect mix drain states with the proper actuators

- -0
- +4
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 12 more files in changeset.

Friday 16 Dec 2022

11:16 am

Dara Navaei

More
9426334
changed 11 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 cleaning modes per the SRS changes

- -23
- +36
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 10 more files in changeset.

Friday 11 Nov 2022

5:54 pm

Dara Navaei

Merged DEN-14237

- -1
- +1
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 5 more files in changeset.

Thursday 10 Nov 2022

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

- -1
- +1
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 22 more files in changeset.

Thursday 03 Nov 2022

3:56 pm

Dara Navaei

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

- -1
- +1
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 3 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
- +1
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 16 more files in changeset.

Tuesday 25 Oct 2022

3:44 pm

Dara Navaei

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

- -15
- +28
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c

3:39 pm

Dara Navaei

More
a8ea22d
changed 1 file
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 added alarms to check the conductivity sensor's bad received hex characters

- -15
- +28
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c

Wednesday 19 Oct 2022

3:35 pm

Dara Navaei

More
d19c1bf
changed 15 files
DEN-14902-bootloader-for-dg, develop

Merged DEN-14166

- -1
- +1
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 14 more files in changeset.

ConductivitySensors.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)

Bill Bracken <bill@criticalsoftwaresolutions.com>

Bill Bracken <bill@criticalsoftwaresolutions.com>

Sean Nash

Sean Nash

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Bill Bracken <bill@criticalsoftwaresolutions.com>

Dara Navaei

Dara Navaei

Sean Nash

Dara Navaei

Sean Nash

Sean Nash

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei