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

solving merging conflicts from 3.1.0 to developer

Browse Source
This commit is contained in:
maliakal_d
2018-03-14 15:45:35 +01:00
parent 06cdf8ad92 85aa47b835
commit b58c3e8951
129 changed files with 1120 additions and 8750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/gotthardDetectorServer/Makefile.virtual
View File

@ -5,7 +5,7 @@ CC = gcc
CFLAGS += -Wall -DGOTTHARDD -DMCB_FUNCS -DDACS_INT -DDEBUG -DVIRTUAL
PROGS= $(DESTDIR)/gotthardVirtualServer
PROGS= $(DESTDIR)/gotthardDetectorServer_virtual
SRCS = server.c server_funcs.c communication_funcs.c firmware_funcs.c mcb_funcs.c trimming_funcs.c sharedmemory.c

7
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
View File

@ -1474,6 +1474,7 @@ int configureMAC(int ipad,long long int macad,long long int detectormacad, int d
#endif
// if(val!=0x2820) return -1;
usleep(1000 * 1000);
return adcConfigured;
}
@ -1536,12 +1537,8 @@ int startStateMachine(){
int stopStateMachine(){
//#ifdef VERBOSE
printf("*******Stopping State Machine*******\n");
cprintf(BG_RED,"*******Stopping State Machine*******\n");
//#endif
#ifdef SHAREDMEMORY
write_stop_sm(1);
write_status_sm("Stopped");
#endif
bus_w16(CONTROL_REG, STOP_ACQ_BIT);
bus_w16(CONTROL_REG, 0x0);
usleep(500);

10
slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 94b61ea2c40176cf2a9a36c7d6477016cd5d7fcd
Revision: 218
Branch: 3.0.1
Repsitory UUID: 675d69392a6497d42b23057c7c8783c8dad768d0
Revision: 223
Branch: 3.1.0-rc
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3351
Last Changed Date: 2018-02-08 11:04:28.000000002 +0100 ./firmware_funcs.c
Last Changed Rev: 3447
Last Changed Date: 2018-02-27 14:04:08.000000002 +0100 ./server_funcs.c

8
slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "94b61ea2c40176cf2a9a36c7d6477016cd5d7fcd"
#define GITREPUUID "675d69392a6497d42b23057c7c8783c8dad768d0"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3351
#define GITDATE 0x20180208
#define GITBRANCH "3.0.1"
#define GITREV 0x3447
#define GITDATE 0x20180227
#define GITBRANCH "3.1.0-rc"

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServer_virtual Executable file
View File

Binary file not shown.

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardVirtualServer
View File

Binary file not shown.

14
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -579,16 +579,18 @@ int get_id(int file_des) {
#ifdef VERBOSE
printf("Getting id %d\n", arg);
#endif
#endif
switch (arg) {
case DETECTOR_SERIAL_NUMBER:
retval=getDetectorNumber();
break;
case DETECTOR_FIRMWARE_VERSION:
return (getFirmwareVersion() & 0xFFFFFF);
retval = (getFirmwareVersion() & 0xFFFFFF);
break;
case DETECTOR_SOFTWARE_VERSION:
return (GITDATE & 0xFFFFFF);
retval = (GITDATE & 0xFFFFFF);
break;
default:
printf("Required unknown id %d \n", arg);
ret=FAIL;
@ -1725,12 +1727,10 @@ int stop_acquisition(int file_des) {
int ret=OK;
int n;
sprintf(mess,"can't stop acquisition\n");
#ifdef VERBOSE
printf("Stopping acquisition\n");
#endif
cprintf(BG_RED,"Client command received to stop acquisition\n");
if (differentClients==1 && lockStatus==1) {