Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r46b163d19c65e8c21db7b0247bbb1af0dba1ece5 -r9a96522e0a94724a13c2c9c8f60cf8d18ebde218
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 46b163d19c65e8c21db7b0247bbb1af0dba1ece5)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 9a96522e0a94724a13c2c9c8f60cf8d18ebde218)
@@ -30,6 +30,7 @@
 #include "ModeTreatment.h"
 #include "ModeTreatmentParams.h"
 #include "OperationModes.h"
+#include "RTC.h"
 #include "Switches.h"
 #include "SyringePump.h"
 #include "SystemComm.h"
@@ -46,7 +47,7 @@
 // ********** private definitions **********
 
 #define DISINFECTS_DATA_PUB_INTERVAL          ( 1 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )    ///< Disinfects data publish interval in counts.
-#define SERVICE_TIME_INTERVAL_MS              ( 6 * 30 * SECONDS_IN_A_DAY * MS_PER_SECOND )    ///< HD/DG 6-month service interval in milliseconds.
+#define DISINFECTS_TIME_INTERVAL_S            ( 2 * SECONDS_IN_A_DAY )                         ///< HD/DG 2-day service interval in seconds.
 
 // ********** private data **********
 
@@ -62,6 +63,8 @@
 /// Interval (in task intervals) at which to publish standby mode data to CAN bus.
 static OVERRIDE_U32_T standbyModePublishInterval = { DISINFECTS_DATA_PUB_INTERVAL, DISINFECTS_DATA_PUB_INTERVAL, DISINFECTS_DATA_PUB_INTERVAL, 0 };
 
+static const U32 SERVICE_TIME_INTERVAL_S = (U32)( 365 * 0.5 * SECONDS_IN_A_DAY );              ///< HD/DG 6-month service interval in seconds.
+
 // ********** private function prototypes **********
 
 static HD_STANDBY_STATE_T handleStandbyModeStartState( void );
@@ -80,6 +83,8 @@
 static HD_STANDBY_STATE_T handleStandbyModeWaitForDGChemDisinfectStartState( void );
 static HD_STANDBY_STATE_T handleStandbyModeDGChemDisininfectInProgressState( void );
 
+static BOOL isDGDisinfectValid( void );
+static BOOL haveHDDGServicesBeenExpired( REQUEST_REJECT_REASON_CODE_T* rejReason );
 static void publishDisinfectData( void );
 
 /*********************************************************************//**
@@ -145,6 +150,9 @@
     {
         currentStandbyState = STANDBY_WAIT_FOR_DISINFECT_STATE;
     }
+    // Request DG service record and usage information from DG
+    sendDGServiceRequestToDG();
+    sendDGUsageInfoRequestToDG();
 
     return currentStandbyState;
 }
@@ -165,7 +173,7 @@
     switch ( currentStandbyState )
     {
         case STANDBY_START_STATE:
-            currentStandbyState = handleStandbyModeStartState();;
+            currentStandbyState = handleStandbyModeStartState();
             break;
 
         case STANDBY_WAIT_FOR_TREATMENT_STATE:
@@ -280,9 +288,22 @@
         rejReason = REQUEST_REJECT_REASON_BATTERY_IS_NOT_CHARGED;
     }
 
+#ifndef _RELEASE_
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SERVICE_AND_DISINFECT_CHECK ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+    {
+        // This function checks both HD and DG service records and if any of them has failed, it fills the provided reject reason buffer
+        haveHDDGServicesBeenExpired( &rejReason );
+
+        if ( FALSE == isDGDisinfectValid() )
+        {
+            rejReason = REQUEST_REJECT_REASON_DG_DISINFECT_HAS_BEEN_EXPIRED;
+        }
+    }
+
     if ( REQUEST_REJECT_REASON_NONE == rejReason )
     {
-        result = TRUE;
+        result                = TRUE;
         treatStartReqReceived = TRUE;
     }
 
@@ -529,7 +550,7 @@
  *************************************************************************/
 static HD_STANDBY_STATE_T handleStandbyModeWaitForTreatmentState( void )
 {
-    HD_STANDBY_STATE_T state = STANDBY_WAIT_FOR_TREATMENT_STATE;
+    HD_STANDBY_STATE_T state     = STANDBY_WAIT_FOR_TREATMENT_STATE;
     DG_OP_MODE_T dgOperationMode = getDGOpMode();
 
     // If DG is filling while we are in standby mode, abort the fill
@@ -544,17 +565,22 @@
         cmdStopDG();
     }
 
