Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r6419179374edcd65da462de84e8aeaefb7e20320 -r9feea867113c62088f0ce91750127972dbd9bf53
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 6419179374edcd65da462de84e8aeaefb7e20320)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 9feea867113c62088f0ce91750127972dbd9bf53)
@@ -491,7 +491,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;
@@ -537,7 +537,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 );
     }
 }
 
@@ -593,8 +593,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 );
     }
 }