Exact pixelation in GlScope and documentation updates

oliverhaag
1 parent 5f0cf293
Showing 13 changed files with 182 additions and 84 deletions
openhantek/ChangeLog
openhantek/mainpage.dox
openhantek/src/dso.cpp
openhantek/src/dsowidget.h
openhantek/src/glgenerator.cpp
openhantek/src/glscope.cpp
openhantek/src/hantek/control.cpp
openhantek/src/hantek/control.h
openhantek/src/hantek/device.cpp
openhantek/src/hantek/device.h
openhantek/src/hantek/types.cpp
openhantek/src/hantek/types.h
openhantek/src/levelslider.cpp
@@ -136,3 +136,10 @@
 2011-12-02 Oliver Haag  <oliver.haag@gmail.com>
 * Moved values needed to control gain into lists, initialized in connectDevice
+
+2012-07-08 Oliver Haag  <oliver.haag@gmail.com>
+* Exact pixelation in GlScope and LevelSlider
+
+2012-09-01 Oliver Haag  <oliver.haag@gmail.com>
+* Updated documentation with first DSO-2250 details
+* General documentation improvements
@@ -50,7 +50,7 @@ After building it, you can just run the fwget.sh script inside the openhantek-ex
 </pre>
 You can also do it manually by placing the DSO*1.SYS file into the same directory and running the built binary:
 <pre>
-	$ ./openhantek-extractfw <driver file>
+	$ ./openhantek-extractfw &lt;driver file&gt;
 </pre>
 This should create two .hex files that should be placed into /usr/local/share/hantek/.
 \subsection ssec_firmware Installing the firmware
