Activity dgfirmware/

Tree
Accordion

Stats

Commits this week: 0

Total Committers:	17
Last Commit:	19 Nov 25
Commits this week:	0

Lines of code count not available

Commit Activity

last updated a few seconds ago

Constraints

Constraints: committers

Committer:

Log Comment:

Constraints: files

File Extension:

File Name:

Constraints: dates

Start Date:

Start Date:

End Date:

End Date:

Monday 21 Nov 2022

4:53 pm

Dara Navaei

More
ea42ed9
changed 3 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 179 more DG-UCOMMITS-38

DEN-14000 addressed the code review comments

- -2
- +1
/firmware/App/Drivers/CPLD.c
- History
- Source
- Diff
/firmware/App/Drivers/CPLD.c
- -0
- +1
/firmware/App/Services/AlarmMgmt.c
- History
- Source
- Diff
/firmware/App/Services/AlarmMgmt.c
- -97
- +97
/firmware/App/Services/SystemCommMessages.c
- History
- Source
- Diff
/firmware/App/.../SystemCommMessages.c

4:51 pm

Dara Navaei

More
9e91443
changed 1 file
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 179 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:51 pm

Dara Navaei

More
5e8f96e
changed 13 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 179 more DG-DEN-14307-1 DG-UCOMMITS-37 DG-DEN-14101-1 DG-DEN-14316-1 DG-DEN-14000-1 (+2 more)

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

- -2
- +2
/firmware/App/Controllers/ROPump.c
- History
- Source
- Diff
/firmware/App/Controllers/ROPump.c
- -2
- +2
/firmware/App/Controllers/ROPump.h
- History
- Source
- Diff
/firmware/App/Controllers/ROPump.h
- -2
- +2
/firmware/App/Modes/ModeFill.c
- History
- Source
- Diff
/firmware/App/Modes/ModeFill.c
- -2
- +2
/firmware/App/Modes/ModeFill.h
- History
- Source
- Diff
/firmware/App/Modes/ModeFill.h
- -2
- +2
/firmware/App/Modes/ModeGenIdle.c
- History
- Source
- Diff
/firmware/App/Modes/ModeGenIdle.c
- -2
- +2
/firmware/App/Modes/ModeGenIdle.h
- History
- Source
- Diff
/firmware/App/Modes/ModeGenIdle.h
- -2
- +2
/firmware/App/Modes/ModeInitPOST.c
- History
- Source
- Diff
/firmware/App/Modes/ModeInitPOST.c
- -2
- +2
/firmware/App/Services/AlarmMgmtSWFaults.h
- History
- Source
- Diff
/firmware/App/.../AlarmMgmtSWFaults.h
- -2
- +2
/firmware/App/Services/PIControllers.c
- History
- Source
- Diff
/firmware/App/Services/PIControllers.c
- -2
- +2
/firmware/App/Services/PIControllers.h
- History
- Source
- Diff
/firmware/App/Services/PIControllers.h
- -2
- +2
/firmware/App/Services/SystemComm.c
- History
- Source
- Diff
/firmware/App/Services/SystemComm.c
- -2
- +2
/firmware/App/Services/SystemCommMessages.c
- History
- Source
- Diff
/firmware/App/.../SystemCommMessages.c
- -2
- +2
/firmware/App/Services/SystemCommMessages.h
- History
- Source
- Diff
/firmware/App/.../SystemCommMessages.h

4:50 pm

Dara Navaei

Done.

Done.

4:49 pm

Sean Nash , jtaylor (deleted user) , Dara Navaei and wbracken (deleted user)

More
DG-DEN-14197-1
finished reviewing

4:46 pm

Michael Garthwaite

More
Re: DG-DEN-14000-1
commented on review

Does CPLD need to include sys comm?

Does CPLD need to include sys comm?

4:44 pm

jtaylor (deleted user)

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

4:42 pm

Dara Navaei

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

Done.

Done.

4:41 pm

Dara Navaei

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

Done.

Done.

4:03 pm

Sean Nash

More
Re: DG-DEN-14000-1
commented on review

This is a normal message - should be up above the test (dialin) messages.

This is a normal message - should be up above the test (dialin) messages.

3:59 pm

Sean Nash

More
Re: DG-DEN-14000-1
commented on review

Add extra blank line here.

Add extra blank line here.

3:55 pm

Sean Nash

More
9970969
changed 3 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 179 more DG-DEN-14000-1

DEN-14000: Changed CPLD status broadcast from on change basis to 1Hz interval.

- -5
- +2
/firmware/App/Drivers/CPLD.c
- History
- Source
- Diff
/firmware/App/Drivers/CPLD.c
- -0
- +2
/firmware/App/Drivers/CPLD.h
- History
- Source
- Diff
/firmware/App/Drivers/CPLD.h
- -1
- +2
/firmware/App/Services/AlarmMgmt.c
- History
- Source
- Diff
/firmware/App/Services/AlarmMgmt.c

3:37 pm

wbracken (deleted user)

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

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

3:30 pm

Dara Navaei

More
DG-DEN-14000-1
started review

DG-DEN-14000_SW Dev Sprint 80 Darren

DG-DEN-14000_SW Dev Sprint 80 Darren

3:29 pm

Michael Garthwaite

More
e6b9f04
changed 0 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 179 more

Merge branch 'DEN-14197-sw-s83-mg-pi-optimizations' into staging

