Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detector_software into 3.0-rc

This commit is contained in:
2017-08-17 17:04:57 +02:00

View File

@ -1451,7 +1451,7 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) {
- <b>temp_10ge</b> Gets the 10Gbe temperature. Used in EIGER only. \c Returns \c EIGER(double"°C") - <b>temp_10ge</b> Gets the 10Gbe temperature. Used in EIGER only. \c Returns \c EIGER(double"°C")
*/ */
descrToFuncMap[i].m_pFuncName="temp_10ge"; // descrToFuncMap[i].m_pFuncName="temp_10ge"; //
descrToFuncMap[i].m_pFuncPtr. \c Returns \c (int ["mV"])etectorCommand::cmdADC; descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC;
i++; i++;
/*! \page settings /*! \page settings