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

jungfrau server: programfpga: stop server also mapped during a reset, binaries added

Browse Source
This commit is contained in:
maliakal_d 2018-05-09 15:16:04 +02:00
parent 16fe4d305e
commit e6c0304af1
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_jungfraunew
View File

Binary file not shown.

2
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -7786,7 +7786,7 @@ int slsDetector::programFPGA(string fname){
#endif #endif
if (thisDetector->onlineFlag==ONLINE_FLAG) { if (thisDetector->onlineFlag==ONLINE_FLAG) {
if (connectControl() == OK){ if (connectControl() == OK){
controlSocket->SendDataOnly(&fnum,sizeof(fnum));cprintf(BG_RED,"size of filesize:%lu\n",sizeof(filesize)); controlSocket->SendDataOnly(&fnum,sizeof(fnum));
controlSocket->SendDataOnly(&filesize,sizeof(filesize)); controlSocket->SendDataOnly(&filesize,sizeof(filesize));
//check opening error //check opening error
controlSocket->ReceiveDataOnly(&ret,sizeof(ret)); controlSocket->ReceiveDataOnly(&ret,sizeof(ret));

4
slsDetectorSoftware/slsDetectorServer/programfpga.h
View File

@ -70,7 +70,7 @@ void eraseFlash(){
char command[255]; char command[255];
sprintf(command,"flash_eraseall %s",mtdvalue); sprintf(command,"flash_eraseall %s",mtdvalue);
system(command); system(command);
printf("flash erased\n"); printf("Flash erased\n");
} }
/** /**
@ -109,7 +109,7 @@ int startWritingFPGAprogram(FILE** filefp){
cprintf(RED,"Unable to open %s in write mode\n",mtdvalue); cprintf(RED,"Unable to open %s in write mode\n",mtdvalue);
return 1; return 1;
} }
printf("flash ready for writing\n"); printf("Flash ready for writing\n");
return 0; return 0;
} }

5
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -4954,7 +4954,7 @@ int program_fpga(int file_des) {
int ret=OK,ret1=OK; int ret=OK,ret1=OK;
int n=0; int n=0;
sprintf(mess,"program FPGA failed\n"); sprintf(mess,"program FPGA failed\n");
printf("Programming FPGA...") printf("Programming FPGA...");
#ifndef JUNGFRAUD #ifndef JUNGFRAUD
//to receive any arguments //to receive any arguments
@ -5117,12 +5117,13 @@ int reset_fpga(int file_des) {
#ifdef SLS_DETECTOR_FUNCTION_LIST #ifdef SLS_DETECTOR_FUNCTION_LIST
else { else {
if (isControlServer) { if (isControlServer) {
basictests(debugflag); basictests(debugflag) // mapping of control server at lease
#ifdef JUNGFRAUD #ifdef JUNGFRAUD
if (debugflag != PROGRAMMING_MODE) if (debugflag != PROGRAMMING_MODE)
#endif #endif
initControlServer(); initControlServer();
} }
else initStopServer(); //remapping of stop server
ret = FORCE_UPDATE; ret = FORCE_UPDATE;
} }
#endif #endif