Activity dgfirmware/

3:57 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
b80c02d
changed 0 files
develop

Merge branch 'DEN-15714-ee-alarm-84-hd-rtc-time-after-cycling-dg-and-hd-dvt-021' into develop

3:51 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
d06fe84
changed 1 file
develop

DEN-15714 Correct baro sensor CRC check. Remove BETA reference. Check now runs in both RELEASE and DEBUG builds.

- -3
- +1
/firmware/App/Controllers/TemperatureSensors.c
- History
- Source
- Diff
/firmware/App/.../TemperatureSensors.c

10:07 am

Dara Navaei

More
2ba1ac0
changed 1 file
develop

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

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

10:05 am

Sean Nash

More
b67f08d
changed 0 files
develop

Fixed merge conflict.

9:54 am

Sean Nash

More
6747acd
changed 1 file
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 97 more DG-DEN-15867-1

DEN-15867: Fix for issue where concentrate prime/test was being done twice in pre-tx.

- -4
- +4
/firmware/App/Modes/ModeStandby.c
- History
- Source
- Diff
/firmware/App/Modes/ModeStandby.c

9:44 am

Dara Navaei

More
667e090
changed 1 file
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 98 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:16 pm

Dara Navaei

More
432b32b
changed 1 file
develop

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

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

2:10 pm

Dara Navaei

More
6e57ef3
changed 4 files
develop

Merged staging

- -1
- +1
/firmware/App/Controllers/ConcentratePumps.c
- History
- Source
- Diff
/firmware/App/.../ConcentratePumps.c
- -2
- +2
/firmware/App/Controllers/ConductivitySensors.c
- History
- Source
- Diff
/firmware/App/.../ConductivitySensors.c
- -1
- +1
/firmware/App/Modes/ModeFill.c
- History
- Source
- Diff
/firmware/App/Modes/ModeFill.c
- -1
- +1
/firmware/App/Services/SystemCommMessages.c
- History
- Source
- Diff
/firmware/App/.../SystemCommMessages.c

1:16 pm

Dara Navaei

More
fc69a13
changed 1 file
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 98 more

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

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

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

1:14 pm

Darren Cox <darren_m@cox.net>

More
3377c19
changed 1 file
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 98 more

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

- -45
- +59
/firmware/App/Controllers/TemperatureSensors.c
- History
- Source
- Diff
/firmware/App/.../TemperatureSensors.c

12:56 pm

Dara Navaei

More
0558c11
changed 1 file
develop

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

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

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
/firmware/App/Controllers/ConductivitySensors.c
- History
- Source
- Diff
/firmware/App/.../ConductivitySensors.c
- -45
- +59
/firmware/App/Controllers/TemperatureSensors.c
- History
- Source
- Diff
/firmware/App/.../TemperatureSensors.c
- -14
- +11
/firmware/App/Modes/ModeStandby.c
- History
- Source
- Diff
/firmware/App/Modes/ModeStandby.c

11:30 am

Dara Navaei

More
ad50d45
changed 1 file
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 98 more

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

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

11:30 am

Dara Navaei

More
39c8361
changed 11 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
/firmware/App/Controllers/ConcentratePumps.c
- History
- Source
- Diff
/firmware/App/.../ConcentratePumps.c
- -1
- +1
/firmware/App/Controllers/TemperatureSensors.c
- History
- Source
- Diff
/firmware/App/.../TemperatureSensors.c
- -1
- +1
/firmware/App/Modes/ModeChemicalDisinfect.c
- History
- Source
- Diff
/firmware/App/.../ModeChemicalDisinfect.c
- -1
- +1
/firmware/App/Modes/ModeChemicalDisinfectFlush.c
- History
- Source
- Diff
/firmware/.../ModeChemicalDisinfectFlush.c
- -1
- +1
/firmware/App/Modes/ModeDrain.c
- History
- Source
- Diff
/firmware/App/Modes/ModeDrain.c
- -1
- +1
/firmware/App/Modes/ModeFill.c
- History
- Source
- Diff
/firmware/App/Modes/ModeFill.c
- -1
- +1
/firmware/App/Modes/ModeFlush.c
- History
- Source
- Diff
/firmware/App/Modes/ModeFlush.c
- -1
- +1
/firmware/App/Modes/ModeGenIdle.c
- History
- Source
- Diff
/firmware/App/Modes/ModeGenIdle.c
- -2
- +2
/firmware/App/Modes/ModeHeatDisinfect.c
- History
- Source
- Diff
/firmware/App/Modes/ModeHeatDisinfect.c
- -1
- +1
/firmware/App/Modes/ModeHeatDisinfectActiveCool.c
- History
- Source
- Diff
/firmware/.../ModeHeatDisinfectActiveCool.c
- -2
- +2
/firmware/App/Services/SystemCommMessages.c
- History
- Source
- Diff
/firmware/App/.../SystemCommMessages.c

