common

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.

Done.

Done.

Updated NoRin, NoEnd, ClrOnly to FALSE.

Updated NoRin, NoEnd, ClrOnly to FALSE.

Would also set internal signal flag to FALSE here so next call to idle exec will get us back into the normal flush water state.

Would also set internal signal flag to FALSE here so next call to idle exec will get us back into the normal flush water state.

I don't think we should be using bad fill to make this decision. It will work first time but bad fill workflow will do 2 more fills that hopefully will not be bad fills and yet we still want to sta...

I don't think we should be using bad fill to make this decision. It will work first time but bad fill workflow will do 2 more fills that hopefully will not be bad fills and yet we still want to stay in the bad fill state until we finish the bad fill workflow.
So what I think we should be doing is having fill mode signal idle mode (call a signal function from fill mode when bad avg conductivity detected which sets a flag here in idle mode).

Need to make sure this fill will target the normal fill volume (not 1,000 mL this time).

Need to make sure this fill will target the normal fill volume (not 1,000 mL this time).

We need to wait in this state (don't fill yet) if the first alarm has not yet been cleared by user (indicating user has confirmed replacement of bottles). So need an "if" here. Also, we need to do ...

We need to wait in this state (don't fill yet) if the first alarm has not yet been cleared by user (indicating user has confirmed replacement of bottles).
So need an "if" here.
Also, we need to do something so that the next fill will only go to 1,000 mL.

Should set back to start state for next time.

Should set back to start state for next time.

Should just set result to this state above at declaration to simplify.

Should just set result to this state above at declaration to simplify.