detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-08-06 05:02:28 +02:00
Code Issues Actions Packages Releases Activity

chipversion changed to chipversioninfpga, chipindex, vals and type introduced with string for 3 different types for chip v1.2 and 1.3.

Browse Source
This commit is contained in:
maliakal_d
2026-07-24 11:34:43 +02:00
parent 160d793f71
commit 0e9f23ff55
7 changed files with 133 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h
+2 -2
View File
@@ -366,8 +366,8 @@
#define DAQ_FIX_GAIN_STG_2_VAL ((0x3 << DAQ_FIX_GAIN_OFST) & DAQ_FIX_GAIN_MSK)
#define DAQ_CMP_RST_OFST (4)
#define DAQ_CMP_RST_MSK (0x00000001 << DAQ_CMP_RST_OFST)
#define DAQ_CHIP11_VRSN_OFST (7)
#define DAQ_CHIP11_VRSN_MSK (0x00000001 << DAQ_CHIP11_VRSN_OFST)
#define DAQ_CHIP_VRSN_OFST (5)
#define DAQ_CHIP_VRSN_MSK (0x00000007 << DAQ_CHIP_VRSN_OFST)
#define DAQ_STRG_CELL_SLCT_OFST (8)
#define DAQ_STRG_CELL_SLCT_MSK (0x0000000F << DAQ_STRG_CELL_SLCT_OFST)
#define DAQ_FRCE_SWTCH_GAIN_OFST (12)
slsDetectorServers/jungfrauDetectorServer/config_jungfrau.txt
+9 -2
View File
@@ -1,4 +1,11 @@
#chip version version (multiplied by 10)
chipversion 11
#chip version version
#10 -> v1.0
#11 -> v1.1
#120 -> v1.2 Normal
#121 -> v1.2 Low Noise
#121 ->v1.2 HDR
#130 ->v1.3 Burst Mode
chipversion 120
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
+102 -51
View File
@@ -46,6 +46,8 @@ int virtual_moduleid = 0;
#endif
enum detectorSettings thisSettings = UNINITIALIZED;
static enum CHIPINDEX chipIndex = v1_0;
static char chipType[SHORT_STR_LENGTH] = {0};
int highvoltage = 0;
int dacValues[NDAC] = {};
int defaultDacValues[] = DEFAULT_DAC_VALS;
@@ -319,23 +321,56 @@ int isHardwareVersion_1_0() {
return ((getHardwareVersionNumber() == hwNumberList[0]) ? 1 : 0);
}
int getChipVersion() {
// chip v1.1
if (bus_r(DAQ_REG) & DAQ_CHIP11_VRSN_MSK) {
return 11;
int getChipVersionInFPGA() {
const int vals[] = CHIP_VALS;
int val = ((bus_r(DAQ_REG) & DAQ_CHIP_VRSN_MSK) >> DAQ_CHIP_VRSN_OFST);
switch (val) {
case 0:
return vals[(int)v1_0];
case 1:
return vals[(int)v1_1];
case 2:
return vals[(int)v1_2_NORMAL];
default:
LOG(logERROR, ("Read undefined value as chip version from FPGA: %d\n", val));
return -1;
}
// chip v1.0
return 10;
}
void setChipVersion(int version) {
LOG(logINFO,
("Setting chip version to %0.1f in FPGA\n", (double)version / 10.0));
if (version == 11) {
bus_w(DAQ_REG, bus_r(DAQ_REG) | DAQ_CHIP11_VRSN_MSK);
} else {
bus_w(DAQ_REG, bus_r(DAQ_REG) & ~DAQ_CHIP11_VRSN_MSK);
void setChipIndex(enum CHIPINDEX ind) {
chipIndex = ind;
char* chip_names[] = {CHIP_NAMES};
memset(chipType, 0, sizeof(chipType));
strncpy(chipType, chip_names[(int)ind], sizeof(chipType) - 1);
setChipVersionInFPGA();
}
void setChipVersionInFPGA() {
int val = 0;
switch (chipIndex) {
case v1_0:
LOG(logINFO, ("Setting Chip Version 1.0 in FPGA\n"));
val = 0;
break;
case v1_1:
LOG(logINFO, ("Setting Chip Version 1.1 in FPGA\n"));
val = 1;
break;
case v1_2_NORMAL:
case v1_2_LOW_NOISE:
case v1_2_HDR:
LOG(logINFO, ("Setting Chip Version 1.1 in FPGA\n"));
val = 2;
break;
default:
LOG(logERROR, ("Unknown chip version %d\n", (int)chipIndex));
break;
}
bus_w(DAQ_REG, bus_r(DAQ_REG) & ~DAQ_CHIP_VRSN_MSK);
bus_w(DAQ_REG, bus_r(DAQ_REG) | ((val << DAQ_CHIP_VRSN_OFST) & DAQ_CHIP_VRSN_MSK));
}
u_int32_t getDetectorNumber() {
@@ -549,13 +584,19 @@ void setupDetector() {
setExpTime(DEFAULT_EXPTIME);
setPeriod(DEFAULT_PERIOD);
setDelayAfterTrigger(DEFAULT_DELAY);
if (getChipVersion() == 11) {
selectStoragecellStart(DEFAULT_STRG_CLL_STRT_CHIP11);
} else {
setNumAdditionalStorageCells(DEFAULT_NUM_STRG_CLLS);
selectStoragecellStart(DEFAULT_STRG_CLL_STRT);
// not applicable for chipv1.1
setStorageCellDelay(DEFAULT_STRG_CLL_DLY);
switch (chipIndex) {
case v1_0:
setNumAdditionalStorageCells(DEFAULT_NUM_STRG_CLLS);
selectStoragecellStart(DEFAULT_STRG_CLL_STRT);
// not applicable for chipv1.1
setStorageCellDelay(DEFAULT_STRG_CLL_DLY);
break;
case v1_1:
selectStoragecellStart(DEFAULT_STRG_CLL_STRT_CHIP11);
break;
default:
// TODO
break;
}
setTiming(DEFAULT_TIMING_MODE);
setNextFrameNumber(DEFAULT_STARTING_FRAME_NUMBER);
@@ -564,7 +605,7 @@ void setupDetector() {
setTemperatureControl(DEFAULT_TMP_CNTRL);
setThresholdTemperature(DEFAULT_TMP_THRSHLD);
setTemperatureEvent(0);
if (getChipVersion() == 11) {
if (chipIndex == v1_1) {
setFilterResistor(DEFAULT_FILTER_RESISTOR);
setNumberOfFilterCells(DEFAULT_FILTER_CELL);
}
@@ -793,10 +834,10 @@ int readConfigFile() {
// chipversion command
if (!strncmp(line, "chipversion", strlen("chipversion"))) {
int version = 0;
int val = 0;
// cannot scan values
if (sscanf(line, "%s %d", command, &version) != 2) {
if (sscanf(line, "%s %d", command, &val) != 2) {
sprintf(
initErrorMessage,
"Could not scan chipversion commands from on-board server "
@@ -805,23 +846,33 @@ int readConfigFile() {
break;
}
// validations
if (version != 10 && version != 11) {
const int vals[] = CHIP_VALS;
enum CHIPINDEX ichip = v1_0;
while (ichip != NUM_CHIP_INDICES) {
if (val == vals[(int)ichip]) {
break;
}
++ichip;
}
if (ichip == NUM_CHIP_INDICES) {
sprintf(initErrorMessage,
"Could not set chip version from on-board server "
"config file. Invalid chip version %d. Line:[%s].\n",
version, line);
break;
}
// chipversion 1.1 and HW 1.0 is incompatible
if (version == 11 && isHardwareVersion_1_0()) {
strcpy(initErrorMessage,
"Chip version 1.1 (from on-board config file) is "
"incompatible with hardware version v1.0. Please update "
"board or correct on-board config file.\n");
"config file. Invalid chip version %d. Options: %s. Line:[%s].\n",
val, CHIP_VALS_HELP, line);
break;
}
setChipVersion(version);
// chipversion > 1.0 and HW 1.0 is incompatible
if (ichip > v1_0 && isHardwareVersion_1_0()) {
char* chip_names[] = {CHIP_NAMES};
sprintf(initErrorMessage,
"Chip version %s (from on-board config file) is "
"incompatible with hardware version v1.0. Please update "
"board or correct on-board config file.\n", chip_names[(int)ichip]);
break;
}
setChipIndex(ichip);
}
// other commands
@@ -915,7 +966,7 @@ int selectStoragecellStart(int pos) {
uint32_t addr = DAQ_REG;
uint32_t mask = DAQ_STRG_CELL_SLCT_MSK;
int offset = DAQ_STRG_CELL_SLCT_OFST;
if (getChipVersion() == 11) {
if (chipIndex== v1_1) {
// set the bit
value = 1 << pos;
addr = CONFIG_V11_REG;
@@ -928,7 +979,7 @@ int selectStoragecellStart(int pos) {
bus_w(addr, bus_r(addr) | ((value << offset) & mask));
// should not do a get to verify (status register does not update
// immediately during acquisition)
if (getChipVersion() == 11) {
if (chipIndex == v1_1) {
return pos;
}
}
@@ -936,7 +987,7 @@ int selectStoragecellStart(int pos) {
// read value back
// chipv1.1, writing and reading registers are different
#ifndef VIRTUAL
if (getChipVersion() == 11) {
if (chipIndex == v1_1) {
addr = CONFIG_V11_STATUS_REG;
mask = CONFIG_V11_STATUS_STRG_CLL_MSK;
offset = CONFIG_V11_STATUS_STRG_CLL_OFST;
@@ -945,12 +996,12 @@ int selectStoragecellStart(int pos) {
uint32_t regval = bus_r(addr);
#ifndef VIRTUAL
// flip all contents of register //TODO FIRMWARE FIX
if (getChipVersion() == 11) {
if (chipIndex == v1_1) {
regval ^= BIT32_MASK;
}
#endif
uint32_t retval = ((regval & mask) >> offset);
if (getChipVersion() == 11) {
if (chipIndex == v1_1) {
// get which bit
int max = getMaxStoragecellStart();
for (int i = 0; i != max + 1; ++i) {
@@ -964,7 +1015,7 @@ int selectStoragecellStart(int pos) {
}
int getMaxStoragecellStart() {
if (getChipVersion() == 11) {
if (chipIndex == v1_1) {
return MAX_STORAGE_CELL_CHIP11_VAL;
} else {
return MAX_STORAGE_CELL_VAL;
@@ -2007,7 +2058,7 @@ int isChipConfigured() { return chipConfigured; }
void configureChip() {
// only for chipv1.1 and chip is powered on
if (getChipVersion() == 11 && powerChip(-1)) {
if (chipIndex == v1_1 && powerChip(-1)) {
LOG(logINFOBLUE, ("\tConfiguring chip\n"));
// waiting 500 ms before configuring selection
@@ -2075,7 +2126,7 @@ void configureASICTimer() {
ASIC_CTRL_PRCHRG_TMR_VAL);
uint32_t val = ASIC_CTRL_DS_TMR_VAL;
if (getChipVersion() == 11) {
if (chipIndex == v1_1) {
val = ASIC_CTRL_DS_TMR_CHIP1_1_VAL;
}
bus_w(ASIC_CTRL_REG, (bus_r(ASIC_CTRL_REG) & ~ASIC_CTRL_DS_TMR_MSK) | val);
@@ -2102,7 +2153,7 @@ int setReadoutSpeed(int val) {
return FAIL;
}
LOG(logINFO, ("Setting Full Speed (40 MHz):\n"));
if (getChipVersion() == 10) {
if (chipIndex == v1_0) {
sampleAdcSpeed = SAMPLE_ADC_FULL_SPEED_CHIP10;
adcPhase = ADC_PHASE_FULL_SPEED_CHIP10;
dbitPhase = DBIT_PHASE_FULL_SPEED_CHIP10;
@@ -2123,7 +2174,7 @@ int setReadoutSpeed(int val) {
sampleAdcSpeed = SAMPLE_ADC_HALF_SPEED_BOARD2;
adcPhase = ADC_PHASE_HALF_SPEED_BOARD2;
dbitPhase = DBIT_PHASE_HALF_SPEED_BOARD2;
} else if (getChipVersion() == 10) {
} else if (chipIndex == v1_0) {
adcOfst = ADC_OFST_HALF_SPEED_VAL_CHIP10;
sampleAdcSpeed = SAMPLE_ADC_HALF_SPEED_CHIP10;
adcPhase = ADC_PHASE_HALF_SPEED_CHIP10;
@@ -2144,7 +2195,7 @@ int setReadoutSpeed(int val) {
sampleAdcSpeed = SAMPLE_ADC_QUARTER_SPEED_BOARD2;
adcPhase = ADC_PHASE_QUARTER_SPEED_BOARD2;
dbitPhase = DBIT_PHASE_QUARTER_SPEED_BOARD2;
} else if (getChipVersion() == 10) {
} else if (chipIndex == v1_0) {
adcOfst = ADC_OFST_QUARTER_SPEED_VAL_CHIP10;
sampleAdcSpeed = SAMPLE_ADC_QUARTER_SPEED_CHIP10;
adcPhase = ADC_PHASE_QUARTER_SPEED_CHIP10;
@@ -2490,7 +2541,7 @@ void disableCurrentSource() {
LOG(logINFO, ("Disabling Current Source\n"));
// set default values for current source first
if (getChipVersion() == 11) {
if (chipIndex == v1_1) {
LOG(logINFO, ("\tSetting default values for selection\n"))
bus_w(CRRNT_SRC_COL_LSB_REG, BIT32_MASK);
bus_w(CRRNT_SRC_COL_MSB_REG, BIT32_MASK);
@@ -2505,7 +2556,7 @@ void disableCurrentSource() {
void enableCurrentSource(int fix, uint64_t select, int normal) {
disableCurrentSource();
if (getChipVersion() == 11) {
if (chipIndex == v1_1) {
LOG(logINFO, ("Enabling current source [fix:%d, select:0x%lx]\n", fix,
(long unsigned int)select));
} else {
@@ -2521,7 +2572,7 @@ void enableCurrentSource(int fix, uint64_t select, int normal) {
LOG(logINFO, ("\tDisabling fix\n"));
bus_w(DAQ_REG, bus_r(DAQ_REG) & ~DAQ_CRRNT_SRC_CLMN_FIX_MSK);
}
if (getChipVersion() == 10) {
if (chipIndex == v1_0) {
// select
LOG(logINFO, ("\tSetting selection to %ld\n", (long int)select));
bus_w(DAQ_REG, bus_r(DAQ_REG) & ~DAQ_CRRNT_SRC_CLMN_SLCT_MSK);
@@ -2582,7 +2633,7 @@ int getFixCurrentSource() {
}
int getNormalCurrentSource() {
if (getChipVersion() == 11) {
if (chipIndex == v1_1) {
int low = ((bus_r(CONFIG_V11_STATUS_REG) &
CONFIG_V11_STATUS_CRRNT_SRC_LOW_MSK) >>
CONFIG_V11_STATUS_CRRNT_SRC_LOW_OFST);
@@ -2592,7 +2643,7 @@ int getNormalCurrentSource() {
}
uint64_t getSelectCurrentSource() {
if (getChipVersion() == 10) {
if (chipIndex == v1_0) {
return ((bus_r(DAQ_REG) & DAQ_CRRNT_SRC_CLMN_SLCT_MSK) >>
DAQ_CRRNT_SRC_CLMN_SLCT_OFST);
} else {
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.h
+3 -2
View File
@@ -57,8 +57,9 @@ void getHardwareVersion(char *version);
u_int16_t getHardwareVersionNumber();
u_int16_t getHardwareSerialNumber();
int isHardwareVersion_1_0();
int getChipVersion();
void setChipVersion(int version);
int getChipVersionInFPGA();
void setChipIndex(enum CHIPINDEX ind);
void setChipVersionInFPGA();
u_int32_t getDetectorNumber();
int getModuleId(int *ret, char *mess);
int updateModuleId();
slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h
+6
View File
@@ -211,6 +211,12 @@ enum DACINDEX {
420 /* J_VREF_COMP */ \
};
enum CHIPINDEX {v1_0, v1_1, v1_2_NORMAL, v1_2_LOW_NOISE, v1_2_HDR, v1_3_BURST_MODE, NUM_CHIP_INDICES};
#define CHIP_VALS { 10, 11, 120, 121, 122, 13};
#define CHIP_VALS_HELP "10, 11, 120, 121, 122, 13"
#define CHIP_NAMES "v1.0", "v1.1", "v1.2 Normal", "v1.2 Low Noise", "v1.2 HDR", "v1.3 Burst Mode"
enum MASTERINDEX { MASTER_HARDWARE, OW_MASTER, OW_SLAVE };
#define MASTER_NAMES "hardware", "master", "slave"
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
+10 -10
View File
@@ -1852,7 +1852,7 @@ int acquire(int blocking, int file_des) {
#endif
#if defined(JUNGFRAUD)
// chipv1.1 has to be configured before acquisition
if (getChipVersion() == 11 && !isChipConfigured()) {
if (getChipVersionInFPGA() == 11 && !isChipConfigured()) {
ret = FAIL;
strcpy(mess,
"Could not start acquisition. Chip is not configured. "
@@ -2274,7 +2274,7 @@ int set_num_additional_storage_cells(int file_des) {
#else
// only set
if (Server_VerifyLock() == OK) {
if (getChipVersion() == 11) {
if (getChipVersionInFPGA() == 11) {
ret = FAIL;
sprintf(mess,
"Cannot set addl. number of storage cells for chip v1.1\n");
@@ -2742,7 +2742,7 @@ int get_storage_cell_delay(int file_des) {
functionNotImplemented();
#else
// get only
if (getChipVersion() == 11) {
if (getChipVersionInFPGA() == 11) {
ret = FAIL;
strcpy(mess, "Storage cell delay is not applicable for chipv 1.1\n");
LOG(logERROR, (mess));
@@ -2770,7 +2770,7 @@ int set_storage_cell_delay(int file_des) {
#else
// only set
if (Server_VerifyLock() == OK) {
if (getChipVersion() == 11) {
if (getChipVersionInFPGA() == 11) {
ret = FAIL;
strcpy(mess,
"Storage cell delay is not applicable for chipv 1.1\n");
@@ -6746,7 +6746,7 @@ int set_current_source(int file_des) {
LOG(logERROR, (mess));
}
#else
int chipVersion = getChipVersion();
int chipVersion = getChipVersionInFPGA();
if (ret == OK) {
if (chipVersion == 11) {
// require both
@@ -7915,7 +7915,7 @@ int get_filter_resistor(int file_des) {
#else
// get only
#if defined(JUNGFRAUD)
if (getChipVersion() == 10) {
if (getChipVersionInFPGA() == 10) {
ret = FAIL;
strcpy(mess, "Could not get filter cell. Not available for this chip "
"version 1.0.\n");
@@ -7954,7 +7954,7 @@ int set_filter_resistor(int file_des) {
LOG(logERROR, (mess));
}
#if defined(JUNGFRAUD)
else if (getChipVersion() == 10) {
else if (getChipVersionInFPGA() == 10) {
ret = FAIL;
strcpy(mess, "Could not set filter cell. Not available for this "
"chip version 1.0.\n");
@@ -8693,7 +8693,7 @@ int get_chip_version(int file_des) {
#if !defined(JUNGFRAUD)
functionNotImplemented();
#else
retval = getChipVersion();
retval = getChipVersionInFPGA();
#endif
LOG(logDEBUG1, ("chip version retval: %d\n", retval));
return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
@@ -8974,7 +8974,7 @@ int get_num_filter_cells(int file_des) {
#else
// get only
// only for chipv1.1
if (getChipVersion() == 10) {
if (getChipVersionInFPGA() == 10) {
ret = FAIL;
strcpy(mess, "Could not get number of filter cells. Only available for "
"chip version 1.1\n");
@@ -9012,7 +9012,7 @@ int set_num_filter_cells(int file_des) {
LOG(logERROR, (mess));
}
// only for chipv1.1
else if (getChipVersion() == 10) {
else if (getChipVersionInFPGA() == 10) {
ret = FAIL;
strcpy(mess,
"Could not set number of filter cells. Only available for "
slsDetectorSoftware/generator/commands.yaml
+1 -1
View File
@@ -1969,7 +1969,7 @@ rx_threads:
chipversion:
inherit_actions: GET_COMMAND
help: "\n\t[Jungfrau] Returns chip version. Can be 1.0 or 1.1"
help: "\n\t[Jungfrau] Returns chip version. Can be 1.0, 1.1 or 1.2"
actions:
GET:
function: getChipVersion