mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-05-14 21:15:36 +02:00
minor, and binaries
This commit is contained in:
Binary file not shown.
@@ -2218,7 +2218,7 @@ int getMaxPhase(enum CLKINDEX ind) {
|
||||
MAX_PHASE_SHIFTS_STEPS;
|
||||
|
||||
char *clock_names[] = {CLK_NAMES};
|
||||
LOG(logDEBUG1, ("Max Phase Shift (%s): %d (Clock: %d MHz, VCO:%d Hz)\n",
|
||||
LOG(logDEBUG1, ("Max Phase Shift (%s): %d (Clock: %d Hz, VCO:%d Hz)\n",
|
||||
clock_names[ind], ret, clkFrequency[ind], PLL_VCO_FREQ_HZ));
|
||||
|
||||
return ret;
|
||||
@@ -2260,7 +2260,7 @@ int setFrequency(enum CLKINDEX ind, int val) {
|
||||
|
||||
// check adc clk too high
|
||||
if (ind == ADC_CLK && val > MAXIMUM_ADC_CLK) {
|
||||
LOG(logERROR, ("Frequency %d MHz too high for ADC\n", val));
|
||||
LOG(logERROR, ("Frequency %d Hz too high for ADC\n", val));
|
||||
return FAIL;
|
||||
}
|
||||
|
||||
@@ -2308,7 +2308,7 @@ int getFrequency(enum CLKINDEX ind) {
|
||||
// checking against 0 here ensures compatibility with old firmware, TODO:
|
||||
// remove this check at some point
|
||||
if (measuredFreqHz != 0) {
|
||||
// Round to nearest MHz. (should we round at all ?)
|
||||
// Round to nearest Hz. (should we round at all ?)
|
||||
clkFrequency[ind] = measuredFreqHz;
|
||||
}
|
||||
#endif
|
||||
|
||||
Binary file not shown.
@@ -3,10 +3,10 @@
|
||||
/** API versions */
|
||||
#define APILIB "0.0.0 0x250909"
|
||||
#define APIRECEIVER "0.0.0 0x250822"
|
||||
#define APICTB "0.0.0 0x260427"
|
||||
#define APICTB "0.0.0 0x260428"
|
||||
#define APIGOTTHARD2 "0.0.0 0x260427"
|
||||
#define APIMOENCH "0.0.0 0x260424"
|
||||
#define APIEIGER "0.0.0 0x260424"
|
||||
#define APIXILINXCTB "0.0.0 0x260427"
|
||||
#define APIXILINXCTB "0.0.0 0x260428"
|
||||
#define APIJUNGFRAU "0.0.0 0x260424"
|
||||
#define APIMYTHEN3 "0.0.0 0x260427"
|
||||
|
||||
Reference in New Issue
Block a user