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

gotthard server : bugfix for getting id

Browse Source
This commit is contained in:
maliakal_d 2018-02-27 14:33:58 +01:00
parent 675d69392a
commit 1f6c289fd4
7 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
RELEASE.txt
View File

@ -68,7 +68,7 @@ Please refer to the link below for more details on the firmware versions.
Gotthard
========
Minimum compatible version : old one
Minimum compatible version : 11.01.2013
Latest version : 08.02.2018 (50um and 25um Master)
09.02.2018 (25 um Slave)
@ -202,8 +202,9 @@ New Features
13. (25um Gotthard) Added start acquisition delay to master module.
14. (Gotthard) New constraints include minimum exposure time is 186 ns and
minimum period is 1278 ns + current exposure time.
14. (Gotthard) New constraints for firmware dated 08.02.2018 and 09.02.2018
(25 um Slave) include minimum exposure time is 186 ns and minimum
period is 1278 ns + current exposure time.
Receiver

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: ac9d9f6a9312d17b1e01e5649bda9278f0466533
Revision: 220
Branch: 3.0.1
Repsitory UUID: 675d69392a6497d42b23057c7c8783c8dad768d0
Revision: 223
Branch: 3.1.0-rc
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3438
Last Changed Date: 2018-02-26 17:01:54.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 "ac9d9f6a9312d17b1e01e5649bda9278f0466533"
#define GITREPUUID "675d69392a6497d42b23057c7c8783c8dad768d0"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3438
#define GITDATE 0x20180226
#define GITBRANCH "3.0.1"
#define GITREV 0x3447
#define GITDATE 0x20180227
#define GITBRANCH "3.1.0-rc"

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.1.0.0
View File

Binary file not shown.

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.1.0.1 Executable file
View File

Binary file not shown.

6
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -586,9 +586,11 @@ int get_id(int file_des) {
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;

6
slsDetectorSoftware/moenchDetectorServer/server_funcs.c
View File

@ -593,9 +593,11 @@ int get_id(int file_des) {
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;