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

updated server firmware and software versions to reflect an svn date plus svn rev

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@413 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-12-17 17:01:03 +00:00
parent 8cad188c59
commit 1d9ae4e316
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorSoftware/gotthardDetectorServer/server_defs.h
View File

@ -45,5 +45,4 @@
#define CLK_FREQ 32.1E+6 #define CLK_FREQ 32.1E+6
#define THIS_SOFTWARE_VERSION 0x20121210
#endif #endif

9
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -9,6 +9,7 @@
#include "mcb_funcs.h" #include "mcb_funcs.h"
#include "trimming_funcs.h" #include "trimming_funcs.h"
#include "registers_g.h" #include "registers_g.h"
#include "svnInfoGotthard.h"
#define FIFO_DATA_REG_OFF 0x50<<11 #define FIFO_DATA_REG_OFF 0x50<<11
#define CONTROL_REG 0x24<<11 #define CONTROL_REG 0x24<<11
@ -550,7 +551,7 @@ int set_external_communication_mode(int file_des) {
int get_id(int file_des) { int get_id(int file_des) {
// sends back 64 bits! // sends back 64 bits!
int64_t retval; int64_t retval=-1;
int ret=OK; int ret=OK;
int n=0; int n=0;
enum idMode arg; enum idMode arg;
@ -573,10 +574,12 @@ int get_id(int file_des) {
retval=getDetectorNumber(); retval=getDetectorNumber();
break; break;
case DETECTOR_FIRMWARE_VERSION: case DETECTOR_FIRMWARE_VERSION:
retval=getFirmwareVersion(); retval=getFirmwareSVNVersion();
retval=(retval <<32) | getFirmwareVersion();
break; break;
case DETECTOR_SOFTWARE_VERSION: case DETECTOR_SOFTWARE_VERSION:
retval=THIS_SOFTWARE_VERSION; retval= SVNREV;
retval= (retval <<32) | SVNDATE;
break; break;
case DETECTOR_FIRMWARE_SVN_VERSION: case DETECTOR_FIRMWARE_SVN_VERSION:
retval=getFirmwareSVNVersion(); retval=getFirmwareSVNVersion();