detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 03:20:14 +01:00
Code Issues Actions Packages Releases Activity

Dev/xilinx ctb test (#942)

Browse Source 
* voltage regulators only looks at dac and not at ctrl_reg

* xilinx: change dac max to 2048, setting dac ist not inverse conversion from dac to voltage anymore, but setting power is inverse, also there is max and min to power, a different min for vio and this is checked at funcs interface, not printign or converting to mv in dac for power regulators (as its conversion max and min are different)

* Use links for dacs/adc and adapt power rglt thresholds

* Remove wait for transceiver reset

* adc and dac device not used anymore and hence removed

* udp restucturing: arm has to be multiple of 16 and no byteswap in udp_gen, option to compile locally in arm architecture, memsize of the second udp memory has to be limited

---------

Co-authored-by: Martin Brückner <martin.brueckner@psi.ch>
This commit is contained in:
maliakal_d
2024-08-20 14:33:18 +02:00
committed by GitHub
parent 991a4115d4
commit b4533ac11f
21 changed files with 255 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorServers/xilinx_ctbDetectorServer/Makefile
View File

@@ -23,6 +23,10 @@ SRCS += $(main_src)slsDetectorServer.c $(main_src)slsDetectorServer_funcs.c $(m
OBJS = $(SRCS:.c=.o)
all: clean $(PROGS)
local: CC := gcc
local: clean $(PROGS)
version: clean versioning $(PROGS)
boot: $(OBJS)

BIN
slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer
View File

Binary file not shown.

152
slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c
View File

@@ -39,8 +39,6 @@ char initErrorMessage[MAX_STR_LENGTH];
int detPos[2] = {0, 0};
int adcDeviceIndex = 0;
int dacDeviceIndex = 0;
int chipConfigured = 0;
int analogEnable = 0;
int digitalEnable = 0;
@@ -75,8 +73,7 @@ void basictests() {
return;
}
initError =
loadDeviceTree(initErrorMessage, &adcDeviceIndex, &dacDeviceIndex);
initError = loadDeviceTree(initErrorMessage);
if (initError == FAIL) {
return;
}
@@ -390,19 +387,18 @@ void setupDetector() {
initializePatternWord();
#endif
// initialization only at start up (restart fpga)
initError = waitTranseiverReset(initErrorMessage);
if (initError == FAIL) {
return;
}
// power off chip
// initError = waitTransceiverReset(initErrorMessage);
// if (initError == FAIL) {
// return;
// }
// // power off chip
initError = powerChip(0, initErrorMessage);
if (initError == FAIL) {
return;
}
// if (initError == FAIL) {
// return;
// }
LTC2620_D_SetDefines(DAC_MAX_MV, DAC_MIN_MV, DAC_DRIVER_FILE_NAME, NDAC,
DAC_DRIVER_NUM_DEVICES, dacDeviceIndex,
DAC_POWERDOWN_DRIVER_FILE_NAME);
LTC2620_D_SetDefines(DAC_MIN_MV, DAC_MAX_MV, DAC_DRIVER_FILE_NAME, NDAC,
NPWR, DAC_POWERDOWN_DRIVER_FILE_NAME);
LOG(logINFOBLUE, ("Powering down all dacs\n"));
for (int idac = 0; idac < NDAC; ++idac) {
setDAC(idac, LTC2620_D_GetPowerDownValue(), 0);
@@ -458,7 +454,7 @@ void resetFlow() {
bus_w(FLOW_CONTROL_REG, bus_r(FLOW_CONTROL_REG) & ~RST_F_MSK);
}
int waitTranseiverReset(char *mess) {
int waitTransceiverReset(char *mess) {
#ifndef VIRTUAL
int resetTransceiverDone = (bus_r(TRANSCEIVERSTATUS) & RESETRXDONE_MSK);
int times = 0;
@@ -556,7 +552,7 @@ int powerChip(int on, char *mess) {
POWER_VCC_C_MSK | POWER_VCC_D_MSK;
if (on) {
LOG(logINFOBLUE, ("Powering chip: on\n"));
bus_w(addr, bus_r(addr) & ~mask);
bus_w(addr, bus_r(addr) | mask);
if (configureChip(mess) == FAIL)
return FAIL;
@@ -566,7 +562,7 @@ int powerChip(int on, char *mess) {
chipConfigured = 1;
} else {
LOG(logINFOBLUE, ("Powering chip: off\n"));
bus_w(addr, bus_r(addr) | mask);
bus_w(addr, bus_r(addr) & ~mask);
chipConfigured = 0;
@@ -588,7 +584,7 @@ int getPowerChip() {
uint32_t addr = CTRL_REG;
uint32_t mask = POWER_VIO_MSK | POWER_VCC_A_MSK | POWER_VCC_B_MSK |
POWER_VCC_C_MSK | POWER_VCC_D_MSK;
return (((bus_r(addr) & mask) == mask) ? 0 : 1);
return (((bus_r(addr) & mask) == mask) ? 1 : 0);
}
int configureChip(char *mess) {
@@ -981,21 +977,8 @@ void setDAC(enum DACINDEX ind, int val, int mV) {
LOG(logDEBUG1, ("Setting dac[%d - %s]: %d %s \n", (int)ind, dacName, val,
(mV ? "mV" : "dac units")));
int dacval = val;
#ifdef VIRTUAL
LOG(logINFO, ("Setting dac[%d - %s]: %d %s \n", (int)ind, dacName, val,
(mV ? "mV" : "dac units")));
if (!mV) {
dacValues[ind] = val;
}
// convert to dac units
else if (LTC2620_D_VoltageToDac(val, &dacval) == OK) {
dacValues[ind] = dacval;
}
#else
if (LTC2620_D_SetDACValue((int)ind, val, mV, dacName, &dacval) == OK)
dacValues[ind] = dacval;
#endif
}
int getDAC(enum DACINDEX ind, int mV) {
@@ -1045,74 +1028,91 @@ void setVLimit(int l) {
vLimit = l;
}
int getPower(enum DACINDEX ind) {
// check power enable first
uint32_t addr = CTRL_REG;
uint32_t offset = POWER_VCC_A_OFST + (int)(D_PWR_A - ind);
if (ind == D_PWR_IO)
offset = POWER_VIO_OFST;
uint32_t mask = (1 << offset);
if ((bus_r(addr) & mask) != 0) {
LOG(logINFO, ("Power for dac %d is off\n", ind));
int isPowerValid(enum DACINDEX ind, int val) {
char *powerNames[] = {PWR_NAMES};
int pwrIndex = (int)(ind - D_PWR_D);
int min = POWER_RGLTR_MIN;
if (!strcmp(powerNames[pwrIndex], "IO")) {
min = VIO_MIN_MV;
}
// not power_rgltr_max because it is allowed only upto vchip max - 200
if (val != 0 && (val != LTC2620_D_GetPowerDownValue()) &&
(val < min || val > POWER_RGLTR_MAX)) {
LOG(logERROR,
("Invalid value of %d mV for Power V%s. Is not between %d and "
"%d mV\n",
val, powerNames[pwrIndex], min, POWER_RGLTR_MAX));
return 0;
}
return 1;
}
int getPower(enum DACINDEX ind) {
char *powerNames[] = {PWR_NAMES};
int pwrIndex = (int)(ind - D_PWR_D);
// check dac value
// not set yet
if (dacValues[ind] == -1) {
LOG(logERROR,
("Power enabled, but unknown dac value for power index %d!", ind));
("Unknown dac value for Power V%s!\n", powerNames[pwrIndex]));
return -1;
}
// dac powered off
if (dacValues[ind] == LTC2620_D_GetPowerDownValue()) {
LOG(logWARNING,
("Power %d enabled, dac value %d, voltage at minimum or 0\n", ind,
LTC2620_D_GetPowerDownValue()));
LOG(logWARNING, ("Power V%s powered down\n", powerNames[pwrIndex]));
return LTC2620_D_GetPowerDownValue();
}
// get dac in mV
// (unless its a different voltage range compared to other dacs)
return getDAC(ind, 1);
int retval = -1;
ConvertToDifferentRange(LTC2620_D_GetMaxInput(), LTC2620_D_GetMinInput(),
POWER_RGLTR_MIN, POWER_RGLTR_MAX, dacValues[ind],
&retval);
return retval;
}
void setPower(enum DACINDEX ind, int val) {
char *powerNames[] = {PWR_NAMES};
int pwrIndex = (int)(ind - D_PWR_D);
uint32_t addr = CTRL_REG;
uint32_t offset = POWER_VCC_A_OFST + (int)(D_PWR_A - ind);
if (ind == D_PWR_IO)
offset = POWER_VIO_OFST;
uint32_t mask = (1 << offset);
if (val >= 0 || val == LTC2620_D_GetPowerDownValue()) {
if (val > 0) {
LOG(logINFO, ("Setting Power to %d mV\n", val));
}
// switch off power enable
LOG(logINFO, ("\tSwitching off enable for P%d (ctrl reg)\n",
(int)(ind - D_PWR_A)));
bus_w(addr, bus_r(addr) | mask);
// power down dac
LOG(logINFO, ("\tPowering down P%d\n", (int)(ind - D_PWR_A)));
// power down dac
if (val == LTC2620_D_GetPowerDownValue()) {
LOG(logINFO, ("\tPowering down V%d\n", powerNames[pwrIndex]));
setDAC(ind, LTC2620_D_GetPowerDownValue(), 0);
}
// set dac in mV
if (val > 0) {
LOG(logINFO, ("\tSetting Power P%d (DAC %d) to %d mV\n",
(int)(ind - D_PWR_A), (int)ind, val));
setDAC(ind, val, 1);
// set dac
else if (val >= 0) {
LOG(logINFO,
("Setting Power V%s to %d mV\n", powerNames[pwrIndex], val));
// validate value (already checked at tcp (funcs.c))
if (!isPowerValid(ind, val)) {
return;
}
// switch on power enable
if (getDAC(ind, 1) == val || val == LTC2620_D_GetPowerDownValue()) {
LOG(logINFO, ("\tSwitching on enable for P%d (ctrl reg)\n",
(int)(ind - D_PWR_A)));
bus_w(addr, bus_r(addr) & ~mask);
// convert voltage to dac
int dacval = -1;
if (ConvertToDifferentRange(
POWER_RGLTR_MIN, POWER_RGLTR_MAX, LTC2620_D_GetMaxInput(),
LTC2620_D_GetMinInput(), val, &dacval) == FAIL) {
LOG(logERROR,
("\tCannot convert Power V%s to dac value. Invalid value of %d "
"mV. Is not between "
"%d and %d mV\n",
powerNames[pwrIndex], val, POWER_RGLTR_MIN, POWER_RGLTR_MAX));
return;
}
// set and power on/ update dac
LOG(logINFO, ("Setting Power V%s: %d mV (%d dac)\n",
powerNames[pwrIndex], val, dacval));
setDAC(ind, dacval, 0);
}
}
@@ -1147,7 +1147,7 @@ int getSlowADC(int ichan, int *retval) {
#ifndef VIRTUAL
char fname[MAX_STR_LENGTH];
memset(fname, 0, MAX_STR_LENGTH);
sprintf(fname, SLOWADC_DRIVER_FILE_NAME, adcDeviceIndex, ichan);
sprintf(fname, SLOWADC_DRIVER_FILE_NAME, ichan);
LOG(logDEBUG1, ("fname %s\n", fname));
if (readParameterFromFile(fname, "slow adc", retval) == FAIL) {

40
slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorServer_defs.h
View File

@@ -25,15 +25,13 @@
#define DYNAMIC_RANGE (16)
#define NUM_BYTES_PER_PIXEL (DYNAMIC_RANGE / 8)
#define DAC_DRIVER_NUM_DEVICES (3)
#define DAC_DRIVER_FILE_NAME \
("/sys/bus/iio/devices/iio:device%d/out_voltage%d_raw")
#define DAC_DRIVER_FILE_NAME ("/root/apps/xilinx-ctb/current_board_links/ao%d")
#define DAC_POWERDOWN_DRIVER_FILE_NAME \
("/sys/bus/iio/devices/iio:device%d/out_voltage%d_powerdown")
("/root/apps/xilinx-ctb/current_board_links/ao%d_pd")
#define SLOWADC_DRIVER_FILE_NAME \
("/sys/bus/iio/devices/iio:device%d/in_voltage%d_raw")
//#define SLOWDAC_CONVERTION_FACTOR_TO_UV (62.500953)
("/root/apps/xilinx-ctb/mythenIII_0.2_1.1/links/ai%d")
// #define SLOWDAC_CONVERTION_FACTOR_TO_UV (62.500953)
#define TEMP_DRIVER_FILE_NAME \
("/sys/bus/iio/devices/iio:device0/in_temp7_input")
@@ -60,8 +58,11 @@
#define MAX_ANALOG_SAMPLES (0x3FFF)
#define MAX_DIGITAL_SAMPLES (0x3FFF)
#define DAC_MIN_MV (0)
#define DAC_MAX_MV (2500)
#define DAC_MIN_MV (0)
#define DAC_MAX_MV (2048)
#define POWER_RGLTR_MIN (1041)
#define POWER_RGLTR_MAX (2661)
#define VIO_MIN_MV (1200) // for fpga to function
#define TICK_CLK (20) // MHz (trig_timeFromStart, frametime, timeFromStart)
#define RUN_CLK \
@@ -117,28 +118,35 @@ enum DACINDEX {
D_PWR_C
};
#define PWR_NAMES "D", "_unknown", "IO", "A", "B", "C"
/* Struct Definitions */
// For arm has to be multiple of 16
// We dont byteswap in the upd_gen so the order has to be different
typedef struct udp_header_struct {
uint32_t udp_destmac_msb;
uint16_t udp_srcmac_msb;
uint16_t udp_destmac_lsb;
uint32_t udp_srcmac_lsb;
uint32_t udp_destmac_msb;
uint8_t ip_tos;
uint8_t ip_ihl : 4, ip_ver : 4;
uint16_t udp_ethertype;
uint16_t ip_identification;
uint16_t ip_totallength;
uint32_t udp_srcmac_lsb;
uint8_t ip_protocol;
uint8_t ip_ttl;
uint16_t ip_fragmentoffset : 13, ip_flags : 3;
uint16_t ip_srcip_msb;
uint16_t ip_checksum;
uint16_t ip_identification;
uint16_t ip_totallength;
uint16_t ip_destip_msb;
uint16_t ip_srcip_lsb;
uint16_t udp_srcport;
uint16_t ip_destip_lsb;
uint16_t ip_srcip_msb;
uint16_t ip_checksum;
uint16_t udp_checksum;
uint16_t udp_destport;
uint16_t udp_srcport;
uint16_t ip_destip_lsb;
// padding
uint32_t padding0;
uint32_t padding1;
} udp_header;
#define IP_HEADER_SIZE (20)