Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r9d7ad180a18e29ba08bf65228d61b6179ddbfcca -r521a0569bf3097e9f7075d9c0e99dca9af3e6410
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 9d7ad180a18e29ba08bf65228d61b6179ddbfcca)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 521a0569bf3097e9f7075d9c0e99dca9af3e6410)
@@ -40,23 +40,6 @@
 
 #define TREATMENT_TIME_DATA_PUB_INTERVAL        ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )  // interval (ms/task time) at which the treatment time data is published on the CAN bus
 
-/// Sub-mode states while in treatment mode
-typedef enum Treatment_States
-{
-    TREATMENT_START_STATE = 0,              ///< Start treatment, prime blood side with gradual ramp for 1 min. while dialyzer is bypassed.  No dialysis or UF taking place.
-    TREATMENT_DIALYSIS_STATE,               ///< Perform dialysis.  Deliver Heparin as prescribed.  Deliver UF as prescribed.  Handle saline boluses as requested.
-    TREATMENT_STOP_STATE,                   ///< Treatment stopped.  All pumps off.  Dializer bypassed.
-    TREATMENT_RINSEBACK_STATE,              ///< Perform rinseback with saline.  Dialyzer bypassed. Dialysate recirculating.
-    TREATMENT_RINSEBACK_PAUSE_STATE,        ///< Rinseback paused.  Blood pump off.  Dialyzer bypassed.  Dialysate recirculating.
-    TREATMENT_RECIRC_SETUP_STATE,           ///< Rinseback complete.  Blood pump off.  Blood lines closed.  User to disconnect and shunt blood lines.
-    TREATMENT_RECIRC_STATE,                 ///< Recirculate saline and dialysate while patient disconnected.  Blood lines open and shunted.  Dialyzer is bypassed.
-    TREATMENT_RECIRC_PAUSE_STATE,           ///< Recirculate paused.  Blood pump off.  Blood lines closed and shunted.  Dialyzer is bypassed.
-    TREATMENT_RECIRC_STOP_STATE,            ///< Recirculate stopped.  Blood pump off.  Blood lines open.  Waiting for patient to unshunt and connect and resume treatment.
-    TREATMENT_DIALYSIS_END_STATE,           ///< Dialysis has ended.  Blood pump slowed.  Dialyzer is bypassed.  Dialysate is recirculated.  User can rinseback.
-    TREATMENT_END_STATE,                    ///< Treatment has ended.  All pumps off.  Dialyzer is bypassed.  Blood lines are closed.  User to disconnect.
-    NUM_OF_TREATMENT_STATES                 ///< # of treatment states (sub-modes).
-} TREATMENT_STATE_T;
-
 // ********** private data **********
 
 static TREATMENT_STATE_T currentTreatmentState;
@@ -131,6 +114,19 @@
 
 /*************************************************************************
  * @brief
+ * The getTreatmentState function gets the current treatment mode state.
+ * @details
+ * Inputs : currentTreatmentState
+ * Outputs : none
+ * @return currentTreatmentState
+ *************************************************************************/
+TREATMENT_STATE_T getTreatmentState( void )
+{
+    return currentTreatmentState;
+}
+
+/*************************************************************************
+ * @brief
  * The execTreatmentMode function executes the Treatment Mode state machine.
  * @details
  * Inputs : none