Index: firmware/App/Modes/SampleWater.c
===================================================================
diff -u -r1277cbbe91938269ed25f77de56c49eefba43a56 -r37a9fd8f15e413db5337371a7d1a1cb65567af7c
--- firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 1277cbbe91938269ed25f77de56c49eefba43a56)
+++ firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 37a9fd8f15e413db5337371a7d1a1cb65567af7c)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2022 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 SampleWater.c
+* @file    SampleWater.c
 *
-* @author (last) Quang Nguyen
-* @date (last) 19-Feb-2021
+* @author  (last)      Darren Cox
+* @date    (last)      10-Mar-2022
 *
-* @author (original) Quang Nguyen
-* @date (original) 19-Feb-2021
+* @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;