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

Merge branch '3.0.1' into developer

Browse Source
This commit is contained in:
maliakal_d 2018-02-08 15:16:49 +01:00
commit 8bf03a7712
5 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/gotthardDetectorServer/config.txt
View File

@ -17,4 +17,7 @@ slavepatternphase 0
slaveadcphase 0
#rst to sw1 delay
rsttosw1delay 2
rsttosw1delay 2
#start acquisition delay
startacqdelay 1

23
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
View File

@ -62,6 +62,7 @@ int adcphase = 0;
int slavepatternphase = 0;
int slaveadcphase = 0;
int rsttosw1delay = 2;
int startacqdelay = 1;
#ifdef MCB_FUNCS
@ -293,6 +294,8 @@ void setMasterSlaveConfiguration(){
slaveadcphase = ival;
else if (!strcasecmp(key,"rsttosw1delay"))
rsttosw1delay = ival;
else if (!strcasecmp(key,"startacqdelay"))
startacqdelay = ival;
else {
cprintf(RED,"could not scan parameter name %s from config file\n",key);
exit(EXIT_FAILURE);
@ -307,13 +310,15 @@ void setMasterSlaveConfiguration(){
"slavepatternphase:%d\n"
"slaveadcphase:%d\n"
"rsttosw1delay:%d\n",
"startacqdelay:%d\n",
masterflags,
masterdefaultdelay,
patternphase,
adcphase,
slavepatternphase,
slaveadcphase,
rsttosw1delay);
rsttosw1delay,
startacqdelay);
@ -341,16 +346,24 @@ void setMasterSlaveConfiguration(){
val = (val & (~(PLL_CLK_SEL_MSK))) | PLL_CLK_SEL_SLAVE_ADC_VAL;
bus_w(MULTI_PURPOSE_REG,val);
setPhaseShift(slaveadcphase);
/* Set start acq delay */
val=bus_r(MULTI_PURPOSE_REG);
#ifdef VERBOSE
printf("Multipurpose reg:0x%x\n",bus_r(MULTI_PURPOSE_REG));
#endif
val = (val & (~(START_ACQ_DELAY_MSK))) | ((startacqdelay << START_ACQ_DELAY_OFFSET) & (START_ACQ_DELAY_MSK));
bus_w(MULTI_PURPOSE_REG,val);
printf("Start acq delay set. Multipurpose reg: 0x%x\n",bus_r(MULTI_PURPOSE_REG));
}
/* Set RST to SW1 delay */
val=bus_r(MULTI_PURPOSE_REG);
//#ifdef VERBOSE
printf("Value of multipurpose reg:%d\n",bus_r(MULTI_PURPOSE_REG));
//#endif
#ifdef VERBOSE
printf("Multipurpose reg:0x%x\n",bus_r(MULTI_PURPOSE_REG));
#endif
val = (val & (~(RST_TO_SW1_DELAY_MSK))) | ((rsttosw1delay << RST_TO_SW1_DELAY_OFFSET) & (RST_TO_SW1_DELAY_MSK));
bus_w(MULTI_PURPOSE_REG,val);
printf("RST to SW1 delay set. Multipurpose reg:0x%x\n",bus_r(MULTI_PURPOSE_REG));
fclose(fd);
}

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.1.1
View File

Binary file not shown.

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.1.2 Executable file
View File

Binary file not shown.

7
slsDetectorSoftware/gotthardDetectorServer/registers_g.h
View File

@ -287,11 +287,12 @@
#define INT_RSTN_OFFSET 12
#define DIGITAL_TEST_BIT 0x00004000
#define DIGITAL_TEST_OFFSET 14
//#define CHANGE_AT_POWER_ON_BIT 0x00008000
//#define CHANGE_AT_POWER_ON_OFFSET 15
//#define CHANGE_AT_POWER_ON_BIT 0x00008000
//#define CHANGE_AT_POWER_ON_OFFSET 15
#define RST_TO_SW1_DELAY_MSK 0x000F0000
#define RST_TO_SW1_DELAY_OFFSET 16
#define START_ACQ_DELAY_MSK 0x00F00000
#define START_ACQ_DELAY_OFFSET 20
/* settings/conf gain register */
#define GAIN_MASK 0x000000ff