Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merged staging, resolved merge conflicts and updated the heat disinfect mode

    • -487
    • +319
    ./Modes/ModeHeatDisinfect.c
    • -205
    • +437
    ./Services/SystemCommMessages.c
RESOLVED IN CODE WALKTHROUGH.

RESOLVED IN CODE WALKTHROUGH.

DEN-14000 addressed the code review comments

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

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

Done.

Done.

Does CPLD need to include sys comm?

Does CPLD need to include sys comm?

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

Done.

Done.

Done.

Done.

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.

Add extra blank line here.

Add extra blank line here.

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

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

DG-DEN-14000_SW Dev Sprint 80 Darren
DG-DEN-14000_SW Dev Sprint 80 Darren
DEN-14197: Code review changes. Pre-merge fixes.

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

    • -10
    • +105
    ./Services/SystemCommMessages.c
DEN-14197: pre-staging merge. code review comments.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

Correct. Fixed. Thanks!

Correct. Fixed. Thanks!

DEN-14197: Addressed code review comments.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

getROFeedbackVoltage() has been renamed, right?

getROFeedbackVoltage() has been renamed, right?

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?

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.