Merge branch 'developer' into rxctb

slsDetectorSoftware/include/slsDetector.h

@@ -1660,7 +1660,7 @@ class slsDetector : public virtual slsDetectorDefs{
 	 * @param i file index
 	 * @returns file index
 	 */
-    int setFileIndex(int i);
+    int setFileIndex(int file_index);
 
     /**
      * Gets the file index
@@ -1781,21 +1781,21 @@ class slsDetector : public virtual slsDetectorDefs{
 	 * @param i is -1 to get, 0 to disable and 1 to enable
 	 * @returns if 10Gbe is enabled
 	 */
-    int enableTenGigabitEthernet(int i = -1);
+    int enableTenGigabitEthernet(int value = -1);
 
     /**
 	 * Set/get receiver fifo depth
 	 * @param i is -1 to get, any other value to set the fifo deph
 	 * @returns the receiver fifo depth
 	 */
-    int setReceiverFifoDepth(int i = -1);
+    int setReceiverFifoDepth(int n_frames = -1);
 
     /**
 	 * Set/get receiver silent mode
 	 * @param i is -1 to get, 0 unsets silent mode, 1 sets silent mode
 	 * @returns the receiver silent mode enable
 	 */
-    bool setReceiverSilentMode(int i = -1);
+    bool setReceiverSilentMode(int value = -1);
 
     /**
 	 * If data streaming in receiver is enabled,

slsDetectorSoftware/include/slsDetectorUsers.h

@@ -24,12 +24,12 @@ class detectorData;
 
 
 /*
-   \mainpage 
 <CENTER><H1>API for SLS detectors data acquisition</H1></CENTER>
 <HR>
  */
 /** 
-    \mainpage 
+\mainpage 
+\subpage CLI
 
 
 <H1>API for SLS detectors data acquisition</H1>