Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -r8348015aa77e1ee2c4c20e9f8e2c45b59bcf3f17 -rbdf2c733a764466fcc4a0ff4938f5c97456bdb77
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 8348015aa77e1ee2c4c20e9f8e2c45b59bcf3f17)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision bdf2c733a764466fcc4a0ff4938f5c97456bdb77)
@@ -554,8 +554,8 @@
         {
             if ( ++conductivitySensorStatus[ sensorId ].interalCondErrorCount > MAX_ALLOWED_UNCHANGED_CONDUCTIVITY_READS )
             {
-                //TODO: restore once conductivity sensor are calibrates and working
-#ifdef ENABLE_ALARM_4
+                //TODO: restore once conductivity sensor are calibrated and working
+#ifndef ENABLE_ALARM_4
                 SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId )
 #endif
             }
@@ -570,8 +570,8 @@
         {
             if ( ++conductivitySensorStatus[ sensorId ].interalTempErrorCount > MAX_ALLOWED_UNCHANGED_CONDUCTIVITY_READS )
             {
-                //TODO: restore once conductivity sensor are calibrates and working
-#ifdef ENABLE_ALARM_4
+                //TODO: restore once conductivity sensor are calibrated and working
+#ifndef ENABLE_ALARM_4
                 SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId )
 #endif
             }
@@ -581,8 +581,8 @@
     {
         if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR ) )
         {
-            //TODO: restore once conductivity sensor are calibrates and working
-#ifdef ENABLE_ALARM_4
+            //TODO: restore once conductivity sensor are calibrated and working
+#ifndef ENABLE_ALARM_4
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId )
 #endif
         }
@@ -701,8 +701,8 @@
     // Alarm if any data is out of range.
     if ( FALSE == result )
     {
-        //TODO: restore once conductivity sensor are calibrates and working
-#ifdef ENABLE_ALARM_4
+        //TODO: restore once conductivity sensor are calibrated and working
+#ifndef ENABLE_ALARM_4
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId, ( U32 )idx )
 #endif
     }