mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-23 18:17:59 +02:00
Moving headers into include/sls (#212)
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
#include "slsDetectorFunctionList.h"
|
||||
#include "clogger.h"
|
||||
#include "sharedMemory.h"
|
||||
#include "versionAPI.h"
|
||||
#include "sls/versionAPI.h"
|
||||
|
||||
#include "AD7689.h" // slow adcs
|
||||
#include "ALTERA_PLL.h" // pll
|
||||
|
@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
#include "RegisterDefs.h"
|
||||
#include "sls_detector_defs.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
|
||||
#define MIN_REQRD_VRSN_T_RD_API 0x181130
|
||||
#define REQRD_FRMWR_VRSN 0x201005
|
||||
|
@ -1,4 +1,4 @@
|
||||
#include "ansi.h"
|
||||
#include "sls/ansi.h"
|
||||
|
||||
#include <errno.h>
|
||||
#include <fcntl.h> // File control definitions
|
||||
|
@ -2,7 +2,7 @@
|
||||
#include "clogger.h"
|
||||
#include "common.h"
|
||||
#include "sharedMemory.h"
|
||||
#include "versionAPI.h"
|
||||
#include "sls/versionAPI.h"
|
||||
|
||||
#ifndef VIRTUAL
|
||||
#include "Beb.h"
|
||||
|
@ -1,5 +1,5 @@
|
||||
#pragma once
|
||||
#include "sls_detector_defs.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
|
||||
#define REQUIRED_FIRMWARE_VERSION (27)
|
||||
#define IDFILECOMMAND "more /home/root/executables/detid.txt"
|
||||
|
@ -7,7 +7,7 @@
|
||||
#include "clogger.h"
|
||||
#include "common.h"
|
||||
#include "sharedMemory.h"
|
||||
#include "versionAPI.h"
|
||||
#include "sls/versionAPI.h"
|
||||
#ifdef VIRTUAL
|
||||
#include "communication_funcs_UDP.h"
|
||||
#endif
|
||||
|
@ -1,5 +1,5 @@
|
||||
#pragma once
|
||||
#include "sls_detector_defs.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
|
||||
#define REQRD_FRMWRE_VRSN (0x200925)
|
||||
#define KERNEL_DATE_VRSN "Wed May 20 13:58:38 CEST 2020"
|
||||
|
@ -3,7 +3,7 @@
|
||||
#include "clogger.h"
|
||||
#include "common.h"
|
||||
#include "sharedMemory.h"
|
||||
#include "versionAPI.h"
|
||||
#include "sls/versionAPI.h"
|
||||
|
||||
#include "LTC2620.h" // dacs
|
||||
#ifdef VIRTUAL
|
||||
|
@ -1,5 +1,5 @@
|
||||
#pragma once
|
||||
#include "sls_detector_defs.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
#include <stdlib.h>
|
||||
|
||||
/* Enums */
|
||||
|
@ -1,7 +1,7 @@
|
||||
#include "slsDetectorFunctionList.h"
|
||||
#include "clogger.h"
|
||||
#include "sharedMemory.h"
|
||||
#include "versionAPI.h"
|
||||
#include "sls/versionAPI.h"
|
||||
|
||||
#include "ALTERA_PLL.h" // pll
|
||||
#include "LTC2620.h" // dacs
|
||||
|
@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
#include "RegisterDefs.h"
|
||||
#include "sls_detector_defs.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
|
||||
#define MIN_REQRD_VRSN_T_RD_API 0x171220
|
||||
#define REQRD_FRMWRE_VRSN_BOARD2 0x200724 // 1.0 pcb
|
||||
|
@ -1,7 +1,7 @@
|
||||
#include "slsDetectorFunctionList.h"
|
||||
#include "clogger.h"
|
||||
#include "sharedMemory.h"
|
||||
#include "versionAPI.h"
|
||||
#include "sls/versionAPI.h"
|
||||
|
||||
#include "ALTERA_PLL.h" // pll
|
||||
#include "LTC2620.h" // dacs
|
||||
|
@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
#include "RegisterDefs.h"
|
||||
#include "sls_detector_defs.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
|
||||
#define MIN_REQRD_VRSN_T_RD_API 0x180314
|
||||
#define REQRD_FRMWR_VRSN 0x201005
|
||||
|
@ -6,7 +6,7 @@
|
||||
#include "clogger.h"
|
||||
#include "common.h"
|
||||
#include "sharedMemory.h"
|
||||
#include "versionAPI.h"
|
||||
#include "sls/versionAPI.h"
|
||||
#ifdef VIRTUAL
|
||||
#include "communication_funcs_UDP.h"
|
||||
#endif
|
||||
|
@ -1,5 +1,5 @@
|
||||
#pragma once
|
||||
#include "sls_detector_defs.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
|
||||
#define REQRD_FRMWRE_VRSN (0x200925)
|
||||
#define KERNEL_DATE_VRSN "Wed May 20 13:58:38 CEST 2020"
|
||||
|
@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "ansi.h"
|
||||
#include "sls/ansi.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
|
@ -1,7 +1,7 @@
|
||||
#ifndef COMMUNICATION_FUNCS_H
|
||||
#define COMMUNICATION_FUNCS_H
|
||||
|
||||
#include "sls_detector_defs.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
|
||||
typedef enum { INT16, INT32, INT64, OTHER } intType;
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
#pragma once
|
||||
#include "sls_detector_defs.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
|
||||
void sharedMemory_print();
|
||||
int sharedMemory_create(int port);
|
||||
|
@ -1,5 +1,5 @@
|
||||
#include "slsDetectorServer_defs.h" // DAC_INDEX, ADC_INDEX, also include RegisterDefs.h
|
||||
#include "sls_detector_defs.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
#ifdef GOTTHARDD
|
||||
#include "AD9252.h" // old board compatibility
|
||||
#include "clogger.h" // runState(enum TLogLevel)
|
||||
|
@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
#include "clogger.h"
|
||||
#include "sls_detector_defs.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
|
||||
enum numberMode { DEC, HEX };
|
||||
#define GOODBYE (-200)
|
||||
|
@ -2,7 +2,7 @@
|
||||
#include "blackfin.h"
|
||||
#include "clogger.h"
|
||||
#include "commonServerFunctions.h" // blackfin.h, ansi.h
|
||||
#include "sls_detector_defs.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
|
||||
/* AD9257 ADC DEFINES */
|
||||
#define AD9257_ADC_NUMBITS (24)
|
||||
|
@ -1,7 +1,7 @@
|
||||
#include "ALTERA_PLL_CYCLONE10.h"
|
||||
#include "clogger.h"
|
||||
#include "nios.h"
|
||||
#include "sls_detector_defs.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
|
||||
#include <unistd.h> // usleep
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#include "ASIC_Driver.h"
|
||||
#include "clogger.h"
|
||||
#include "common.h"
|
||||
#include "sls_detector_defs.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
|
||||
#include <getopt.h>
|
||||
#include <stdint.h>
|
||||
|
@ -1,7 +1,7 @@
|
||||
#include "DAC6571.h"
|
||||
#include "clogger.h"
|
||||
#include "common.h"
|
||||
#include "sls_detector_defs.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
|
||||
#include "string.h"
|
||||
|
||||
|
@ -3,7 +3,7 @@
|
||||
#include "clogger.h"
|
||||
#include "common.h"
|
||||
#include "commonServerFunctions.h" // blackfin.h, ansi.h
|
||||
#include "sls_detector_defs.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#include "LTC2620_Driver.h"
|
||||
#include "clogger.h"
|
||||
#include "common.h"
|
||||
#include "sls_detector_defs.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
|
@ -3,7 +3,7 @@
|
||||
#include "clogger.h"
|
||||
#include "common.h"
|
||||
#include "commonServerFunctions.h" // blackfin.h, ansi.h
|
||||
#include "sls_detector_defs.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
|
||||
/* MAX1932 HV DEFINES */
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
#include "UDPPacketHeaderGenerator.h"
|
||||
#include "clogger.h"
|
||||
#include "sls_detector_defs.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
|
||||
#include <arpa/inet.h>
|
||||
#include <errno.h>
|
||||
|
@ -1,8 +1,8 @@
|
||||
#include "blackfin.h"
|
||||
#include "RegisterDefs.h"
|
||||
#include "ansi.h"
|
||||
#include "sls/ansi.h"
|
||||
#include "clogger.h"
|
||||
#include "sls_detector_defs.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
|
||||
#include <fcntl.h> // open
|
||||
#include <sys/mman.h> // mmap
|
||||
|
@ -1,7 +1,7 @@
|
||||
#define _GNU_SOURCE // needed for strptime to be at the top
|
||||
#include "common.h"
|
||||
#include "clogger.h"
|
||||
#include "sls_detector_defs.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
|
||||
#include <libgen.h> // dirname
|
||||
#include <string.h>
|
||||
|
@ -1,6 +1,6 @@
|
||||
#include "communication_funcs_UDP.h"
|
||||
#include "clogger.h"
|
||||
#include "sls_detector_defs.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
|
||||
#include <arpa/inet.h>
|
||||
#include <errno.h>
|
||||
|
@ -1,9 +1,9 @@
|
||||
#include "nios.h"
|
||||
#include "RegisterDefs.h"
|
||||
#include "ansi.h"
|
||||
#include "sls/ansi.h"
|
||||
#include "clogger.h"
|
||||
#include "common.h"
|
||||
#include "sls_detector_defs.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
|
||||
#include <fcntl.h> // open
|
||||
#include <string.h>
|
||||
|
@ -1,5 +1,5 @@
|
||||
#include "programFpgaBlackfin.h"
|
||||
#include "ansi.h"
|
||||
#include "sls/ansi.h"
|
||||
#include "clogger.h"
|
||||
#include "slsDetectorServer_defs.h"
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
#include "programFpgaNios.h"
|
||||
#include "ansi.h"
|
||||
#include "sls/ansi.h"
|
||||
#include "clogger.h"
|
||||
#include "slsDetectorServer_defs.h"
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
#include "readDefaultPattern.h"
|
||||
#include "ansi.h"
|
||||
#include "sls/ansi.h"
|
||||
#include "clogger.h"
|
||||
#include "common.h"
|
||||
#include "slsDetectorServer_defs.h"
|
||||
#include "sls_detector_defs.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
|
@ -6,8 +6,8 @@
|
||||
#include "sharedMemory.h"
|
||||
#include "slsDetectorServer_defs.h"
|
||||
#include "slsDetectorServer_funcs.h"
|
||||
#include "sls_detector_defs.h"
|
||||
#include "versionAPI.h"
|
||||
#include "sls/sls_detector_defs.h"
|
||||
#include "sls/versionAPI.h"
|
||||
|
||||
#include <getopt.h>
|
||||
#include <signal.h>
|
||||
|
@ -3,7 +3,7 @@
|
||||
#include "communication_funcs.h"
|
||||
#include "sharedMemory.h"
|
||||
#include "slsDetectorFunctionList.h"
|
||||
#include "sls_detector_funcs.h"
|
||||
#include "sls/sls_detector_funcs.h"
|
||||
|
||||
#include <arpa/inet.h>
|
||||
#include <pthread.h>
|
||||
|
Reference in New Issue
Block a user