common

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-11928 Updated

At the end of drain, check for empty bottles

At the end of drain, check for empty bottles

Replaced else if ( ( FALSE == isAlarmActive( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME ) ) || ( FALSE == isAlarmActive( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME ) ) ) { with else {

Replaced
else if ( ( FALSE == isAlarmActive( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME ) ) ||
( FALSE == isAlarmActive( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME ) ) )
{
with
else
{

Removed setBottlesNeedPrimeFlag and use function setThisFirstFillFlag().

Removed setBottlesNeedPrimeFlag and use function setThisFirstFillFlag().

Removed fillBottlesNeedPrimeFlag and use the existing isThisFirstFill

Removed fillBottlesNeedPrimeFlag and use the existing isThisFirstFill

isAvgConductivityOutOfRange is now called in ModeGenIdle

isAvgConductivityOutOfRange is now called in ModeGenIdle

Added startFillCmd( targetFillVolumeML, getTargetFillFlowRateLPM() ); // refill to the saved target fill volume (~1500 mL)

Added
startFillCmd( targetFillVolumeML, getTargetFillFlowRateLPM() ); // refill to the saved target fill volume (~1500 mL)

Assigned MSG_ID_DG_FILL_MODE_DATA = 0xAE, ///< DG broadcast of fill mode data such as used acid & bicarb volume Updated Message List.xlsx (Denali Tab, Row = 142) with 0xAE00 DG Fill Mode Data

Assigned MSG_ID_DG_FILL_MODE_DATA = 0xAE, ///< DG broadcast of fill mode data such as used acid & bicarb volume
Updated Message List.xlsx (Denali Tab, Row = 142) with 0xAE00 DG Fill Mode Data

DEN-11928 Merged MsgDefs.h in staging to DEN-11928 branch

DEN-11928 Merged AlarmDefs.h from staging to DEN-11928 branch

Merge branch 'staging' into develop

DEN-12224 added an alarm for the conductivity sensors bad status reading

Idle mode calls BOOL isAvgConductivityOutOfRange( void ){ return fillStatus.fillAvgConductivityOutOfRange; }

Idle mode calls
BOOL isAvgConductivityOutOfRange( void )

Unknown macro: { return fillStatus.fillAvgConductivityOutOfRange; }
DEN-11928 Updated per peer review comments

Renamed setBottlesNeedPrimeFlag() to setThisFirstFillFlag()

Renamed setBottlesNeedPrimeFlag() to setThisFirstFillFlag()

This function is obsolete since the fillBottlesNeedPrimeFlag is replaced by isThisFirstFill flag in ModeFill.c

This function is obsolete since the fillBottlesNeedPrimeFlag is replaced by isThisFirstFill flag in ModeFill.c

Removed isBadFill() function and used signal function isAvgConductivityOutOfRange( void );

Removed isBadFill() function and used signal function isAvgConductivityOutOfRange( void );

Set result = DG_HANDLE_BAD_FILL_STATE_START;

Set result = DG_HANDLE_BAD_FILL_STATE_START;

Wait here for alarm is no longer active, then transition to fill mode.

Wait here for alarm is no longer active, then transition to fill mode.

Done.

Done.

Done.

Done.

Removed flushWaterVolumeL.

Removed flushWaterVolumeL.

Removed TARGET_FLUSH_WATER_RO_FLOW_RATE_L

Removed TARGET_FLUSH_WATER_RO_FLOW_RATE_L

Replaced with activateAlarmNoData.

Replaced with activateAlarmNoData.

Changed this function to private.

Changed this function to private.

Removed requestNewOperationMode( DG_MODE_GENE );

Removed requestNewOperationMode( DG_MODE_GENE );

Removed requestNewOperationMode( DG_MODE_GENE );

Removed requestNewOperationMode( DG_MODE_GENE );

Removed return.

Removed return.

Changed COND_SENSOR_CPI_WARNING_HIGH to COND_SENSOR_CPI_WARNING_LOW

Changed COND_SENSOR_CPI_WARNING_HIGH to COND_SENSOR_CPI_WARNING_LOW

Done.

Done.