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

frame index now is set via the multi and sls and sent to receiver when frames/cycles is set, resetframescaught doesnt decide if frames needed, possible problem in acquire scans,gets #frames/cycles from detector,but needed

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@451 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-02-05 11:23:46 +00:00
parent ed4aaa83ce
commit 7a55ed9a74
14 changed files with 196 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_funcs.c
View File

@ -54,20 +54,17 @@ int init_detector(int b) {
printf("This is a VIRTUAL detector\n");
#else
mapCSP0();
//only for control server
if(b){
printf("fifo reset\n");
fifoReset();
printf("fifo test\n");
fifoTest();
printf("\ninitializing detector\n");
//Aurora-Links
printf("\ninitializing detector\n");
#endif
#ifdef SLS_DETECTOR_FUNCTION_LIST
initializeDetector();
fifoReset();
fifoTest();
//testFpga();
//testRAM();
//setSettings(GET_SETTINGS,-1);

6
slsDetectorSoftware/eigerDetectorServer/slsDetector_firmware.c
View File

@ -122,7 +122,7 @@ int fifoReset(){
u_int32_t mask = FIFOCNTRL_RESET_MASK;
fifo_control_reg |= mask;
printf("CTRL Register bits: 0x%08x\n",fifo_control_reg);
//printf("CTRL Register bits: 0x%08x\n",fifo_control_reg);
bus_w(FIFO_CNTRL_REG,fifo_control_reg);
bus_w(FIFO_CNTRL_REG,fifo_control_reg);
@ -132,6 +132,8 @@ int fifoReset(){
fifo_control_reg &= (~mask);
bus_w(FIFO_CNTRL_REG,fifo_control_reg);
printf("fifo has been reset\n\n");
return OK;
}
@ -142,7 +144,7 @@ int fifoTest(void){
int buffer_length = 256;
int rec_buffer_length = 4096;
char cmd[] = "fpgatfemp";
char cmd[] = "help";
unsigned int buffer[buffer_length];
unsigned int rec_buffer[rec_buffer_length];
unsigned int send_len;