Activity dgfirmware/firmware

5:12 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

Merge remote-tracking branch 'origin/develop' into develop

- -18
- +20
./App/Controllers/Heaters.c
- History
- Source
- Diff
./App/Controllers/Heaters.c

4:59 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
4468dcb
changed 7 files
DEN-14902-bootloader-for-dg, develop DG-DEN-14902-1

Merge branch 'DEN-12974-miscellaneous-flush-issues_bb' into develop

# Conflicts:

# firmware/App/Controllers/DialysateFlow.c

# firmware/App/Controllers/Heaters.c

# firmware/App/Controllers/ROPump.h

- -1
- +1
./App/Controllers/DialysateFlow.c
- History
- Source
- Diff
./App/Controllers/DialysateFlow.c
- -0
- +1
./App/Controllers/Heaters.c
- History
- Source
- Diff
./App/Controllers/Heaters.c
- -3
- +3
./App/Controllers/ROPump.c
- History
- Source
- Diff
./App/Controllers/ROPump.c
- -2
- +2
./App/Controllers/ROPump.h
- History
- Source
- Diff
./App/Controllers/ROPump.h
- -41
- +35
./App/Modes/ModeChemicalDisinfect.c
- History
- Source
- Diff
./App/Modes/ModeChemicalDisinfect.c
- -8
- +8
./App/Modes/ModeFlush.c
- History
- Source
- Diff
./App/Modes/ModeFlush.c
- -41
- +35
./App/Modes/ModeHeatDisinfect.c
- History
- Source
- Diff
./App/Modes/ModeHeatDisinfect.c

4:52 pm

Dara Navaei

More
DG-DEN-12974-1
Closed

3:55 pm

Sean Nash

More
DG-DEN-12974-1
finished reviewing

1:51 pm

Dara Navaei

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

- -1
- +1
./App/DGCommon.h
- History
- Source
- Diff
./App/DGCommon.h

1:49 pm

Dara Navaei

Merge branch 'DEN-13460-dg_hd_dev-hd_dg_dvt-update-part-2' into develop

- -18
- +20
./App/Controllers/Heaters.c
- History
- Source
- Diff
./App/Controllers/Heaters.c
- -4
- +17
./App/Controllers/TemperatureSensors.c
- History
- Source
- Diff
./App/Controllers/TemperatureSensors.c

1:49 pm

Dara Navaei

More
788c0f9
changed 2 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 189 more DG-DEN-13460-2

DEN-13460 updated the heaters control

- -18
- +20
./App/Controllers/Heaters.c
- History
- Source
- Diff
./App/Controllers/Heaters.c
- -4
- +17
./App/Controllers/TemperatureSensors.c
- History
- Source
- Diff
./App/Controllers/TemperatureSensors.c

2:29 pm

Dara Navaei

More
e14e093
changed 1 file
DEN-14902-bootloader-for-dg, cdc-demo-branch-218, develop

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

- -1
- +1
./App/DGCommon.h
- History
- Source
- Diff
./App/DGCommon.h

2:27 pm

Dara Navaei

More
231ca86
changed 1 file
DEN-14902-bootloader-for-dg, cdc-demo-branch-218, develop

Merge branch 'DEN-13460-dg_hd_dev-hd_dg_dvt-update-part-2' into develop

- -14
- +38
./App/Controllers/TemperatureSensors.c
- History
- Source
- Diff
./App/Controllers/TemperatureSensors.c

2:23 pm

Dara Navaei

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

DEN-13460 updated the temperature sensors

- -14
- +38
./App/Controllers/TemperatureSensors.c
- History
- Source
- Diff
./App/Controllers/TemperatureSensors.c
- -3
- +11
./App/Services/FPGA.c
- History
- Source
- Diff
./App/Services/FPGA.c

2:03 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
87ebf31
changed 9 files
DEN-12974-miscellaneous-flush-issues_bb, DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle and 192 more DG-DEN-12974-1

Merge branch 'staging' into DEN-12974-miscellaneous-flush-issues_bb

# Conflicts:

# firmware/App/Controllers/TemperatureSensors.c

