Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -r91685a2616bc603aaa3d01206e27ac0b0fd02b45 -r8348015aa77e1ee2c4c20e9f8e2c45b59bcf3f17
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 91685a2616bc603aaa3d01206e27ac0b0fd02b45)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 8348015aa77e1ee2c4c20e9f8e2c45b59bcf3f17)
@@ -554,7 +554,10 @@
         {
             if ( ++conductivitySensorStatus[ sensorId ].interalCondErrorCount > MAX_ALLOWED_UNCHANGED_CONDUCTIVITY_READS )
             {
-//                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId )
+                //TODO: restore once conductivity sensor are calibrates and working
+#ifdef ENABLE_ALARM_4
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId )
+#endif
             }
         }
 
@@ -567,15 +570,21 @@
         {
             if ( ++conductivitySensorStatus[ sensorId ].interalTempErrorCount > MAX_ALLOWED_UNCHANGED_CONDUCTIVITY_READS )
             {
-//                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId )
+                //TODO: restore once conductivity sensor are calibrates and working
+#ifdef ENABLE_ALARM_4
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId )
+#endif
             }
         }
     }
     else
     {
         if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR ) )
         {
-//            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId )
+            //TODO: restore once conductivity sensor are calibrates and working
+#ifdef ENABLE_ALARM_4
+            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId )
+#endif
         }
     }
 }
@@ -692,7 +701,10 @@
     // Alarm if any data is out of range.
     if ( FALSE == result )
     {
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId, ( U32 )idx )
+        //TODO: restore once conductivity sensor are calibrates and working
+#ifdef ENABLE_ALARM_4
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, sensorId, ( U32 )idx )
+#endif
     }
 
     return result;