dgfirmware

firmware

Clone Tools

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

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
Monday 21 Nov 2022
3:17 pm

Michael Garthwaite

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

Options
    • -3
    • +4
    ./App/Controllers/ROPump.c
    • -11
    • +21
    ./App/Modes/ModeFill.c
    • -4
    • +5
    ./App/Modes/ModeFill.h
    • -1
    • +13
    ./App/Services/SystemComm.c
    • -10
    • +105
    ./App/Services/SystemCommMessages.c
    • -1
    • +1
    ./App/Services/SystemCommMessages.h
3:16 pm

Michael Garthwaite

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

Options
    • -1
    • +1
    ./App/Modes/ModeFill.c
    • -1
    • +1
    ./App/Services/PIControllers.h
    • -28
    • +0
    ./App/Services/SystemCommMessages.c
2:56 pm

Sean Nash

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

2:55 pm

Michael Garthwaite

Correct. Fixed. Thanks!

Correct. Fixed. Thanks!

2:55 pm

Michael Garthwaite

DEN-14197: Addressed code review comments.

Options
    • -3
    • +2
    ./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

getROFeedbackVoltage() has been renamed, right?

getROFeedbackVoltage() has been renamed, right?

2:45 pm

Michael Garthwaite

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

Fixed. Thanks!

Fixed. Thanks!

2:43 pm

Michael Garthwaite

Fixed. Thanks!

Fixed. Thanks!

2:43 pm

Michael Garthwaite

Fixed. Thanks!

Fixed. Thanks!

2:43 pm

Michael Garthwaite

DEN-14197: Addressed code review comments.

Options
    • -1
    • +1
    ./App/Controllers/ROPump.c
2:42 pm

Michael Garthwaite

Fixed. Thanks!

Fixed. Thanks!

2:36 pm

Sean Nash

I thought we changed this to include "DG" in the enum name. Why is it deleted again?

I thought we changed this to include "DG" in the enum name. Why is it deleted again?

2:32 pm

Sean Nash

Change voltage to duty cycle.

Change voltage to duty cycle.

2:32 pm

Sean Nash

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

2:31 pm

Sean Nash

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

2:30 pm

Sean Nash

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

2:29 pm

Sean Nash

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

2:27 pm

Michael Garthwaite

Fixed. Thanks!

Fixed. Thanks!

2:27 pm

Michael Garthwaite

Fixed. Thanks!

Fixed. Thanks!

2:27 pm

Michael Garthwaite

DEN-14197: Addressed code review comments.

Options
    • -18
    • +18
    ./App/Controllers/ROPump.c
    • -2
    • +2
    ./App/Services/SystemCommMessages.c
2:26 pm

Sean Nash

This line of code is not referencing a field in a structure. I do not see it declared anywhere. I've been unable to build this branch (I think because there is no fwcommon branch) so somebody may h...

This line of code is not referencing a field in a structure. I do not see it declared anywhere. I've been unable to build this branch (I think because there is no fwcommon branch) so somebody may have fixed this in develop.

2:23 pm

wbracken  (deleted user)

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

2:23 pm

wbracken  (deleted user)

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

2:22 pm

wbracken  (deleted user)

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH