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

mythenDetectorServer now works with dacs_t and the commands vpreamp and vcalibration respond correctly

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@226 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-08-22 09:44:08 +00:00
parent cd7cfadac8
commit 362ba2af11
6 changed files with 68 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
slsDetectorSoftware/mythenDetectorServer/server_funcs.c
View File

@ -842,13 +842,13 @@ int read_register(int file_des) {
int set_dac(int file_des) {
float retval;
dacs_t retval;
int ret=OK;
int arg[2];
enum dacIndex ind;
int imod;
int n;
float val;
dacs_t val;
int idac=0;
sprintf(mess,"Can't set DAC\n");
@ -954,7 +954,7 @@ add possible potentiometers like in chiptest board!!!!!!!!!!!!!!!
int get_adc(int file_des) {
float retval;
dacs_t retval;
int ret=OK;
int arg[2];
enum dacIndex ind;
@ -1309,11 +1309,15 @@ int get_chip(int file_des) {
}
int set_module(int file_des) {
sls_detector_module myModule;
int *myChip=malloc(NCHIP*sizeof(int));
int *myChan=malloc(NCHIP*NCHAN*sizeof(int));
float *myDac=malloc(NDAC*sizeof(int));
float *myAdc=malloc(NADC*sizeof(int));
dacs_t *myDac=malloc(NDAC*sizeof(dacs_t));
dacs_t *myAdc=malloc(NADC*sizeof(dacs_t));
int retval, n;
int ret=OK;
int dr;//, ow;
@ -1431,8 +1435,8 @@ int get_module(int file_des) {
sls_detector_module myModule;
int *myChip=malloc(NCHIP*sizeof(int));
int *myChan=malloc(NCHIP*NCHAN*sizeof(int));
float *myDac=malloc(NDAC*sizeof(int));
float *myAdc=malloc(NADC*sizeof(int));
dacs_t *myDac=malloc(NDAC*sizeof(dacs_t));
dacs_t *myAdc=malloc(NADC*sizeof(dacs_t));
if (myDac)