dgfirmware / firmware / App / Controllers

ConductivitySensors.c

Clone Tools

Stats

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

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Wednesday 29 Mar 2023
8:39 am

Dara Navaei

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

Options
    • -1
    • +1
    ./ConductivitySensors.c
  2. … 7 more files in changeset.
Tuesday 28 Mar 2023
5:27 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

Merge branch 'staging' into DEN-14646-fpga-alarm-properties-and-timing-3

Options
    • -7
    • +15
    ./ConductivitySensors.c
  2. … 4 more files in changeset.
4:48 pm

Dara Navaei

DEN-15014 addressed the code review comments

Options
    • -1
    • +1
    ./ConductivitySensors.c
  2. … 5 more files in changeset.
11:16 am

Dara Navaei

Merged staging

Options
    • -1
    • +2
    ./ConductivitySensors.c
  2. … 7 more files in changeset.
Monday 27 Mar 2023
11:29 am

Dara Navaei

DEN-15014 added code to support RO only mode

Options
    • -3
    • +25
    ./ConductivitySensors.c
  2. … 6 more files in changeset.
Wednesday 22 Mar 2023
2:23 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

DEN-14646 Updates per code review.

Options
    • -7
    • +3
    ./ConductivitySensors.c
Tuesday 21 Mar 2023
4:48 pm

Dara Navaei

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

Options
    • -1
    • +1
    ./ConductivitySensors.c
  2. … 17 more files in changeset.
Wednesday 15 Mar 2023
5:19 pm

Dara Navaei

DEN-14763 addressed the code review comments and added inlet water conditions to the heat disinfect active cool

Options
    • -0
    • +1
    ./ConductivitySensors.c
  2. … 7 more files in changeset.
Tuesday 14 Mar 2023
1:41 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

DEN-14646 Update per code review comments.

Options
    • -18
    • +5
    ./ConductivitySensors.c
  2. … 5 more files in changeset.
Friday 10 Mar 2023
1:44 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

DEN-14646 - Remove code inserted for debugging. Enable FPGA clock speed check and watchdog check.

Options
    • -17
    • +1
    ./ConductivitySensors.c
  2. … 4 more files in changeset.
Wednesday 08 Mar 2023
6:33 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

DEN-14646 Use typedefs in voltages.c to improve debugging. Correct counting FPGA timeouts twice if write values ACK not received. Correct handling of emstat response status values.

Options
    • -14
    • +49
    ./ConductivitySensors.c
  2. … 2 more files in changeset.
Friday 24 Feb 2023
3:18 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

DEN-14646 Add buffer protection for emStat. Add NAK, CRC and timeout check for response to write actuators.

Options
    • -47
    • +5
    ./ConductivitySensors.c
  2. … 1 more file in changeset.
Thursday 23 Feb 2023
1:26 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

DEN-14646 Add window timer support for communications alarms. Debug code for testing conductivity sensor FPGA generated alarms.

Options
    • -1
    • +41
    ./ConductivitySensors.c
  2. … 1 more file in changeset.
Friday 10 Feb 2023
3:23 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

DEN-1646 - Update for conductivity sensor alarms.

Options
    • -9
    • +26
    ./ConductivitySensors.c
3:22 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

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

Options
    • -0
    • +1
    ./ConductivitySensors.c
  2. … 3 more files in changeset.
Monday 06 Feb 2023
1:03 pm

Sean Nash

Fixed merge conflict.

Options
    • -1
    • +1
    ./ConductivitySensors.c
  2. … 6 more files in changeset.
Saturday 04 Feb 2023
3:19 pm

Sean Nash

Fixed merge conflicts.

Options
    • -5
    • +21
    ./ConductivitySensors.c
  2. … 6 more files in changeset.
Friday 03 Feb 2023
1:48 pm

Dara Navaei

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

Options
    • -1
    • +1
    ./ConductivitySensors.c
  2. … 15 more files in changeset.
Thursday 02 Feb 2023
8:41 am

Dara Navaei

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

Options
    • -5
    • +21
    ./ConductivitySensors.c
  2. … 6 more files in changeset.
Thursday 19 Jan 2023
11:30 am

Dara Navaei

Merged staging with the latest updates

Options
    • -7
    • +7
    ./ConductivitySensors.c
  2. … 4 more files in changeset.
11:22 am

Dara Navaei

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

Options
    • -1
    • +1
    ./ConductivitySensors.c
  2. … 22 more files in changeset.
Wednesday 18 Jan 2023
3:34 pm

Dara Navaei

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

Options
    • -4
    • +4
    ./ConductivitySensors.c
  2. … 10 more files in changeset.
Tuesday 17 Jan 2023
10:38 am

Dara Navaei

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

Options
    • -2
    • +2
    ./ConductivitySensors.c
  2. … 12 more files in changeset.
Thursday 12 Jan 2023
5:02 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

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

# Conflicts:

# firmware/App/DGCommon.h

Options
    • -1
    • +1
    ./ConductivitySensors.c
  2. … 8 more files in changeset.
Wednesday 11 Jan 2023
2:13 pm

Dara Navaei

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

Options
    • -1
    • +1
    ./ConductivitySensors.c
  2. … 23 more files in changeset.
10:32 am

Dara Navaei

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

Options
    • -1
    • +1
    ./ConductivitySensors.c
  2. … 23 more files in changeset.
Tuesday 10 Jan 2023
3:33 pm

Sean Nash

Fixed merge conflicts.

Options
    • -52
    • +28
    ./ConductivitySensors.c
  2. … 22 more files in changeset.
Monday 09 Jan 2023
3:04 pm

Dara Navaei

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

Options
    • -16
    • +27
    ./ConductivitySensors.c
  2. … 10 more files in changeset.
Friday 06 Jan 2023
5:38 pm

Sean Nash

DEN-14497: Changed CPo and RR alarms to only occur at end of fill based on average conductivity.

Options
    • -34
    • +0
    ./ConductivitySensors.c
  2. … 4 more files in changeset.
Thursday 05 Jan 2023
9:56 am

Sean Nash

Fixed merge conflicts.

Options
    • -2
    • +2
    ./ConductivitySensors.c
  2. … 13 more files in changeset.