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

ctb and moench: wrong firmware will set numchannels to 0 and this will throw when updating detector size, binaries in

Browse Source
This commit is contained in:
maliakal_d
2021-08-20 14:03:43 +02:00
parent 9158a3c8b0
commit b37db1de72
6 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
View File

Binary file not shown.

8
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@@ -55,10 +55,10 @@ char *digitalData = 0;
char volatile *analogDataPtr = 0;
char volatile *digitalDataPtr = 0;
char udpPacketData[UDP_PACKET_DATA_BYTES + sizeof(sls_detector_header)];
uint32_t adcEnableMask_1g = 0;
uint32_t adcEnableMask_1g = BIT32_MSK;
// 10g readout
uint8_t adcEnableMask_10g = 0;
uint8_t adcEnableMask_10g = BIT32_MSK;
int32_t clkPhase[NUM_CLOCKS] = {};
uint32_t clkFrequency[NUM_CLOCKS] = {40, 20, 20, 200};
@@ -470,8 +470,8 @@ void setupDetector() {
}
vLimit = DEFAULT_VLIMIT;
highvoltage = 0;
adcEnableMask_1g = 0;
adcEnableMask_10g = 0;
adcEnableMask_1g = BIT32_MSK;
adcEnableMask_10g = BIT32_MSK;
analogEnable = 1;
digitalEnable = 0;
naSamples = 1;

BIN
slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
View File

Binary file not shown.

8
slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
View File

@@ -53,10 +53,10 @@ char *digitalData = 0;
char volatile *analogDataPtr = 0;
char volatile *digitalDataPtr = 0;
char udpPacketData[UDP_PACKET_DATA_BYTES + sizeof(sls_detector_header)];
uint32_t adcEnableMask_1g = 0;
uint32_t adcEnableMask_1g = BIT32_MSK;
// 10g readout
uint8_t adcEnableMask_10g = 0;
uint8_t adcEnableMask_10g = BIT32_MSK;
int32_t clkPhase[NUM_CLOCKS] = {};
uint32_t clkFrequency[NUM_CLOCKS] = {40, 20, 20, 200};
@@ -480,8 +480,8 @@ void setupDetector() {
dacValues[i] = -1;
vLimit = DEFAULT_VLIMIT;
highvoltage = 0;
adcEnableMask_1g = 0;
adcEnableMask_10g = 0;
adcEnableMask_1g = BIT32_MSK;
adcEnableMask_10g = BIT32_MSK;
nSamples = 1;
#ifdef VIRTUAL
sharedMemory_setStatus(IDLE);