detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-19 08:17:13 +02:00
Code Issues Actions Packages Releases Activity

few gotthard bug fixes, including cs mask for adc

Browse Source
This commit is contained in:
maliakal_d
2018-12-04 16:02:24 +01:00
parent 4e65a1d964
commit b3393fc18b
5 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorServers/gotthardDetectorServer/RegisterDefs.h
View File

@ -88,7 +88,7 @@
#define ADC_SERIAL_DATA_OUT_OFST (1)
#define ADC_SERIAL_DATA_OUT_MSK (0x00000001 << ADC_SERIAL_DATA_OUT_OFST)
#define ADC_SERIAL_CS_OUT_OFST (2)
#define ADC_SERIAL_CS_OUT_MSK (0x0000000F << ADC_SERIAL_CS_OUT_OFST)
#define ADC_SERIAL_CS_OUT_MSK (0x0000001F << ADC_SERIAL_CS_OUT_OFST)
/** ADC Sync register */
#define ADC_SYNC_REG (0x19 << MEM_MAP_SHIFT)

21
slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
View File

@ -105,16 +105,16 @@ void basictests() {
int64_t client_sw_apiversion = getDetectorId(CLIENT_SOFTWARE_API_VERSION);
FILE_LOG(logINFOBLUE, ("************ Gotthard Server *********************\n"
"Board Revision:\t\t 0x%x\n"
"Board Revision : 0x%x\n"
"Detector IP Addr:\t\t 0x%x\n"
"Detector MAC Addr:\t\t 0x%llx\n\n"
"Detector IP Addr : 0x%x\n"
"Detector MAC Addr : 0x%llx\n\n"
"Firmware Version:\t\t 0x%llx\n"
"Software Version:\t\t 0x%llx\n"
"F/w-S/w API Version:\t\t 0x%llx\n"
"Required Firmware Version:\t 0x%x\n"
"Client-Software API Version:\t 0x%llx\n"
"Firmware Version : 0x%llx\n"
"Software Version : 0x%llx\n"
"F/w-S/w API Version : 0x%llx\n"
"Required F/w Version : 0x%x\n"
"Client-S/w API Version : 0x%llx\n"
"********************************************************\n",
boardrev,
ipadd,
@ -372,11 +372,12 @@ void setupDetector() {
// Initialization
setPhaseShiftOnce();
/* FIXME: (also check with commenting out #define GOTTHARDD in ad9257.h), check if need to replace with configureADC from firmwarE_funcs.c? */
if (getBoardRevision() == 1)
prepareADC9252(); /* FIXME: (also check with commenting out #define GOTTHARDD in ad9257.h), check if need to replace with configureADC from firmwarE_funcs.c? */
prepareADC9252();
else
prepareADC9257();
configureADC();
//configureADC();
setROIADC(-1); // set adcsyncreg, daqreg, chipofinterestreg, cleanfifos,
setGbitReadout();
initDac(0); /*FIXME: if it doesnt work, switch to the old dac*/