From aa10c4665f3dbcd5d659205ad2ff16ccb7b9661e Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Fri, 11 Sep 2020 15:25:23 +0200 Subject: [PATCH] added ctb --- docs/CMakeLists.txt | 2 ++ docs/gen_server_doc.py.in | 2 +- docs/src/servers.rst | 8 ++++++++ .../ctbDetectorServer/slsDetectorServer_defs.h | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 6d885f4ca..d8e63a448 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -81,3 +81,5 @@ add_custom_target(rst ${SPHINX_BUILD}/src ${SPHINX_BUILD}/html COMMENT "Generating documentation with Sphinx") + +add_custom_target(server_rst python gen_server_doc.py) \ No newline at end of file diff --git a/docs/gen_server_doc.py.in b/docs/gen_server_doc.py.in index f4d99f05a..b99c3e0ad 100644 --- a/docs/gen_server_doc.py.in +++ b/docs/gen_server_doc.py.in @@ -6,7 +6,7 @@ from pathlib import Path src = Path('@CMAKE_SOURCE_DIR@')/'slsDetectorServers/' -detectors = ['Mythen3', 'Gotthard2', 'Eiger', 'Jungfrau', 'Moench', 'Gotthard'] +detectors = ['Mythen3', 'Gotthard2', 'Eiger', 'Jungfrau', 'Moench', 'Gotthard', 'Ctb'] for det in detectors: diff --git a/docs/src/servers.rst b/docs/src/servers.rst index aeae6ce2b..34edc8de0 100644 --- a/docs/src/servers.rst +++ b/docs/src/servers.rst @@ -27,6 +27,14 @@ Moench :widths: 35, 35 :header-rows: 1 +Ctb +------------- + +.. csv-table:: Default values + :file: ctb.csv + :widths: 35, 35 + :header-rows: 1 + Eiger ------------- diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h index a6f39cd5c..f5b681efc 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h @@ -95,7 +95,7 @@ enum CLKINDEX { RUN_CLK, ADC_CLK, SYNC_CLK, DBIT_CLK, NUM_CLOCKS }; #define NDAC_ONLY (NDAC - NPWR) #define DYNAMIC_RANGE (16) #define NUM_BYTES_PER_PIXEL (DYNAMIC_RANGE / 8) -#define CLK_FREQ (156.25) /* MHz */ +#define CLK_FREQ (156.25) // MHz #define I2C_POWER_VIO_DEVICE_ID (0x40) #define I2C_POWER_VA_DEVICE_ID (0x41) #define I2C_POWER_VB_DEVICE_ID (0x42)