detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-26 08:10:02 +02:00
Code Issues Actions Packages Releases Activity

mythen3: workaround for busy signal

Browse Source
This commit is contained in:
maliakal_d 2019-11-20 11:57:14 +01:00
parent 66e9b80995
commit 781e8fc67f
4 changed files with 47 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorServers/mythen3DetectorServer/RegisterDefs.h
View File

@ -89,11 +89,6 @@
/* Status register */ /* Status register */
#define STATUS_REG (0x04 * REG_OFFSET + BASE_CONTROL) #define STATUS_REG (0x04 * REG_OFFSET + BASE_CONTROL)
#ifdef VIRTUAL // until firmware is ready
#define RUN_BUSY_OFST (0)
#define RUN_BUSY_MSK (0x00000001 << RUN_BUSY_OFST)
#endif
/* Look at me register, read only */ /* Look at me register, read only */
#define LOOK_AT_ME_REG (0x05 * REG_OFFSET + BASE_CONTROL) //Not used in firmware or software, good to play with #define LOOK_AT_ME_REG (0x05 * REG_OFFSET + BASE_CONTROL) //Not used in firmware or software, good to play with
@ -123,8 +118,8 @@
#define CONTROL_STRT_ACQSTN_MSK (0x00000001 << CONTROL_STRT_ACQSTN_OFST) #define CONTROL_STRT_ACQSTN_MSK (0x00000001 << CONTROL_STRT_ACQSTN_OFST)
#define CONTROL_STP_ACQSTN_OFST (1) #define CONTROL_STP_ACQSTN_OFST (1)
#define CONTROL_STP_ACQSTN_MSK (0x00000001 << CONTROL_STP_ACQSTN_OFST) #define CONTROL_STP_ACQSTN_MSK (0x00000001 << CONTROL_STP_ACQSTN_OFST)
#define CONTROL_RN_BSY_OFST (2) // assumed for MY3 TODO //#define CONTROL_RN_BSY_OFST (2) // assumed for MY3 TODO
#define CONTROL_RN_BSY_MSK (0x00000001 << CONTROL_RN_BSY_OFST) //#define CONTROL_RN_BSY_MSK (0x00000001 << CONTROL_RN_BSY_OFST)
#define CONTROL_CRE_RST_OFST (10) #define CONTROL_CRE_RST_OFST (10)
#define CONTROL_CRE_RST_MSK (0x00000001 << CONTROL_CRE_RST_OFST) #define CONTROL_CRE_RST_MSK (0x00000001 << CONTROL_CRE_RST_OFST)
#define CONTROL_PRPHRL_RST_OFST (11) // Only GBE10? #define CONTROL_PRPHRL_RST_OFST (11) // Only GBE10?

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

55
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@ -17,6 +17,9 @@
#include <pthread.h> #include <pthread.h>
#include <time.h> #include <time.h>
#endif #endif
// ------------------------------------------
#include <time.h>
// ------------------------------------------
// Global variable from slsDetectorServer_funcs // Global variable from slsDetectorServer_funcs
@ -32,6 +35,9 @@ pthread_t pthread_virtual_tid;
int virtual_status = 0; int virtual_status = 0;
int virtual_stop = 0; int virtual_stop = 0;
#endif #endif
// ------------------------------------------
int temp_status = 0;
// ------------------------------------------
int32_t clkPhase[NUM_CLOCKS] = {0, 0, 0, 0, 0}; int32_t clkPhase[NUM_CLOCKS] = {0, 0, 0, 0, 0};
uint32_t clkFrequency[NUM_CLOCKS] = {0, 0, 0, 0, 0}; uint32_t clkFrequency[NUM_CLOCKS] = {0, 0, 0, 0, 0};
@ -1225,7 +1231,10 @@ int startStateMachine(){
#endif #endif
FILE_LOG(logINFOBLUE, ("Starting State Machine\n")); FILE_LOG(logINFOBLUE, ("Starting State Machine\n"));
cleanFifos(); cleanFifos();
// ------------------------------------------
temp_status = 1;
// ------------------------------------------
//start state machine //start state machine
bus_w(CONTROL_REG, bus_r(CONTROL_REG) | CONTROL_STRT_ACQSTN_MSK); bus_w(CONTROL_REG, bus_r(CONTROL_REG) | CONTROL_STRT_ACQSTN_MSK);
@ -1305,11 +1314,14 @@ enum runStatus getRunStatus(){
#endif #endif
FILE_LOG(logDEBUG1, ("Getting status\n")); FILE_LOG(logDEBUG1, ("Getting status\n"));
uint32_t retval = bus_r(STATUS_REG); // ------------------------------------------
FILE_LOG(logINFO, ("Status Register: %08x\n",retval)); //uint32_t retval = bus_r(STATUS_REG);
//FILE_LOG(logINFO, ("Status Register: %08x\n",retval));
// running // running
if(retval & CONTROL_RN_BSY_MSK) { if (temp_status) {
//if(retval & CONTROL_RN_BSY_MSK) {
// ------------------------------------------
FILE_LOG(logINFOBLUE, ("Status: Running\n")); FILE_LOG(logINFOBLUE, ("Status: Running\n"));
return RUNNING; return RUNNING;
@ -1319,9 +1331,28 @@ enum runStatus getRunStatus(){
void readFrame(int *ret, char *mess){ void readFrame(int *ret, char *mess){
// wait for status to be done // wait for status to be done
while(runBusy()){
usleep(500); // ------------------------------------------
} //while(runBusy()){
// usleep(500);
//}
int64_t periodns = getPeriod();
int numFrames = getNumFrames();
int frameNr = 0;
// loop over number of frames
for(frameNr=0; frameNr!= numFrames; ++frameNr ) {
// sleep for exposure time
struct timespec begin, end;
clock_gettime(CLOCK_REALTIME, &begin);
usleep(periodns / 1000);
clock_gettime(CLOCK_REALTIME, &end);
}
usleep(1 * 1000 * 1000);
temp_status = 0;
// ------------------------------------------
#ifdef VIRTUAL #ifdef VIRTUAL
FILE_LOG(logINFOGREEN, ("acquisition successfully finished\n")); FILE_LOG(logINFOGREEN, ("acquisition successfully finished\n"));
return; return;
@ -1344,10 +1375,12 @@ u_int32_t runBusy() {
return virtual_status; return virtual_status;
#endif #endif
u_int32_t s = (bus_r(CONTROL_REG) & CONTROL_RN_BSY_OFST); // ------------------------------------------
FILE_LOG(logDEBUG1, ("Status Register: %08x\n", s)); return temp_status;
return s; //u_int32_t s = (bus_r(CONTROL_REG) & CONTROL_RN_BSY_OFST);
//FILE_LOG(logDEBUG1, ("Status Register: %08x\n", s));
//return s;
// ------------------------------------------
} }
/* common */ /* common */

2
slsSupportLib/include/versionAPI.h
View File

@ -8,5 +8,5 @@
#define APIGOTTHARD 0x191111 #define APIGOTTHARD 0x191111
#define APIJUNGFRAU 0x191111 #define APIJUNGFRAU 0x191111
#define APIEIGER 0x191111 #define APIEIGER 0x191111
#define APIMYTHEN3 0x191119
#define APIGOTTHARD2 0x191119 #define APIGOTTHARD2 0x191119
#define APIMYTHEN3 0x191120