Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -rb89d157b56dce2daf63f4a9e9df9ef6636f2bf44 -r289696b3b5e15120cfecbe447ff45ef093959056
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision b89d157b56dce2daf63f4a9e9df9ef6636f2bf44)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 289696b3b5e15120cfecbe447ff45ef093959056)
@@ -22,14 +22,14 @@
 #include "ModeService.h"
 #include "ModeFault.h"
 #include "ModeStandby.h"
-#include "ModeTxParams.h"
 #include "ModePreTreat.h"
 #include "ModeTreatment.h"
 //#include "ModePostTreat.h"
 //#include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "TaskGeneral.h"
 #include "Timers.h"
+#include "TxParams.h"
 
 /**
  *  @addtogroup TDOperationModes
@@ -72,15 +72,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,7 +123,6 @@
     initServiceMode();
     initInitAndPOSTMode();
     initStandbyMode();
-    initTreatParamsMode();
 //    initPreTreatmentMode();
     initTreatmentMode();
 //    initPostTreatmentMode();
@@ -203,10 +201,6 @@
             currentSubMode = execStandbyMode();
             break;
 
-        case MODE_TPAR:
-            currentSubMode = execTreatParamsMode();
-            break;
-
         case MODE_PRET:
             currentSubMode = execPreTreatmentMode();
             break;
@@ -326,9 +320,6 @@
         case MODE_STAN:
             signalAlarmActionToStandbyMode( action );
             break;
-        case MODE_TPAR:
-            signalAlarmActionToTreatParamsMode( action );
-            break;
 //        case MODE_PRET:
 //            signalAlarmActionToPreTreatmentMode( action );
 //            break;
@@ -412,9 +403,6 @@
         case MODE_STAN:
             currentSubMode = transitionToStandbyMode();
             break;
-        case MODE_TPAR:
-            currentSubMode = transitionToTreatParamsMode();
-            break;
         case MODE_PRET:
             currentSubMode = transitionToPreTreatmentMode();
             break;