Index: firmware/App/Modes/SampleWater.c
===================================================================
diff -u -r3d72b777cf1ceb673d118341c46e2d6d5b7b75f5 -r6c1d6a3eaf065c2b2d537d9fef793d73ea328359
--- firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 3d72b777cf1ceb673d118341c46e2d6d5b7b75f5)
+++ firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 6c1d6a3eaf065c2b2d537d9fef793d73ea328359)
@@ -7,8 +7,8 @@
 *
 * @file    SampleWater.c
 *
-* @author  (last)      Quang Nguyen
-* @date    (last)      21-May-2021
+* @author  (last)      Dara Navaei
+* @date    (last)      22-Feb-2022
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  19-Feb-2021
@@ -129,9 +129,11 @@
 {
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_FAILED;
 
-#ifdef SKIP_SAMPLE_WATER
-    sampleWaterResult = TRUE;
-#endif
+    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) )
+    {
+        sampleWaterResult = TRUE;
+    }
+
     if ( TRUE == sampleWaterResult )
     {
         result = SELF_TEST_STATUS_PASSED;