Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r395522dffef1348e176564925656012f529c1910 -r4bbd5980e71fec58ab5ee2f1c9a50bdc76a5a38c
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 395522dffef1348e176564925656012f529c1910)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 4bbd5980e71fec58ab5ee2f1c9a50bdc76a5a38c)
@@ -22,7 +22,6 @@
 #include "ModeService.h"
 #include "ModeFault.h"
 #include "ModeStandby.h"
-#include "ModeTxParams.h"
 #include "ModePreTreat.h"
 #include "ModeTreatment.h"
 //#include "ModePostTreat.h"
@@ -72,15 +71,14 @@
 
 /// This matrix determines legal transitions from one mode to another
 static const TD_OP_MODE_T MODE_TRANSITION_TABLE[ NUM_OF_MODES - 1 ][ NUM_OF_MODES - 1 ] = {
-// From    to->    FAULT    SERVICE      INIT      STANBY   TRT.PARAMS PRE-TREAT  TREATMENT  POST_TREA
-/* FAUL     */{ MODE_FAUL, MODE_SERV, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, },
-/* SERV     */{ MODE_NLEG, MODE_SERV, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, },
-/* INIT     */{ MODE_FAUL, MODE_NLEG, MODE_INIT, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, },
-/* STAN     */{ MODE_FAUL, MODE_SERV, MODE_INIT, MODE_STAN, MODE_TPAR, MODE_NLEG, MODE_NLEG, MODE_NLEG, },
-/* TPAR     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_TPAR, MODE_PRET, MODE_NLEG, MODE_NLEG, },
-/* PRET     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_NLEG, MODE_PRET, MODE_TREA, MODE_POST, },
-/* TREA     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_TREA, MODE_POST, },
-/* POST     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_POST, }, };
+// From    to->    FAULT    SERVICE      INIT      STANBY    PRE-TREAT  TREATMENT  POST_TREA
+/* FAUL     */{ MODE_FAUL, MODE_SERV, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, },
+/* SERV     */{ MODE_NLEG, MODE_SERV, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, },
+/* INIT     */{ MODE_FAUL, MODE_NLEG, MODE_INIT, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_NLEG, },
+/* STAN     */{ MODE_FAUL, MODE_SERV, MODE_INIT, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_NLEG, },
+/* PRET     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_PRET, MODE_TREA, MODE_POST, },
+/* TREA     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_NLEG, MODE_TREA, MODE_POST, },
+/* POST     */{ MODE_FAUL, MODE_NLEG, MODE_NLEG, MODE_STAN, MODE_NLEG, MODE_NLEG, MODE_POST, }, };
 
 // ********** private function prototypes **********
 
@@ -124,8 +122,7 @@
     initServiceMode();
     initInitAndPOSTMode();
     initStandbyMode();
-    initTreatParamsMode();
-//    initPreTreatmentMode();
+    initPreTreatmentMode();
     initTreatmentMode();
 //    initPostTreatmentMode();
 }
@@ -203,10 +200,6 @@
             currentSubMode = execStandbyMode();
             break;
 
-        case MODE_TPAR:
-            currentSubMode = execTreatParamsMode();
-            break;
-
         case MODE_PRET:
             currentSubMode = execPreTreatmentMode();
             break;
@@ -326,9 +319,6 @@
         case MODE_STAN:
             signalAlarmActionToStandbyMode( action );
             break;
-        case MODE_TPAR:
-            signalAlarmActionToTreatParamsMode( action );
-            break;
 //        case MODE_PRET:
 //            signalAlarmActionToPreTreatmentMode( action );
 //            break;
@@ -412,9 +402,6 @@
         case MODE_STAN:
             currentSubMode = transitionToStandbyMode();
             break;
-        case MODE_TPAR:
-            currentSubMode = transitionToTreatParamsMode();
-            break;
         case MODE_PRET:
             currentSubMode = transitionToPreTreatmentMode();
             break;