Changeset 11229 for trunk

Timestamp:

07/01/11 08:38:40 (13 years ago)

Author:

tbretz

Message:

Reverted commit by mistake.

Location:

trunk/FACT++

Files:

• Makefile.am (modified) (3 diffs)
• Makefile.in (modified) (13 diffs)
• src/argv.cc (modified) (3 diffs)
• src/logtime.cc (modified) (3 diffs)
• src/tools.cc (modified) (4 diffs)
• src/tools.h (modified) (1 diff)

trunk/FACT++/Makefile.am

@@ -37 +37 @@
         fadctrl fad \
         fscctrl fsc \
-        biasctrl \
         fitsdump
 
@@ -176 +175 @@
         \
         src/Connection.h      src/Connection.cc \
-        src/ConnectionUSB.h   src/ConnectionUSB.cc \
         \
         FACT.h ByteOrder.h
@@ -240 +238 @@
         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  libTime.la
+argv_LDADD = libConfiguration.la 
 
 

trunk/FACT++/Makefile.in

@@ -51 +51 @@
         scheduler$(EXEEXT) triggerschedule$(EXEEXT) ftmctrl$(EXEEXT) \
         ftm$(EXEEXT) fadctrl$(EXEEXT) fad$(EXEEXT) fscctrl$(EXEEXT) \
-        fsc$(EXEEXT) biasctrl$(EXEEXT) fitsdump$(EXEEXT) \
-        $(am__EXEEXT_2) $(am__EXEEXT_3)
+        fsc$(EXEEXT) fitsdump$(EXEEXT) $(am__EXEEXT_2) $(am__EXEEXT_3)
 @HAS_LIBXP_TRUE@am__append_1 = did
 
@@ -147 +146 @@
         src/DimServiceInfoList.lo src/DimNetwork.lo src/ServiceList.lo \
         src/DimErrorRedirecter.lo src/DimDescriptionService.lo \
-        src/Connection.lo src/ConnectionUSB.lo
+        src/Connection.lo
 libStateMachine_la_OBJECTS = $(am_libStateMachine_la_OBJECTS)
 libTime_la_LIBADD =
@@ -164 +163 @@
 am_argv_OBJECTS = src/argv.$(OBJEXT)
 argv_OBJECTS = $(am_argv_OBJECTS)
-argv_DEPENDENCIES = libConfiguration.la libTime.la
+argv_DEPENDENCIES = libConfiguration.la
 astro_SOURCES = astro.c
 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)
@@ -337 +332 @@
         $(libStateMachine_la_SOURCES) $(libTime_la_SOURCES) \
         $(libTools_la_SOURCES) $(argv_SOURCES) astro.c \
-        $(biasctrl_SOURCES) $(chatclient_SOURCES) $(chatserv_SOURCES) \
+        $(chatclient_SOURCES) $(chatserv_SOURCES) \
         $(datalogger_SOURCES) $(dclient5_SOURCES) $(did_SOURCES) \
         $(dimctrl_SOURCES) $(dns_SOURCES) $(drivectrl_SOURCES) \
@@ -350 +345 @@
         $(libStateMachine_la_SOURCES) $(libTime_la_SOURCES) \
         $(libTools_la_SOURCES) $(argv_SOURCES) astro.c \
-        $(biasctrl_SOURCES) $(chatclient_SOURCES) $(chatserv_SOURCES) \
+        $(chatclient_SOURCES) $(chatserv_SOURCES) \
         $(am__datalogger_SOURCES_DIST) $(dclient5_SOURCES) \
         $(did_SOURCES) $(dimctrl_SOURCES) $(dns_SOURCES) \
@@ -735 +730 @@
         \
         src/Connection.h      src/Connection.cc \
-        src/ConnectionUSB.h   src/ConnectionUSB.cc \
         \
         FACT.h ByteOrder.h
@@ -787 +781 @@
         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  libTime.la
+argv_LDADD = libConfiguration.la 
 dimctrl_SOURCES = src/dimctrl.cc src/RemoteControl.cc src/RemoteControl.h
 dimctrl_LDADD = libTools.la libStateMachine.la libTime.la \
@@ -1015 +1004 @@
         src/$(DEPDIR)/$(am__dirstamp)
 src/Connection.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/ConnectionUSB.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)
@@ -1091 +1078 @@
         @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)
@@ -1307 +1289 @@
         -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
@@ -1365 +1345 @@
         -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)
@@ -1428 +1407 @@
 @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@
@@ -1460 +1438 @@
 @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@

trunk/FACT++/src/argv.cc

@@ -4 +4 @@
 
 using namespace std;
-
-template<class T,class S>
-std::ostream &operator<<(std::ostream &out, const pair<T,S> &f)
-{
-    out << f.first << "|" << f.second;
-    return out;
-}
-template<class T, class S>
-std::istream &operator>>(std::istream &in,  pair<T,S> &f)
-{
-    char c;
-    in >> f.first;
-    in >> c;
-    if (c!=':')
-        return in;
-    in >> f.second;
-    return in;
-}
-
-typedef pair<int,int> mytype;
-
-
-//Source is OutputStreamable, meaning that an operator<< is defined
-// that takes a std::ostream or std::wostream object on the left hand side
-// and an instance of the argument type on the right.
-
-// Target is InputStreamable, meaning that an operator>> is defined that
-// takes a std::istream or std::wistream object on the left hand side and
-// an instance of the result type on the right.
-
-//Target is CopyConstructible [20.1.3].
-//Target is DefaultConstructible, meaning that it is possible to default-initialize an object of that type [8.5, 20.1.4].
 
 // --------------------------------------------------------------------------