-    // If treatment start is requested by user, initiate treatment workflow (transition to treatment params mode).  TODO - check required conditions before allowing treatment start, reject if necessary.
+    // If treatment start is requested by user, initiate treatment workflow (transition to treatment params mode).
     if ( TRUE == treatStartReqReceived )
     {
-        // Initialize treatment modes before starting a new treatment
-        initTreatParamsMode();
-        initPreTreatmentMode();
-        initTreatmentMode();
-        initPostTreatmentMode();
-        // Start treatment workflow with treatment parameters mode
-        requestNewOperationMode( MODE_TPAR );
-        treatStartReqReceived = FALSE;
+        BOOL startTreatment = TRUE;
+
+        if ( TRUE == startTreatment )
+        {
+            // Initialize treatment modes before starting a new treatment
+            initTreatParamsMode();
+            initPreTreatmentMode();
+            initTreatmentMode();
+            initPostTreatmentMode();
+            // Start treatment workflow with treatment parameters mode
+            requestNewOperationMode( MODE_TPAR );
+            treatStartReqReceived = FALSE;
+        }
     }
 
     return state;
@@ -832,6 +858,85 @@
 
 /*********************************************************************//**
  * @brief
+ * The isDGDisinfectValid function checks whether the DG disinfects is
+ * acceptable to start another treatment.
+ * @details Inputs: none
+ * @details Outputs: none
+ * @return TRUE if the disinfect is valid otherwise, FALSE
+ ***********************************************************************/
+static BOOL isDGDisinfectValid( void )
+{
+    DG_SERVICE_AND_USAGE_DATA_T data;
+    BOOL status = TRUE;
+
+    getHDVersionDGServiceAndUsageData( &data );
+
+    if ( TRUE == data.isDGUsageInfoAviable )
+    {
+        if ( TRUE == data.dgUsageInfo.isDisinfected )
+        {
+            U32 chemDisElapsedTimeS    = getRTCTimestamp() - data.dgUsageInfo.lastChemicalDisDateEpoch;
+            BOOL hasChemDisBeenExpired = ( chemDisElapsedTimeS > DISINFECTS_TIME_INTERVAL_S ? TRUE : FALSE );
+            U32 heatDisElapsedTimeS    = getRTCTimestamp() - data.dgUsageInfo.lastHeatDisDateEpoch;
+            BOOL hasHeatDisBeenExpired = ( heatDisElapsedTimeS > DISINFECTS_TIME_INTERVAL_S ? TRUE : FALSE );
+
+            if ( ( TRUE == hasChemDisBeenExpired ) && ( TRUE == hasHeatDisBeenExpired ) )
+            {
+                status = FALSE;
+            }
+        }
+        else
+        {
+            status = FALSE;
+        }
+    }
+
+    return status;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The haveHDDGServicesBeenExpired function checks whether the last DG/HD
+ * service time is still within the interval or not.
+ * @details Inputs: none
+ * @details Outputs: none
+ * @param rejReason pointer to the provided reject reason buffer to be send to UI
+ * @return TRUE if the service time is still valid otherwise, FALSE
+ ***********************************************************************/
+static BOOL haveHDDGServicesBeenExpired( REQUEST_REJECT_REASON_CODE_T* rejReason )
+{
+    BOOL status = TRUE;
+    DG_SERVICE_AND_USAGE_DATA_T dgData;
+    HD_SERVICE_RECORD_T hdServiceRecord;
+
+    getHDVersionDGServiceAndUsageData( &dgData );
+    getNVRecord2Driver( GET_SRV_RECORD, (U08*)&hdServiceRecord, sizeof( HD_SERVICE_RECORD_T ), 0, ALARM_ID_NO_ALARM );
+
+    if ( TRUE == dgData.isDGServiceRecordAvailable )
+    {
+        U32 dgSrvcElapsedTimeS    = getRTCTimestamp() - dgData.dgServiceRecord.lastServiceDateEpoch;
+        BOOL hasDGSrvcBeenExpired = ( dgSrvcElapsedTimeS > SERVICE_TIME_INTERVAL_S ? TRUE : FALSE );
+        U32 hdSrvcElapsedTimeS    = getRTCTimestamp() - hdServiceRecord.lastServiceEpochDate;
+        BOOL hasHDSrvcBeenExpied  = ( hdSrvcElapsedTimeS > SERVICE_TIME_INTERVAL_S ? TRUE : FALSE );
+
+        if ( TRUE == hasDGSrvcBeenExpired )
+        {
+            status     = FALSE;
+            *rejReason = REQUEST_REJECT_REASON_DG_SERVICE_IS_DUE;
+        }
+
+        if ( TRUE == hasHDSrvcBeenExpied )
+        {
+            status     = FALSE;
+            *rejReason = REQUEST_REJECT_REASON_HD_SERVICE_IS_DUE;
+        }
+    }
+
+    return status;
+}
+
+/*********************************************************************//**
+ * @brief
  * The publishDisinfectData function publishes disinfects data at
  * the set interval.
  * @details Inputs: dataPublishCounter