Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r91aa11a47f3b3c744cbbfd9e9c1bd240263aa1bd -rab57180655892575252175a4310d97a1c8c46e74
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 91aa11a47f3b3c744cbbfd9e9c1bd240263aa1bd)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision ab57180655892575252175a4310d97a1c8c46e74)
@@ -514,7 +514,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;
@@ -588,7 +588,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 );
     }
 }
 
@@ -644,8 +644,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 );
     }
 }