From e7ff96fe8d4f92661db970064e69a788f9fee188 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 20 Jul 2020 17:30:44 +0200 Subject: [PATCH] gotthard2 --- slsDetectorServers/gotthard2DetectorServer/CMakeLists.txt | 2 ++ slsDetectorServers/gotthard2DetectorServer/Makefile | 1 + .../{config.txt => config_gotthard2.txt} | 0 .../gotthard2DetectorServer/slsDetectorServer_defs.h | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) rename slsDetectorServers/gotthard2DetectorServer/{config.txt => config_gotthard2.txt} (100%) diff --git a/slsDetectorServers/gotthard2DetectorServer/CMakeLists.txt b/slsDetectorServers/gotthard2DetectorServer/CMakeLists.txt index 02dd438f2..6fbb6a8d1 100644 --- a/slsDetectorServers/gotthard2DetectorServer/CMakeLists.txt +++ b/slsDetectorServers/gotthard2DetectorServer/CMakeLists.txt @@ -38,3 +38,5 @@ set_target_properties(gotthard2DetectorServer_virtual PROPERTIES install(TARGETS gotthard2DetectorServer_virtual RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) + +configure_file(config_gotthard2.txt ${CMAKE_BINARY_DIR}/bin/config_gotthard2.txt COPYONLY) diff --git a/slsDetectorServers/gotthard2DetectorServer/Makefile b/slsDetectorServers/gotthard2DetectorServer/Makefile index 273630224..000d778bb 100755 --- a/slsDetectorServers/gotthard2DetectorServer/Makefile +++ b/slsDetectorServers/gotthard2DetectorServer/Makefile @@ -32,6 +32,7 @@ $(PROGS): $(OBJS) mkdir -p $(DESTDIR) $(CC) -o $@ $^ $(CFLAGS) $(LDLIBS) mv $(PROGS) $(DESTDIR) + cp config_gotthard2.txt $(DESTDIR) rm $(main_src)*.o clean: diff --git a/slsDetectorServers/gotthard2DetectorServer/config.txt b/slsDetectorServers/gotthard2DetectorServer/config_gotthard2.txt similarity index 100% rename from slsDetectorServers/gotthard2DetectorServer/config.txt rename to slsDetectorServers/gotthard2DetectorServer/config_gotthard2.txt diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h index 825fd5898..f775acc7e 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h @@ -18,7 +18,7 @@ #define DAC_DRIVER_FILE_NAME ("/etc/devlinks/dac") #define ONCHIP_DAC_DRIVER_FILE_NAME ("/etc/devlinks/chipdac") #define TYPE_FILE_NAME ("/etc/devlinks/type") -#define CONFIG_FILE ("config.txt") +#define CONFIG_FILE ("config_gotthard2.txt") #define DAC_MAX_MV (2048) #define ONCHIP_DAC_MAX_VAL (0x3FF) #define ADU_MAX_VAL (0xFFF)