Index: trunk/FACT++/Makefile.am =================================================================== --- trunk/FACT++/Makefile.am (revision 11314) +++ trunk/FACT++/Makefile.am (revision 11315) @@ -37,4 +37,5 @@ fadctrl fad \ fscctrl fsc \ + biasctrl \ fitsdump @@ -175,6 +176,9 @@ \ src/Connection.h src/Connection.cc \ - \ - FACT.h ByteOrder.h + src/ConnectionUSB.h src/ConnectionUSB.cc \ + \ + FACT.h ByteOrder.h \ + \ + src/DimWriteStatistics.h src/DimWriteStatistics.cc @@ -238,7 +242,12 @@ libConfiguration.la +biasctrl_SOURCES = src/biasctrl.cc src/LocalControl.h +biasctrl_LDADD = libDim.la libDim++.la libDimExtension.la \ + libTime.la libTools.la libStateMachine.la \ + libConfiguration.la + argv_SOURCES = src/argv.cc -argv_LDADD = libConfiguration.la +argv_LDADD = libConfiguration.la Index: trunk/FACT++/Makefile.in =================================================================== --- trunk/FACT++/Makefile.in (revision 11314) +++ trunk/FACT++/Makefile.in (revision 11315) @@ -51,5 +51,6 @@ scheduler$(EXEEXT) triggerschedule$(EXEEXT) ftmctrl$(EXEEXT) \ ftm$(EXEEXT) fadctrl$(EXEEXT) fad$(EXEEXT) fscctrl$(EXEEXT) \ - fsc$(EXEEXT) fitsdump$(EXEEXT) $(am__EXEEXT_2) $(am__EXEEXT_3) + fsc$(EXEEXT) biasctrl$(EXEEXT) fitsdump$(EXEEXT) \ + $(am__EXEEXT_2) $(am__EXEEXT_3) @HAS_LIBXP_TRUE@am__append_1 = did @@ -146,5 +147,6 @@ src/DimServiceInfoList.lo src/DimNetwork.lo src/ServiceList.lo \ src/DimErrorRedirecter.lo src/DimDescriptionService.lo \ - src/Connection.lo + src/Connection.lo src/ConnectionUSB.lo \ + src/DimWriteStatistics.lo libStateMachine_la_OBJECTS = $(am_libStateMachine_la_OBJECTS) libTime_la_LIBADD = @@ -167,4 +169,8 @@ astro_OBJECTS = astro.$(OBJEXT) astro_LDADD = $(LDADD) +am_biasctrl_OBJECTS = src/biasctrl.$(OBJEXT) +biasctrl_OBJECTS = $(am_biasctrl_OBJECTS) +biasctrl_DEPENDENCIES = libDim.la libDim++.la libDimExtension.la \ + libTime.la libTools.la libStateMachine.la libConfiguration.la am_chatclient_OBJECTS = src/chatclient.$(OBJEXT) chatclient_OBJECTS = $(am_chatclient_OBJECTS) @@ -332,5 +338,5 @@ $(libStateMachine_la_SOURCES) $(libTime_la_SOURCES) \ $(libTools_la_SOURCES) $(argv_SOURCES) astro.c \ - $(chatclient_SOURCES) $(chatserv_SOURCES) \ + $(biasctrl_SOURCES) $(chatclient_SOURCES) $(chatserv_SOURCES) \ $(datalogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \ $(dimctrl_SOURCES) $(dns_SOURCES) $(drivectrl_SOURCES) \ @@ -345,5 +351,5 @@ $(libStateMachine_la_SOURCES) $(libTime_la_SOURCES) \ $(libTools_la_SOURCES) $(argv_SOURCES) astro.c \ - $(chatclient_SOURCES) $(chatserv_SOURCES) \ + $(biasctrl_SOURCES) $(chatclient_SOURCES) $(chatserv_SOURCES) \ $(am__datalogger_SOURCES_DIST) $(dclient5_SOURCES) \ $(did_SOURCES) $(dimctrl_SOURCES) $(dns_SOURCES) \ @@ -730,6 +736,9 @@ \ src/Connection.h src/Connection.cc \ + src/ConnectionUSB.h src/ConnectionUSB.cc \ \ - FACT.h ByteOrder.h + FACT.h ByteOrder.h \ + \ + src/DimWriteStatistics.h src/DimWriteStatistics.cc libConfiguration_la_SOURCES = \ @@ -781,6 +790,11 @@ libConfiguration.la +biasctrl_SOURCES = src/biasctrl.cc src/LocalControl.h +biasctrl_LDADD = libDim.la libDim++.la libDimExtension.la \ + libTime.la libTools.la libStateMachine.la \ + libConfiguration.la + argv_SOURCES = src/argv.cc -argv_LDADD = libConfiguration.la +argv_LDADD = libConfiguration.la dimctrl_SOURCES = src/dimctrl.cc src/RemoteControl.cc src/RemoteControl.h dimctrl_LDADD = libTools.la libStateMachine.la libTime.la \ @@ -1004,4 +1018,8 @@ src/$(DEPDIR)/$(am__dirstamp) src/Connection.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) +src/ConnectionUSB.lo: src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +src/DimWriteStatistics.lo: src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) libStateMachine.la: $(libStateMachine_la_OBJECTS) $(libStateMachine_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) -rpath $(libdir) $(libStateMachine_la_OBJECTS) $(libStateMachine_la_LIBADD) $(LIBS) @@ -1078,4 +1096,9 @@ @rm -f astro$(EXEEXT) $(AM_V_CCLD)$(LINK) $(astro_OBJECTS) $(astro_LDADD) $(LIBS) +src/biasctrl.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +biasctrl$(EXEEXT): $(biasctrl_OBJECTS) $(biasctrl_DEPENDENCIES) + @rm -f biasctrl$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(biasctrl_OBJECTS) $(biasctrl_LDADD) $(LIBS) src/chatclient.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) @@ -1289,4 +1312,6 @@ -rm -f src/Connection.$(OBJEXT) -rm -f src/Connection.lo + -rm -f src/ConnectionUSB.$(OBJEXT) + -rm -f src/ConnectionUSB.lo -rm -f src/Console.$(OBJEXT) -rm -f src/Console.lo @@ -1307,4 +1332,6 @@ -rm -f src/DimSetup.$(OBJEXT) -rm -f src/DimSetup.lo + -rm -f src/DimWriteStatistics.$(OBJEXT) + -rm -f src/DimWriteStatistics.lo -rm -f src/Event.$(OBJEXT) -rm -f src/Event.lo @@ -1345,4 +1372,5 @@ -rm -f src/WindowLog.lo -rm -f src/argv.$(OBJEXT) + -rm -f src/biasctrl.$(OBJEXT) -rm -f src/chatclient.$(OBJEXT) -rm -f src/chatserv.$(OBJEXT) @@ -1407,4 +1435,5 @@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Configuration.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Connection.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ConnectionUSB.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Console.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Converter.Plo@am__quote@ @@ -1416,4 +1445,5 @@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimServiceInfoList.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimSetup.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimWriteStatistics.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Event.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/EventBuilder.Po@am__quote@ @@ -1438,4 +1468,5 @@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/WindowLog.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/argv.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/biasctrl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chatclient.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/chatserv.Po@am__quote@