detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 01:58:00 +02: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

2
slsDetectorServers/gotthardDetectorServer/RegisterDefs.h
View File

@ -131,7 +131,7 @@
#define TEMP_SPI_IN_T2_CLK_MSK (0x00000001 << TEMP_SPI_IN_T2_CLK_OFST)
#define TEMP_SPI_IN_T2_CS_OFST (3)
#define TEMP_SPI_IN_T2_CS_MSK (0x00000001 << TEMP_SPI_IN_T2_CS_OFST)
#define TEMP_SPI_IDLE_MSK (TEMP_SPI_IN_T1_CS_MSK | TEMP_SPI_IN_T2_CS_MSK)
#define TEMP_SPI_IN_IDLE_MSK (TEMP_SPI_IN_T1_CS_MSK | TEMP_SPI_IN_T2_CS_MSK | TEMP_SPI_IN_T1_CLK_MSK | TEMP_SPI_IN_T2_CLK_MSK)
/** Temperatre SPI Out register */
#define TEMP_SPI_OUT_REG (0x1c << MEM_MAP_SHIFT)

1
slsDetectorServers/gotthardDetectorServer/common.h Symbolic link
View File

@ -0,0 +1 @@
../slsDetectorServer/common.h

8
slsDetectorServers/gotthardDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorPackage/slsDetectorServers/gotthardDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 87f75630357249e5082b435a9ba852335881331f
Revision: 13
Repsitory UUID: bfda07d262dd4eb8c8298df6809d0172d10076e5
Revision: 14
Branch: refactor
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4181
Last Changed Date: 2018-12-06 15:21:07.000000002 +0100 ./RegisterDefs.h
Last Changed Rev: 4199
Last Changed Date: 2019-01-04 12:28:36.000000002 +0100 ./.target-makefrag

6
slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "87f75630357249e5082b435a9ba852335881331f"
#define GITREPUUID "bfda07d262dd4eb8c8298df6809d0172d10076e5"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4181
#define GITDATE 0x20181206
#define GITREV 0x4199
#define GITDATE 0x20190104
#define GITBRANCH "refactor"

16
slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
View File

@ -113,13 +113,13 @@ void basictests() {
"Firmware Version : 0x%llx\n"
"Software Version : 0x%llx\n"
"F/w-S/w API Version : 0x%llx\n"
"Required F/w Version : 0x%x\n"
"Client-S/w API Version : 0x%llx\n"
"********************************************************\n",
boardrev,
ipadd,
(long long unsigned int)macadd,
(long long int)fwversion,
(long long int)swversion,
(long long int)client_sw_apiversion
@ -379,7 +379,7 @@ void setupDetector() {
AD9252_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);
else
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);
// disable spi
if (getBoardRevision() == 1)
@ -388,9 +388,8 @@ void setupDetector() {
AD9257_Disable();
LTC2620_Disable();
bus_w(DAC_CNTRL_REG, DAC_CNTRL_SPI_IDLE_MSK);
bus_w(ADC_SPI_REG, ADC_SERIAL_CS_OUT_MSK);
bus_w(TEMP_SPI_IN_REG, TEMP_SPI_IDLE_MSK);
bus_w(TEMP_SPI_IN_REG, TEMP_SPI_IN_IDLE_MSK);
bus_w(TEMP_SPI_OUT_REG, 0x0);
#ifndef VIRTUAL
if (getBoardRevision() == 1)
@ -1144,6 +1143,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
@ -1166,7 +1168,7 @@ int getDAC(enum DACINDEX ind, int mV) {
return voltage;
}
int getMAXDACUnits() {
int getMaxDacSteps() {
return LTC2620_MAX_STEPS;
}

2
slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h
View File

@ -51,7 +51,7 @@ enum DACINDEX {VREF_DS, VCASCN_PB, VCASCP_PB, VOUT_CM, VCASC_OUT, VIN
#define DEFAULT_PHASE_SHIFT (120)
#define DEFAULT_TX_UDP_PORT (0xE185)
#define MAX_DAC_VOLTAGE_VALUE (2500)
#define DAC_MAX_VOLTAGE_MV (2500)
/** ENEt conf structs */
typedef struct mac_header_struct{