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

pulsing client side, and bug fix server side for reset partially

Browse Source
This commit is contained in:
Dhanya Maliakal
2015-11-19 16:15:59 +01:00
parent 291fe8bc22
commit e0464ef782
15 changed files with 372 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/eigerDetectorServer/FebControl.c
View File

@ -1417,7 +1417,7 @@ int Feb_Control_ResetChipCompletely(){
int Feb_Control_ResetChipPartially(){
if(!Feb_Control_SetCommandRegister(DAQ_RESET_PERIPHERY & DAQ_RESET_COLUMN_SELECT) || !Feb_Control_StartDAQOnlyNWaitForFinish(5000)){
if(!Feb_Control_SetCommandRegister(DAQ_RESET_PERIPHERY | DAQ_RESET_COLUMN_SELECT) || !Feb_Control_StartDAQOnlyNWaitForFinish(5000)){
printf("Warning: could not ResetChipPartially().\n");;
return 0;
}

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer
View File

Binary file not shown.

13
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -453,6 +453,19 @@ int setCounterBit(int val){
}
int pulsePixel(int n, int x, int y){
printf("not implemented yet\n");
return OK;
}
int pulsePixelNMove(int n, int x, int y){
printf("not implemented yet\n");
return OK;
}
int setModule(sls_detector_module myMod, int* gain, int* offset){
int retval[2];
int i;