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

done, but need to compile

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-06-09 11:42:25 +02:00
parent 0254ff0281
commit c755a8974c
12 changed files with 3156 additions and 2630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -117,22 +117,6 @@ void checkFirmwareCompatibility(){
int moduleTest( enum digitalTestMode arg, int imod){
cprintf(BG_RED, "Warning: Module Test not implemented for this detector\n");
return OK;
}
int detectorTest( enum digitalTestMode arg){
cprintf(BG_RED, "Warning: Detector Tests not implemented for this detector\n");
//DETECTOR_FIRMWARE_TEST:testFpga()
//DETECTOR_MEMORY_TEST:testRAM()
//DETECTOR_BUS_TEST:testBus()
//DETECTOR_SOFTWARE_TEST:testFpga()
return OK;
}
/* Ids */
@ -1079,7 +1063,7 @@ int setNetworkParameter(enum detNetworkParameter mode, int value){
/* aquisition */
int startReceiver(int d){
int prepareAcquisition(){
printf("Going to prepare for acquisition with counter_bit:%d\n",Feb_Control_Get_Counter_Bit());
Feb_Control_PrepareForAcquisition();
@ -1159,10 +1143,10 @@ enum runStatus getRunStatus(){
//if(trialMasterMode == IS_MASTER){
int i = Feb_Control_AcquisitionInProgress();
if(i== 0){
//printf("IDLE\n");
printf("Status: IDLE\n");
return IDLE;
}else{
printf("RUNNING\n");
printf("Status: RUNNING...\n");
return RUNNING;
}
//}else printf("***** not master*** \n");

5
slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h
View File

@ -76,6 +76,11 @@ enum NETWORK_PARA_INDEX {TXN_LEFT, TXN_RIGHT, TXN_FRAME,FLOWCTRL_10G};
#define DEFAULT_TIMING_MODE (AUTO_TIMING)
#define DEFAULT_PHOTON_ENERGY (-1)
#define DEFAULT_RATE_CORRECTION (0)
#define DEFAULT_EXT_GATING_ENABLE (0)
#define DEFAULT_EXT_GATING_POLARITY (1) //positive
#define DEFAULT_TEST_MODE (0)
#define DEFAULT_HIGH_VOLTAGE (0)
#define MAX_SUBFRAME_EXPOSURE_VAL_IN_10NS (0x1FFFFFFF) /** 29 bit register for max subframe exposure value */