Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r316f8773970f94c9b1996a03f2235050afb514da -r93156ec3080112357d4cd115ab2e9a23c6ab152d
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 316f8773970f94c9b1996a03f2235050afb514da)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 93156ec3080112357d4cd115ab2e9a23c6ab152d)
@@ -512,7 +512,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 +575,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 +631,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 );
     }
 }