Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r6085153faf2a176c51a34653bdd3a36a4699e528 -rbdf2072247c8779596c6bcf418c5a7ae4d9f9848
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 6085153faf2a176c51a34653bdd3a36a4699e528)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision bdf2072247c8779596c6bcf418c5a7ae4d9f9848)
@@ -295,7 +295,7 @@
     }
     else
     {
-        activateAlarmNoData( ALARM_ID_DG_SOFTWARE_FAULT );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CONDUCTIVITY_SENSOR_ID, sensorID );
     }
 
     return result;
Index: firmware/App/Controllers/Pressures.c
===================================================================
diff -u -rebbb1f85550a1f9b8f946655f7b2b63f76fbf67d -rbdf2072247c8779596c6bcf418c5a7ae4d9f9848
--- firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision ebbb1f85550a1f9b8f946655f7b2b63f76fbf67d)
+++ firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision bdf2072247c8779596c6bcf418c5a7ae4d9f9848)
@@ -291,7 +291,7 @@
     }
     else
     {
-        activateAlarmNoData( ALARM_ID_DG_SOFTWARE_FAULT );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_PRESSURE_SENSOR_ID, pressureID );
     }
 
     return result;
Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r8467f8ff09e382e0991f14d02683080dc811e24e -rbdf2072247c8779596c6bcf418c5a7ae4d9f9848
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 8467f8ff09e382e0991f14d02683080dc811e24e)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision bdf2072247c8779596c6bcf418c5a7ae4d9f9848)
@@ -168,6 +168,9 @@
     SW_FAULT_ID_INVALID_RTI_NOTIFICATION,
     SW_FAULT_ID_CAN_TX_FAULT,
     SW_FAULT_ID_INVALID_CAN_MESSAGE_SIZE,
+    SW_FAULT_ID_INVALID_CONDUCTIVITY_SENSOR_ID,                         // 90
+    SW_FAULT_ID_INVALID_PRESSURE_SENSOR_ID,
+    SW_FAULT_ID_INVALID_TASK,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;
 
Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -ra8d919375cdb830f52e82e2d1c72c8153f5f58ca -rbdf2072247c8779596c6bcf418c5a7ae4d9f9848
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision a8d919375cdb830f52e82e2d1c72c8153f5f58ca)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision bdf2072247c8779596c6bcf418c5a7ae4d9f9848)
@@ -266,7 +266,7 @@
     }
     else
     {
-        activateAlarmNoData( ALARM_ID_DG_SOFTWARE_FAULT );
+        activateAlarmNoData( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_TASK, task );
     }
 
     return result;