Merge branch '3.0-rc' into developer

This commit is contained in:
Dhanya Maliakal 2017-08-17 17:24:30 +02:00
commit ed8e41a02c
4 changed files with 15 additions and 18 deletions

View File

@ -177,12 +177,6 @@ Versions</a></h2>
<li><b>receiverversion</b> Gets the software version of receiver. Only get! <code>Returns</code> <code></code>(long int) in hexadecimal</li> <li><b>receiverversion</b> Gets the software version of receiver. Only get! <code>Returns</code> <code></code>(long int) in hexadecimal</li>
</ul> </ul>
<ul> <ul>
<li><b>period [i]</b> sets/gets frame period in s. <code>Returns</code> <code></code>(double with 9 decimal digits)</li>
</ul>
<ul>
<li><b>delay [i]</b> sets/gets delay in s. Used in MYTHEN, GOTTHARD only. <code>Returns</code> <code></code>(double with 9 decimal digits)</li>
</ul>
<ul>
<li><b>framesl</b> gets number of frames left. Used in MYTHEN, GOTTHARD only. Only get! <code>Returns</code> <code></code>(double with 9 decimal digits)</li> <li><b>framesl</b> gets number of frames left. Used in MYTHEN, GOTTHARD only. Only get! <code>Returns</code> <code></code>(double with 9 decimal digits)</li>
</ul> </ul>
<h2><a class="anchor" id="configspeed"> <h2><a class="anchor" id="configspeed">

View File

@ -48,7 +48,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
<ul> <ul>
<li><b>subexptime [i]</b> sets/gets sub exposure time in s. Used in EIGER only in 32 bit mode. <code>Returns</code> <code></code>(double with 9 decimal digits)</li> <li><b>subexptime [i]</b> sets/gets sub exposure time in s. Used in EIGER only in 32 bit mode. <code>Returns</code> <code></code>(double with 9 decimal digits)</li>
</ul> </ul>
<p>/*!</p> <ul>
<li><b>period [i]</b> sets/gets frame period in s. <code>Returns</code> <code></code>(double with 9 decimal digits)</li>
</ul>
<ul>
<li><b>delay [i]</b> sets/gets delay in s. Used in MYTHEN, GOTTHARD only. <code>Returns</code> <code></code>(double with 9 decimal digits)</li>
</ul>
<ul> <ul>
<li><b>gates [i]</b> sets/gets number of gates. Used in MYTHEN, GOTTHARD only. <code>Returns</code> <code></code>(long long int)</li> <li><b>gates [i]</b> sets/gets number of gates. Used in MYTHEN, GOTTHARD only. <code>Returns</code> <code></code>(long long int)</li>
</ul> </ul>

View File

@ -198,16 +198,6 @@ Commands to check versions of each subsystem
\end{DoxyItemize} \end{DoxyItemize}
\begin{DoxyItemize}
\item {\bfseries period \mbox{[}i\mbox{]}} sets/gets frame period in s. {\ttfamily Returns} {\ttfamily }(double with 9 decimal digits)
\end{DoxyItemize}
\begin{DoxyItemize}
\item {\bfseries delay \mbox{[}i\mbox{]}} sets/gets delay in s. Used in MYTHEN, GOTTHARD only. {\ttfamily Returns} {\ttfamily }(double with 9 decimal digits)
\end{DoxyItemize}
\begin{DoxyItemize} \begin{DoxyItemize}
\item {\bfseries framesl} gets number of frames left. Used in MYTHEN, GOTTHARD only. Only get! {\ttfamily Returns} {\ttfamily }(double with 9 decimal digits) \item {\bfseries framesl} gets number of frames left. Used in MYTHEN, GOTTHARD only. Only get! {\ttfamily Returns} {\ttfamily }(double with 9 decimal digits)
\end{DoxyItemize}\hypertarget{config_configspeed}{}\subsection{Speed}\label{config_configspeed} \end{DoxyItemize}\hypertarget{config_configspeed}{}\subsection{Speed}\label{config_configspeed}

View File

@ -15,7 +15,15 @@ Commands to setup the timing
\item {\bfseries subexptime \mbox{[}i\mbox{]}} sets/gets sub exposure time in s. Used in EIGER only in 32 bit mode. {\ttfamily Returns} {\ttfamily }(double with 9 decimal digits) \item {\bfseries subexptime \mbox{[}i\mbox{]}} sets/gets sub exposure time in s. Used in EIGER only in 32 bit mode. {\ttfamily Returns} {\ttfamily }(double with 9 decimal digits)
\end{DoxyItemize} \end{DoxyItemize}
/$\ast$!
\begin{DoxyItemize}
\item {\bfseries period \mbox{[}i\mbox{]}} sets/gets frame period in s. {\ttfamily Returns} {\ttfamily }(double with 9 decimal digits)
\end{DoxyItemize}
\begin{DoxyItemize}
\item {\bfseries delay \mbox{[}i\mbox{]}} sets/gets delay in s. Used in MYTHEN, GOTTHARD only. {\ttfamily Returns} {\ttfamily }(double with 9 decimal digits)
\end{DoxyItemize}
\begin{DoxyItemize} \begin{DoxyItemize}