diff --git a/src/AcquireWaveformLecroy.cpp b/src/AcquireWaveformLecroy.cpp index ace584a9a33d5fd6fe0321a39673ba6fdeeb7d19..787c5288faeeb9d6219ad8301a233bfcdd69abd7 100644 --- a/src/AcquireWaveformLecroy.cpp +++ b/src/AcquireWaveformLecroy.cpp @@ -1,4 +1,4 @@ -static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/AcquireWaveformLecroy.cpp,v 1.2 2004-10-05 13:09:10 xavela Exp $"; +static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/AcquireWaveformLecroy.cpp,v 1.3 2004-10-05 13:11:11 xavela Exp $"; //+============================================================================= // // file : AcquireWaveformLecroy.cpp @@ -13,9 +13,13 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio // // $Author: xavela $ // -// $Revision: 1.2 $ +// $Revision: 1.3 $ // // $Log: not supported by cvs2svn $ +// Revision 1.2 2004/10/05 13:09:10 xavela +// Xavier : memory allocation in read_attr_hardware() method. +// calculation of offset of the begining of the struct, which contains the context of the waveform acquisition, in the received block data. +// // Revision 1.1.1.1 2004/09/29 15:42:14 syldup // Initial import. // diff --git a/src/AcquireWaveformLecroy.h b/src/AcquireWaveformLecroy.h index b7f96ac290da42b3c9ebb85b0e959b803f1d00f3..7c5dbd325b5245fcbd90f36393dd4fe7089f5815 100644 --- a/src/AcquireWaveformLecroy.h +++ b/src/AcquireWaveformLecroy.h @@ -8,9 +8,13 @@ // // $Author: xavela $ // -// $Revision: 1.2 $ +// $Revision: 1.3 $ // // $Log: not supported by cvs2svn $ +// Revision 1.2 2004/10/05 13:09:10 xavela +// Xavier : memory allocation in read_attr_hardware() method. +// calculation of offset of the begining of the struct, which contains the context of the waveform acquisition, in the received block data. +// // Revision 1.1.1.1 2004/09/29 15:42:14 syldup // Initial import. // @@ -39,7 +43,7 @@ /** * @author $Author: xavela $ - * @version $Revision: 1.2 $ $ + * @version $Revision: 1.3 $ $ */ // Add your own constants definitions here. diff --git a/src/AcquireWaveformLecroyClass.cpp b/src/AcquireWaveformLecroyClass.cpp index 969c5a0aea195d64952828f8b6aeb9b39937e5e3..e45bdeef08c3f31badc6b5f7bc07e8b7ebd50eac 100644 --- a/src/AcquireWaveformLecroyClass.cpp +++ b/src/AcquireWaveformLecroyClass.cpp @@ -1,4 +1,4 @@ -static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/AcquireWaveformLecroyClass.cpp,v 1.2 2004-10-05 13:09:10 xavela Exp $"; +static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/AcquireWaveformLecroyClass.cpp,v 1.3 2004-10-05 13:11:11 xavela Exp $"; static const char *TagName = "$Name: not supported by cvs2svn $"; @@ -20,9 +20,13 @@ static const char *RCSfile = "$RCSfile: AcquireWaveformLecroyClass.cpp,v $"; // // $Author: xavela $ // -// $Revision: 1.2 $ +// $Revision: 1.3 $ // // $Log: not supported by cvs2svn $ +// Revision 1.2 2004/10/05 13:09:10 xavela +// Xavier : memory allocation in read_attr_hardware() method. +// calculation of offset of the begining of the struct, which contains the context of the waveform acquisition, in the received block data. +// // // copyleft : Synchrotron SOLEIL // L'Orme des Merisiers diff --git a/src/AcquireWaveformLecroyClass.h b/src/AcquireWaveformLecroyClass.h index 9aa2748bb9e3f4430d416c5282440956486a5f53..ccdd411ac0d4656b5f8f5dbf05a6d50427c53738 100644 --- a/src/AcquireWaveformLecroyClass.h +++ b/src/AcquireWaveformLecroyClass.h @@ -12,9 +12,13 @@ // // $Author: xavela $ // -// $Revision: 1.2 $ +// $Revision: 1.3 $ // // $Log: not supported by cvs2svn $ +// Revision 1.2 2004/10/05 13:09:10 xavela +// Xavier : memory allocation in read_attr_hardware() method. +// calculation of offset of the begining of the struct, which contains the context of the waveform acquisition, in the received block data. +// // // copyleft : Synchrotron SOLEIL // L'Orme des Merisiers diff --git a/src/ClassFactory.cpp b/src/ClassFactory.cpp index d53002ca3d1c4fc78beecf967eb5e66e4250beb7..eedd68637fab10264a5851a9d23b9a0c7b2af9c1 100644 --- a/src/ClassFactory.cpp +++ b/src/ClassFactory.cpp @@ -1,4 +1,4 @@ -static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/ClassFactory.cpp,v 1.1.1.1 2004-09-29 15:42:14 syldup Exp $"; +static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/ClassFactory.cpp,v 1.2 2004-10-05 13:11:11 xavela Exp $"; //+============================================================================= // // file : ClassFactory.cpp @@ -10,11 +10,14 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio // // project : TANGO Device Server // -// $Author: syldup $ +// $Author: xavela $ // -// $Revision: 1.1.1.1 $ +// $Revision: 1.2 $ // // $Log: not supported by cvs2svn $ +// Revision 1.1.1.1 2004/09/29 15:42:14 syldup +// Initial import. +// // // copyleft : Synchrotron SOLEIL // L'Orme des Merisiers @@ -35,8 +38,8 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio /** * Create AcquireWaveformLecroyClass singleton and store it in DServer object. * - * @author $Author: syldup $ - * @version $Revision: 1.1.1.1 $ $ + * @author $Author: xavela $ + * @version $Revision: 1.2 $ $ */ void Tango::DServer::class_factory() diff --git a/src/Makefile b/src/Makefile index 0a3a35cf576a7061761211a53c11c863ce69dc49..c5229ed2a520b1c463772a9556e77ed0909a0c99 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,91 +1,185 @@ -#============================================================================= -# -# file : Makefile.h -# -# description : Include for the AcquireWaveformLecroy class. -# -# project : Makefile to generate a Tango server -# -# $Author: syldup $ -# -# $Revision: 1.1.1.1 $ -# -# $Log: not supported by cvs2svn $ -# -# copyleft : European Synchrotron Radiation Facility -# BP 220, Grenoble 38043 -# FRANCE -# -#============================================================================= -# This file is generated by POGO -# (Program Obviously used to Generate tango Object) -# -# (c) - Software Engineering Group - ESRF -#============================================================================= -# - -ifdef _solaris -CC = CC -BIN_DIR = solaris7_CC -endif - -ifdef linux -CC = c++ -AR = ar -BIN_DIR = suse72 -endif - -TANGO_HOME = /segfs/tango -INCLUDE_DIRS = -I$(TANGO_HOME)/include/$(BIN_DIR) -I. -LIB_DIRS = -L $(TANGO_HOME)/lib/$(BIN_DIR) - -ifdef _solaris -CXXFLAGS = -mt -D_PTHREADS $(INCLUDE_DIRS) -LFLAGS = -g $(LIB_DIRS) \ - -ltango \ - -llog4tango \ - -lomniORB4 \ - -lomniDynamic4 \ - -lomnithread \ - -lpthread \ - -lposix4 -lsocket -lnsl -endif - -ifdef linux -CXXFLAGS = -g -D_REENTRANT $(INCLUDE_DIRS) -LFLAGS = -g $(LIB_DIRS) \ - -ltango \ - -llog4tango \ - -lomniORB4 \ - -lomniDynamic4 \ - -lomnithread \ - -ldl -lpthread -endif - - - - -CLASS = AcquireWaveformLecroy - -SVC_OBJS = main.o \ - ClassFactory.o \ - $(CLASS)Class.o \ - $(CLASS).o - -SVC_INC = $(CLASS)Class.h \ - $(CLASS).h - - -%.o: %.cpp $(SVC_INC) - $(CC) $(CXXFLAGS) -c $< - -all: $(CLASS) - -$(CLASS): $(SVC_OBJS) - $(CC) $(SVC_OBJS) -o $(CLASS) $(LFLAGS) - -clean: - rm -f *.o $(CLASS) core - -install: - cp $(CLASS) $(TANGO_HOME)/bin/$(BIN_DIR) +#============================================================================= + +# + +# file : Makefile.h + +# + +# description : Include for the AcquireWaveformLecroy class. + +# + +# project : Makefile to generate a Tango server + +# + +# $Author: xavela $ + +# + +# $Revision: 1.2 $ + +# + +# $Log: not supported by cvs2svn $ +# Revision 1.1.1.1 2004/09/29 15:42:14 syldup +# Initial import. +# + +# + +# copyleft : European Synchrotron Radiation Facility + +# BP 220, Grenoble 38043 + +# FRANCE + +# + +#============================================================================= + +# This file is generated by POGO + +# (Program Obviously used to Generate tango Object) + +# + +# (c) - Software Engineering Group - ESRF + +#============================================================================= + +# + + + +ifdef _solaris + +CC = CC + +BIN_DIR = solaris7_CC + +endif + + + +ifdef linux + +CC = c++ + +AR = ar + +BIN_DIR = suse72 + +endif + + + +TANGO_HOME = /segfs/tango + +INCLUDE_DIRS = -I$(TANGO_HOME)/include/$(BIN_DIR) -I. + +LIB_DIRS = -L $(TANGO_HOME)/lib/$(BIN_DIR) + + + +ifdef _solaris + +CXXFLAGS = -mt -D_PTHREADS $(INCLUDE_DIRS) + +LFLAGS = -g $(LIB_DIRS) \ + + -ltango \ + + -llog4tango \ + + -lomniORB4 \ + + -lomniDynamic4 \ + + -lomnithread \ + + -lpthread \ + + -lposix4 -lsocket -lnsl + +endif + + + +ifdef linux + +CXXFLAGS = -g -D_REENTRANT $(INCLUDE_DIRS) + +LFLAGS = -g $(LIB_DIRS) \ + + -ltango \ + + -llog4tango \ + + -lomniORB4 \ + + -lomniDynamic4 \ + + -lomnithread \ + + -ldl -lpthread + +endif + + + + + + + + + +CLASS = AcquireWaveformLecroy + + + +SVC_OBJS = main.o \ + + ClassFactory.o \ + + $(CLASS)Class.o \ + + $(CLASS).o + + + +SVC_INC = $(CLASS)Class.h \ + + $(CLASS).h + + + + + +%.o: %.cpp $(SVC_INC) + + $(CC) $(CXXFLAGS) -c $< + + + +all: $(CLASS) + + + +$(CLASS): $(SVC_OBJS) + + $(CC) $(SVC_OBJS) -o $(CLASS) $(LFLAGS) + + + +clean: + + rm -f *.o $(CLASS) core + + + +install: + + cp $(CLASS) $(TANGO_HOME)/bin/$(BIN_DIR) + diff --git a/src/main.cpp b/src/main.cpp index cc6a47ea3e07bea7d779f2ed817bed47cb1de7b7..d3de32a3835f999d1c57b6415e46cf767eb009a1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,4 @@ -static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/main.cpp,v 1.1.1.1 2004-09-29 15:42:14 syldup Exp $"; +static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/main.cpp,v 1.2 2004-10-05 13:11:11 xavela Exp $"; //+============================================================================= // // file : main.cpp @@ -10,11 +10,14 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio // // project : TANGO Device Server // -// $Author: syldup $ +// $Author: xavela $ // -// $Revision: 1.1.1.1 $ $ +// $Revision: 1.2 $ $ // // $Log: not supported by cvs2svn $ +// Revision 1.1.1.1 2004/09/29 15:42:14 syldup +// Initial import. +// // // copyleft : Synchrotron SOLEIL // L'Orme des Merisiers