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

changes in gotthard

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@225 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-08-21 13:38:01 +00:00
parent 2981ac8700
commit cd7cfadac8
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/Makefile
View File

@ -1,5 +1,5 @@
CFLAGS= -DC_ONLY CFLAGS= -DC_ONLY
FLAGS= -DVERBOSE -DVERYVERBOSE -DDACS_INT FLAGS+= -DDACS_INT #-DVERBOSE -DVERYVERBOSE
INCLUDES= -IcommonFiles -IslsDetector -IMySocketTCP -IusersFunctions -ImultiSlsDetector -IslsDetectorUtils -IslsDetectorCommand -IslsDetectorAnalysis INCLUDES= -IcommonFiles -IslsDetector -IMySocketTCP -IusersFunctions -ImultiSlsDetector -IslsDetectorUtils -IslsDetectorCommand -IslsDetectorAnalysis
#EPICSFLAGS=-D EPICS -I/usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ -L /usr/local/epics/base/lib/SL5-x86/ -Wl,-R/usr/local/epics/base/lib/SL5-x86 -lca -lCom #EPICSFLAGS=-D EPICS -I/usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ -L /usr/local/epics/base/lib/SL5-x86/ -Wl,-R/usr/local/epics/base/lib/SL5-x86 -lca -lCom

8
slsDetectorSoftware/commonFiles/sls_detector_defs.h
View File

@ -12,17 +12,15 @@
/** maxmimum number of detectors ina multidetector structure*/ /** maxmimum number of detectors ina multidetector structure*/
#define MAXDET 100 #define MAXDET 100
typedef double double32_t; typedef double double32_t;
typedef int int32_t; typedef float float32_t;
typedef int int32_t;
typedef char mystring[MAX_STR_LENGTH]; typedef char mystring[MAX_STR_LENGTH];
typedef double mysteps[MAX_SCAN_STEPS]; typedef double mysteps[MAX_SCAN_STEPS];
#ifdef DACS_INT #ifdef DACS_INT
typedef int dacs_t; typedef int dacs_t;
//typedef uint32_t dacs_t;
//#elif DACS_INT_CSERVER
//typedef u_int32_t dacs_t;
#else #else
typedef float dacs_t; typedef float dacs_t;
#endif #endif

4
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
View File

@ -228,9 +228,9 @@ int setPhaseShiftOnce(){
//Checking if it is power on(negative number) //Checking if it is power on(negative number)
if(((reg&0xFFFF0000)>>16)>0){ if(((reg&0xFFFF0000)>>16)>0){
bus_w(addr,0x0); //clear the reg bus_w(addr,0x0); //clear the reg
#ifdef VERBOSE //#ifdef VERBOSE
printf("Implementing Phase Shift-Reg:%x\n",bus_r(addr)); printf("Implementing Phase Shift-Reg:%x\n",bus_r(addr));
#endif //#endif
//phase shift //phase shift
for (i=1;i<PHASE_SHIFT;i++) { for (i=1;i<PHASE_SHIFT;i++) {
bus_w(addr,(INT_RSTN_BIT|ENET_RESETN_BIT|SW1_BIT|PHASE_STEP_BIT));//0x2821 bus_w(addr,(INT_RSTN_BIT|ENET_RESETN_BIT|SW1_BIT|PHASE_STEP_BIT));//0x2821

2
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -71,7 +71,7 @@ int init_detector( int b) {
testFpga(); testFpga();
testRAM(); testRAM();
//gotthard specific //gotthard specific
setPhaseShiftOnce(); //setPhaseShiftOnce();
setDAQRegister(); setDAQRegister();
setSettings(GET_SETTINGS,-1); setSettings(GET_SETTINGS,-1);
//Initialization //Initialization