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

jungfrau server configuring ASIC timer at server startup

Browse Source
This commit is contained in:
maliakal_d
2018-04-13 11:07:22 +02:00
parent 70e193b0fd
commit 5ff2e86060
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/jungfrauDetectorServer/RegisterDefs.h
View File

@ -363,8 +363,10 @@
#define ASIC_CTRL_PRCHRG_TMR_OFST (0) #define ASIC_CTRL_PRCHRG_TMR_OFST (0)
#define ASIC_CTRL_PRCHRG_TMR_MSK (0x000000FF << ASIC_CTRL_PRCHRG_TMR_OFST) #define ASIC_CTRL_PRCHRG_TMR_MSK (0x000000FF << ASIC_CTRL_PRCHRG_TMR_OFST)
#define ASIC_CTRL_PRCHRG_TMR_VAL ((0x1F << ASIC_CTRL_PRCHRG_TMR_OFST) & ASIC_CTRL_PRCHRG_TMR_MSK)
#define ASIC_CTRL_DS_TMR_OFST (8) #define ASIC_CTRL_DS_TMR_OFST (8)
#define ASIC_CTRL_DS_TMR_MSK (0x000000FF << ASIC_CTRL_DS_TMR_OFST) #define ASIC_CTRL_DS_TMR_MSK (0x000000FF << ASIC_CTRL_DS_TMR_OFST)
#define ASIC_CTRL_DS_TMR_VAL ((0x1F << ASIC_CTRL_DS_TMR_OFST) & ASIC_CTRL_DS_TMR_MSK)
#endif //REGISTERS_G_H #endif //REGISTERS_G_H

11
slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -390,9 +390,9 @@ void setupDetector() {
} }
bus_w(DAQ_REG, 0x0); /* Only once at server startup */ bus_w(DAQ_REG, 0x0); /* Only once at server startup */
setSpeed(CLOCK_DIVIDER, HALF_SPEED); setSpeed(CLOCK_DIVIDER, HALF_SPEED);
cleanFifos(); /* todo might work without */ cleanFifos();
resetCore(); /* todo might work without */ resetCore();
configureASICTimer();
//Initialization of acquistion parameters //Initialization of acquistion parameters
setSettings(DEFAULT_SETTINGS,-1); setSettings(DEFAULT_SETTINGS,-1);
@ -501,7 +501,10 @@ int getPhase() {
return clkPhase[0]; return clkPhase[0];
} }
void configureASICTimer() {
bus_w(ASIC_CTRL_REG, (bus_r(ASIC_CTRL_REG) & ~ASIC_CTRL_PRCHRG_TMR_MSK) | ASIC_CTRL_PRCHRG_TMR_VAL);
bus_w(ASIC_CTRL_REG, (bus_r(ASIC_CTRL_REG) & ~ASIC_CTRL_DS_TMR_MSK) | ASIC_CTRL_DS_TMR_VAL);
}

2
slsDetectorSoftware/jungfrauDetectorServer/slsDetectorServer_defs.h
View File

@ -9,7 +9,7 @@
#define GOODBYE (-200) #define GOODBYE (-200)
#define MIN_REQRD_VRSN_T_RD_API 0x171220 #define MIN_REQRD_VRSN_T_RD_API 0x171220
#define REQRD_FRMWR_VRSN 0x171220 #define REQRD_FRMWR_VRSN 0x180222
/* Struct Definitions */ /* Struct Definitions */

1
slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h
View File

@ -85,6 +85,7 @@ int configureFrequency(int val, int i);
int autoCompDisable(int on); int autoCompDisable(int on);
int adcPhase(int st); int adcPhase(int st);
int getPhase(); int getPhase();
void configureASICTimer();
#endif #endif
// parameters - nmod, dr, roi // parameters - nmod, dr, roi