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

Merge branch 'developer' into gui

Browse Source
This commit is contained in:
maliakal_d
2019-06-25 09:08:29 +02:00
parent 33f5253831 4b69c01357
commit 3db09bc0cd
11 changed files with 71 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsSupportLib/include/sls_detector_defs.h
View File

@@ -67,7 +67,7 @@
#define DEFAULT_STREAMING_TIMER_IN_MS 200
typedef char mystring[MAX_STR_LENGTH];
// typedef char mystring[MAX_STR_LENGTH];
#ifdef __cplusplus
class slsDetectorDefs {
@@ -496,6 +496,7 @@ format
DBIT_PIPELINE, /**< adc pipeline */
MAX_ADC_PHASE_SHIFT, /** max adc phase shift */
MAX_DBIT_PHASE_SHIFT, /** max adc phase shift */
SYNC_CLOCK,
};
/**