diff --git a/serverBin/mythen3DetectorServerv8.0.0 b/serverBin/mythen3DetectorServerv8.0.0 deleted file mode 120000 index c98a6145e..000000000 --- a/serverBin/mythen3DetectorServerv8.0.0 +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv8.0.0 \ No newline at end of file diff --git a/serverBin/mythen3DetectorServerv8.0.2 b/serverBin/mythen3DetectorServerv8.0.2 new file mode 120000 index 000000000..187339896 --- /dev/null +++ b/serverBin/mythen3DetectorServerv8.0.2 @@ -0,0 +1 @@ +../slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv8.0.2 \ No newline at end of file diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv8.0.0 b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv8.0.2 similarity index 50% rename from slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv8.0.0 rename to slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv8.0.2 index bf54ab681..0cba6ba1c 100755 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv8.0.0 and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv8.0.2 differ diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c index 3fcfda045..ba49a339e 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c @@ -479,6 +479,11 @@ void setupDetector() { READOUT_PLL_VCO_FREQ_HZ, SYSTEM_PLL_VCO_FREQ_HZ); ALTERA_PLL_C10_ResetPLL(READOUT_PLL); ALTERA_PLL_C10_ResetPLL(SYSTEM_PLL); + // change startup clock divider in software + // because firmware only sets max clock divider + setClockDividerWithTimeUpdateOption(READOUT_C0, DEFAULT_READOUT_C0_STARTUP, + 0); + // hv DAC6571_SetDefines(HV_HARD_MAX_VOLTAGE, HV_DRIVER_FILE_NAME); // dac @@ -2331,6 +2336,7 @@ int setClockDividerWithTimeUpdateOption(enum CLKINDEX ind, int val, return FAIL; } if (val < 2 || val > getMaxClockDivider()) { + LOG(logERROR, ("Invalid clock divider %d\n", val)); return FAIL; } char *clock_names[] = {CLK_NAMES}; diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h index e9e020ca0..aa57b0f78 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h @@ -64,6 +64,8 @@ #define DEFAULT_SYSTEM_C2 (5) //(200000000) // smp_clk, 200 MHz const #define DEFAULT_TRIMMING_RUN_CLKDIV (40) // (25000000) // 25 MHz +#define DEFAULT_READOUT_C0_STARTUP (20) //(50000000) // rdo_clk, 50 MHz + #define DEFAULT_ASIC_LATCHING_NUM_PULSES (10) #define DEFAULT_MSTR_OTPT_P1_NUM_PULSES (20) #define DEFAULT_ADIF_PIPELINE_VAL (8) diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 35194c835..904367157 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -7,7 +7,7 @@ #define APIGOTTHARD "8.0.0 0x231109" #define APIGOTTHARD2 "8.0.0 0x231109" #define APIJUNGFRAU "8.0.0 0x231109" -#define APIMYTHEN3 "8.0.0 0x231109" #define APIEIGER "8.0.0 0x231109" #define APILIB "8.0.1 0x240112" #define APIMOENCH "8.0.2 0x240703" +#define APIMYTHEN3 "8.0.2 0x240715"