Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r4fa5628781e2b420cad6afc42a4b754dd484b997 -rf43eb1e9e0803776ec7420b16e1db8760b020bd9
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 4fa5628781e2b420cad6afc42a4b754dd484b997)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision f43eb1e9e0803776ec7420b16e1db8760b020bd9)
@@ -22,24 +22,30 @@
     #include "CPLD.h"
 #endif
 
+/**
+ *  @addtogroup FillMode
+ *  @{
+ */
+
 // ********** private definitions **********
 
 #define QUARTER_SECOND   250
 #define HALF_SECOND      500
 
+/// Enumberation of fill mode states.
 typedef enum Fill_Mode_States
 {
-    FILL_MODE_STATE_START = 0,
-    FILL_MODE_STATE_CHECK_INLET_WATER,
-    FILL_MODE_STATE_CREATE_PRODUCT_WATER,
-    FILL_MODE_STATE_DIALYSATE_PRODUCTION,
-    FILL_MODE_STATE_DELIVER_DIALYSATE,
-    NUM_OF_FILL_MODE_STATES
+    FILL_MODE_STATE_START = 0,                          ///< Start fill mode state.
+    FILL_MODE_STATE_CHECK_INLET_WATER,                  ///< Check inlet water state.
+    FILL_MODE_STATE_CREATE_PRODUCT_WATER,               ///< Create product water state.
+    FILL_MODE_STATE_DIALYSATE_PRODUCTION,               ///< Dialysate production state.
+    FILL_MODE_STATE_DELIVER_DIALYSATE,                  ///< Deliver dialysate state.
+    NUM_OF_FILL_MODE_STATES                             ///< Number of fill mode states.
 } FILL_MODE_STATE_T;
 
 // ********** private data **********
 
-static FILL_MODE_STATE_T fillState;
+static FILL_MODE_STATE_T fillState;                     ///< Currently active fill state.
 
 // ********** private function prototypes **********
 
@@ -109,7 +115,8 @@
             break;
 
         default:
-            // TODO - s/w fault
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 0, fillState )     // TODO - add s/w fault enum to 1st data param
+            fillState = FILL_MODE_STATE_START;
             break;
     }
 }
@@ -181,3 +188,5 @@
 
     return result;
 }
+
+/**@}*/