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

rst to sw1 for all

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-08-16 16:03:57 +02:00
parent 509d81ba7d
commit f4b01bc18b
5 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
View File

@ -244,15 +244,6 @@ u_int32_t bus_r(u_int32_t offset) {
void setMasterSlaveConfiguration(){ void setMasterSlaveConfiguration(){
/*
int masterflags = NO_MASTER;
int masterdefaultdelay = 62;
int patternphase = 0;
int adcphase = 0;
int slavepatternphase = 0;
int slaveadcphase = 0;
int sw1torstdelay = 2;
*/
// global master default delay picked from config file // global master default delay picked from config file
FILE* fd=fopen(CONFIG_FILE,"r"); FILE* fd=fopen(CONFIG_FILE,"r");
if(fd==NULL){ if(fd==NULL){
@ -354,17 +345,15 @@ void setMasterSlaveConfiguration(){
setPhaseShift(slaveadcphase); setPhaseShift(slaveadcphase);
} }
/* Set RST to SW1 delay */
val=bus_r(MULTI_PURPOSE_REG);
//#ifdef VERBOSE
printf("Value of multipurpose reg:%d\n",bus_r(MULTI_PURPOSE_REG));
//#endif
val = (val & (~(RST_TO_SW1_DELAY_MSK))) | ((rsttosw1delay << RST_TO_SW1_DELAY_OFFSET) & (RST_TO_SW1_DELAY_MSK));
bus_w(MULTI_PURPOSE_REG,val);
if (masterflags == IS_MASTER || masterflags == IS_SLAVE) {
val=bus_r(MULTI_PURPOSE_REG);
//#ifdef VERBOSE
printf("Value of multipurpose reg:%d\n",bus_r(MULTI_PURPOSE_REG));
//#endif
val = (val & (~(RST_TO_SW1_DELAY_MSK))) | ((rsttosw1delay << RST_TO_SW1_DELAY_OFFSET) & (RST_TO_SW1_DELAY_MSK));
bus_w(MULTI_PURPOSE_REG,val);
}
fclose(fd); fclose(fd);
} }

8
slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: a0ae3985068425e7142df8271eac6ce09a238dc9 Repsitory UUID: e4fa807b5d987714a047b9d2cac271c89f6c2fef
Revision: 206 Revision: 208
Branch: developer Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1454 Last Changed Rev: 1487
Last Changed Date: 2017-08-04 09:28:44.000000002 +0200 ./firmware_funcs.c Last Changed Date: 2017-08-16 16:01:46.000000002 +0200 ./firmware_funcs.c

8
slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "a0ae3985068425e7142df8271eac6ce09a238dc9" #define SVNREPUUID "e4fa807b5d987714a047b9d2cac271c89f6c2fef"
//#define SVNREV 0x1454 //#define SVNREV 0x1487
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x1454 #define SVNREV 0x1487
#define SVNDATE 0x20170804 #define SVNDATE 0x20170816
// //

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.0.4
View File

Binary file not shown.

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

Binary file not shown.