@@ -114 +82 @@
         ("switch",        po_switch(),                    "include path")
         ("bool",          var<bool>()->implicit_value(true),                    "include path")
-        ("mytype",        var<mytype>(),                  "include path")
         ;
 
@@ -205 +172 @@
     cout << conf.Has("switch") << " " << conf.Get<bool>("switch") << endl;
     cout << conf.Has("bool") << " " << conf.Get<bool>("bool") << endl;
-    cout << conf.Has("mytype") << " " << conf.Get<mytype>("mytype") << endl;
 
     return 0;

trunk/FACT++/src/logtime.cc

@@ -6 +6 @@
 #include <iostream>
 
-#include "DimDescriptionService.h"
-
 int main(int, const char **)
 {
-    // We could use putenv to make the Configure class change the value...
+   // We could use putenv to make the Configure class change the value...
     setenv("DIM_DNS_NODE", "localhost", 0);
 
@@ -16 +14 @@
     DimServer::start("TIME");
 
-    usleep(2000000);
-
-    DimServer::stop();
-
-    return 0;
-
     // Some info on the console
     std::cout << "Offering TIME/MESSAGE...\n" << std::endl;
-
-    short s;
-    int i;
-    long long ll;
-    float f;
-    DimDescribedService servt("TIME/TEST", "O:1;I:1;C",
-                              "This is my test command|Char[c]:This is a char|   Int This is an int|String[s]:This is a string");
-
-    DimDescribedService servs("TIME/SHORT",     s,  "[a]");
-    DimDescribedService servx("TIME/LONGLONG",  ll, "|: This is my long long");
-    DimDescribedService servi("TIME/INT",       i,  "|MyInt  [  mi  ] ");
-    DimDescribedService servf("TIME/FLOAT",     f,  "|   MyFloat  :   This is my float");
-    DimDescribedService servc("TIME/TIME", const_cast<char*>(""), "|MyTime[T]:This is my time");
-
-    DimCommand cmd("TIME/CMD", "I:2;F:2");
-
-    DimDescriptionService des("TIME/CMD", "|range[addr]:From DAC to DAC|values[DAC]:DAC values to be set");
-
-    {
-    Time t0;
 
     // Setup a DimService called TIME/MESSAGE
@@ -51 +23 @@
         // Send current time
         msg.Message(Time().GetAsStr());
-//        servx.Update();
-        /*
-        servs.updateService();
-        servi.updateService();
-        servf.updateService();
-        servc.updateService();
-         */
+
         // wait approximately one second
-        usleep(100000);
-
-//        if (t0.UnixTime()-Time().UnixTime()<-5)
-//            break;
+        usleep(1000000);
     }
-    }
-
-    DimDescribedService servxx("TIME/XXX", const_cast<char*>(""), "|MyTime[T]:This is my time");
-    usleep(10000000);
 
     return 0;

trunk/FACT++/src/tools.cc

@@ -12 +12 @@
 #include <stdarg.h>
 
-#include <boost/filesystem.hpp>
+using namespace std;
 
-using namespace std;
-/*
 string Tools::Format(const char *fmt, va_list &ap)
 {
@@ -51 +49 @@
     return str;
 }
-*/
 
 // --------------------------------------------------------------------------
@@ -57 +54 @@
 //! This is a static helper to remove leading and trailing whitespaces.
 //!
-//! @param str
+//! @param buf
 //!    a pointer to the char array from which the whitespaces should be
 //!    removed
@@ -76 +73 @@
     return str.substr(start, end-start+1);
 }
-
-// --------------------------------------------------------------------------
-//
-//! Splits a string of the form [SERVER/]COMMAND[ arguments]
-//! into SERVER, COMMAND and arguments.
-//!
-//! @param str
-//!    string to be splitted
-//!
-//! @returns
-//!    a vector<string> with three components. Depending on what is existing
-//!    in the string some of the components might be empty.
-//!
-/*
-vector<string> Split(std::string str)
-{
-    const size_t p0 = str.find_first_of('/');
-
-    size_t p1 = str.find_first_of(' ');
-
-    vector<string> v(3);
-
-    // string starts with SERVER/COMMAND[ arguments]
-    if (p0<p1)
-    {
-        // SERVER
-        v[0] = str.substr(0, p0);
-
-        // COMMAND[ arguments)
-        str = str.substr(p0+1);
-        p1  = str.find_first_of(' ');
-    }
-
-    // String is of the form: COMMAND[ arguments]
-
-    // COMMAND
-    v[1] = str.substr(0, p1);
-
-    // Has arguments
-    if (p1!=string::npos)
-        v[2] = str.substr(p1+1);
-
-    return v;
-}
-*/

trunk/FACT++/src/tools.h

@@ -1 +1 @@
 #include <string>
-#include <vector>
 
 namespace Tools
 {
-//    std::string Format(const char *fmt, va_list &ap);
-//    std::string Form(const char *fmt, ...);
+    std::string Format(const char *fmt, va_list &ap);
+    std::string Form(const char *fmt, ...);
     std::string Trim(const std::string &str);
 }