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

updated ctb and moench, moench not tested

Browse Source
This commit is contained in:
maliakal_d
2019-03-05 09:38:10 +01:00
parent 08bd2378f4
commit c56561bc9f
17 changed files with 433 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h
View File

@ -20,8 +20,8 @@ int getFirmwareCheckResult(char** mess);
void basictests();
#if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD)
int checkType();
u_int32_t testFpga(void);
int testBus(void);
int testFpga();
int testBus();
#endif
#ifdef GOTTHARDD
@ -33,8 +33,8 @@ int detectorTest(enum digitalTestMode arg);
// Ids
int64_t getDetectorId(enum idMode arg);
u_int64_t getFirmwareVersion();
#if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD)
u_int64_t getFirmwareAPIVersion();
#if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD)
u_int16_t getHardwareVersionNumber();
u_int16_t getHardwareSerialNumber();
#endif
@ -183,13 +183,7 @@ int getPower();
void setPower(enum DACINDEX ind, int val);
void powerOff();
#endif
/*#ifdef GOTTHARDD
void initDAC(int dac_addr, int value);
void clearDACSregister();
void nextDAC();
void program_one_dac(int addr, int value);
u_int32_t putout(char *s);
#endif*/
#ifndef MOENCHD
int getADC(enum ADCINDEX ind);
#endif
@ -232,7 +226,7 @@ int enableTenGigabitEthernet(int val);
int powerChip (int on);
#endif
// chip test board specific - sendudp, pll, flashing firmware
// chip test board or moench specific - configure frequency, phase, pll, flashing firmware
#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
void configurePhase(enum CLKINDEX ind, int val);
int getPhase(enum CLKINDEX ind);
@ -245,7 +239,7 @@ extern void eraseFlash(); // p
extern int startWritingFPGAprogram(FILE** filefp); // programfpga.h
extern void stopWritingFPGAprogram(FILE* filefp); // programfpga.h
extern int writeFPGAProgram(char* fpgasrc, size_t fsize, FILE* filefp); // programfpga.h
// ctb patterns
// patterns
uint64_t writePatternIOControl(uint64_t word);
uint64_t writePatternClkControl(uint64_t word);
uint64_t readPatternWord(int addr);

2
slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -3267,6 +3267,7 @@ int power_chip(int file_des) {
retval = powerChip(arg);
FILE_LOG(logDEBUG1, ("Power chip: %d\n", retval));
validate(arg, retval, "power on/off chip", DEC);
#ifdef JUNGFRAUD
// narrow down error when powering on
if (ret == FAIL && arg > 0) {
if (setTemperatureEvent(-1) == 1)
@ -3274,6 +3275,7 @@ int power_chip(int file_des) {
"Clear event & power chip again. Set %d, read %d \n", arg, retval);
FILE_LOG(logERROR, (mess));
}
#endif
}
#endif
return Server_SendResult(file_des, INT32, UPDATE, &retval, sizeof(retval));