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?
