Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -rbdf2c733a764466fcc4a0ff4938f5c97456bdb77 -rc4e1d97e73dd863ddffe895833d209e172b5ae4a
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision bdf2c733a764466fcc4a0ff4938f5c97456bdb77)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision c4e1d97e73dd863ddffe895833d209e172b5ae4a)
@@ -555,7 +555,7 @@
             if ( ++conductivitySensorStatus[ sensorId ].interalCondErrorCount > MAX_ALLOWED_UNCHANGED_CONDUCTIVITY_READS )
             {
                 //TODO: restore once conductivity sensor are calibrated and working
-#ifndef ENABLE_ALARM_4
+#ifdef __CONDUCTIVITY_SENSOR_ALARMS_DISABLED__
                 SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId )
 #endif
             }
@@ -571,7 +571,7 @@
             if ( ++conductivitySensorStatus[ sensorId ].interalTempErrorCount > MAX_ALLOWED_UNCHANGED_CONDUCTIVITY_READS )
             {
                 //TODO: restore once conductivity sensor are calibrated and working
-#ifndef ENABLE_ALARM_4
+#ifdef __CONDUCTIVITY_SENSOR_ALARMS_DISABLED__
                 SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId )
 #endif
             }
@@ -582,7 +582,7 @@
         if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR ) )
         {
             //TODO: restore once conductivity sensor are calibrated and working
-#ifndef ENABLE_ALARM_4
+#ifdef __CONDUCTIVITY_SENSOR_ALARMS_DISABLED__
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId )
 #endif
         }
@@ -702,7 +702,7 @@
     if ( FALSE == result )
     {
         //TODO: restore once conductivity sensor are calibrated and working
-#ifndef ENABLE_ALARM_4
+#ifdef __CONDUCTIVITY_SENSOR_ALARMS_DISABLED__
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId, ( U32 )idx )
 #endif
     }