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:

Tuesday 14 Jun 2022

5:42 pm

Dara Navaei

More
852597f
changed 3 files
DEN-12847-sw_dev_sprint_71_darren, DEN-12931-dg_hd_dev-hd_dg_dvt-update and 197 more

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

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

2:34 pm

Dara Navaei

More
6d3a383
changed 12 files
DEN-14902-bootloader-for-dg, cdc-demo-branch-218 and 3 more

Merged DEN-12931

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

10:48 am

Dara Navaei

More
a8eecf9
changed 2 files
DEN-12845-sw_dev_sprint_s71_steve, DEN-12847-sw_dev_sprint_71_darren and 198 more DG-DEN-12845-2

DEN-12845 addressed code review comments and merges staging

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

Monday 13 Jun 2022

5:59 pm

Sean Nash

More
8ee7300
changed 1 file
DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-12974-miscellaneous-flush-issues_bb and 196 more

DEN-12931: Removed init persistence call for unused alarm.

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

9:08 am

Dara Navaei

More
f91baac
changed 10 files
DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-12974-miscellaneous-flush-issues_bb and 196 more DG-DEN-12931-1

DEN-12931 DVT updates and SRS changes

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

Friday 03 Jun 2022

5:13 pm

Bill Bracken <bbracken@diality.com>

More
1747702
changed 13 files
DEN-14902-bootloader-for-dg, cdc-demo-branch-218 and 3 more

Merge remote-tracking branch 'origin/DEN-12974-miscellaneous-flush-issues_bb' into develop

# Conflicts:

# firmware/App/DGCommon.h

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

Wednesday 25 May 2022

11:06 am

Dara Navaei

More
22176ce
changed 54 files
DEN-12845-sw_dev_sprint_s71_steve, DEN-12847-sw_dev_sprint_71_darren and 198 more DG-DEN-12845-2 DG-DEN-12847-1 DG-UCOMMITS-37

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

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

Monday 23 May 2022

2:41 pm

Dara Navaei

More
0803f82
changed 20 files
DEN-12224-dg_hd_dev-switches-monitor, DEN-12845-sw_dev_sprint_s71_steve and 199 more DG-DEN-12224-7

DEN-12224 addressed the code review comments

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

Monday 02 May 2022

2:13 pm

Dara Navaei

More
f4a444d
changed 6 files
DEN-14902-bootloader-for-dg, cdc-demo-branch-218 and 3 more

Merge branch 'DEN-12224-dg_hd_dev-switches-monitor' into develop

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

Saturday 30 Apr 2022

5:34 pm

Dara Navaei

More
ab14e70
changed 13 files
DEN-12224-dg_hd_dev-switches-monitor, DEN-12845-sw_dev_sprint_s71_steve and 199 more DG-DEN-12224-7

DEN-12224 working in progress. Activated and debugged heaters flow check

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

Wednesday 20 Apr 2022

2:54 pm

Dara Navaei

More
6e3bbb4
changed 6 files
DEN-14902-bootloader-for-dg, cdc-demo-branch-218 and 3 more

Merged DEN-12224

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

2:44 pm

Dara Navaei

More
8fe65bf
changed 18 files
DEN-12224-dg_hd_dev-switches-monitor, DEN-12845-sw_dev_sprint_s71_steve and 199 more DG-DEN-12224-7

DEN-12224 removed the build switches

- -37
- +52
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 17 more files in changeset.

Sunday 17 Apr 2022

4:59 pm

Dara Navaei

More
48ea28a
changed 5 files
DEN-14902-bootloader-for-dg, cdc-demo-branch-218 and 3 more

Merged DEN-12224

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

Wednesday 13 Apr 2022

1:38 pm

Dara Navaei

More
95eefee
changed 15 files
DEN-12224-dg_hd_dev-switches-monitor, DEN-12845-sw_dev_sprint_s71_steve and 199 more DG-DEN-12224-7

DEN-12224 updated the code with the alarms for the SRSs

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

Wednesday 06 Apr 2022

12:41 pm

Dara Navaei

More
750a8b6
changed 11 files
DEN-12224-dg_hd_dev-switches-monitor, DEN-12845-sw_dev_sprint_s71_steve and 199 more DG-DEN-12224-7

DEN-12224 tested the fill mode

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

Monday 04 Apr 2022

10:38 am

Dara Navaei

More
23fd384
changed 9 files
DEN-14902-bootloader-for-dg, cdc-demo-branch-218 and 3 more

