From 7d3d2a8b312d25954ab2872489a74087fcbc66df Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 13 Mar 2019 16:03:11 +0100 Subject: [PATCH 1/2] ctb and moench server: pll vco clock changed from 400 to 800,ctb server: max adc clock from 40 to 65MHz --- slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h | 4 ++-- .../moenchDetectorServer/slsDetectorServer_defs.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h index ae6e9597e..f094cdeea 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h @@ -97,6 +97,6 @@ enum DACINDEX {D0, D1, D2, D3, D4, D5, D6, D7, D8, D9, #define IP_PACKETSIZE (0x2032) #define ADC_PORT_INVERT_VAL (0x453b2593) -#define MAXIMUM_ADC_CLK (40) -#define PLL_VCO_FREQ_MHZ (400) +#define MAXIMUM_ADC_CLK (65) +#define PLL_VCO_FREQ_MHZ (800) diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h index fa2aac94b..4c9cabf60 100644 --- a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h @@ -79,5 +79,5 @@ enum DACINDEX {D0, D1, D2, D3, D4, D5, D6, D7}; #define IP_PACKETSIZE (0x2032) #define ADC_PORT_INVERT_VAL (0x453b2593) //FIXME: a default value? #define MAXIMUM_ADC_CLK (40) -#define PLL_VCO_FREQ_MHZ (400) +#define PLL_VCO_FREQ_MHZ (800) From 14131f93f1a079cad7916b5fe95fdf534c0d82ac Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 14 Mar 2019 09:06:44 +0100 Subject: [PATCH 2/2] sanitizer compile fail --- CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a2a349f7d..4f318726a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,9 +63,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 ") # set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=thread") # set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=thread") -set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address,undefined") -set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address,undefiend") - +#set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address,undefined") +#set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address,undefiend") +set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") +set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG}") set(CMAKE_POSITION_INDEPENDENT_CODE ON)