Activity dgfirmware/

4:03 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

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

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

4:03 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
a15cd6e
changed 1 file
DEN-14902-bootloader-for-dg, cdc-demo-branch-218 and 3 more

Merge correction

- -4
- +2
/firmware/App/Controllers/ROPump.c
- History
- Source
- Diff
/firmware/App/Controllers/ROPump.c

4:00 pm

Dara Navaei

More
9d5a331
changed 1 file
DEN-14902-bootloader-for-dg, cdc-demo-branch-218 and 3 more

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

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

4:00 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

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

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

4:00 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
044928a
changed 1 file
DEN-14902-bootloader-for-dg, cdc-demo-branch-218 and 3 more

Correct merge issue.

- -2
- +6
/firmware/App/Controllers/ROPump.c
- History
- Source
- Diff
/firmware/App/Controllers/ROPump.c

3:51 pm

Dara Navaei

More
f00f71d
changed 1 file
DEN-14902-bootloader-for-dg, cdc-demo-branch-218 and 3 more

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

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

3:51 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

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

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

3:51 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

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

Remove some debug statements.

- -1
- +1
/firmware/App/Controllers/ConductivitySensors.c
- History
- Source
- Diff
/firmware/App/.../ConductivitySensors.c
- -1
- +1
/firmware/App/Controllers/ROPump.c
- History
- Source
- Diff
/firmware/App/Controllers/ROPump.c

3:40 pm

Dara Navaei

More
7f02d61
changed 1 file
DEN-14902-bootloader-for-dg, cdc-demo-branch-218 and 3 more

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

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

3:38 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
2a791a5
changed 6 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

- -8
- +19
/firmware/App/Controllers/ConductivitySensors.c
- History
- Source
- Diff
/firmware/App/.../ConductivitySensors.c
- -0
- +2
/firmware/App/Controllers/ROPump.c
- History
- Source
- Diff
/firmware/App/Controllers/ROPump.c
- -1
- +0
/firmware/App/Controllers/ROPump.h
- History
- Source
- Diff
/firmware/App/Controllers/ROPump.h
- -29
- +28
/firmware/App/Modes/ModeChemicalDisinfect.c
- History
- Source
- Diff
/firmware/App/.../ModeChemicalDisinfect.c
- -24
- +23
/firmware/App/Modes/ModeFlush.c
- History
- Source
- Diff
/firmware/App/Modes/ModeFlush.c
- -34
- +33
/firmware/App/Modes/ModeHeatDisinfect.c
- History
- Source
- Diff
/firmware/App/Modes/ModeHeatDisinfect.c

3:31 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
9334347
changed 5 files
DEN-12974-miscellaneous-flush-issues_bb, DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle and 195 more DG-DEN-12974-1

Revert "DEN-13047 Implement unique haveDrainParamsBeenInit for both reservoirs."

This reverts commit 81872acd6f2ce222c6b9a9b93f65b7cd3665f28f.

- -1
- +0
/firmware/App/Controllers/ROPump.h
- History
- Source
- Diff
/firmware/App/Controllers/ROPump.h
- -2
- +2
/firmware/App/Controllers/UVReactors.c
- History
- Source
- Diff
/firmware/App/Controllers/UVReactors.c
- -29
- +28
/firmware/App/Modes/ModeChemicalDisinfect.c
- History
- Source
- Diff
/firmware/App/.../ModeChemicalDisinfect.c
- -24
- +23
/firmware/App/Modes/ModeFlush.c
- History
- Source
- Diff
/firmware/App/Modes/ModeFlush.c
- -34
- +33
/firmware/App/Modes/ModeHeatDisinfect.c
- History
- Source
- Diff
/firmware/App/Modes/ModeHeatDisinfect.c

3:29 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
3c4e97c
changed 0 files
DEN-12974-miscellaneous-flush-issues_bb, DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle and 195 more

Finish Feature-1

3:27 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
43fdad4
changed 3 files
DEN-12974-miscellaneous-flush-issues_bb, DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle and 195 more DG-DEN-12974-1 DG-UCOMMITS-38

Testing of printf

- -9
- +19
/firmware/App/Controllers/ConductivitySensors.c
- History
- Source
- Diff
/firmware/App/.../ConductivitySensors.c
- -2
- +2
/firmware/App/Controllers/DrainPump.c
- History
- Source
- Diff
/firmware/App/Controllers/DrainPump.c
- -0
- +2
/firmware/App/Controllers/ROPump.c
- History
- Source
- Diff
/firmware/App/Controllers/ROPump.c

11:34 am

Dara Navaei

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

Merge branch 'staging' into DEN-12931-dg_hd_dev-hd_dg_dvt-update

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

5:42 pm

Dara Navaei

More
0a1c998
changed 1 file
DEN-12847-sw_dev_sprint_71_darren, DEN-12931-dg_hd_dev-hd_dg_dvt-update and 197 more

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

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

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
/firmware/App/Controllers/ConductivitySensors.c
- History
- Source
- Diff
/firmware/App/.../ConductivitySensors.c
- -1
- +1
/firmware/App/Controllers/Switches.c
- History
- Source
- Diff
/firmware/App/Controllers/Switches.c
- -1
- +1
/firmware/App/Controllers/Switches.h
- History
- Source
- Diff
/firmware/App/Controllers/Switches.h

