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

void pointers added to callback functions

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@199 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
ramani_n
2012-06-22 12:12:29 +00:00
parent 6298136a19
commit 67471563b0
10 changed files with 60 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
slsDetectorSoftware/usersFunctions/usersFunctions.cpp
View File

@ -134,7 +134,7 @@ float defaultAngleFunction(float ichan, float encoder, float totalOffset, float
/* reads the encoder and returns the position */
float defaultGetPosition() {
float defaultGetPosition(void *d) {
#ifdef VERBOSE
printf("Getting motor position \n");
#endif
@ -158,13 +158,14 @@ float defaultGetPosition() {
return pos;
return pos
;
}
/* moves the encoder to position p */
int defaultGoToPosition(float p) {
int defaultGoToPosition(float p,void *d) {
#ifdef VERBOSE
printf("Setting motor position \n");
#endif
@ -191,7 +192,7 @@ int defaultGoToPosition(float p) {
/* moves the encoder to position p without waiting */
int defaultGoToPositionNoWait(float p) {
int defaultGoToPositionNoWait(float p,void *d) {
#ifdef VERBOSE
printf("Setting motor position no wait \n");
#endif
@ -222,7 +223,7 @@ int defaultGoToPositionNoWait(float p) {
/* reads I0 and returns the intensity */
float defaultGetI0(int t) {
float defaultGetI0(int t,void *d) {
#ifdef VERBOSE
printf("Getting I0 readout \n");
#endif
@ -258,7 +259,7 @@ float defaultGetI0(int t) {
}
int defaultConnectChannels() {
int defaultConnectChannels(void*d) {
#ifdef EPICS
//double value = 256;
/* channel name */
@ -308,7 +309,7 @@ int defaultConnectChannels() {
return 0;
}
int defaultDisconnectChannels() {
int defaultDisconnectChannels(void *d) {
#ifdef EPICS
/* close channel connect */
disconnect_channel(ch_i0);