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

Merge branch 'roundrobin' of github.com:slsdetectorgroup/slsDetectorPackage into roundrobin

Browse Source
This commit is contained in:
maliakal_d
2021-08-25 14:44:01 +02:00
parent b2541117b8 1d989637e9
commit 9a4e18f42d
13 changed files with 162 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@ -58,7 +58,7 @@ char udpPacketData[UDP_PACKET_DATA_BYTES + sizeof(sls_detector_header)];
uint32_t adcEnableMask_1g = BIT32_MSK;
// 10g readout
uint8_t adcEnableMask_10g = BIT32_MSK;
uint8_t adcEnableMask_10g = 0xFF;
int32_t clkPhase[NUM_CLOCKS] = {};
uint32_t clkFrequency[NUM_CLOCKS] = {40, 20, 20, 200};
@ -471,7 +471,7 @@ void setupDetector() {
vLimit = DEFAULT_VLIMIT;
highvoltage = 0;
adcEnableMask_1g = BIT32_MSK;
adcEnableMask_10g = BIT32_MSK;
adcEnableMask_10g = 0xFF;
analogEnable = 1;
digitalEnable = 0;
naSamples = 1;