@@ -30,7 +30,7 @@
 namespace Dso {
 	/// \brief Return string representation of the given channel mode.
-	/// \param mode The #ChannelMode that should be returned as string.
+	/// \param mode The ::ChannelMode that should be returned as string.
 	/// \return The string that should be used in labels etc., empty when invalid.
 	QString channelModeString(ChannelMode mode) {
 		switch(mode) {
@@ -44,7 +44,7 @@ namespace Dso {
 	}
 	/// \brief Return string representation of the given graph format.
-	/// \param format The #GraphFormat that should be returned as string.
+	/// \param format The ::GraphFormat that should be returned as string.
 	/// \return The string that should be used in labels etc.
 	QString graphFormatString(GraphFormat format) {
 		switch(format) {
@@ -58,7 +58,7 @@ namespace Dso {
 	}
 	/// \brief Return string representation of the given channel coupling.
-	/// \param coupling The #Coupling that should be returned as string.
+	/// \param coupling The ::Coupling that should be returned as string.
 	/// \return The string that should be used in labels etc.
 	QString couplingString(Coupling coupling) {
 		switch(coupling) {
@@ -74,7 +74,7 @@ namespace Dso {
 	}
 	/// \brief Return string representation of the given math mode.
-	/// \param mode The #MathMode that should be returned as string.
+	/// \param mode The ::MathMode that should be returned as string.
 	/// \return The string that should be used in labels etc.
 	QString mathModeString(MathMode mode) {
 		switch(mode) {
@@ -90,7 +90,7 @@ namespace Dso {
 	}
 	/// \brief Return string representation of the given trigger mode.
-	/// \param mode The #TriggerMode that should be returned as string.
+	/// \param mode The ::TriggerMode that should be returned as string.
 	/// \return The string that should be used in labels etc.
 	QString triggerModeString(TriggerMode mode) {
 		switch(mode) {
@@ -106,7 +106,7 @@ namespace Dso {
 	}
 	/// \brief Return string representation of the given trigger slope.
-	/// \param slope The #Slope that should be returned as string.
+	/// \param slope The ::Slope that should be returned as string.
 	/// \return The string that should be used in labels etc.
 	QString slopeString(Slope slope) {
 		switch(slope) {
@@ -120,7 +120,7 @@ namespace Dso {
 	}
 	/// \brief Return string representation of the given dft window function.
-	/// \param window The #WindowFunction that should be returned as string.
+	/// \param window The ::WindowFunction that should be returned as string.
 	/// \return The string that should be used in labels etc.
 	QString windowFunctionString(WindowFunction window) {
 		switch(window) {
@@ -160,7 +160,7 @@ namespace Dso {
 	}
 	/// \brief Return string representation of the given graph interpolation mode.
-	/// \param interpolation The #InterpolationMode that should be returned as string.
+	/// \param interpolation The ::InterpolationMode that should be returned as string.
 	/// \return The string that should be used in labels etc.
 	QString interpolationModeString(InterpolationMode interpolation) {
 		switch(interpolation) {
@@ -110,7 +110,7 @@ class DsoWidget : public QWidget {
 		void updateSpectrumUsed(unsigned int channel, bool used);
 		// Vertical axis
-    void updateVoltageCoupling(unsigned int channel);
+		void updateVoltageCoupling(unsigned int channel);
 		void updateMathMode();
 		void updateVoltageGain(unsigned int channel);
 		void updateVoltageUsed(unsigned int channel, bool used);
@@ -310,13 +310,12 @@ void GlGenerator::generateGrid() {
 	// Border
 	this->vaGrid[2].setSize(4 * 2);
-	// The 1e-4 offsets avoid that the border is outside our drawing area
-	this->vaGrid[2].data[0] = -DIVS_TIME / 2 + 1e-4;
-	this->vaGrid[2].data[1] = -DIVS_VOLTAGE / 2 + 1e-4;
-	this->vaGrid[2].data[2] = DIVS_TIME / 2 - 1e-4;
-	this->vaGrid[2].data[3] = -DIVS_VOLTAGE / 2 + 1e-4;
-	this->vaGrid[2].data[4] = DIVS_TIME / 2 - 1e-4;
-	this->vaGrid[2].data[5] = DIVS_VOLTAGE / 2 - 1e-4;
-	this->vaGrid[2].data[6] = -DIVS_TIME / 2 + 1e-4;
-	this->vaGrid[2].data[7] = DIVS_VOLTAGE / 2 - 1e-4;
+	this->vaGrid[2].data[0] = -DIVS_TIME / 2;
+	this->vaGrid[2].data[1] = -DIVS_VOLTAGE / 2;
+	this->vaGrid[2].data[2] = DIVS_TIME / 2;
+	this->vaGrid[2].data[3] = -DIVS_VOLTAGE / 2;
+	this->vaGrid[2].data[4] = DIVS_TIME / 2;
+	this->vaGrid[2].data[5] = DIVS_VOLTAGE / 2;
+	this->vaGrid[2].data[6] = -DIVS_TIME / 2;
+	this->vaGrid[2].data[7] = DIVS_VOLTAGE / 2;
 }
@@ -181,10 +181,15 @@ void GlScope::paintGL() {
 /// \param height The new height of the widget.
 void GlScope::resizeGL(int width, int height) {
 	glViewport(0, 0, (GLint) width, (GLint) height);
-	//glViewport(1, 0, (GLint) width - 1, (GLint) height - 1);
+
 	glMatrixMode(GL_PROJECTION);
+
+	// Set axes to div-scale and apply correction for exact pixelization
 	glLoadIdentity();
-	glOrtho(-DIVS_TIME / 2, DIVS_TIME / 2, -DIVS_VOLTAGE / 2, DIVS_VOLTAGE / 2, -1.0, 1.0);
+	GLdouble pixelizationWidthCorrection = (width > 0) ? (GLdouble) width / (width - 1) : 1;
+	GLdouble pixelizationHeightCorrection = (height > 0) ? (GLdouble) height / (height - 1) : 1;
+	glOrtho(-(DIVS_TIME / 2) * pixelizationWidthCorrection, (DIVS_TIME / 2) * pixelizationWidthCorrection, -(DIVS_VOLTAGE / 2) * pixelizationHeightCorrection, (DIVS_VOLTAGE / 2) * pixelizationHeightCorrection, -1.0, 1.0);
+
 	glMatrixMode(GL_MODELVIEW);
 }
@@ -285,14 +285,14 @@ namespace Hantek {
 	/// \param value The data value that contains the trigger point.
 	/// \return The calculated trigger point for the given data.
 	unsigned short int Control::calculateTriggerPoint(unsigned short int value) {
-    unsigned short int result = value;
-    
+		unsigned short int result = value;
+
 		// Each set bit inverts all bits with a lower value
 		for(unsigned short int bitValue = 1; bitValue; bitValue <<= 1)
 			if(result & bitValue)
 				result ^= bitValue - 1;
-		
-    return result;
+
+		return result;
 	}
 	/// \brief Gets the current state.
@@ -546,7 +546,6 @@ namespace Hantek {
 		// Determine the command version we need for this model
 		bool unsupported = false;
 		switch(this->device->getModel()) {
-			case MODEL_DSO2100:
 			case MODEL_DSO2150:
 				unsupported = true;
@@ -72,7 +72,7 @@ namespace Hantek {
 	};
 	//////////////////////////////////////////////////////////////////////////////
-	/// \struct ControlSpecificationCommandsControlValues         hantek/control.h
+	/// \struct ControlSpecificationCommandsValues                hantek/control.h
 	/// \brief Stores the control value codes used for this device.
 	struct ControlSpecificationCommandsValues {
 		ControlValue offsetLimits; ///< Code for channel offset limits
@@ -137,7 +137,7 @@ namespace Hantek {
 	};
 	//////////////////////////////////////////////////////////////////////////////
-	/// \struct ControlSettingsSamplerate                         hantek/control.h
+	/// \struct ControlSettingsTrigger                            hantek/control.h
 	/// \brief Stores the current trigger settings of the device.
 	struct ControlSettingsTrigger {
 		double level[HANTEK_CHANNELS]; ///< The trigger level for each channel in V
@@ -150,7 +150,7 @@ namespace Hantek {
 	};
 	//////////////////////////////////////////////////////////////////////////////
-	/// \struct ControlSettingsSamplerate                         hantek/control.h
+	/// \struct ControlSettingsVoltage                            hantek/control.h
 	/// \brief Stores the current amplification settings of the device.
 	struct ControlSettingsVoltage {
 		unsigned int gain; ///< The gain id
@@ -460,7 +460,7 @@ namespace Hantek {
 	}
 	/// \brief Gets the speed of the connection.
-	/// \return The #ConnectionSpeed of the USB connection.
+	/// \return The ::ConnectionSpeed of the USB connection.
 	int Device::getConnectionSpeed() {
 		int errorCode;
 		ControlGetSpeed response;
@@ -473,7 +473,7 @@ namespace Hantek {
 	}
 	/// \brief Get the oscilloscope model.
-	/// \return The #Model of the connected Hantek DSO.
+	/// \return The ::Model of the connected Hantek DSO.
 	Model Device::getModel() {
 		return this->model;
 	}
@@ -79,8 +79,8 @@ namespace Hantek {
 		protected:
 			// Lists for enums
-			QList<unsigned short int> modelIds; ///< Product ID for each #Model
-			QStringList modelStrings; ///< The name as QString for each #Model
+			QList<unsigned short int> modelIds; ///< Product ID for each ::Model
+			QStringList modelStrings; ///< The name as QString for each ::Model
 			// Command buffers
 			ControlBeginCommand *beginCommandControl; ///< Buffer for the CONTROL_BEGINCOMMAND control command
@@ -135,13 +135,13 @@ namespace Hantek {
 	}
 	/// \brief Get the bufferSize value in Tsr1Bits.
-	/// \return The #BufferSizeId value.
+	/// \return The ::BufferSizeId value.
 	unsigned char BulkSetTriggerAndSamplerate::getBufferSize() {
 		return ((Tsr1Bits *) &(this->array[2]))->bufferSize;
 	}
 	/// \brief Set the bufferSize in Tsr1Bits to the given value.
-	/// \param value The new #BufferSizeId value.
+	/// \param value The new ::BufferSizeId value.
 	void BulkSetTriggerAndSamplerate::setBufferSize(unsigned char value) {
 		((Tsr1Bits *) &(this->array[2]))->bufferSize = value;
 	}
@@ -623,7 +623,7 @@ namespace Hantek {
 	/// \param triggerPositionPost The TriggerPositionPost value.
 	/// \param usedPre The TriggerPositionUsedPre value.
 	/// \param usedPost The TriggerPositionUsedPost value.
-	/// \param bufferSize The #BufferSizeId value.
+	/// \param bufferSize The ::BufferSizeId value.
 	BulkSetBuffer5200::BulkSetBuffer5200(unsigned short int triggerPositionPre, unsigned short int triggerPositionPost, unsigned char usedPre, unsigned char usedPost, unsigned char bufferSize) : Helper::DataArray<unsigned char>(10) {
 		this->init();
@@ -661,37 +661,37 @@ namespace Hantek {
 	}
 	/// \brief Get the TriggerPositionUsedPre value.
-	/// \return The #DTriggerPositionUsed value for the pre position.
+	/// \return The ::DTriggerPositionUsed value for the pre position.
 	unsigned char BulkSetBuffer5200::getUsedPre() {
 		return this->array[4];
 	}
 	/// \brief Set the TriggerPositionUsedPre to the given value.
-	/// \param value The new #DTriggerPositionUsed value for the pre position.
+	/// \param value The new ::DTriggerPositionUsed value for the pre position.
 	void BulkSetBuffer5200::setUsedPre(unsigned char value) {
 		this->array[4] = value;
 	}
 	/// \brief Get the TriggerPositionUsedPost value.
-	/// \return The #DTriggerPositionUsed value for the post position.
+	/// \return The ::DTriggerPositionUsed value for the post position.
 	unsigned char BulkSetBuffer5200::getUsedPost() {
 		return ((DBufferBits *) &(this->array[8]))->triggerPositionUsed;
 	}
 	/// \brief Set the TriggerPositionUsedPost to the given value.
-	/// \param value The new #DTriggerPositionUsed value for the post position.
+	/// \param value The new ::DTriggerPositionUsed value for the post position.
 	void BulkSetBuffer5200::setUsedPost(unsigned char value) {
 		((DBufferBits *) &(this->array[8]))->triggerPositionUsed = value;
 	}
 	/// \brief Get the bufferSize value in DBufferBits.
-	/// \return The #BufferSizeId value.
+	/// \return The ::BufferSizeId value.
 	unsigned char BulkSetBuffer5200::getBufferSize() {
 		return ((DBufferBits *) &(this->array[8]))->bufferSize;
 	}
 	/// \brief Set the bufferSize in DBufferBits to the given value.
-	/// \param value The new #BufferSizeId value.
+	/// \param value The new ::BufferSizeId value.
 	void BulkSetBuffer5200::setBufferSize(unsigned char value) {
 		((DBufferBits *) &(this->array[8]))->bufferSize = value;
 	}
@@ -728,25 +728,25 @@ namespace Hantek {
 	}
 	/// \brief Get the triggerSource value in ETsrBits.
-	/// \return The #TriggerSource value.
+	/// \return The ::TriggerSource value.
 	unsigned char BulkSetTrigger5200::getTriggerSource() {
 		return ((ETsrBits *) &(this->array[2]))->triggerSource;
 	}
 	/// \brief Set the triggerSource in ETsrBits to the given value.
-	/// \param value The new #TriggerSource value.
+	/// \param value The new ::TriggerSource value.
 	void BulkSetTrigger5200::setTriggerSource(unsigned char value) {
 		((ETsrBits *) &(this->array[2]))->triggerSource = value;
 	}
 	/// \brief Get the usedChannels value in ETsrBits.
-	/// \return The #UsedChannels value.
+	/// \return The ::UsedChannels value.
 	unsigned char BulkSetTrigger5200::getUsedChannels() {
 		return ((ETsrBits *) &(this->array[2]))->usedChannels;
 	}
 	/// \brief Set the usedChannels in ETsrBits to the given value.
-	/// \param value The new #UsedChannels value.
+	/// \param value The new ::UsedChannels value.
 	void BulkSetTrigger5200::setUsedChannels(unsigned char value) {
 		((ETsrBits *) &(this->array[2]))->usedChannels = value;
 	}
@@ -51,6 +51,7 @@ namespace Hantek {
 	/// \brief All supported bulk commands.
 	/// Indicies given in square brackets specify byte numbers in little endian format.
 	enum BulkCode {
+		/// <em>[::MODEL_DSO2090, ::MODEL_DSO2150, ::MODEL_DSO2250, ::MODEL_DSO5200, ::MODEL_DSO5200A]</em>
 		/// <p>
 		///   This command sets channel and trigger filter:
 		///   <table>
@@ -66,8 +67,10 @@ namespace Hantek {
 		///     </tr>
 		///   </table>
 		/// </p>
+		/// <p><br /></p>
 		BULK_SETFILTER,
+		/// <em>[::MODEL_DSO2090, ::MODEL_DSO2150]</em>
 		/// <p>
 		///   This command sets trigger and timebase:
 		///   <table>
@@ -101,8 +104,10 @@ namespace Hantek {
 		/// <p>
 		///   The TriggerPosition sets the position of the pretrigger in samples. The left side (0 %) is 0x77660 when using the small buffer and 0x78000 when using the large buffer.
 		/// </p>
+		/// <p><br /></p>
 		BULK_SETTRIGGERANDSAMPLERATE,
+		/// <em>[::MODEL_DSO2090, ::MODEL_DSO2150, ::MODEL_DSO2250, ::MODEL_DSO5200, ::MODEL_DSO5200A]</em>
 		/// <p>
 		///   This command forces triggering:
 		///   <table>
@@ -112,8 +117,10 @@ namespace Hantek {
 		///     </tr>
 		///   </table>
 		/// </p>
+		/// <p><br /></p>
 		BULK_FORCETRIGGER,
+		/// <em>[::MODEL_DSO2090, ::MODEL_DSO2150, ::MODEL_DSO2250, ::MODEL_DSO5200, ::MODEL_DSO5200A]</em>
 		/// <p>
 		///   This command starts to capture data:
 		///   <table>
@@ -123,8 +130,10 @@ namespace Hantek {
 		///     </tr>
 		///   </table>
 		/// </p>
+		/// <p><br /></p>
 		BULK_STARTSAMPLING,
+		/// <em>[::MODEL_DSO2090, ::MODEL_DSO2150, ::MODEL_DSO2250, ::MODEL_DSO5200, ::MODEL_DSO5200A]</em>
 		/// <p>
 		///   This command sets the trigger:
 		///   <table>
@@ -134,8 +143,10 @@ namespace Hantek {
 		///     </tr>
 		///   </table>
 		/// </p>
+		/// <p><br /></p>
 		BULK_ENABLETRIGGER,
+		/// <em>[::MODEL_DSO2090, ::MODEL_DSO2150, ::MODEL_DSO2250, ::MODEL_DSO5200, ::MODEL_DSO5200A]</em>
 		/// <p>
 		///   This command reads data from the hardware:
 		///   <table>
@@ -180,8 +191,10 @@ namespace Hantek {
 		///     </tr>
 		///   </table>
 		/// </p>
+		/// <p><br /></p>
 		BULK_GETDATA,
+		/// <em>[::MODEL_DSO2090, ::MODEL_DSO2150, ::MODEL_DSO2250, ::MODEL_DSO5200, ::MODEL_DSO5200A]</em>
 		/// <p>
 		///   This command checks the capture state:
 		///   <table>
@@ -195,7 +208,7 @@ namespace Hantek {
 		///   The oscilloscope returns it's capture state and the trigger point. Not sure about this, looks like 248 16-bit words with nearly constant values. These can be converted to the start address of the data in the buffer (See Hantek::Control::calculateTriggerPoint):
 		///   <table>
 		///     <tr>
-		///       <td>#CaptureState</td>
+		///       <td>::CaptureState</td>
 		///       <td>0x00</td>
 		///       <td>TriggerPoint[0]</td>
 		///       <td>TriggerPoint[1]</td>
@@ -203,8 +216,10 @@ namespace Hantek {
 		///     </tr>
 		///   </table>
 		/// </p>
+		/// <p><br /></p>
 		BULK_GETCAPTURESTATE,
+		/// <em>[::MODEL_DSO2090, ::MODEL_DSO2150, ::MODEL_DSO2250, ::MODEL_DSO5200, ::MODEL_DSO5200A]</em>
 		/// <p>
 		///   This command sets the gain:
 		///   <table>
@@ -219,10 +234,12 @@ namespace Hantek {
 		///       <td>0x00</td>
 		///     </tr>
 		///   </table>
-		///   It is usually used in combination with #CONTROL_SETRELAYS.
+		///   It is usually used in combination with ::CONTROL_SETRELAYS.
 		/// </p>
+		/// <p><br /></p>
 		BULK_SETGAIN,
+		/// <em>[]</em>
 		/// <p>
 		///   This command sets the logical data (Not used in official Hantek software):
 		///   <table>
@@ -238,8 +255,10 @@ namespace Hantek {
 		///     </tr>
 		///   </table>
 		/// </p>
+		/// <p><br /></p>
 		BULK_SETLOGICALDATA,
+		/// <em>[::MODEL_DSO2250]</em>
 		/// <p>
 		///   This command reads the logical data (Not used in official Hantek software):
 		///   <table>
@@ -258,10 +277,12 @@ namespace Hantek {
 		///     </tr>
 		///   </table>
 		/// </p>
+		/// <p><br /></p>
 		BULK_GETLOGICALDATA,
+		/// <em>[]</em>
 		/// <p>
-		///   This command isn't used for the DSO-2090 and DSO-5200:
+		///   This command isn't used for any supported model:
 		///   <table>
 		///     <tr>
 		///       <td>0x0a</td>
@@ -269,19 +290,25 @@ namespace Hantek {
 		///     </tr>
 		///   </table>
 		/// </p>
+		/// <p><br /></p>
 		BULK_UNKNOWN_0A,
-		
+
+		/// <em>[::MODEL_DSO2250]</em>
 		/// <p>
-		///   This command isn't used for the DSO-2090 and DSO-5200:
+		///   This command is used for the DSO-2250:
 		///   <table>
 		///     <tr>
 		///       <td>0x0b</td>
-		///       <td>...</td>
+		///       <td>0x00</td>
+		///       <td>(unknown)</td>
+		///       <td>0x00</td>
 		///     </tr>
 		///   </table>
 		/// </p>
+		/// <p><br /></p>
 		BULK_UNKNOWN_0B,
-		
+
+		/// <em>[::MODEL_DSO2250, ::MODEL_DSO5200, ::MODEL_DSO5200A]</em>
 		/// <p>
 		///   This command sets the sampling rate for the DSO-5200:
 		///   <table>
@@ -296,12 +323,14 @@ namespace Hantek {
 		///   </table>
 		/// </p>
 		/// <p>
-		///   The values are similar to the ones used on the DSO-2090. The formula is a bit different here:<br />
+		///   The values are similar to the ones used with ::BULK_SETTRIGGERANDSAMPLERATE. The formula is a bit different here:<br />
 		///   <i>Samplerate = SamplerateMax / (2comp(SamplerateSlow) * 2 + 4 - SamplerateFast)</i><br />
 		///   SamplerateMax is 100 MS/s for the DSO-5200 in default configuration and 250 MS/s in fast rate mode though, the modifications regarding buffer size are the the same that apply for the DSO-2090.
 		/// </p>
+		/// <p><br /></p>
 		BULK_SETSAMPLERATE5200,
+		/// <em>[::MODEL_DSO2250, ::MODEL_DSO5200, ::MODEL_DSO5200A]</em>
 		/// <p>
 		///   This command sets the trigger position and buffer size for the DSO-5200:
 		///   <table>
@@ -310,7 +339,7 @@ namespace Hantek {
 		///       <td>0x00</td>
 		///       <td>TriggerPositionPre[0]</td>
 		///       <td>TriggerPositionPre[1]</td>
-		///       <td>#DTriggerPositionUsed</td>
+		///       <td>::DTriggerPositionUsed</td>
 		///     </tr>
 		///   </table>
 		///   <table>
@@ -326,8 +355,10 @@ namespace Hantek {
 		/// <p>
 		///   The TriggerPositionPre and TriggerPositionPost values set the pretrigger position. Both values have a range from 0xd7ff (0xc7ff for 14 kiS buffer) to 0xfffe. On the left side (0 %) the TriggerPositionPre value is minimal, on the right side (100 %) it is maximal. The TriggerPositionPost value is maximal for 0 % and minimal for 100%.
 		/// </p>
+		/// <p><br /></p>
 		BULK_SETBUFFER5200,
+		/// <em>[::MODEL_DSO2250, ::MODEL_DSO5200, ::MODEL_DSO5200A]</em>
 		/// <p>
 		///   This command sets the channel and trigger settings for the DSO-5200:
 		///   <table>
@@ -343,25 +374,56 @@ namespace Hantek {
 		///     </tr>
 		///   </table>
 		/// </p>
+		/// <p><br /></p>
 		BULK_SETTRIGGER5200,
-		
-		BULK_COUNT ///< Total number of commands
+
+		/// <em>[::MODEL_DSO2250]</em>
+		/// <p>
+		///   This command is used for the DSO-2250:
+		///   <table>
+		///     <tr>
+		///       <td>0x0f</td>
+		///       <td>0x00</td>
+		///       <td>(unknown)</td>
+		///       <td>(unknown)</td>
+		///       <td>(unknown)</td>
+		///       <td>(unknown)</td>
+		///     </tr>
+		///   </table>
+		///   <table>
+		///     <tr>
+		///       <td>(unknown)</td>
+		///       <td>(unknown)</td>
+		///       <td>(unknown)</td>
+		///       <td>(unknown)</td>
+		///       <td>(unknown)</td>
+		///       <td>(unknown)</td>
+		///     </tr>
+		///   </table>
+		/// </p>
+		/// <p><br /></p>
+		BULK_UNKNOWN_0F,
+
+		BULK_COUNT
 	};
 	//////////////////////////////////////////////////////////////////////////////
 	/// \enum ControlCode                                           hantek/types.h
 	/// \brief All supported control commands.
 	enum ControlCode {
+		/// <em>[::MODEL_DSO2090, ::MODEL_DSO2150, ::MODEL_DSO2250, ::MODEL_DSO5200, ::MODEL_DSO5200A]</em>
 		/// <p>
-		///   The 0xa2 control read/write command gives access to a #ControlValue.
+		///   The 0xa2 control read/write command gives access to a ::ControlValue.
 		/// </p>
+		/// <p><br /></p>
 		CONTROL_VALUE = 0xa2,
+		/// <em>[::MODEL_DSO2090, ::MODEL_DSO2150, ::MODEL_DSO2250, ::MODEL_DSO5200, ::MODEL_DSO5200A]</em>
 		/// <p>
 		///   The 0xb2 control read command gets the speed level of the USB connection:
 		///   <table>
 		///     <tr>
-		///       <td>#ConnectionSpeed</td>
+		///       <td>::ConnectionSpeed</td>
 		///       <td>0x00</td>
 		///       <td>0x00</td>
 		///       <td>0x00</td>
@@ -374,16 +436,18 @@ namespace Hantek {
 		///     </tr>
 		///   </table>
 		/// </p>
+		/// <p><br /></p>
 		CONTROL_GETSPEED = 0xb2,
+		/// <em>[::MODEL_DSO2090, ::MODEL_DSO2150, ::MODEL_DSO2250, ::MODEL_DSO5200, ::MODEL_DSO5200A]</em>
 		/// <p>
 		///   The 0xb3 control write command is sent before any bulk command:
 		///   <table>
 		///     <tr>
 		///       <td>0x0f</td>
-		///       <td>#CommandIndex</td>
-		///       <td>#CommandIndex</td>
-		///       <td>#CommandIndex</td>
+		///       <td>::BulkIndex</td>
+		///       <td>::BulkIndex</td>
+		///       <td>::BulkIndex</td>
 		///       <td>0x00</td>
 		///       <td>0x00</td>
 		///       <td>0x00</td>
@@ -393,8 +457,10 @@ namespace Hantek {
 		///     </tr>
 		///   </table>
 		/// </p>
+		/// <p><br /></p>
 		CONTROL_BEGINCOMMAND = 0xb3,
+		/// <em>[::MODEL_DSO2090, ::MODEL_DSO2150, ::MODEL_DSO2250, ::MODEL_DSO5200, ::MODEL_DSO5200A]</em>
 		/// <p>
 		///   The 0xb4 control write command sets the channel offsets:
 		///   <table>
@@ -423,8 +489,10 @@ namespace Hantek {
 		///     </tr>
 		///   </table>
 		/// </p>
+		/// <p><br /></p>
 		CONTROL_SETOFFSET = 0xb4,
+		/// <em>[::MODEL_DSO2090, ::MODEL_DSO2150, ::MODEL_DSO2250, ::MODEL_DSO5200, ::MODEL_DSO5200A]</em>
 		/// <p>
 		///   The 0xb5 control write command sets the internal relays:
 		///   <table>
@@ -460,6 +528,7 @@ namespace Hantek {
 		/// <p>
 		///   The limits are <= instead of < for the 10 bit models, since those support voltages up to 10 V.
 		/// </p>
+		/// <p><br /></p>
 		CONTROL_SETRELAYS = 0xb5
 	};
@@ -467,17 +536,33 @@ namespace Hantek {
 	/// \enum ControlValue                                          hantek/types.h
 	/// \brief All supported values for control commands.
 	enum ControlValue {
+		/// <em>[::MODEL_DSO2090, ::MODEL_DSO2150, ::MODEL_DSO2250, ::MODEL_DSO5200, ::MODEL_DSO5200A]</em>
+		/// <p>
 		/// Value 0x08 is the calibration data for the channels offsets. It holds the offset value for the top and bottom of the scope screen for every gain step on every channel. The data is stored as a three-dimensional array:<br />
-		/// <i>channelLevels[channel][#Gain][#LevelOffset]</i>
+		/// <i>channelLevels[channel][GainId][::LevelOffset]</i>
+		/// </p>
+		/// <p><br /></p>
 		VALUE_OFFSETLIMITS = 0x08,
+		/// <em>[::MODEL_DSO2090, ::MODEL_DSO2150, ::MODEL_DSO2250, ::MODEL_DSO5200, ::MODEL_DSO5200A]</em>
+		/// <p>
 		/// Value 0x0a is the address of the device. It has a length of one byte.
+		/// </p>
+		/// <p><br /></p>
 		VALUE_DEVICEADDRESS = 0x0a,
-		/// Value 0x60 is the calibration data for the fast rate mode on the DSO-5200. It's used to correct the level differences between the two merged channels to avoid .
+		/// <em>[::MODEL_DSO2250, ::MODEL_DSO5200, ::MODEL_DSO5200A]</em>
+		/// <p>
+		/// Value 0x60 is the calibration data for the fast rate mode on the DSO-2250, DSO-5200 and DSO-5200A. It's used to correct the level differences between the two merged channels to avoid deterministic noise.
+		/// </p>
+		/// <p><br /></p>
 		VALUE_CALIBRATIONDATA = 0x60,
-		/// Value 0x70 contains correction values for the ETS functionality of the DSO-5200.
+		/// <em>[::MODEL_DSO5200, ::MODEL_DSO5200A]</em>
+		/// <p>
+		/// Value 0x70 contains correction values for the ETS functionality of the DSO-5200 and DSO-5200A.
+		/// </p>
+		/// <p><br /></p>
 		VALUE_VOLTAGELIMITS = 0x70
 	};
@@ -485,9 +570,12 @@ namespace Hantek {
 	/// \enum Model                                                 hantek/types.h
 	/// \brief All supported Hantek DSO models.
 	enum Model {
-		MODEL_UNKNOWN = -1,
-		MODEL_DSO2090, MODEL_DSO2100, MODEL_DSO2150, MODEL_DSO2250,
-		MODEL_DSO5200, MODEL_DSO5200A,
+		MODEL_UNKNOWN = -1, ///< Unknown model
+		MODEL_DSO2090,      ///< %Hantek DSO-2090 USB
+		MODEL_DSO2150,      ///< %Hantek DSO-2150 USB
+		MODEL_DSO2250,      ///< %Hantek DSO-2250 USB
+		MODEL_DSO5200,      ///< %Hantek DSO-5200 USB
+		MODEL_DSO5200A,     ///< %Hantek DSO-5200A USB
 		MODEL_COUNT
 	};
@@ -551,7 +639,7 @@ namespace Hantek {
 		COMMANDINDEX_0 = 0x03, ///< Used most of the time
 		COMMANDINDEX_1 = 0x0a,
 		COMMANDINDEX_2 = 0x09,
-		COMMANDINDEX_3 = 0x01, ///< Used for #BULK_SETTRIGGERANDSAMPLERATE sometimes
+		COMMANDINDEX_3 = 0x01, ///< Used for ::BULK_SETTRIGGERANDSAMPLERATE sometimes
 		COMMANDINDEX_4 = 0x02,
 		COMMANDINDEX_5 = 0x08
 	};
@@ -597,7 +685,7 @@ namespace Hantek {
 	/// \brief Trigger and samplerate bits (Byte 1).
 	struct Tsr1Bits {
 		unsigned char triggerSource:2; ///< The trigger source, see Hantek::TriggerSource
-		unsigned char bufferSize:3; ///< See #BufferSizeId
+		unsigned char bufferSize:3; ///< See ::BufferSizeId
 		unsigned char samplerateFast:3; ///< samplerate value for fast sampling rates
 	};
@@ -615,8 +703,8 @@ namespace Hantek {
 	/// \struct DBufferBits                                         hantek/types.h
 	/// \brief Buffer mode bits for 0x0d command.
 	struct DBufferBits {
-		unsigned char triggerPositionUsed:3; ///< See #DTriggerPositionUsed
-		unsigned char bufferSize:3; ///< See #BufferSizeId
+		unsigned char triggerPositionUsed:3; ///< See ::DTriggerPositionUsed
+		unsigned char bufferSize:3; ///< See ::BufferSizeId
 		unsigned char reserved:2; ///< Unused bits
 	};
@@ -329,9 +329,9 @@ void LevelSlider::mouseMoveEvent(QMouseEvent *event) {
 	// Get new value
 	double value;
 	if(this->_direction == Qt::RightArrow || this->_direction == Qt::LeftArrow)
-		value = this->slider[pressedSlider]->maximum - (this->slider[pressedSlider]->maximum - this->slider[pressedSlider]->minimum) * (event->y() - this->_preMargin) / (this->height() - this->_preMargin - this->_postMargin - 1);
+		value = this->slider[pressedSlider]->maximum - (this->slider[pressedSlider]->maximum - this->slider[pressedSlider]->minimum) * ((double) event->y() - this->_preMargin + 0.5) / (this->height() - this->_preMargin - this->_postMargin - 1);
 	else
-		value = this->slider[pressedSlider]->minimum + (this->slider[pressedSlider]->maximum - this->slider[pressedSlider]->minimum) * (event->x() - this->_preMargin) / (this->width() - this->_preMargin - this->_postMargin - 1);
+		value = this->slider[pressedSlider]->minimum + (this->slider[pressedSlider]->maximum - this->slider[pressedSlider]->minimum) * ((double) event->x() - this->_preMargin + 0.5) / (this->width() - this->_preMargin - this->_postMargin - 1);
 	// Move the slider
 	if(event->modifiers() & Qt::AltModifier)
@@ -491,18 +491,18 @@ QRect LevelSlider::calculateRect(int sliderId) {
 		if(this->slider[sliderId]->text.isEmpty()) {
 			this->slider[sliderId]->rect = QRect(
 				0,                              // Start at the left side
-				// The needle should be center-aligned
-				(long) (this->height() - this->_preMargin - this->_postMargin - 1) * (this->slider[sliderId]->maximum - this->slider[sliderId]->value) / (this->slider[sliderId]->maximum - this->slider[sliderId]->minimum) + this->_preMargin - 3,
+				// The needle should be center-aligned, 0.5 pixel offset for exact pixelization
+				(long) ((double) (this->height() - this->_preMargin - this->_postMargin - 1) * (this->slider[sliderId]->maximum - this->slider[sliderId]->value) / (this->slider[sliderId]->maximum - this->slider[sliderId]->minimum) + 0.5f) + this->_preMargin - 3,
 				this->sliderWidth,              // Fill the whole width
-				7                               // The needle is 5 px wide
+				7                               // The needle is 7 px wide
 			);
 		}
 		// Or a thin needle with text?
 		else {
 			this->slider[sliderId]->rect = QRect(
 				0,                              // Start at the left side
-				// The needle is at the bottom, the text above it
-				(long) (this->height() - this->_preMargin - this->_postMargin - 1) * (this->slider[sliderId]->maximum - this->slider[sliderId]->value) / (this->slider[sliderId]->maximum - this->slider[sliderId]->minimum),
+				// The needle is at the bottom, the text above it, 0.5 pixel offset for exact pixelization
+				(long) ((double) (this->height() - this->_preMargin - this->_postMargin - 1) * (this->slider[sliderId]->maximum - this->slider[sliderId]->value) / (this->slider[sliderId]->maximum - this->slider[sliderId]->minimum) + 0.5f),
 				this->sliderWidth,              // Fill the whole width
 				this->preMargin() + 1           // Use the full margin
 			);
@@ -513,10 +513,10 @@ QRect LevelSlider::calculateRect(int sliderId) {
 		// Is it a triangular needle?
 		if(this->slider[sliderId]->text.isEmpty()) {
 			this->slider[sliderId]->rect = QRect(
-				// The needle should be center-aligned
-				(long) (this->width() - this->_preMargin - this->_postMargin - 1) * (this->slider[sliderId]->value - this->slider[sliderId]->minimum) / (this->slider[sliderId]->maximum - this->slider[sliderId]->minimum) + this->_preMargin - 3,
+				// The needle should be center-aligned, 0.5 pixel offset for exact pixelization
+				(long) ((double) (this->width() - this->_preMargin - this->_postMargin - 1) * (this->slider[sliderId]->value - this->slider[sliderId]->minimum) / (this->slider[sliderId]->maximum - this->slider[sliderId]->minimum) + 0.5f) + this->_preMargin - 3,
 				0,                              // Start at the top
-				7,                              // The needle is 5 px wide
+				7,                              // The needle is 7 px wide
 				this->sliderWidth               // Fill the whole height
 			);
 		}
@@ -524,8 +524,8 @@ QRect LevelSlider::calculateRect(int sliderId) {
 		else {
 			int sliderLength = this->fontMetrics().size(0, this->slider[sliderId]->text).width() + 2;
 			this->slider[sliderId]->rect = QRect(
-				// The needle is at the right side, the text before it
-				(long) (this->width() - this->_preMargin - this->_postMargin - 1) * (this->slider[sliderId]->value - this->slider[sliderId]->minimum) / (this->slider[sliderId]->maximum - this->slider[sliderId]->minimum) + this->_preMargin - sliderLength + 1,
+				// The needle is at the right side, the text before it, 0.5 pixel offset for exact pixelization
+				(long) ((double) (this->width() - this->_preMargin - this->_postMargin - 1) * (this->slider[sliderId]->value - this->slider[sliderId]->minimum) / (this->slider[sliderId]->maximum - this->slider[sliderId]->minimum) + 0.5f) + this->_preMargin - sliderLength + 1,
 				0,                              // Start at the top
 				sliderLength,                   // The width depends on the text
 				this->sliderWidth               // Fill the whole height