firmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-12224-dg_hd_dev-switches-monitor' into develop

DEN-1224 added a build switch

Merged DEN-12224

    • -18
    • +38
    ./App/Controllers/ConcentratePumps.c
    • -14
    • +23
    ./App/Controllers/ConductivitySensors.c
RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

DEN-12224 worked on the concentrate pumps

    • -18
    • +38
    ./App/Controllers/ConcentratePumps.c
    • -14
    • +23
    ./App/Controllers/ConductivitySensors.c
    • -0
    • +4
    ./App/Controllers/ConductivitySensors.h
RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

Retract issue - looking at latest code it is needed. Else and mode change request restored. RESOLVED in CODE WALKTHROUGH.

Retract issue - looking at latest code it is needed. Else and mode change request restored. RESOLVED in CODE WALKTHROUGH.

DEN-11928 Update per review

DEN-11928 Update per review

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

Sean is OK with current implementation.

Sean is OK with current implementation.

Sean is OK with current implementation.

Sean is OK with current implementation.

DEN-11928 Updated per peer review comments

Added signal function setBadAvgConductivityDetectedFlag( BOOL flag ) in ModeGenIdle.

Added signal function setBadAvgConductivityDetectedFlag( BOOL flag ) in ModeGenIdle.

Initialized badFillState where it is declared in the private data section.

Initialized badFillState where it is declared in the private data section.

Added genIdleState = DG_GEN_IDLE_MODE_STATE_START;

Added
genIdleState = DG_GEN_IDLE_MODE_STATE_START;

Removed line //requestNewOperationMode( DG_MODE_GENE );

Removed line

//requestNewOperationMode( DG_MODE_GENE );

Removed line //activateAlarmNoData( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME );

Removed line

//activateAlarmNoData( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME );

Moved check for empty bottles before if ( TRUE == isReservoirTarePending() )

Moved check for empty bottles before if ( TRUE == isReservoirTarePending() )

Removed else requestNewOperationMode( DG_MODE_GENE );

Removed else requestNewOperationMode( DG_MODE_GENE );

Uncommented requestNewOperationMode( )

Uncommented requestNewOperationMode( )

Added doxygen comment DG_HANDLE_BAD_FILL_STATE_START = 0, ///< Bad fill start state

Added doxygen comment

DG_HANDLE_BAD_FILL_STATE_START = 0, ///< Bad fill start state

Added doxygen comment ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY = 106, ///< DG inlet water conductivity is greater than threshold

Added doxygen comment

ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY = 106, ///< DG inlet water conductivity is greater than threshold

Removed U32 fillToVolumeML = 1000; Added #define BAD_FLUSH_FILL_TARGET_VOLUME_ML 1000

Removed U32 fillToVolumeML = 1000;
Added #define BAD_FLUSH_FILL_TARGET_VOLUME_ML 1000