Changeset 18788

Timestamp:

03/21/17 15:56:48 (8 years ago)

Author:

(none)

Message:

add new target lidctrl_usb

Location:

branches/FACT++_lidctrl_usb

Files:

• Makefile.am (modified) (3 diffs)
• Makefile.in (modified) (8 diffs)
• biasctrl.rc (modified) (1 diff)
• ftmctrl.rc (modified) (1 diff)
• src/lidctrl_usb.cc (added)

branches/FACT++_lidctrl_usb/Makefile.am

@@ -40 +40 @@
         mcp feedback ratescan ratecontrol \
         tngweather lidctrl gpsctrl pfminictrl sqmctrl pwrctrl \
+        lidctrl_usb \
         magicweather magiclidar \
         smartfact evtserver getevent \
@@ -121 +122 @@
         gpsctrl.man \
         lidctrl.man \
+        lidctrl_usb.man \
         magiclidar.man \
         magicweather.man \
@@ -393 +395 @@
         libConfiguration.la -lQtXml
 
+lidctrl_usb_SOURCES = src/lidctrl_usb.cc src/LocalControl.h
+lidctrl_usb_LDADD   = libDim++.la libDim.la libDimExtension.la \
+        libStateMachine.la libTools.la libTime.la \
+        libConfiguration.la -lQtXml
+
 gpsctrl_SOURCES = src/gpsctrl.cc src/LocalControl.h
 gpsctrl_LDADD   = libDim++.la libDim.la libDimExtension.la \

branches/FACT++_lidctrl_usb/Makefile.in

@@ -99 +99 @@
         ratescan$(EXEEXT) ratecontrol$(EXEEXT) tngweather$(EXEEXT) \
         lidctrl$(EXEEXT) gpsctrl$(EXEEXT) pfminictrl$(EXEEXT) \