5:27 pm

Dara Navaei

More
DG-DEN-12845-2
Closed

5:07 pm

Sean Nash and Michael Garthwaite

More
DG-DEN-12845-2
finished reviewing

2:36 pm

Dara Navaei

More
b490bf4
changed 1 file
DEN-14902-bootloader-for-dg, cdc-demo-branch-218 and 3 more

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

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

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

- -0
- +25
/firmware/App/Controllers/ConcentratePumps.c
- History
- Source
- Diff
/firmware/App/.../ConcentratePumps.c
- -2
- +0
/firmware/App/Controllers/ConductivitySensors.c
- History
- Source
- Diff
/firmware/App/.../ConductivitySensors.c
- -13
- +18
/firmware/App/Controllers/Heaters.c
- History
- Source
- Diff
/firmware/App/Controllers/Heaters.c
- -23
- +24
/firmware/App/Controllers/ROPump.c
- History
- Source
- Diff
/firmware/App/Controllers/ROPump.c
- -1
- +1
/firmware/App/Controllers/ROPump.h
- History
- Source
- Diff
/firmware/App/Controllers/ROPump.h
- -6
- +10
/firmware/App/Controllers/TemperatureSensors.c
- History
- Source
- Diff
/firmware/App/.../TemperatureSensors.c
- -0
- +2
/firmware/App/DGCommon.h
- History
- Source
- Diff
/firmware/App/DGCommon.h
- -1
- +1
/firmware/App/Modes/ModeChemicalDisinfect.c
- History
- Source
- Diff
/firmware/App/.../ModeChemicalDisinfect.c
- -7
- +1
/firmware/App/Modes/ModeFlush.c
- History
- Source
- Diff
/firmware/App/Modes/ModeFlush.c
- -14
- +7
/firmware/App/Modes/ModeHeatDisinfect.c
- History
- Source
- Diff
/firmware/App/Modes/ModeHeatDisinfect.c
- -1
- +200
/firmware/App/Services/FPGA.c
- History
- Source
- Diff
/firmware/App/Services/FPGA.c
- -2
- +34
/firmware/App/Services/SystemCommMessages.c
- History
- Source
- Diff
/firmware/App/.../SystemCommMessages.c

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
/firmware/App/Controllers/ConductivitySensors.c
- History
- Source
- Diff
/firmware/App/.../ConductivitySensors.c
- -2
- +2
/firmware/App/Controllers/Switches.c
- History
- Source
- Diff
/firmware/App/Controllers/Switches.c

10:41 am

Dara Navaei

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

Merge branch 'staging' into DEN-12845-sw_dev_sprint_s71_steve

- -3
- +2
/firmware/App/Controllers/Switches.c
- History
- Source
- Diff
/firmware/App/Controllers/Switches.c
- -5
- +5
/firmware/App/Controllers/Switches.h
- History
- Source
- Diff
/firmware/App/Controllers/Switches.h

6:20 pm

Dara Navaei

More
e43f13e
changed 1 file
DEN-14902-bootloader-for-dg, cdc-demo-branch-218 and 3 more

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

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

6:20 pm

Bill Bracken <bbracken@diality.com>

More
87b1872
changed 2 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

- -1
- +4
/firmware/.launches/DG.launch
- History
- Source
- Diff
/firmware/.launches/DG.launch
- -23
- +24
/firmware/App/Modes/ModeFlush.c
- History
- Source
- Diff
/firmware/App/Modes/ModeFlush.c

5:59 pm

Sean Nash

More
cd9a00b
changed 0 files
DEN-12931-dg_hd_dev-hd_dg_dvt-update, DEN-12974-miscellaneous-flush-issues_bb and 196 more

Merge branch 'DEN-12931-dg_hd_dev-hd_dg_dvt-update' of ssh://dvm-linux02:7999/dg/dgfirmware into DEN-12931-dg_hd_dev-hd_dg_dvt-update

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
/firmware/App/Controllers/ConductivitySensors.c
- History
- Source
- Diff
/firmware/App/.../ConductivitySensors.c

11:06 am

Sean Nash

RESOLVED in CODE WALKTHROUGH.

11:06 am

Sean Nash

RESOLVED in CODE WALKTHROUGH.

11:05 am

Sean Nash

RESOLVED in CODE WALKTHROUGH.

11:05 am

Sean Nash

RESOLVED in CODE WALKTHROUGH.

dgfirmware

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

Bill Bracken <bill@criticalsoftwaresolutions.com>

Bill Bracken <bill@criticalsoftwaresolutions.com>

Dara Navaei

Bill Bracken <bill@criticalsoftwaresolutions.com>

Bill Bracken <bill@criticalsoftwaresolutions.com>

Dara Navaei

Bill Bracken <bill@criticalsoftwaresolutions.com>

Bill Bracken <bill@criticalsoftwaresolutions.com>

Bill Bracken <bill@criticalsoftwaresolutions.com>

Bill Bracken <bill@criticalsoftwaresolutions.com>

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Sean Nash and Michael Garthwaite

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Bill Bracken <bbracken@diality.com>

Sean Nash

Sean Nash

Sean Nash

Sean Nash

Sean Nash

Sean Nash