Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -ra2ea8edd918761b403cbe2c00e1bfe2fc69be5ea -rbc22e4fbb56800101e22ac1752c2f1b67541ba02
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision a2ea8edd918761b403cbe2c00e1bfe2fc69be5ea)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision bc22e4fbb56800101e22ac1752c2f1b67541ba02)
@@ -554,7 +554,7 @@
             if ( ++conductivitySensorStatus[ sensorId ].interalCondErrorCount > MAX_ALLOWED_UNCHANGED_CONDUCTIVITY_READS )
             {
                 //TODO: restore once conductivity sensor are calibrated and working
-#ifndef ENABLE_ALARM_4
+#ifndef __CONDUCTIVITY_SENSOR_ALARMS_DISABLED__
                 SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId )
 #endif
             }
@@ -570,7 +570,7 @@
             if ( ++conductivitySensorStatus[ sensorId ].interalTempErrorCount > MAX_ALLOWED_UNCHANGED_CONDUCTIVITY_READS )
             {
                 //TODO: restore once conductivity sensor are calibrated and working
-#ifndef ENABLE_ALARM_4
+#ifndef __CONDUCTIVITY_SENSOR_ALARMS_DISABLED__
                 SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId )
 #endif
             }
@@ -581,7 +581,7 @@
         if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR ) )
         {
             //TODO: restore once conductivity sensor are calibrated and working
-#ifndef ENABLE_ALARM_4
+#ifndef __CONDUCTIVITY_SENSOR_ALARMS_DISABLED__
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId )
 #endif
         }
@@ -701,7 +701,7 @@
     if ( FALSE == result )
     {
         //TODO: restore once conductivity sensor are calibrated and working
-#ifndef ENABLE_ALARM_4
+#ifndef __CONDUCTIVITY_SENSOR_ALARMS_DISABLED__
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId, ( U32 )idx )
 #endif
     }