Changeset 12000 for trunk

Timestamp:

09/07/11 09:59:38 (13 years ago)

Author:

tbretz

Message:

Renamed TakingData state (description) to TriggerOn to avoid confusion (sounds like data is written)

Location:

trunk/FACT++

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (8 diffs)
• src/ftmctrl.cc (modified) (1 diff)

trunk/FACT++/Makefile.am

@@ -38 +38 @@
         chatclient chatserv \
         biasctrl \
-        mcp \
+        mcp feedback \
         fitsdump
 
@@ -269 +269 @@
         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

trunk/FACT++/Makefile.in

@@ -52 +52 @@
         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 +271 @@
 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 +398 @@
         $(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 +414 @@
         $(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 +859 @@
         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 +1303 @@
         @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 +1529 @@
         -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 +1639 @@
 @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@

trunk/FACT++/src/ftmctrl.cc

@@ -1913 +1913 @@
                         "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", "");