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

gotthard2 and mythen3: programming fpga, reboot; jungfrau, ctb: modified programming (#74)

Browse Source
This commit is contained in:
Dhanya Thattil
2020-01-31 04:52:35 +01:00
committed by GitHub
parent 7d7302a90c
commit 5ca3a1b685
39 changed files with 479 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorServers/mythen3DetectorServer/CMakeLists.txt
View File

@ -9,6 +9,7 @@ add_executable(mythen3DetectorServer_virtual
../slsDetectorServer/src/common.c
../slsDetectorServer/src/LTC2620_Driver.c
../slsDetectorServer/src/ALTERA_PLL_CYCLONE10.c
../slsDetectorServer/src/programFpgaNios.c
)
include_directories(

2
slsDetectorServers/mythen3DetectorServer/Makefile
View File

@ -12,7 +12,7 @@ DESTDIR ?= bin
INSTMODE = 0777
SRCS = slsDetectorFunctionList.c
SRCS += $(main_src)slsDetectorServer.c $(main_src)slsDetectorServer_funcs.c $(main_src)communication_funcs.c $(main_src)nios.c $(main_src)DAC6571.c $(main_src)common.c $(main_src)LTC2620_Driver.c $(main_src)ALTERA_PLL_CYCLONE10.c
SRCS += $(main_src)slsDetectorServer.c $(main_src)slsDetectorServer_funcs.c $(main_src)communication_funcs.c $(main_src)nios.c $(main_src)DAC6571.c $(main_src)common.c $(main_src)LTC2620_Driver.c $(main_src)ALTERA_PLL_CYCLONE10.c $(main_src)/programFpgaNios.c
OBJS = $(SRCS:.c=.o)

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

10
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@ -7,7 +7,9 @@
#include "common.h"
#include "RegisterDefs.h"
#include "ALTERA_PLL_CYCLONE10.h"
#ifdef VIRTUAL
#ifndef VIRTUAL
#include "programFpgaNios.h"
#else
#include "communication_funcs_UDP.h"
#endif
@ -249,7 +251,7 @@ u_int32_t getDetectorNumber(){
#ifdef VIRTUAL
return 0;
#endif
return bus_r(MCB_SERIAL_NO_REG);
return ((bus_r(MCB_SERIAL_NO_REG) & MCB_SERIAL_NO_VRSN_MSK) >> MCB_SERIAL_NO_VRSN_OFST);
}
@ -303,10 +305,14 @@ u_int32_t getDetectorIP(){
/* initialization */
void initControlServer(){
CreateNotificationForCriticalTasks();
if (initError == OK) {
setupDetector();
}
initCheckDone = 1;
if (initError == OK) {
NotifyServerStartSuccess();
}
}
void initStopServer() {