Merged DEN-12224

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

9:31 am

Dara Navaei

More
9279d01
changed 12 files
DEN-14902-bootloader-for-dg, cdc-demo-branch-218 and 3 more

Merged DEN-11928

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

Thursday 31 Mar 2022

9:07 pm

Dara Navaei

More
66cc826
changed 13 files
DEN-12224-dg_hd_dev-switches-monitor, DEN-12845-sw_dev_sprint_s71_steve and 199 more DG-DEN-12224-7

DEN-12224 merged staging

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

2:27 pm

Dara Navaei

More
604d8aa
changed 17 files
DEN-12224-dg_hd_dev-switches-monitor, DEN-12845-sw_dev_sprint_s71_steve and 200 more DG-DEN-12224-7

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

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

1:55 pm

Dara Navaei

More
c7ed4f9
changed 16 files
DEN-11928-dg-conductivity-update-den-tbd, DEN-12224-dg_hd_dev-switches-monitor and 201 more DG-DEN-11928-1

DEN-11928 merged staging

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

9:09 am

Dara Navaei

More
674e18b
changed 4 files
DEN-11928-dg-conductivity-update-den-tbd, DEN-12224-dg_hd_dev-switches-monitor and 201 more DG-DEN-11928-1

DEN-11928 addressed the code review comments

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

Wednesday 30 Mar 2022

4:31 pm

Dara Navaei

More
aa8dbad
changed 9 files
DEN-11928-dg-conductivity-update-den-tbd, DEN-12224-dg_hd_dev-switches-monitor and 201 more DG-DEN-11928-1

DEN-11928 updated the alarms and fill mode

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

Wednesday 23 Mar 2022

2:37 pm

Dara Navaei

More
73f039b
changed 3 files
DEN-14902-bootloader-for-dg, cdc-demo-branch-218 and 3 more

Merged DEN-12224

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

2:33 pm

Dara Navaei

More
3414e47
changed 6 files
DEN-12224-dg_hd_dev-switches-monitor, DEN-12845-sw_dev_sprint_s71_steve and 199 more DG-DEN-12224-7

DEN-12224 worked on the concentrate pumps

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

Tuesday 22 Mar 2022

3:43 pm

Hung Nguyen <hnguyen@diality.com>

More
069fa54
changed 1 file
DEN-11928-dg-conductivity-update-den-tbd, DEN-12224-dg_hd_dev-switches-monitor and 201 more DG-DEN-11928-1

DEN-11928 Updated per peer review comments

- -2
- +2
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c

Monday 21 Mar 2022

12:20 pm

Dara Navaei

More
1634157
changed 3 files
DEN-14902-bootloader-for-dg, cdc-demo-branch-218 and 3 more

Merged DEN-12224

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

12:16 pm

Dara Navaei

More
867521a
changed 8 files
DEN-12224-dg_hd_dev-switches-monitor, DEN-12845-sw_dev_sprint_s71_steve and 199 more DG-DEN-12224-7

DEN-12224, DEN-12436 removed the concentrate pumps requested flow fault alarm if it was out of range

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

Friday 18 Mar 2022

5:39 pm

Hung Nguyen <hnguyen@diality.com>

More
0c59960
changed 5 files
DEN-11928-dg-conductivity-update-den-tbd, DEN-12224-dg_hd_dev-switches-monitor and 201 more DG-DEN-11928-1

DEN-11928 Updated per peer review comments

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

Tuesday 15 Mar 2022

6:29 pm

Hung Nguyen <hnguyen@diality.com>

More
9c6a93c
changed 1 file
DEN-11928-dg-conductivity-update-den-tbd, DEN-12224-dg_hd_dev-switches-monitor and 201 more DG-DEN-11928-1

DEN-11928 Corrected conductivity checking

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

Tuesday 08 Mar 2022

5:22 pm

Dara Navaei

More
35c0719
changed 10 files
DEN-14902-bootloader-for-dg, cdc-demo-branch-218 and 3 more

Merged DEN-12224 and resolved the conflicts

- -4
- +4
./ConductivitySensors.c
- History
- Source
- Diff
./ConductivitySensors.c
… 9 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

Sean Nash

Dara Navaei

Bill Bracken <bbracken@diality.com>

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

Dara Navaei

Dara Navaei

Hung Nguyen <hnguyen@diality.com>

Dara Navaei

Dara Navaei

Hung Nguyen <hnguyen@diality.com>

Hung Nguyen <hnguyen@diality.com>

Dara Navaei