dgfirmware / firmware

App

Clone Tools

Stats

Commits this week: 0
Total Committers: 17
Last Commit: 19 Nov
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
5:15 pm

Dara Navaei

Merged staging, resolved merge conflicts and updated the heat disinfect mode

Options
    • -2
    • +2
    ./Drivers/CPLD.c
    • -2
    • +2
    ./Drivers/CPLD.h
    • -487
    • +319
    ./Modes/ModeHeatDisinfect.c
    • -3
    • +3
    ./Services/AlarmMgmt.c
    • -33
    • +53
    ./Services/SystemComm.c
    • -205
    • +437
    ./Services/SystemCommMessages.c
    • -22
    • +40
    ./Services/SystemCommMessages.h
4:56 pm

Michael Garthwaite

RESOLVED IN CODE WALKTHROUGH.

RESOLVED IN CODE WALKTHROUGH.

4:56 pm

Michael Garthwaite

4:53 pm

Dara Navaei

DEN-14000 addressed the code review comments

Options
    • -2
    • +1
    ./Drivers/CPLD.c
    • -0
    • +1
    ./Services/AlarmMgmt.c
    • -97
    • +97
    ./Services/SystemCommMessages.c
4:51 pm

Dara Navaei

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

Options
    • -1
    • +1
    ./DGCommon.h
4:51 pm

Dara Navaei

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

Options
    • -2
    • +2
    ./Controllers/ROPump.c
    • -2
    • +2
    ./Controllers/ROPump.h
    • -2
    • +2
    ./Modes/ModeFill.c
    • -2
    • +2
    ./Modes/ModeFill.h
    • -2
    • +2
    ./Modes/ModeGenIdle.c
    • -2
    • +2
    ./Modes/ModeGenIdle.h
    • -2
    • +2
    ./Modes/ModeInitPOST.c
    • -2
    • +2
    ./Services/AlarmMgmtSWFaults.h
    • -2
    • +2
    ./Services/PIControllers.c
    • -2
    • +2
    ./Services/PIControllers.h
    • -2
    • +2
    ./Services/SystemComm.c
    • -2
    • +2
    ./Services/SystemCommMessages.c
    • -2
    • +2
    ./Services/SystemCommMessages.h
4:50 pm

Dara Navaei

Done.

Done.

4:49 pm

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

4:46 pm

Michael Garthwaite

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

Done.

Done.

4:41 pm

Dara Navaei

Done.

Done.

4:03 pm

Sean Nash

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

Add extra blank line here.

Add extra blank line here.

3:55 pm

Sean Nash

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

Options
    • -5
    • +2
    ./Drivers/CPLD.c
    • -0
    • +2
    ./Drivers/CPLD.h
    • -1
    • +2
    ./Services/AlarmMgmt.c
3:37 pm

wbracken  (deleted user)

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

3:30 pm

Dara Navaei

DG-DEN-14000_SW Dev Sprint 80 Darren
DG-DEN-14000_SW Dev Sprint 80 Darren
3:29 pm

Michael Garthwaite

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

Options
    • -1
    • +1
    ./Controllers/ROPump.c
    • -2
    • +2
    ./Controllers/ROPump.h
    • -1
    • +1
    ./Modes/ModeFill.c
    • -2
    • +2
    ./Modes/ModeGenIdle.c
3:17 pm

Michael Garthwaite

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

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

Michael Garthwaite

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

Options
    • -1
    • +1
    ./Modes/ModeFill.c
    • -1
    • +1
    ./Services/PIControllers.h
    • -28
    • +0
    ./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
    ./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.