From f6dd02acc20ad0cd498e3e531dc871b23ea40117 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Fri, 18 Sep 2020 14:18:19 +0200 Subject: [PATCH] minor print in temp_Fpgafl in eiger --- .../eigerDetectorServer/slsDetectorFunctionList.c | 6 +++--- .../eigerDetectorServer/slsDetectorServer_defs.h | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c index f33e04423..938e72db8 100644 --- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c @@ -1313,9 +1313,9 @@ int getADC(enum ADCINDEX ind) { return 0; #else int retval = -1; - char tempnames[6][20] = {"FPGA EXT", "10GE", "DCDC", - "SODL", "SODR", "FPGA"}; + char *adc_names[] = {ADC_NAMES}; char cstore[255]; + memset(cstore, 0, 255); switch (ind) { case TEMP_FPGA: @@ -1348,7 +1348,7 @@ int getADC(enum ADCINDEX ind) { } LOG(logINFO, - ("Temperature %s: %f°C\n", tempnames[ind], (double)retval / 1000.00)); + ("Temperature %s: %f°C\n", adc_names[ind], (double)retval / 1000.00)); return retval; #endif diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h index 213475dbd..b7f0104ea 100644 --- a/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h @@ -63,6 +63,10 @@ enum ADCINDEX { TEMP_FPGAFEBL, TEMP_FPGAFEBR }; + +#define ADC_NAMES \ + "FPGA EXT", "10GE", "DCDC", "SODL", "SODR", "FPGA", "FPGA_FL", "FPGA_FR" + enum NETWORKINDEX { TXN_LEFT, TXN_RIGHT, TXN_FRAME, FLOWCTRL_10G }; enum ROINDEX { E_PARALLEL, E_NON_PARALLEL }; enum CLKINDEX { RUN_CLK, NUM_CLOCKS }; @@ -130,7 +134,7 @@ enum MASTERINDEX { MASTER_HARDWARE, OW_MASTER, OW_SLAVE }; #define DAC_MAX_STEPS (4096) #define MAX_SUBFRAME_EXPOSURE_VAL_IN_10NS \ -(0x1FFFFFFF) // 29 bit register for max subframe exposure value + (0x1FFFFFFF) // 29 bit register for max subframe exposure value #define SLAVE_HIGH_VOLTAGE_READ_VAL (-999) #define HIGH_VOLTAGE_TOLERANCE (5)