-        sqmctrl$(EXEEXT) pwrctrl$(EXEEXT) magicweather$(EXEEXT) \
-        magiclidar$(EXEEXT) smartfact$(EXEEXT) evtserver$(EXEEXT) \
-        getevent$(EXEEXT) temperature$(EXEEXT) timecheck$(EXEEXT) \
-        showlog$(EXEEXT) fitsdump$(EXEEXT) fitscheck$(EXEEXT) \
-        fitsselect$(EXEEXT) zfits$(EXEEXT) $(am__EXEEXT_1) \
-        $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \
-        $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \
-        $(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10)
+        sqmctrl$(EXEEXT) pwrctrl$(EXEEXT) lidctrl_usb$(EXEEXT) \
+        magicweather$(EXEEXT) magiclidar$(EXEEXT) smartfact$(EXEEXT) \
+        evtserver$(EXEEXT) getevent$(EXEEXT) temperature$(EXEEXT) \
+        timecheck$(EXEEXT) showlog$(EXEEXT) fitsdump$(EXEEXT) \
+        fitscheck$(EXEEXT) fitsselect$(EXEEXT) zfits$(EXEEXT) \
+        $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
+        $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
+        $(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
+        $(am__EXEEXT_10)
 @HAS_FITS_TRUE@am__append_1 = datalogger
 @HAS_V8_TRUE@am__append_2 = dimctrl dimserver
@@ -466 +467 @@
 lidctrl_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
         libStateMachine.la libTools.la libTime.la libConfiguration.la
+am_lidctrl_usb_OBJECTS = src/lidctrl_usb.$(OBJEXT)
+lidctrl_usb_OBJECTS = $(am_lidctrl_usb_OBJECTS)
+lidctrl_usb_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \
+        libStateMachine.la libTools.la libTime.la libConfiguration.la
 am_log_OBJECTS = src/log.$(OBJEXT)
 log_OBJECTS = $(am_log_OBJECTS)
@@ -674 +679 @@
         $(ftm_SOURCES) $(ftmctrl_SOURCES) $(gcn_SOURCES) \
         $(getevent_SOURCES) $(gpsctrl_SOURCES) $(lidctrl_SOURCES) \
-        $(log_SOURCES) $(logtime_SOURCES) $(magiclidar_SOURCES) \
-        $(magicweather_SOURCES) $(makedata_SOURCES) \
-        $(makeplots_SOURCES) $(makeschedule_SOURCES) $(mcp_SOURCES) \
-        $(moon_SOURCES) $(pfminictrl_SOURCES) $(pwrctrl_SOURCES) \
+        $(lidctrl_usb_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
+        $(magiclidar_SOURCES) $(magicweather_SOURCES) \
+        $(makedata_SOURCES) $(makeplots_SOURCES) \
+        $(makeschedule_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \
+        $(pfminictrl_SOURCES) $(pwrctrl_SOURCES) \
         $(ratecontrol_SOURCES) $(ratescan_SOURCES) $(readfits_SOURCES) \
         $(rootifysql_SOURCES) sched.c $(scheduler_SOURCES) \
@@ -701 +707 @@
         $(fscctrl_SOURCES) $(ftm_SOURCES) $(ftmctrl_SOURCES) \
         $(gcn_SOURCES) $(getevent_SOURCES) $(gpsctrl_SOURCES) \
-        $(lidctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
-        $(magiclidar_SOURCES) $(magicweather_SOURCES) \
-        $(makedata_SOURCES) $(makeplots_SOURCES) \
-        $(makeschedule_SOURCES) $(mcp_SOURCES) $(moon_SOURCES) \
-        $(pfminictrl_SOURCES) $(pwrctrl_SOURCES) \
+        $(lidctrl_SOURCES) $(lidctrl_usb_SOURCES) $(log_SOURCES) \
+        $(logtime_SOURCES) $(magiclidar_SOURCES) \
+        $(magicweather_SOURCES) $(makedata_SOURCES) \
+        $(makeplots_SOURCES) $(makeschedule_SOURCES) $(mcp_SOURCES) \
+        $(moon_SOURCES) $(pfminictrl_SOURCES) $(pwrctrl_SOURCES) \
         $(ratecontrol_SOURCES) $(ratescan_SOURCES) $(readfits_SOURCES) \
         $(rootifysql_SOURCES) sched.c $(scheduler_SOURCES) \
@@ -1052 +1058 @@
 @HAS_HELP2MAN_TRUE@     gpsctrl.man \
 @HAS_HELP2MAN_TRUE@     lidctrl.man \
+@HAS_HELP2MAN_TRUE@     lidctrl_usb.man \
 @HAS_HELP2MAN_TRUE@     magiclidar.man \
 @HAS_HELP2MAN_TRUE@     magicweather.man \
@@ -1296 +1303 @@
         libConfiguration.la -lQtXml
 
+lidctrl_usb_SOURCES = src/lidctrl_usb.cc src/LocalControl.h
+lidctrl_usb_LDADD = libDim++.la libDim.la libDimExtension.la \
+        libStateMachine.la libTools.la libTime.la \
+        libConfiguration.la -lQtXml
+
 gpsctrl_SOURCES = src/gpsctrl.cc src/LocalControl.h
 gpsctrl_LDADD = libDim++.la libDim.la libDimExtension.la \
@@ -2204 +2216 @@
         @rm -f lidctrl$(EXEEXT)
         $(AM_V_CXXLD)$(CXXLINK) $(lidctrl_OBJECTS) $(lidctrl_LDADD) $(LIBS)
+src/lidctrl_usb.$(OBJEXT): src/$(am__dirstamp) \
+        src/$(DEPDIR)/$(am__dirstamp)
+
+lidctrl_usb$(EXEEXT): $(lidctrl_usb_OBJECTS) $(lidctrl_usb_DEPENDENCIES) $(EXTRA_lidctrl_usb_DEPENDENCIES) 
+        @rm -f lidctrl_usb$(EXEEXT)
+        $(AM_V_CXXLD)$(CXXLINK) $(lidctrl_usb_OBJECTS) $(lidctrl_usb_LDADD) $(LIBS)
 src/log.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 
@@ -2663 +2681 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/gpsctrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/lidctrl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/lidctrl_usb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/log.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/logtime.Po@am__quote@

branches/FACT++_lidctrl_usb/biasctrl.rc

@@ -1 @@
-database=readpo:readc0nf1g@10.0.100.21/programoptions
+database=readpo:readc0nf1g@database/programoptions
 console=2
 quiet=yes

branches/FACT++_lidctrl_usb/ftmctrl.rc

@@ -1 @@
-database=readpo:readc0nf1g@10.0.100.21/programoptions
+database=readpo:readc0nf1g@database/programoptions