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

gotthard, cmakefiles language line removed

Browse Source
This commit is contained in:
maliakal_d
2019-01-04 16:34:34 +01:00
parent bfda07d262
commit 06a6d53a3f
23 changed files with 198 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@@ -399,7 +399,7 @@ void setupDetector() {
// set spi defines
AD9257_SetDefines(ADC_SPI_REG, ADC_SPI_SRL_CS_OTPT_MSK, ADC_SPI_SRL_CLK_OTPT_MSK, ADC_SPI_SRL_DT_OTPT_MSK, ADC_SPI_SRL_DT_OTPT_OFST);
LTC2620_SetDefines(SPI_REG, SPI_DAC_SRL_CS_OTPT_MSK, SPI_DAC_SRL_CLK_OTPT_MSK, SPI_DAC_SRL_DGTL_OTPT_MSK, SPI_DAC_SRL_DGTL_OTPT_OFST, NDAC, MAX_DAC_VOLTAGE_VALUE);
LTC2620_SetDefines(SPI_REG, SPI_DAC_SRL_CS_OTPT_MSK, SPI_DAC_SRL_CLK_OTPT_MSK, SPI_DAC_SRL_DGTL_OTPT_MSK, SPI_DAC_SRL_DGTL_OTPT_OFST, NDAC, DAC_MAX_VOLTAGE_MV);
MAX1932_SetDefines(SPI_REG, SPI_HV_SRL_CS_OTPT_MSK, SPI_HV_SRL_CLK_OTPT_MSK, SPI_HV_SRL_DGTL_OTPT_MSK, SPI_HV_SRL_DGTL_OTPT_OFST);
// disable spi
@@ -838,6 +838,9 @@ enum detectorSettings getSettings(){
/* parameters - dac, adc, hv */
void setDAC(enum DACINDEX ind, int val, int mV) {
if (val < 0)
return;
FILE_LOG(logDEBUG1, ("Setting dac[%d]: %d %s \n", (int)ind, val, (mV ? "mV" : "dac units")));
int dacval = val;
#ifdef VIRTUAL
@@ -865,7 +868,7 @@ int getDAC(enum DACINDEX ind, int mV) {
return voltage;
}
int getMAXDACUnits() {
int getMaxDacSteps() {
return LTC2620_MAX_STEPS;
}

2
slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h
View File

@@ -66,7 +66,7 @@ enum NETWORKINDEX { TXN_FRAME };
#define DEFAULT_NUM_STRG_CLLS (0)
#define DEFAULT_STRG_CLL_STRT (0xf)
#define MAX_DAC_VOLTAGE_VALUE (2500)
#define DAC_MAX_VOLTAGE_MV (2500)
/* Defines in the Firmware */
#define FIX_PATT_VAL (0xACDC2014)