Index: /trunk/FACT++/Makefile.am
===================================================================
--- /trunk/FACT++/Makefile.am	(revision 11999)
+++ /trunk/FACT++/Makefile.am	(revision 12000)
@@ -38,5 +38,5 @@
 	chatclient chatserv \
 	biasctrl \
-	mcp \
+	mcp feedback \
 	fitsdump
 
@@ -269,4 +269,9 @@
     	libConfiguration.la
 
+feedback_SOURCES = src/feedback.cc src/LocalControl.h
+feedback_LDADD   = libDim.la libDim++.la  libDimExtension.la \
+	libTime.la libTools.la libStateMachine.la \
+    	libConfiguration.la
+
 
 argv_SOURCES = src/argv.cc
Index: /trunk/FACT++/Makefile.in
===================================================================
--- /trunk/FACT++/Makefile.in	(revision 11999)
+++ /trunk/FACT++/Makefile.in	(revision 12000)
@@ -52,6 +52,7 @@
 	fadctrl$(EXEEXT) fad$(EXEEXT) fscctrl$(EXEEXT) fsc$(EXEEXT) \
 	chatclient$(EXEEXT) chatserv$(EXEEXT) biasctrl$(EXEEXT) \
-	mcp$(EXEEXT) fitsdump$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
-	$(am__EXEEXT_3) $(am__EXEEXT_4)
+	mcp$(EXEEXT) feedback$(EXEEXT) fitsdump$(EXEEXT) \
+	$(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
+	$(am__EXEEXT_4)
 @HAS_GUI_TRUE@am__append_1 = fact
 @HAS_VIEWER_TRUE@am__append_2 = viewer
@@ -270,4 +271,8 @@
 fadctrl_DEPENDENCIES = libDim.la libDim++.la libDimExtension.la \
 	libTime.la libTools.la libStateMachine.la libConfiguration.la
+am_feedback_OBJECTS = src/feedback.$(OBJEXT)
+feedback_OBJECTS = $(am_feedback_OBJECTS)
+feedback_DEPENDENCIES = libDim.la libDim++.la libDimExtension.la \
+	libTime.la libTools.la libStateMachine.la libConfiguration.la
 am_fitsdump_OBJECTS = src/fitsdump.$(OBJEXT)
 fitsdump_OBJECTS = $(am_fitsdump_OBJECTS)
@@ -393,10 +398,11 @@
 	$(dimctrl_SOURCES) $(dns_SOURCES) $(drivectrl_SOURCES) \
 	$(dserver2_SOURCES) $(fact_SOURCES) $(fad_SOURCES) \
-	$(fadctrl_SOURCES) $(fitsdump_SOURCES) fitsgrep.c \
-	$(fitsloader_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \
-	$(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
-	$(logtime_SOURCES) $(mcp_SOURCES) $(readfits_SOURCES) sched.c \
-	$(scheduler_SOURCES) $(test_SOURCES) $(time_SOURCES) \
-	$(triggerschedule_SOURCES) $(viewer_SOURCES)
+	$(fadctrl_SOURCES) $(feedback_SOURCES) $(fitsdump_SOURCES) \
+	fitsgrep.c $(fitsloader_SOURCES) $(fsc_SOURCES) \
+	$(fscctrl_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \
+	$(log_SOURCES) $(logtime_SOURCES) $(mcp_SOURCES) \
+	$(readfits_SOURCES) sched.c $(scheduler_SOURCES) \
+	$(test_SOURCES) $(time_SOURCES) $(triggerschedule_SOURCES) \
+	$(viewer_SOURCES)
 DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \
 	$(libDim_la_SOURCES) $(libDimExtension_la_SOURCES) \
@@ -408,8 +414,9 @@
 	$(drivectrl_SOURCES) $(dserver2_SOURCES) \
 	$(am__fact_SOURCES_DIST) $(fad_SOURCES) \
-	$(am__fadctrl_SOURCES_DIST) $(fitsdump_SOURCES) fitsgrep.c \
-	$(fitsloader_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \
-	$(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
-	$(logtime_SOURCES) $(mcp_SOURCES) $(readfits_SOURCES) sched.c \
+	$(am__fadctrl_SOURCES_DIST) $(feedback_SOURCES) \
+	$(fitsdump_SOURCES) fitsgrep.c $(fitsloader_SOURCES) \
+	$(fsc_SOURCES) $(fscctrl_SOURCES) $(ftm_SOURCES) \
+	$(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
+	$(mcp_SOURCES) $(readfits_SOURCES) sched.c \
 	$(scheduler_SOURCES) $(test_SOURCES) $(time_SOURCES) \
 	$(triggerschedule_SOURCES) $(am__viewer_SOURCES_DIST)
@@ -852,4 +859,9 @@
     	libConfiguration.la
 
+feedback_SOURCES = src/feedback.cc src/LocalControl.h
+feedback_LDADD = libDim.la libDim++.la  libDimExtension.la \
+	libTime.la libTools.la libStateMachine.la \
+    	libConfiguration.la
+
 argv_SOURCES = src/argv.cc
 argv_LDADD = libConfiguration.la
@@ -1291,4 +1303,9 @@
 	@rm -f fadctrl$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(fadctrl_OBJECTS) $(fadctrl_LDADD) $(LIBS)
+src/feedback.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+feedback$(EXEEXT): $(feedback_OBJECTS) $(feedback_DEPENDENCIES) 
+	@rm -f feedback$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(feedback_OBJECTS) $(feedback_LDADD) $(LIBS)
 src/fitsdump.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
@@ -1512,4 +1529,5 @@
 	-rm -f src/fad.$(OBJEXT)
 	-rm -f src/fadctrl.$(OBJEXT)
+	-rm -f src/feedback.$(OBJEXT)
 	-rm -f src/fitsdump.$(OBJEXT)
 	-rm -f src/fitsloader.$(OBJEXT)
@@ -1621,4 +1639,5 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fad.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fadctrl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/feedback.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fitsdump.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/fitsloader.Po@am__quote@
Index: /trunk/FACT++/src/ftmctrl.cc
===================================================================
--- /trunk/FACT++/src/ftmctrl.cc	(revision 11999)
+++ /trunk/FACT++/src/ftmctrl.cc	(revision 12000)
@@ -1913,6 +1913,6 @@
                         "Received answer identical with target configuration.");
 
-        T::AddStateName(FTM::kTakingData, "TakingData",
-                        "Ethernet connection to FTM established, FTM is in taking data state.");
+        T::AddStateName(FTM::kTakingData, "TriggerOn",
+                        "Ethernet connection to FTM established, FTM is in taking data state (trigger switched on).");
 
         T::AddStateName(FTM::kConfigError1, "ErrorInConfig1", "");