detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 20:09:22 +01:00
Code Issues Actions Packages Releases Activity

WIP

Browse Source
This commit is contained in:
maliakal_d
2019-08-16 17:38:41 +02:00
parent d3e60eba80
commit a0bdfcdae3
24 changed files with 62 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
View File

Binary file not shown.

8
slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
View File

@@ -1226,10 +1226,10 @@ int setHighVoltage(int val){
/* parameters - timing, extsig */
void setTiming( enum externalCommunicationMode arg){
void setTiming( enum timingMode arg){
u_int32_t addr = EXT_SIGNAL_REG;
if (arg != GET_EXTERNAL_COMMUNICATION_MODE){
if (arg != GET_TIMING_MODE){
switch((int)arg){
case AUTO_TIMING:
FILE_LOG(logINFO, ("Set Timing: Auto\n"));
@@ -1251,7 +1251,7 @@ void setTiming( enum externalCommunicationMode arg){
}
}
enum externalCommunicationMode getTiming() {
enum timingMode getTiming() {
u_int32_t regval = bus_r(EXT_SIGNAL_REG);
switch (regval) {
case EXT_SIGNAL_TRGGR_IN_RSNG_VAL:
@@ -1456,7 +1456,7 @@ int configureMAC(uint32_t destip, uint64_t destmac, uint64_t sourcemac, uint32_t
*/
FILE_LOG(logINFOBLUE, ("Sending an image to counter the packet numbers\n"));
// remember old parameters
enum externalCommunicationMode oldtiming = getTiming();
enum timingMode oldtiming = getTiming();
uint64_t oldframes = setTimer(FRAME_NUMBER, -1);
uint64_t oldcycles = setTimer(CYCLES_NUMBER, -1);
uint64_t oldPeriod = setTimer(FRAME_PERIOD, -1);