Index: HDDefs.h
===================================================================
diff -u -re6a12753529acd2edd005e17656d51303819d0a0 -re4dee34da24914019a3cf84bebf762d8c4ebdc50
--- HDDefs.h	(.../HDDefs.h)	(revision e6a12753529acd2edd005e17656d51303819d0a0)
+++ HDDefs.h	(.../HDDefs.h)	(revision e4dee34da24914019a3cf84bebf762d8c4ebdc50)
@@ -36,7 +36,7 @@
     MODE_PRET,                           ///< Pre-Treatment mode
     MODE_TREA,                           ///< Treatment mode
     MODE_POST,                           ///< Post-Treatment mode
-    MODE_NLEG,                           ///< Not legal - an illegale mode transition occurred
+    MODE_NLEG,                           ///< Not legal - an illegal mode transition occurred
     NUM_OF_MODES                         ///< Number of HD operation modes
 };
 typedef enum HD_Op_Modes HD_OP_MODE_T;  ///< Type for HD operation modes enumeration
@@ -203,12 +203,12 @@
     NO_CART_SELF_TESTS_OCCLUSION_SENSORS_STATE,             ///< No cartridge occlusion sensors self-test state
     NO_CART_SELF_TESTS_BLOOD_FLOW_METERS_STATE,             ///< No cartridge blood flow meter self-test state
     NO_CART_SELF_TESTS_DIALYSATE_FLOW_METERS_STATE,         ///< No cartridge dialysate flow meter self-test state
-    NO_CART_SELF_TESTS_PUMPS_STATE,                         ///< No cartridge self-test for blood pump, dialysate in pump, dialysate out pump state
     NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE,                ///< No cartridge leak detectors self-test state
     NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE,             ///< No cartridge board temperature self-test state
     NO_CART_SELF_TESTS_START_HOMING_STATE,                  ///< No cartridge start home valves and pumps state
     NO_CART_SELF_TESTS_HOME_VALVES_AND_PUMPS_STATE,         ///< No cartridge home valves and pumps self-test state
     NO_CART_SELF_TESTS_HOME_IDLE_STATE,                     ///< Wait for valves and pumps finish homing state
+    NO_CART_SELF_TESTS_PUMPS_STATE,                         ///< No cartridge self-test for blood pump, dialysate in pump, dialysate out pump state
     NO_CART_SELF_TESTS_STOPPED_STATE,                       ///< No cart self-test stopped state
     NO_CART_SELF_TESTS_COMPLETE_STATE,                      ///< No cartridge self-test complete state
     NUM_OF_NO_CART_SELF_TESTS_STATES                        ///< Number of no cartridge self-tests states
@@ -371,8 +371,8 @@
 /// Enumeration of saline bolus command parameters.
 enum Saline_Commands
 {
-    SALINE_CMD_STOP = 0,                                ///< Start saline bolus command
-    SALINE_CMD_START,                                   ///< Stop saline bolus command
+    SALINE_CMD_STOP = 0,                                ///< Stop saline bolus command
+    SALINE_CMD_START,                                   ///< Start saline bolus command
     NUM_OF_SALINE_CMDS                                  ///< Number of saline bolus command parameters
 };
 typedef enum Saline_Commands SALINE_CMD_T;              ///< Type for saline command enum.
@@ -398,7 +398,7 @@
 /**@}*/
 
 /**
- *  @addtogroup Heparin
+ *  @addtogroup SyringePump
  *  @{
  */