mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-23 15:00:02 +02:00
Merge branch '3.0-rc' into developer
This commit is contained in:
commit
269227b093
@ -1459,7 +1459,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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user