diff --git a/drivers/DAC-AD5791/Makefile b/drivers/DAC-AD5791/Makefile deleted file mode 100644 index 8935917..0000000 --- a/drivers/DAC-AD5791/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -CXX=g++ -CXXFLAGS=-g -O0 -Wall -Wshadow -pedantic -CXXCPPFLAGS=-I. -I../.. -LDFLAGS=-lexpat -lxerces-c - -.PHONY: all clean install - -all: AD5791.o - -../../tools/add_endline.exe: ../../tools/add_endline.cpp - $(CXX) $< -o $@ - -../../core/core.a: - $(MAKE) -C ../../core core.a - -clean: ../../tools/add_endline.exe - for f in AD5791.cpp AD5791.h; do $< $$f; done - rm -f *.exe *.o *~ core.* - -AD5791.o: AD5791.cpp AD5791.h - $(CXX) -c $(CXXFLAGS) $(CXXCPPFLAGS) -o $@ $< - diff --git a/drivers/Datel-PCI416/Makefile b/drivers/Datel-PCI416/Makefile deleted file mode 100644 index 397041f..0000000 --- a/drivers/Datel-PCI416/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -############################################################################# -# -# Author: Achim Gaedke -# Created: June 2004 -# -############################################################################# - - -# für den ersten Anlauf -CPP=g++ -CPPFLAGS=-g -I. -I../.. -LDFLAGS= - -.PHONY: all clean install - -../../tools/add_endline.exe: ../../tools/add_endline.cpp - $(CXX) $< -o $@ - -all: Datel-PCI416.o - -Datel-PCI416.o: Datel-PCI416.cpp Datel-PCI416.h PCI416_func_import.cpp - $(CPP) -c $(CPPFLAGS) $< -o $@ - -PCI416_func_import.cpp: 416inc/41632DLL.H - grep "^TFP_" $< |sed 's/.* \(.*\);/pci41632dll_getproc(\1)/' >$@ - -clean: - for f in *.cpp *.h; do ../../tools/add_endline.exe $$f; done; \ -rm -f *.o *~ *.stackdump PCI416_func_import.cpp - -install: - diff --git a/drivers/Eurotherm-2000Series/Eurotherm-2000Series.cpp b/drivers/Eurotherm-2000Series/Eurotherm-2000Series.cpp index 0f9d887..8558853 100644 --- a/drivers/Eurotherm-2000Series/Eurotherm-2000Series.cpp +++ b/drivers/Eurotherm-2000Series/Eurotherm-2000Series.cpp @@ -68,7 +68,7 @@ void Eurotherm2000Series::configure(const std::map& con mode=config_mode; } } - catch (Eurotherm2000Series_error e){error_message+=i->first+"->"+i->second+", ";} + catch (Eurotherm2000Series_error &e){error_message+=i->first+"->"+i->second+", ";} } if (mode==config_mode) { set_value("IM","0000."); diff --git a/drivers/Eurotherm-2000Series/Makefile b/drivers/Eurotherm-2000Series/Makefile deleted file mode 100644 index 646280c..0000000 --- a/drivers/Eurotherm-2000Series/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -############################################################################# -# -# Author: Achim Gaedke -# Created: January 2005 -# -############################################################################# - -CXX=g++ -CXXFLAGS=-O0 -g -Wall -Wshadow -pedantic -CXXCPPFLAGS=-I. -I../.. -LIBS=-lpthread -lxerces-c - -.PHONY: all clean - -all: Eurotherm-2000Series.o - -../../tools/add_endline.exe: ../../tools/add_endline.cpp - $(CXX) $< -o $@ - -../tempcont.o: ../tempcont.h ../tempcont.cpp - $(MAKE) -C .. tempcont.o - -Eurotherm-2000Series.o: Eurotherm-2000Series.cpp Eurotherm-2000Series.h ../tempcont.h - $(CXX) -c $(CXXFLAGS) $(CXXCPPFLAGS) $< -o $@ - -test.exe: test.cpp Eurotherm-2000Series.o Eurotherm-2000Series.h ../tempcont.o - $(CXX) $(CXXFLAGS) $(CXXCPPFLAGS) -o $@ $< Eurotherm-2000Series.o ../tempcont.o $(LIBS) - -control: control.cpp Eurotherm-2000Series.o Eurotherm-2000Series.h ../tempcont.o ../../machines/hardware.o ../../core/core.a - $(CXX) $(CXXFLAGS) $(CXXCPPFLAGS) -o $@ $< Eurotherm-2000Series.o ../tempcont.o ../../machines/hardware.o ../../core/core.a -lexpat $(LIBS) - -gnuplot_output.exe: gnuplot_output.cpp Eurotherm-2000Series.o ../tempcont.o - $(CXX) $(CXXFLAGS) $(CXXCPPFLAGS) -o $@ $< Eurotherm-2000Series.o ../tempcont.o $(LIBS) - -clean: ../../tools/add_endline.exe - for f in Eurotherm-2000Series.cpp Eurotherm-2000Series.h test.cpp Makefile; do ../../tools/add_endline.exe $$f; done; \ -rm -f *~ *.o *.exe *.stackdump core.{0,1,2,3,4,5,6,7,8,9}*; diff --git a/drivers/Makefile b/drivers/Makefile deleted file mode 100644 index 058ecce..0000000 --- a/drivers/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -############################################################################# -# -# Author: Achim Gaedke -# Created: June 2004 -# -############################################################################# - -CXX=g++ -CXXFLAGS=-O0 -g -Wall -Wshadow -pedantic -CXXCPPFLAGS=-I. -I.. - -#ToDo PBP-HS3-test.exe -SUBDIRS:=SpinCore-PulseBlaster SpinCore-PulseBlaster24Bit SpinCore-PulseBlasterDDSIII PTS-Synthesizer Eurotherm-2000Series dummy Spectrum-MI40xxSeries Spectrum-M2i40xxSeries Tecmag-DAC20 DAC-AD5791 -ifeq ($(shell /bin/uname -o),Cygwin) -SUBDIRS+=TiePie-HS3 Datel-PCI416 -endif - -all: tempcont.o - for i in $(SUBDIRS); do make -C $$i all; done - -../tools/add_endline.exe: ../tools/add_endline.cpp - $(CXX) $< -o $@ - -.PHONY: SpinCore-PulseBlasterDDSIII/SpinCore-PulseBlasterDDSIII.o TiePie-HS3/TiePie-HS3.a Eurotherm-2000Series/Eurotherm-2000Series.o clean install - -tempcont.o: tempcont.cpp tempcont.h - $(CXX) $(CXXFLAGS) $(CXXCPPFLAGS) -c $< -o $@ - -SpinCore-PulseBlasterDDSIII/SpinCore-PulseBlasterDDSIII.o: - $(MAKE) -C SpinCore-PulseBlasterDDSIII SpinCore-PulseBlasterDDSIII.o - -Eurotherm-2000Series/Eurotherm-2000Series.o: - $(MAKE) -C Eurotherm-2000Series Eurotherm-2000Series.o - -TiePie-HS3/TiePie-HS3.a: - $(MAKE) -C TiePie-HS3 TiePie-HS3.a - -Datel-PCI416/Datel-PCI416.o: - $(MAKE) -C Datel-PCI416 Datel-PCI416.o - -clean: ../tools/add_endline.exe - for f in ADC.h frequgen.h pulsegen.h tempcont.h ; do ../tools/add_endline.exe $$f; done; \ -rm -f *~ *.o *.exe *.stackdump core.{0,1,2,3,4,5,6,7,8,9}*; \ -for i in $(SUBDIRS); do make -C $$i clean; done - -install: all - for i in $(SUBDIRS); do make PREFIX=$(PREFIX) -C $$i install; done diff --git a/drivers/PTS-Synthesizer/Makefile b/drivers/PTS-Synthesizer/Makefile deleted file mode 100644 index 13a1ca7..0000000 --- a/drivers/PTS-Synthesizer/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -############################################################################# -# -# Author: Achim Gaedke -# Created: October 2004 -# -############################################################################# - -CXX=g++ -CXXFLAGS=-g -O0 -Wall -Wshadow -pedantic -CXXCPPFLAGS=-I. -I../.. -LDFLAGS=../../core/core.a -lexpat - -.PHONY: all clean install - -all: PTS.o PTS_test.exe - -../../tools/add_endline.exe: ../../tools/add_endline.cpp - $(CXX) $< -o $@ - -../../core/core.a: - $(MAKE) -C ../../core core.a - -PTS.o: PTS.cpp ../frequgen.h - $(CXX) -c $(CXXFLAGS) $(CXXCPPFLAGS) -o $@ $< - -PTS_test.o: PTS_test.cpp PTS.h - $(CXX) -c $(CXXFLAGS) $(CXXCPPFLAGS) -o $@ $< - -PTS_test.exe: PTS_test.o PTS.o - $(CXX) -o $@ $^ $(LDFLAGS) - -clean: ../../tools/add_endline.exe - for f in PTS.cpp PTS.h PTS_test.cpp; do $< $$f; done - rm -f *.exe *.o *~ core.* diff --git a/drivers/Spectrum-M2i40xxSeries/Makefile b/drivers/Spectrum-M2i40xxSeries/Makefile deleted file mode 100644 index 3313c39..0000000 --- a/drivers/Spectrum-M2i40xxSeries/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -CPPFLAGS=-Iinclude -I../.. -CXXFLAGS=-Wshadow -Wall -O0 -g -DSPC_DEBUG=0 -AR=ar -LIBS+= -lpthread -lm -lxerces-c -lexpat - -SPC_HEADERS = include/spcerr.h include/regs.h include/dlltyp.h include/spcioctl.inc -SPC_ZIP = drv_spcm_linux_drv_v214b5633.zip -# SPC_ZIP = drv_new.zip - -all: clean $(SPC_HEADERS) Spectrum-M2i40xxSeries.a - -$(SPC_HEADERS): $(SPC_ZIP) - unzip -u $< "*.h" "*.txt" "*.inc" -d include/ - -Spectrum-M2i40xxSeries.a: Spectrum-M2i40xxSeries.o GatedData.o - $(AR) r $@ $^ - -Spectrum-M2i40xxSeries.o: Spectrum-M2i40xxSeries.cpp Spectrum-M2i40xxSeries.h GatedData.h - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< - -GatedData.o: GatedData.cpp GatedData.h - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< - -test.o: test.cpp Spectrum-M2i40xxSeries.h include/spcerr.h - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< - -test: test.o Spectrum-M2i40xxSeries.a ../../core/core.a -# $(CXX) -o $@ -I../.. ../ADC.h $^ $(LIBS) - $(CXX) -o $@ $(LIBS) -I../ADC.h $^ - - -../../core/core.a: - $(MAKE) -C ../../core core.a - -clean: - rm -f *.o *.a *~ test *.core - rm -rf include diff --git a/drivers/Spectrum-MI40xxSeries/CMakeLists.txt b/drivers/Spectrum-MI40xxSeries/CMakeLists.txt index 5560072..1810e6b 100644 --- a/drivers/Spectrum-MI40xxSeries/CMakeLists.txt +++ b/drivers/Spectrum-MI40xxSeries/CMakeLists.txt @@ -14,67 +14,6 @@ add_custom_command(OUTPUT ${SPC_HEADERS} COMMENT "Unpacking SPC headers" VERBATIM) -# Kernelmodule is build from NDA source code. -# just go to the current directory and tar xfz drvsrc_all_V*.tgz -# this will usually create a "linux" folder -# the actual kernel source file is in the src_all/micx_drv subfolder. -# If the "linux" folder exists the driver will be build. -# Alternatively you can set the SPC_SOURCE environment variable to the micx_drv folder - -file(GLOB MILIST "drvsrc_all_V*.tgz" ) -# sort and select last (alphabetic order) tarball driver -list(SORT MILIST) -if(MILIST) - list(GET MILIST -1 MITGZ ) -else() - set(MITGZ "non-existing-file") -endif() -#message(STATUS ${MITGZ}) - -if(EXISTS ${MITGZ}) - message(STATUS "Using spectrum driver source tarball: " ${MITGZ}) - add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/linux/src_all/micx_drv - COMMAND tar xfvz ${MITGZ} - COMMAND cp -v ${CMAKE_CURRENT_SOURCE_DIR}/linux/src_all/micx_drv/makefile.kernel26 ${CMAKE_CURRENT_SOURCE_DIR}/linux/src_all/micx_drv/Makefile - COMMAND sed -i "s/Wno-deprecated-declarations/w/" ${CMAKE_CURRENT_SOURCE_DIR}/linux/src_all/micx_drv/Makefile - # fails on jessie - COMMAND sed -i "s/-Wno-error=date-time//g" ${CMAKE_CURRENT_SOURCE_DIR}/linux/src_all/micx_drv/Makefile - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMENT "Unpacking Spectrum driver tarball" - VERBATIM) - set(SPC_SRC "${CMAKE_CURRENT_SOURCE_DIR}/linux/src_all/micx_drv") - add_custom_target(spc_smp ALL DEPENDS ${SPC_SRC}) -elseif(DEFINED ENV{SPC_SOURCE}) - message(STATUS "SPC_SOURCE environment variable set: " $ENV{SPC_SOURCE}) - set(SPC_SRC $ENV{SPC_SOURCE}) - add_custom_target(spc_smp ALL DEPENDS ${SPC_SRC}) -else() - set(SPC_SRC "${CMAKE_CURRENT_SOURCE_DIR}/linux/src_all/micx_drv") - message("\nIf you have signed the NDA from Spectrum and got a kernel driver tarball (i.e. drvsrc_all_V*.tgz), put it in:\n\n\t" ${CMAKE_CURRENT_SOURCE_DIR} "\n\nto get a kernel module built\n") - message(WARNING "Spectrum driver source path not defined in envirnoment variable SPC_SOURCE,\nusing default: " ${SPC_SRC}) -endif() - -set(DRIVER_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) -file(GLOB KERNEL_VERSIONS_DIR RELATIVE "/lib/modules" "/lib/modules/*/build") -foreach(KERNEL_DIR ${KERNEL_VERSIONS_DIR}) - string(REPLACE "/build" "" KERNEL_VERSION ${KERNEL_DIR}) - message(STATUS "Compiling spc_smp.ko for kernel: " ${KERNEL_VERSION}) - set(DRIVER_FILE ${KERNEL_VERSION}/spc_smp.ko ) - set(KBUILD_CMD ${CMAKE_MAKE_PROGRAM} - -C "/lib/modules/${KERNEL_DIR}" - M=${SPC_SRC} modules) - - add_custom_command(OUTPUT ${DRIVER_FILE} - COMMAND ${KBUILD_CMD} - COMMAND mkdir -p ${DRIVER_DIRECTORY}/${KERNEL_VERSION} - COMMAND cp -fv ${SPC_SRC}/spc_smp.ko ${DRIVER_DIRECTORY}/${KERNEL_VERSION}/spc_smp.ko - COMMENT "Building spc_smp.ko for kernel version: " ${KERNEL_VERSION} - WORKING_DIRECTORY ${SPC_SRC} - VERBATIM) - add_custom_target (micx_drv_${KERNEL_VERSION} ALL DEPENDS ${DRIVER_FILE}) - add_dependencies (micx_drv_${KERNEL_VERSION} spc_smp) - install(FILES ${DRIVER_FILE} DESTINATION /lib/modules/${KERNEL_VERSION}/kernel/damaris) -endforeach(KERNEL_DIR) add_library(Spectrum_MI40xxSeries STATIC Spectrum-MI40xxSeries.cpp GatedData.cpp ${SPC_HEADERS}) add_executable(hw_test_ext hw_test_extclock.cpp GatedData.cpp ${SPC_HEADERS}) diff --git a/drivers/Spectrum-MI40xxSeries/Makefile b/drivers/Spectrum-MI40xxSeries/Makefile deleted file mode 100644 index 4c7129b..0000000 --- a/drivers/Spectrum-MI40xxSeries/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -CPPFLAGS=-Iinclude -I../.. -CXXFLAGS=-Wshadow -Wall -pedantic -O0 -AR=ar - - -SPC_HEADERS = include/spcerr.h include/regs.h include/dlltyp.h include/spcioctl.inc -#SPC_ZIP = ../Spectrum-M2i40xxSeries/drv_spcm_linux_drv_v214b5633.zip -SPC_ZIP = ../Spectrum-MI40xxSeries/drv_header_v402b6844.zip - -all: clean $(SPC_HEADERS) patch Spectrum-MI40xxSeries.a hw_test_int hw_test_ext - -$(SPC_HEADERS): $(SPC_ZIP) - unzip -u $< "*.h" "*.txt" "*.inc" -d include/ - -patch: - patch -N -p0 < ftbfs_patch.diff - -Spectrum-MI40xxSeries.a: Spectrum-MI40xxSeries.o GatedData.o - $(AR) r $@ $^ - -Spectrum-MI40xxSeries.o: Spectrum-MI40xxSeries.cpp Spectrum-MI40xxSeries.h GatedData.h include/spcerr.h - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< - -GatedData.o: GatedData.cpp GatedData.h - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< - -test.o: test.cpp Spectrum-MI40xxSeries.h include/spcerr.h - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< - -test: test.o Spectrum-MI40xxSeries.o ../../core/core.a - $(CXX) -o $@ -I../.. ../ADC.h $^ -lpthread -lm -hw_test_int: hw_test_intclock.cpp - $(CXX) -o $@ -Iinclude $^ -hw_test_ext: hw_test_extclock.cpp - $(CXX) -o $@ -Iinclude $^ - - -../../core/core.a: - $(MAKE) -C ../../core core.a - -clean: - rm -f *.o *.a *~ test *.core hw_test_ext hw_test_int - rm -rf include diff --git a/drivers/SpinCore-PulseBlaster/CMakeLists.txt b/drivers/SpinCore-PulseBlaster/CMakeLists.txt index 3f2142e..2fb95a5 100644 --- a/drivers/SpinCore-PulseBlaster/CMakeLists.txt +++ b/drivers/SpinCore-PulseBlaster/CMakeLists.txt @@ -1,29 +1,5 @@ cmake_minimum_required(VERSION 3.0) - - -set(DRIVER_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) -file(GLOB KERNEL_VERSIONS_DIR RELATIVE "/lib/modules" "/lib/modules/*/build") -foreach(KERNEL_DIR ${KERNEL_VERSIONS_DIR}) - string(REPLACE "/build" "" KERNEL_VERSION ${KERNEL_DIR}) - message(STATUS "Compiling pulseblaster.ko for kernel: " ${KERNEL_VERSION}) - - # Creating pulseblaster kernel module - set(DRIVER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${KERNEL_VERSION}/pulseblaster.ko ) - set(KBUILD_CMD ${CMAKE_MAKE_PROGRAM} - -C "/lib/modules/${KERNEL_DIR}" - M=${CMAKE_CURRENT_SOURCE_DIR} modules) - - add_custom_command(OUTPUT ${DRIVER_FILE} - COMMAND ${KBUILD_CMD} - COMMAND mkdir -p ${KERNEL_VERSION} - COMMAND mv -fv pulseblaster.ko ${DRIVER_FILE} - COMMENT "Building pulseblaster.ko for kernel version: " ${KERNEL_VERSION} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - VERBATIM) - add_custom_target(pulseblaster_driver_${KERNEL_VERSION} ALL DEPENDS ${DRIVER_FILE} ) - install(FILES ${DRIVER_FILE} DESTINATION /lib/modules/${KERNEL_VERSION}/kernel/damaris) -endforeach(KERNEL_DIR) #include_directories(..) add_library(SpinCore-PulseBlaster SpinCore-PulseBlaster.cpp) add_library(PulseBlasterProgram PulseBlasterProgram.cpp) diff --git a/drivers/SpinCore-PulseBlaster/Makefile b/drivers/SpinCore-PulseBlaster/Makefile deleted file mode 100644 index a886a67..0000000 --- a/drivers/SpinCore-PulseBlaster/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# author: Achim Gaedke -# created: February 2005 - -ifdef KERNELRELEASE - -obj-m += pulseblaster.o - -else - -ifeq ($(shell uname -o), GNU/Linux) -KERNELSRC=/lib/modules/$(shell uname -r)/build -endif - -THISDIR=$(shell cd . >/dev/null; pwd) -LIBS=-lm -lxerces-c -lexpat -CXXFLAGS=-g -O0 -Wall -Wshadow -pedantic -CXXCPPFLAGS=-I../.. - -all: PulseBlasterProgram.o SpinCore-PulseBlaster.o - -pulseblaster_test: pulseblaster_test.cpp SpinCore-PulseBlaster.o - $(CXX) $(CXXFLAGS) $(CXXCPPFLAGS) -o$@ $^ $(LIBS) - -TestCase: TestCase.cpp SpinCore-PulseBlaster.o ../../core/core.a - $(CXX) $(CXXFLAGS) $(CXXCPPFLAGS) -I. -o$@ $^ $(LIBS) - -PulseBlasterProgram.o: PulseBlasterProgram.cpp PulseBlasterProgram.h - $(CXX) $(CXXFLAGS) $(CXXCPPFLAGS) -c -o$@ $< - -SpinCore-PulseBlaster.o: SpinCore-PulseBlaster.cpp SpinCore-PulseBlaster.h - $(CXX) $(CXXFLAGS) $(CXXCPPFLAGS) -c -o$@ $< - -../../core/core.a: - $(MAKE) -C ../../core core.a - -pulseblaster.ko: - $(MAKE) -C $(KERNELSRC) SUBDIRS=$(THISDIR) - -clean: - rm -f *.o *~ pulseblaster_test -ifeq ($(shell uname -o), GNU/Linux) - $(MAKE) -C $(KERNELSRC) SUBDIRS=$(THISDIR) clean -endif - -endif diff --git a/drivers/SpinCore-PulseBlaster24Bit/Makefile b/drivers/SpinCore-PulseBlaster24Bit/Makefile deleted file mode 100644 index 0564dcd..0000000 --- a/drivers/SpinCore-PulseBlaster24Bit/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -CXXFLAGS=-g -O0 -Wshadow -Wall -pedantic -CXXCPPFLAGS=-I../.. -CXX=g++ - -all: SpinCore-PulseBlaster24Bit.o - -test: test.cpp SpinCore-PulseBlaster24Bit.o ../SpinCore-PulseBlaster/SpinCore-PulseBlaster.o ../SpinCore-PulseBlaster/PulseBlasterProgram.o ../../core/core.a - $(CXX) $(CXXFLAGS) $(CXXCPPFLAGS) -o $@ $^ -lm -lexpat -lxerces-c - -../SpinCore-PulseBlaster/SpinCore-PulseBlaster.o: ../SpinCore-PulseBlaster/SpinCore-PulseBlaster.cpp ../SpinCore-PulseBlaster/SpinCore-PulseBlaster.h - $(MAKE) -C ../SpinCore-PulseBlaster SpinCore-PulseBlaster.o - -../SpinCore-PulseBlaster/PulseBlasterProgram.o: ../SpinCore-PulseBlaster/PulseBlasterProgram.cpp ../SpinCore-PulseBlaster/PulseBlasterProgram.h - $(MAKE) -C ../SpinCore-PulseBlaster PulseBlasterProgram.o - -../../core/core.a: - $(MAKE) -C ../../core core.a - -SpinCore-PulseBlaster24Bit.o: SpinCore-PulseBlaster24Bit.cpp SpinCore-PulseBlaster24Bit.h - $(CXX) $(CXXFLAGS) $(CXXCPPFLAGS) -c -o $@ $< - -clean: - rm -f *.o *~ test diff --git a/drivers/SpinCore-PulseBlasterDDSIII/Makefile b/drivers/SpinCore-PulseBlasterDDSIII/Makefile deleted file mode 100644 index 1c4829f..0000000 --- a/drivers/SpinCore-PulseBlasterDDSIII/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -############################################################################# -# -# Author: Achim Gaedke -# Created: June 2004 -# -############################################################################# -CXX=g++ -CXXFLAGS=-g -O0 -Wall -Wshadow -pedantic -CXXCPPFLAGS=-I../.. -I. - -.PHONY: all clean intall - -all: SpinCore-PulseBlasterDDSIII.o - -../../tools/add_endline.exe: ../../tools/add_endline.cpp - $(CXX) $< -o $@ - -../SpinCore-PulseBlaster/SpinCore-PulseBlaster.o: ../SpinCore-PulseBlaster/SpinCore-PulseBlaster.cpp ../SpinCore-PulseBlaster/SpinCore-PulseBlaster.h - $(MAKE) -C ../SpinCore-PulseBlaster SpinCore-PulseBlaster.o - -SpinCore-PulseBlasterDDSIII.o: SpinCore-PulseBlasterDDSIII.cpp SpinCore-PulseBlasterDDSIII.h ../SpinCore-PulseBlaster/SpinCore-PulseBlaster.h ../pulsegen.h ../frequgen.h - $(CXX) $(CXXFLAGS) $(CXXCPPFLAGS) -c $< -o $@ - -../../core/core.a: - make -C ../../core core.a - -test.exe: test.cpp SpinCore-PulseBlasterDDSIII.o ../SpinCore-PulseBlaster/SpinCore-PulseBlaster.o ../SpinCore-PulseBlaster/PulseBlasterProgram.o ../../core/core.a - $(CXX) $(CXXFLAGS) $(CXXCPPFLAGS) -o $@ $^ -lexpat - -clean: ../../tools/add_endline.exe - for f in *.cpp *.h; do ../../tools/add_endline.exe $$f; done; \ -rm -f *.stackdump *.o *.exe \#* *~ - -install: - install PBD03PC.dll $(PREFIX) diff --git a/drivers/Tecmag-DAC20/Makefile b/drivers/Tecmag-DAC20/Makefile deleted file mode 100644 index 6c15619..0000000 --- a/drivers/Tecmag-DAC20/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -CXX=g++ -CXXFLAGS=-g -O0 -Wall -Wshadow -pedantic -CXXCPPFLAGS=-I. -I../.. -LDFLAGS=-lexpat -lxerces-c - -.PHONY: all clean install - -all: DAC20.o DAC_test.exe - -../../tools/add_endline.exe: ../../tools/add_endline.cpp - $(CXX) $< -o $@ - -../../core/core.a: - $(MAKE) -C ../../core core.a - -clean: ../../tools/add_endline.exe - for f in DAC20.cpp DAC20.h DAC_test.cpp; do $< $$f; done - rm -f *.exe *.o *~ core.* - -DAC20.o: DAC20.cpp DAC20.h - $(CXX) -c $(CXXFLAGS) $(CXXCPPFLAGS) -o $@ $< - -DAC_test.o: DAC_test.cpp - $(CXX) -c $(CXXFLAGS) $(CXXCPPFLAGS) -o $@ $< - -DAC_test.exe: DAC_test.o DAC20.o ../../core/core.a - $(CXX) -o $@ $^ $(LDFLAGS) diff --git a/drivers/TiePie-HS3/Makefile b/drivers/TiePie-HS3/Makefile deleted file mode 100644 index f91d3f3..0000000 --- a/drivers/TiePie-HS3/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -############################################################################# -# -# Author: Achim Gaedke -# Created: June 2004 -# -############################################################################# - -CXX=g++ -CXXFLAGS=-g -O0 -I. -I../.. -LDFLAGS= - -.PHONY: all clean install - -all: TiePie-HS3.a - -../../tools/add_endline.exe: ../../tools/add_endline.cpp - $(CXX) $< -o $@ - -TiePie-HS3.o: TiePie-HS3.cpp TiePie-HS3.h - $(CXX) -c $(CXXFLAGS) $< -o $@ - -tiepie.o: tiepie.cpp tiepie.h - $(CXX) -c $(CXXFLAGS) $< -o $@ - -TiePie-HS3.a: TiePie-HS3.o tiepie.o - $(AR) r $@ $^ - -HS3test.exe: HS3test.cpp TiePie-HS3.a ../../core/core.a - $(CXX) $(CXXFLAGS) $^ -o $@ - -../../core/core.a: - $(MAKE) -C ../../core core.a - -clean: - for f in *.cpp *.h; do ../../tools/add_endline.exe $$f; done; \ -rm -f *.o *~ \#* *.stackdump *.a *.exe - -install: - install *.hex *.dll $(PREFIX) diff --git a/drivers/dummy/Makefile b/drivers/dummy/Makefile deleted file mode 100644 index 0f6daac..0000000 --- a/drivers/dummy/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -############################################################################# -# -# Author: Achim Gaedke -# Created: June 2004 -# -############################################################################# - - -CXX=g++ -CXXFLAGS=-Wall -Wshadow -pedantic -g -O0 -CXXCPPFLAGS=-I. -I../.. -LIBS=-lpthread - -.PHONY: clean install all - -all: dummy.o - -../tempcont.o: ../tempcont.cpp ../tempcont.h - $(MAKE) -C .. tempcont.o - -../../core/core.a: - $(MAKE) -C ../core core.a - -dummy.o: dummy.h dummy.cpp ../tempcont.h ../ADC.h ../pulsegen.h ../frequgen.h - $(CXX) $(CXXFLAGS) $(CXXCPPFLAGS) -c -o dummy.o dummy.cpp - -temperature_dummy.exe: temperature_dummy.cpp dummy.o ../tempcont.o ../../core/core.a - $(CXX) $(CXXFLAGS) -o temperature_dummy.exe temperature_dummy.cpp dummy.o ../tempcont.o ../../core/core.a $(LIBS) - -../../tools/add_endline.exe: ../../tools/add_endline.cpp - $(CXX) $< -o $@ - -clean: ../../tools/add_endline.exe - for f in *.cpp *.h; do ../../tools/add_endline.exe $$f; done; \ -rm -f *~ *.o - -install: - diff --git a/drivers/tempcont.cpp b/drivers/tempcont.cpp index 98d8712..48745d7 100644 --- a/drivers/tempcont.cpp +++ b/drivers/tempcont.cpp @@ -9,7 +9,7 @@ void temp_history::print_xml(FILE* f) const { char timebuffer[30]; ctime_r(&latest,timebuffer); timebuffer[strlen(timebuffer)-1]=0; - fprintf(f,"",timebuffer,step); + fprintf(f,"",timebuffer,step); if (!empty()) { fprintf(f,"\n"); for (const_iterator i=begin(); i!=end();++i) fprintf(f,"%g ",*i); @@ -28,7 +28,7 @@ configuration_result* temp_history::as_result() const { // print step [s] XMLCh* step_name=XERCES_CPP_NAMESPACE_QUALIFIER XMLString::transcode("step"); char step_value_char_buf[100]; - snprintf(step_value_char_buf,sizeof(step_value_char_buf),"%d",step); + snprintf(step_value_char_buf,sizeof(step_value_char_buf),"%zu",step); XMLCh* step_value=XERCES_CPP_NAMESPACE_QUALIFIER XMLString::transcode(step_value_char_buf); newelement->setAttribute(step_name,step_value); XERCES_CPP_NAMESPACE_QUALIFIER XMLString::release(&step_name); @@ -125,7 +125,7 @@ void tempcont::maintain_history() { try { new_temp=get_temperature(); } - catch (tempcont_error e) { + catch (tempcont_error &e) { pthread_mutex_unlock(&history_lock); fprintf(stderr,"history maintainance thread caught exception: %s, terminating\n",e.what()); device_failed=1; diff --git a/machines/CMakeLists.txt b/machines/CMakeLists.txt index 73c8a65..20e7eae 100644 --- a/machines/CMakeLists.txt +++ b/machines/CMakeLists.txt @@ -56,7 +56,8 @@ add_executable(fc1neu_backend fc1neu_backend.cpp hardware.cpp) target_link_libraries( fc1neu_backend pthread ${XERCES_LIBRARIES} core Spectrum_MI40xxSeries ${PB24} PTS DAC20 ) # spcm linux driver needs to be installed (see http://spectrum-instrumentation.com/de/downloads/drivers) -find_library(SPCM_LIB spcm) +find_library(SPCM_LIB spcm_linux HINTS /usr/lib64) + if (NOT SPCM_LIB) message(WARNING "spcm not found, install library (see http://spectrum-instrumentation.com/de/downloads/drivers)") else()