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

WIP

Browse Source
This commit is contained in:
maliakal_d
2020-04-06 17:28:05 +02:00
parent 47b0e46f15
commit 80e55cd4da
7 changed files with 230 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorServers/mythen3DetectorServer/CMakeLists.txt
View File

@ -10,7 +10,7 @@ add_executable(mythen3DetectorServer_virtual
../slsDetectorServer/src/LTC2620_Driver.c
../slsDetectorServer/src/ALTERA_PLL_CYCLONE10.c
../slsDetectorServer/src/programFpgaNios.c
../slsDetectorServer/src/clogger.c
../slsDetectorServer/src/communication_virtual.c
)
include_directories(

77
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@ -8,6 +8,7 @@
#include "ALTERA_PLL_CYCLONE10.h"
#ifdef VIRTUAL
#include "communication_funcs_UDP.h"
#include "communication_virtual.h"
#endif
#include <string.h>
@ -33,7 +34,6 @@ int initCheckDone = 0;
char initErrorMessage[MAX_STR_LENGTH];
#ifdef VIRTUAL
//int pipeFDs[2];
pthread_t pthread_virtual_tid;
int virtual_status = 0;
int virtual_stop = 0;
@ -326,6 +326,12 @@ void initStopServer() {
LOG(logERROR, ("Stop Server: Map Fail. Dangerous to continue. Goodbye!\n"));
exit(EXIT_FAILURE);
}
#ifdef VIRTUAL
virtual_stop = 0;
if (!isControlServer) {
ComVirtual_writeStop(virtual_stop);
}
#endif
}
@ -350,6 +356,12 @@ void setupDetector() {
dacValues[i] = 0;
}
}
#ifdef VIRTUAL
virtual_status = 0;
if (isControlServer) {
ComVirtual_writeStatus(virtual_status);
}
#endif
// pll defines
ALTERA_PLL_C10_SetDefines(REG_OFFSET, BASE_READOUT_PLL, BASE_SYSTEM_PLL, PLL_RESET_REG, PLL_RESET_REG, PLL_RESET_READOUT_MSK, PLL_RESET_SYSTEM_MSK, READOUT_PLL_VCO_FREQ_HZ, SYSTEM_PLL_VCO_FREQ_HZ);
@ -1353,16 +1365,21 @@ int startStateMachine(){
LOG(logINFOBLUE, ("Starting State Machine\n"));
// set status to running
virtual_status = 1;
/*if (isControlServer) {
//write(pipeFDs[PIPE_WRITE], &virtual_status, sizeof(virtual_status));
}*/
virtual_stop = 0;
if (isControlServer) {
ComVirtual_writeStatus(virtual_status);
ComVirtual_readStop(&virtual_stop);
if (virtual_stop != 0) {
LOG(logERROR, ("Cant start acquisition. "
"Stop server has not updated stop status to 0\n"));
return FAIL;
}
}
if(pthread_create(&pthread_virtual_tid, NULL, &start_timer, NULL)) {
LOG(logERROR, ("Could not start Virtual acquisition thread\n"));
virtual_status = 0;
/*if (isControlServer) {
//write(pipeFDs[PIPE_WRITE], &virtual_status, sizeof(virtual_status));
}*/
if (isControlServer) {
ComVirtual_writeStatus(virtual_status);
}
return FAIL;
}
LOG(logINFOGREEN, ("Virtual Acquisition started\n"));
@ -1383,6 +1400,10 @@ int startStateMachine(){
#ifdef VIRTUAL
void* start_timer(void* arg) {
if (!isControlServer) {
return NULL;
}
int64_t periodNs = getPeriod();
int numFrames = (getNumFrames() *
getNumTriggers() );
@ -1409,6 +1430,8 @@ void* start_timer(void* arg) {
// loop over number of frames
for (frameNr = 0; frameNr != numFrames; ++frameNr) {
// update the virtual stop from stop server
ComVirtual_readStop(&virtual_stop);
//check if virtual_stop is high
if(virtual_stop == 1){
break;
@ -1463,9 +1486,9 @@ void* start_timer(void* arg) {
closeUDPSocket(0);
virtual_status = 0;
/*if (isControlServer) {
//write(pipeFDs[PIPE_WRITE], &virtual_status, sizeof(virtual_status));
} */
if (isControlServer) {
ComVirtual_writeStatus(virtual_status);
}
LOG(logINFOBLUE, ("Finished Acquiring\n"));
return NULL;
}
@ -1475,7 +1498,18 @@ void* start_timer(void* arg) {
int stopStateMachine(){
LOG(logINFORED, ("Stopping State Machine\n"));
#ifdef VIRTUAL
virtual_stop = 0;
if (!isControlServer) {
virtual_stop = 1;
ComVirtual_writeStop(virtual_stop);
// read till status is idle
int tempStatus = 1;
while(tempStatus == 1) {
ComVirtual_readStatus(&tempStatus);
}
virtual_stop = 0;
ComVirtual_writeStop(virtual_stop);
LOG(logINFO, ("Stopped State Machine\n"));
}
return OK;
#endif
//stop state machine
@ -1486,13 +1520,9 @@ int stopStateMachine(){
enum runStatus getRunStatus(){
#ifdef VIRTUAL
/*if (!isControlServer) {
LOG(logINFORED, ("***** reading\n"));
while (read(pipeFDs[PIPE_READ], &virtual_status, sizeof(virtual_status)) > 0) {
LOG(logINFORED, ("virtual status:%d\n", virtual_status));
}
LOG(logINFORED, ("***** final %d\n", virtual_status));
}*/
if (!isControlServer) {
ComVirtual_readStatus(&virtual_status);
}
if(virtual_status == 0){
LOG(logINFOBLUE, ("Status: IDLE\n"));
return IDLE;
@ -1568,12 +1598,9 @@ void readFrame(int *ret, char *mess) {
u_int32_t runBusy() {
#ifdef VIRTUAL
/*if (!isControlServer) {
LOG(logINFORED, ("runbusy \n"));
while (read(pipeFDs[PIPE_READ], &virtual_status, sizeof(virtual_status)) > 0) {
LOG(logINFORED, ("runbusy virtual status:%d\n", virtual_status));
}
}*/
if (!isControlServer) {
ComVirtual_readStatus(&virtual_status);
}
return virtual_status;
#endif
u_int32_t s = (bus_r(PAT_STATUS_REG) & PAT_STATUS_RUN_BUSY_MSK);

3
slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h
View File

@ -5,9 +5,6 @@
#define CTRL_SRVR_INIT_TIME_US (300 * 1000)
#define PIPE_WRITE 1
#define PIPE_READ 0
/* Hardware Definitions */
#define NCOUNTERS (3)
#define MAX_COUNTER_MSK (0x7)