- -191
- +264
./App/Controllers/ConductivitySensors.c
- History
- Source
- Diff
./App/Controllers/ConductivitySensors.c
- -19
- +12
./App/Controllers/DialysateFlow.c
- History
- Source
- Diff
./App/Controllers/DialysateFlow.c
- -16
- +5
./App/Controllers/DrainPump.c
- History
- Source
- Diff
./App/Controllers/DrainPump.c
- -119
- +87
./App/Controllers/Heaters.c
- History
- Source
- Diff
./App/Controllers/Heaters.c
- -29
- +33
./App/Controllers/ROPump.c
- History
- Source
- Diff
./App/Controllers/ROPump.c
- -2
- +2
./App/Controllers/ROPump.h
- History
- Source
- Diff
./App/Controllers/ROPump.h
- -2
- +2
./App/Modes/ModeChemicalDisinfect.c
- History
- Source
- Diff
./App/Modes/ModeChemicalDisinfect.c
- -1
- +1
./App/Modes/ModeFlush.c
- History
- Source
- Diff
./App/Modes/ModeFlush.c
- -15
- +8
./App/Modes/ModeHeatDisinfect.c
- History
- Source
- Diff
./App/Modes/ModeHeatDisinfect.c

12:55 pm

Dara Navaei

More
7184917
changed 1 file
intertek_branch

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

- -1
- +1
./App/DGCommon.h
- History
- Source
- Diff
./App/DGCommon.h

12:55 pm

Dara Navaei

More
4e47dd9
changed 1 file
intertek_branch

Updated the heaters internal temperature sensors

- -14
- +37
./App/Controllers/TemperatureSensors.c
- History
- Source
- Diff
./App/Controllers/TemperatureSensors.c

3:45 pm

Sean Nash

More
Re: DG-DEN-12974-1
replied to Sean Nash

RESOLVED in CODE WALKTHROUGH.

3:44 pm

Sean Nash

More
Re: DG-DEN-12974-1
replied to Sean Nash

RESOLVED in CODE WALKTHROUGH.

3:43 pm

Sean Nash

RESOLVED in CODE WALKTHROUGH.

3:42 pm

Sean Nash

RESOLVED in CODE WALKTHROUGH.

3:42 pm

Sean Nash

RESOLVED in CODE WALKTHROUGH.

3:41 pm

Sean Nash

RESOLVED in CODE WALKTHROUGH.

3:40 pm

Sean Nash

RESOLVED in CODE WALKTHROUGH.

3:40 pm

Sean Nash

More
Re: DG-DEN-12974-1
replied to wbracken (deleted user)

RESOLVED in CODE WALKTHROUGH.

3:39 pm

Sean Nash

More
Re: DG-DEN-12974-1
replied to Sean Nash

RESOLVED in CODE WALKTHROUGH.

3:39 pm

Sean Nash

More
Re: DG-DEN-12974-1
replied to Sean Nash

RESOLVED in CODE WALKTHROUGH.

3:38 pm

Sean Nash

More
Re: DG-DEN-12974-1
replied to Sean Nash

RESOLVED in CODE WALKTHROUGH.

3:38 pm

Sean Nash

More
Re: DG-DEN-12974-1
replied to wbracken (deleted user)

RESOLVED in CODE WALKTHROUGH.

3:37 pm

Sean Nash

More
Re: DG-DEN-12974-1
replied to wbracken (deleted user)

RESOLVED in CODE WALKTHROUGH.

3:37 pm

Sean Nash

More
Re: DG-DEN-12974-1
replied to wbracken (deleted user)

RESOLVED in CODE WALKTHROUGH.

3:37 pm

Sean Nash

More
Re: DG-DEN-12974-1
replied to wbracken (deleted user)

RESOLVED in CODE WALKTHROUGH.

3:37 pm

Sean Nash

More
Re: DG-DEN-12974-1
replied to wbracken (deleted user)

RESOLVED in CODE WALKTHROUGH.

3:36 pm

Sean Nash

More
Re: DG-DEN-12974-1
replied to wbracken (deleted user)

RESOLVED in CODE WALKTHROUGH.

firmware

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>

Dara Navaei

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

Sean Nash

Sean Nash

Sean Nash

Sean Nash

Sean Nash

Sean Nash

Sean Nash

Sean Nash

Sean Nash

Sean Nash

Sean Nash

Sean Nash

Sean Nash

Sean Nash

Sean Nash

Sean Nash