Index: firmware/App/Modes/ModeGenIdle.c =================================================================== diff -u -r35179cc5895f6b7b9b1f8338754836898514a14e -r2c08db070a6e09306caf461e7aceeb53097fd995 --- firmware/App/Modes/ModeGenIdle.c (.../ModeGenIdle.c) (revision 35179cc5895f6b7b9b1f8338754836898514a14e) +++ firmware/App/Modes/ModeGenIdle.c (.../ModeGenIdle.c) (revision 2c08db070a6e09306caf461e7aceeb53097fd995) @@ -1,15 +1,15 @@ /************************************************************************** * -* Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved. +* Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * @file ModeGenIdle.c * -* @author (last) Michael Garthwaite -* @date (last) 21-Nov-2022 +* @author (last) Dara Navaei +* @date (last) 02-Jan-2023 * * @author (original) Quang Nguyen * @date (original) 06-Aug-2021 @@ -63,8 +63,8 @@ static U32 targetFillVolumeML; ///< Save the target fill volume before calling startFillCmd(). static BOOL handleBadFillFlag; ///< Internal signal flag to handle bad fill. static OVERRIDE_U32_T genIdleDataPublicationInterval = { BAD_FILL_SUBSTATES_PUB_INTERVAL, - BAD_FILL_SUBSTATES_PUB_INTERVAL, - 0, 0 }; ///< Interval (in ms) at which to publish bad fill sub-states to CAN bus. + BAD_FILL_SUBSTATES_PUB_INTERVAL, + 0, 0 }; ///< Interval (in ms) at which to publish bad fill sub-states to CAN bus. // ********** private function prototypes ********** @@ -191,7 +191,6 @@ checkInletWaterConductivity(); checkInletWaterTemperature(); checkInletWaterPressure(); - checkRORejectionRatio(); // Transition to standby mode when HD is not communicating if ( TRUE == isHDCommunicating() ) @@ -416,27 +415,26 @@ return state; } - /*********************************************************************//** * @brief * The publishGenIdleSubstates function publishes gen idle * sub-states at the set interval. - * @details Inputs: none - * @details Outputs: none - * @param none + * @details Inputs: handleBadFillFlag, badFillState, targetFillVolumeML, + * dataPublishCounter + * @details Outputs: dataPublishCounter * @return none *************************************************************************/ -static void publishGenIdleSubstates() +static void publishGenIdleSubstates( void ) { // publish Gen Idle pump data on interval if ( ++dataPublishCounter >= getU32OverrideValue( &genIdleDataPublicationInterval ) ) { DG_GEN_IDLE_DATA_T data; // Populate the data structure for publication - data.badFillSignal = (U32)handleBadFillFlag; - data.badFillState = (U32)badFillState; - data.genIdleState = (U32)getCurrentGenIdleState(); + data.badFillSignal = (U32)handleBadFillFlag; + data.badFillState = (U32)badFillState; + data.genIdleState = (U32)getCurrentGenIdleState(); data.targetFillVolumemL = targetFillVolumeML; broadcastData( MSG_ID_DG_GEN_IDLE_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( DG_GEN_IDLE_DATA_T ) );