11:10 am

Dara Navaei

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

Merged DEN-15660

9:36 am

Dara Navaei

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

Merge branch 'staging' into DEN-15660-test_configuration_treatment_recovery

4:34 pm

Dara Navaei

More
beb5fc0
changed 1 file
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 98 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:34 pm

Dara Navaei

More
7d652fb
changed 1 file
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
/firmware/App/Controllers/Voltages.c
- History
- Source
- Diff
/firmware/App/Controllers/Voltages.c

4:33 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
43f6d26
changed 0 files
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 98 more

Merge remote-tracking branch 'origin/DEN-15608-alarm-77-failing-to-trigger-for-lower-bound-values' into staging

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

4:02 pm

Dara Navaei

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

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

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
/firmware/App/Controllers/ConductivitySensors.c
- History
- Source
- Diff
/firmware/App/.../ConductivitySensors.c
- -44
- +44
/firmware/App/Controllers/Pressures.c
- History
- Source
- Diff
/firmware/App/Controllers/Pressures.c
- -49
- +49
/firmware/App/Controllers/TemperatureSensors.c
- History
- Source
- Diff
/firmware/App/.../TemperatureSensors.c

2:30 pm

Dara Navaei

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

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

2:26 pm

Dara Navaei

Changed the heat disinfect transfer rate from 800 mL/min to 500 mL/min

- -1
- +1
/firmware/App/Modes/ModeHeatDisinfect.c
- History
- Source
- Diff
/firmware/App/Modes/ModeHeatDisinfect.c

2:08 pm

Dara Navaei

More
5459464
changed 1 file
develop

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

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

2:07 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
ab8edc7
changed 0 files
develop

Merge remote-tracking branch 'origin/DEN-15608-alarm-77-failing-to-trigger-for-lower-bound-values' into develop

# Conflicts:

# firmware/App/DGCommon.h

2:00 pm

Bill Bracken <bill@criticalsoftwaresolutions.com>

More
c4d2a49
changed 1 file
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 99 more DG-DEN-15608-1

DEN-15608 Correct monitoring of voltages

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

1:19 pm

Dara Navaei

More
75f5cf4
changed 5 files
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 98 more DG-DEN-15660-1

Merge branch 'staging' into DEN-15660-test_configuration_treatment_recovery

- -22
- +54
/firmware/App/Controllers/ConcentratePumps.c
- History
- Source
- Diff
/firmware/App/.../ConcentratePumps.c
- -6
- +11
/firmware/App/Modes/ModeFlush.c
- History
- Source
- Diff
/firmware/App/Modes/ModeFlush.c
- -3
- +3
/firmware/App/Modes/ModeHeatDisinfect.c
- History
- Source
- Diff
/firmware/App/Modes/ModeHeatDisinfect.c
- -2
- +9
/firmware/App/Modes/ModeHeatDisinfectActiveCool.c
- History
- Source
- Diff
/firmware/.../ModeHeatDisinfectActiveCool.c
- -3
- +6
/firmware/App/Services/SystemCommMessages.c
- History
- Source
- Diff
/firmware/App/.../SystemCommMessages.c

11:15 am

Dara Navaei

More
ae3c351
changed 1 file
DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-can-messge-not-acked-fix and 99 more

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

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

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

Sean Nash

Sean Nash

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Darren Cox <darren_m@cox.net>

Dara Navaei

Darren Cox <darren_m@cox.net>

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Dara Navaei

Bill Bracken <bill@criticalsoftwaresolutions.com>

Darren Cox <darren_m@cox.net>

Dara Navaei

Darren Cox <darren_m@cox.net>

Dara Navaei

Dara Navaei

Dara Navaei

Bill Bracken <bill@criticalsoftwaresolutions.com>

Bill Bracken <bill@criticalsoftwaresolutions.com>

Dara Navaei

Dara Navaei