dgfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-11928 Addressed code review - set internal signal flag to move to normal flush water state

Removed flush lines

Removed flush lines

The fillStatus.fillEmptyAcidBottleDetected is set to TRUE to signal drain mode that empty bottle is detected This flag is checked at the end of the drain mode.

The fillStatus.fillEmptyAcidBottleDetected is set to TRUE to signal drain mode that empty bottle is detected
This flag is checked at the end of the drain mode.

Corrected Initialized in case DG_GEN_IDLE_MODE_STATE_START: // Execute current generation idle state switch ( genIdleState ) { case DG_GEN_IDLE_MODE_STATE_START: badFillState = DG_HANDLE_BAD_FILL_...

Corrected
Initialized in case DG_GEN_IDLE_MODE_STATE_START:

// Execute current generation idle state
switch ( genIdleState )
{
case DG_GEN_IDLE_MODE_STATE_START:
badFillState = DG_HANDLE_BAD_FILL_STATE_START;
genIdleState = handleIdleStartState();
break;

DEN-11928 Updated per code review - reject moving to fill if alarm is active

DEN-11928 Updated per code review comments

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

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

Merged DEN-12224

DEN-12224, DEN-12436 removed the concentrate pumps requested flow fault alarm if it was out of range

    • -2
    • +1
    /firmware/App/Controllers/DialysateFlow.c
DEN-11928 Updated per peer review comments

    • -16
    • +25
    /firmware/App/Modes/ModeGenIdle.c
Idle mode calls BOOL isAvgConductivityOutOfRange( void ){ return fillStatus.fillAvgConductivityOutOfRange; }

Idle mode calls
BOOL isAvgConductivityOutOfRange( void )

Unknown macro: { return fillStatus.fillAvgConductivityOutOfRange; }
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 );