Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r754427f339e660b7fa688e5e3becc587b30518a8 -r083b5fc400f4afeed6b1bf32f4468aeef73fed2d
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 754427f339e660b7fa688e5e3becc587b30518a8)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 083b5fc400f4afeed6b1bf32f4468aeef73fed2d)
@@ -20,7 +20,8 @@
 #include "DGDefs.h"
 #include "DGInterface.h"
 #include "ModeInitPOST.h"
-#include "ModeTreatment.h"
+#include "ModeTreatment.h"
+#include "ModeTreatmentParams.h"
 #include "OperationModes.h"
 #include "SystemCommMessages.h"
 #include "Timers.h"
@@ -512,7 +513,7 @@
     }
     else
     {
-        activateAlarmNoData( ALARM_ID_HD_SOFTWARE_FAULT );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_LOAD_CELL_ID, loadCellID );
     }
 
     return result;
@@ -575,7 +576,7 @@
     }
     else
     {
-        // TODO - s/w fault
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_DG_OPERATING_MODE, opMode );
     }
 }
 
@@ -631,8 +632,8 @@
         dgReservoirDrainVolumeTarget = drainVol;
     }
     else
-    {
-        // TODO - s/w fault
+    {
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_RESERVOIR_ID, resID );
     }
 }