3:29 pm

Michael Garthwaite

More
28b75f3
changed 4 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 180 more DG-DEN-14197-1

DEN-14197: Code review changes. Pre-merge fixes.

- -1
- +1
/firmware/App/Controllers/ROPump.c
- History
- Source
- Diff
/firmware/App/Controllers/ROPump.c
- -2
- +2
/firmware/App/Controllers/ROPump.h
- History
- Source
- Diff
/firmware/App/Controllers/ROPump.h
- -1
- +1
/firmware/App/Modes/ModeFill.c
- History
- Source
- Diff
/firmware/App/Modes/ModeFill.c
- -2
- +2
/firmware/App/Modes/ModeGenIdle.c
- History
- Source
- Diff
/firmware/App/Modes/ModeGenIdle.c

3:17 pm

Michael Garthwaite

More
f565edd
changed 6 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 180 more DG-DEN-14197-1

Merge branch 'staging' into DEN-14197-sw-s83-mg-pi-optimizations

- -3
- +4
/firmware/App/Controllers/ROPump.c
- History
- Source
- Diff
/firmware/App/Controllers/ROPump.c
- -11
- +21
/firmware/App/Modes/ModeFill.c
- History
- Source
- Diff
/firmware/App/Modes/ModeFill.c
- -4
- +5
/firmware/App/Modes/ModeFill.h
- History
- Source
- Diff
/firmware/App/Modes/ModeFill.h
- -1
- +13
/firmware/App/Services/SystemComm.c
- History
- Source
- Diff
/firmware/App/Services/SystemComm.c
- -10
- +105
/firmware/App/Services/SystemCommMessages.c
- History
- Source
- Diff
/firmware/App/.../SystemCommMessages.c
- -1
- +1
/firmware/App/Services/SystemCommMessages.h
- History
- Source
- Diff
/firmware/App/.../SystemCommMessages.h

3:16 pm

Michael Garthwaite

More
a265ac3
changed 3 files
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 180 more DG-DEN-14197-1

DEN-14197: pre-staging merge. code review comments.

- -1
- +1
/firmware/App/Modes/ModeFill.c
- History
- Source
- Diff
/firmware/App/Modes/ModeFill.c
- -1
- +1
/firmware/App/Services/PIControllers.h
- History
- Source
- Diff
/firmware/App/Services/PIControllers.h
- -28
- +0
/firmware/App/Services/SystemCommMessages.c
- History
- Source
- Diff
/firmware/App/.../SystemCommMessages.c

2:56 pm

Sean Nash

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

2:55 pm

Michael Garthwaite

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

Correct. Fixed. Thanks!

Correct. Fixed. Thanks!

2:55 pm

Michael Garthwaite

More
432b2a6
changed 1 file
DEN-13050-vpi-does-not-close-after-sample-water-returns-to-flush-idle, DEN-13154-heparin-syringe-empty-position-incorrect and 180 more DG-DEN-14197-1

DEN-14197: Addressed code review comments.

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

2:51 pm

Sean Nash

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

2:51 pm

Sean Nash

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

2:51 pm

Sean Nash

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

2:48 pm

Sean Nash

More
Re: DG-DEN-14197-1
commented on review

getROFeedbackVoltage() has been renamed, right?

getROFeedbackVoltage() has been renamed, right?

2:45 pm

Michael Garthwaite

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

inactiveReservoir is the correct variable name. it is defined at line 752 within this same function. In our current staging branch, this is named inactiveRsrvr. In develop, it's inactiveReservoir....

inactiveReservoir is the correct variable name. it is defined at line 752 within this same function.

In our current staging branch, this is named inactiveRsrvr. In develop, it's inactiveReservoir. Note that commit 2b6abbe does not show the change of name.

Regardless, it compiled when merging the working branch into develop. using crtl+f within the file shows that no other variable has the name inactiveRsrvr in my working branch. Using code composer's "Open declaration" of the variable points to to this data structure with this name.

/// Heaters data structure
typedef struct

F32 targetTemp; ///< Heater target temperature.
HEATERS_STATE_T state; ///< Heater state.
BOOL startHeaterSignal; ///< Heater start indication flag.
BOOL isHeaterOn; ///< Heater on/off status flag.
F32 dutyCycle; ///< Heater duty cycle.
F32 targetFlow; ///< Heater target flow.
BOOL hasTargetTempChanged; ///< Heater target temperature change flag indicator.
F32 heaterEstGain; ///< Heater estimation gain during the run.
BOOL hasTargetBeenReached; ///< Heater flag to indicate whether the target temperature has been reached.
F32 calculatedTemperature; ///< Heater calculated temperature.
DG_RESERVOIR_ID_T inactiveRsrvr; ///< Heater inactive reservoir.
HEATER_STATUS_T;

in heaters.c

So this is an odd one. maybe something got mixed up in a merge conflict?

2:44 pm

Sean Nash

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

2:44 pm

Sean Nash

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

2:44 pm

Michael Garthwaite

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

Fixed. Thanks!

Fixed. Thanks!

2:43 pm

Michael Garthwaite

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

Fixed. Thanks!

Fixed. Thanks!

Atlassian Fisheye Git analysis with Crucible code review. (Version:4.8.14 Build:20240111091859 2024-01-11 09:20) - Administration - Page generated 2026-03-26 00:20 -0700