Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r3f22d883958a14b6193d6cd59c9acdbbd359b69e -ra1b8dbb69c4bd2f0cc22e62bede7015c9307d378
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 3f22d883958a14b6193d6cd59c9acdbbd359b69e)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision a1b8dbb69c4bd2f0cc22e62bede7015c9307d378)
@@ -126,7 +126,7 @@
     // is requested new mode valid and legal at this time?
     if ( newMode >= DG_MODE_NLEG )
     {
-        // TODO - s/w fault
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_ILLEGAL_MODE_TRANSITION_REQUESTED, (U32)newMode )
         newMode = currentMode;
     }
 
@@ -186,7 +186,7 @@
             break;
 
         default:
-            // TODO - trigger s/w fault
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_STATE, (U32)currentMode )
             currentMode = DG_MODE_FAUL;
             currentSubMode = 0;
             break;
@@ -214,7 +214,7 @@
     }
     else
     {  // invalid mode requested
-       // TODO - trigger s/w fault
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_REQUESTED, (U32)newMode )
     }
 }
 
@@ -316,7 +316,7 @@
             transitionToChemicalDisinfectMode();
             break;
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, 0, (U32)newMode )     // TODO - add s/w fault enum to 1st data param
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_TRANSITION_TO, (U32)newMode )
             break;
     }
 }