Index: firmware/App/Modes/SampleWater.c =================================================================== diff -u -rf760ffc4b10556e5186e9ceb90294262063440ca -r243440e3f50813aca213f8e167a833c03605d37e --- firmware/App/Modes/SampleWater.c (.../SampleWater.c) (revision f760ffc4b10556e5186e9ceb90294262063440ca) +++ firmware/App/Modes/SampleWater.c (.../SampleWater.c) (revision 243440e3f50813aca213f8e167a833c03605d37e) @@ -28,9 +28,6 @@ // ********** private definitions ********** -/// DG restarted alarm persistent interval -#define DG_RESTARTED_ALARM_PERSISTENT_INTERVAL ( ( 5 * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL ) - // ********** private data ********** static BOOL sampleWaterStartRequested; ///< Flag indicates user has requested to start sample water. @@ -39,11 +36,9 @@ static SAMPLE_WATER_STATE_T currentSampleWaterState; ///< Current state of sample water sub-mode. static BOOL sampleWaterResult; ///< The result entered by user after testing water sample. -static U32 dgRestartedPersistentCount; ///< Persistent count for DG restarted alarm. // ********** private function prototypes ********** -static void hasDGRestarted( void ); static SAMPLE_WATER_STATE_T handleWaterSampleSetupState( void ); static SAMPLE_WATER_STATE_T handleWaterSampleState( void ); @@ -231,28 +226,6 @@ /*********************************************************************//** * @brief - * The hasDGRestarted function checks if DG has restarted. - * @details Inputs: DG operation mode and operation sub-mode - * @details Outputs: alarm if DG restarted - * @return none - *************************************************************************/ -static void hasDGRestarted( void ) -{ - if ( ( DG_MODE_STAN == getDGOpMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == getDGSubMode() ) ) - { - if ( dgRestartedPersistentCount++ >= DG_RESTARTED_ALARM_PERSISTENT_INTERVAL ) - { - activateAlarmNoData( ALARM_ID_DG_RESTARTED_FAULT ); - } - } - else - { - dgRestartedPersistentCount = 0; - } -} - -/*********************************************************************//** - * @brief * The handleWaterSampleSetupState function waits for filter flush period elapsed. * @details Inputs: flushTimerCounter * @details Outputs: none @@ -269,8 +242,6 @@ state = SAMPLE_WATER_STATE; } - hasDGRestarted(); - return state; } @@ -303,8 +274,6 @@ cmdDGSampleWater( SAMPLE_WATER_CMD_STOP ); } - hasDGRestarted(); - return state; }