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:

Monday 08 Jan 2024

2:41 pm

Dara Navaei

More
4bd3bf3
changed 101 files
DEN-16204-ui-fw-pure-water-mode-turning-on-intermittently-p1-staging, DEN-16499-fw-message-list-testing-issues-2 and 14 more

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

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

2:00 pm

Dara Navaei

More
7d4711e
changed 101 files
DEN-16204-ui-fw-pure-water-mode-turning-intermittently-staging, DEN-16499-fw-message-list-testing-issues and 28 more

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

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

Wednesday 06 Sep 2023

1:45 pm

Dara Navaei

More
1da5fe9
changed 8 files
develop

Merged DEN-16323

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

Thursday 31 Aug 2023

12:03 pm

Dara Navaei

More
51d6753
changed 7 files
DEN-14706-can-messge-not-acked-fix, DEN-15614-new-updated-disinfect-actuators-requirement-issues-list-4 and 68 more

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

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

Tuesday 29 Aug 2023

4:59 pm

Dara Navaei

More
28e9d54
changed 4 files
develop

Merged DEN-16309

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

Sunday 27 Aug 2023

3:51 pm

Dara Navaei

More
4fbaa82
changed 3 files
DEN-14706-can-messge-not-acked-fix, DEN-15614-new-updated-disinfect-actuators-requirement-issues-list-4 and 69 more DG-DEN-16309-1

DEN-16309 removed the clearance period some of the persistence alarms

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

Wednesday 23 Aug 2023

11:55 am

James Walter Taylor <jtaylor@diality.com>

More
150a74d
changed 6 files
develop

Merge remote-tracking branch 'origin/DEN-16280-stuck-in-post-treatment-when-inlet-water-alarm-appears' into develop

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

11:51 am

James Walter Taylor <jtaylor@diality.com>

More
5998ba7
changed 1 file
develop DG-DEN-16280-1

DEN-16280-stuck-in-post-treatment-when-inlet-water-alarm-appears

Incorporated HD mode check, to clear alarm 150/151

- -1
- +5
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c

Thursday 13 Jul 2023

2:10 pm

Dara Navaei

More
6e57ef3
changed 4 files
develop

Merged staging

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

1:16 pm

Dara Navaei

More
05718e4
changed 4 files
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 98 more

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

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

12:52 pm

Darren Cox <darren_m@cox.net>

More
cc52e0d
changed 3 files
develop

Merge branch 'DEN-15702-alarm-150-inlet-water-conductivity-high-does-not-disappear-on-standby-screen-when' into develop

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

Wednesday 12 Jul 2023

4:16 pm

Darren Cox <darren_m@cox.net>

More
08eb894
changed 3 files
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 99 more DG-DEN-15702-1

DEN-15702 Code review update - remove spaces.

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

3:34 pm

Darren Cox <darren_m@cox.net>

More
852e1ea
changed 3 files
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 99 more DG-DEN-15702-1

DEN-15702 Indent for code review comments.

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

Tuesday 11 Jul 2023

3:37 pm

Darren Cox <darren_m@cox.net>

More
3163683
changed 4 files
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 99 more DG-DEN-15702-1

DEN-15702 Check VPI Open for Inlet Conductivity, Pressure, temperature. If VPI Closed, clear alarms.

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

Wednesday 14 Jun 2023

1:31 pm

Dara Navaei

More
bae4aed
changed 8 files
develop

Merged staging

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

9:57 am

Dara Navaei

More
d325999
changed 26 files
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 106 more

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

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

Sunday 04 Jun 2023

3:53 pm

Dara Navaei

More
c53dd92
changed 7 files
develop

Merged DEN-15367

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

Monday 29 May 2023

9:23 pm

Dara Navaei

More
a12e121
changed 8 files
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 107 more DG-DEN-15367-1

DEN-15404 work in progress. Worked on the RO permeat sample mode

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

Sunday 28 May 2023

12:39 pm

Dara Navaei

More
860e1ce
changed 5 files
develop

Merged staging

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

Saturday 20 May 2023

3:53 pm

Dara Navaei

More
59357d3
changed 8 files
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 113 more DG-DEN-15367-1

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

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

3:26 pm

Dara Navaei

More
dae35bc
changed 7 files
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 114 more DG-DEN-15375-1

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

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

Thursday 18 May 2023

8:30 am

Dara Navaei

More
ec84271
changed 7 files
develop

Merged staging

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

Wednesday 17 May 2023

5:38 pm

Dara Navaei

More
5109bb9
changed 20 files
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 116 more

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

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

Monday 15 May 2023

11:27 am

Dara Navaei

More
d4f40c4
changed 8 files
develop DG-DEN-15336-1

Merged DEN-15274

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

10:41 am

Dara Navaei

More
fe738f3
changed 5 files
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 117 more DG-DEN-15274-1 DG-DEN-15336-1

DEN-15274 added a command to set the calibration tables from dailin

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

Friday 12 May 2023

10:13 am

Dara Navaei

More
c4f3105
changed 9 files
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 119 more DG-DEN-15274-1

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

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

8:51 am

Dara Navaei

More
ff489c6
changed 3 files
develop

Merged DEN-15246

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

Thursday 11 May 2023

2:14 pm

Dara Navaei

More
bc85a63
changed 3 files
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 120 more DG-DEN-15246-1

DEN-15246 addressed the code review comments

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

Wednesday 03 May 2023

1:33 pm

Dara Navaei

More
fb1750f
changed 3 files
develop

Merge branch 'DEN-15246-active-reservoir-empty-post-concentrate-alarm-recovery' into develop

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

12:47 pm

Dara Navaei

More
fd89ed3
changed 8 files
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 120 more DG-DEN-15246-1

DEN-15246 added more code to support different conductivity sensors calibration tables

- -27
- +70
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 7 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)

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

James Walter Taylor <jtaylor@diality.com>

James Walter Taylor <jtaylor@diality.com>

Dara Navaei

Dara Navaei

Darren Cox <darren_m@cox.net>

Darren Cox <darren_m@cox.net>

Darren Cox <darren_m@cox.net>

Darren Cox <darren_m@cox.net>

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

Dara Navaei

Dara Navaei

Dara Navaei