Redesign of Hantek::Control

oliverhaag
1 parent ed72f34b
Showing 9 changed files with 747 additions and 567 deletions
openhantek/ChangeLog
openhantek/OpenHantek.pro
openhantek/src/dockwindows.cpp
openhantek/src/glgenerator.cpp
openhantek/src/hantek/control.cpp
openhantek/src/hantek/control.h
openhantek/src/hantek/device.cpp
openhantek/src/hantek/types.cpp
openhantek/src/hantek/types.h
@@ -126,3 +126,7 @@
 * Version 0.2.0:
 * Updated version information
 * Updated Doxygen mainpage and roadmap
+
+2011-11-16 Oliver Haag  <oliver.haag@gmail.com>
+* Redesign of Hantek::Control to make it easier to add support for new models
+* Removed buggy destructor from GlGenerator, proper cleanup still missing
@@ -96,6 +96,7 @@ DEFINES += LIBUSB_VERSION=$${LIBUSB_VERSION}
 # Debug output
 CONFIG(debug, debug|release): DEFINES += DEBUG
+else: DEFINES += QT_NO_DEBUG_OUTPUT
 # Settings for different operating systems
 unix:!macx { 
@@ -50,13 +50,13 @@ HorizontalDock::HorizontalDock(DsoSettings *settings, QWidget *parent, Qt::Windo
 			<< 1e-3 << 2e-3 << 4e-3 << 1e-2 << 2e-2 << 4e-2 << 1e-1 << 2e-1 << 4e-1
 			<<  1e0 <<  2e0 <<  4e0 <<  1e1 <<  2e1 <<  4e1 <<  6e1 << 12e1 << 24e1
 			<<  6e2 << 12e2 << 24e2 << 36e2;  ///< Timebase steps in seconds/div
-	for(QList<double>::iterator timebase = this->timebaseSteps.begin(); timebase != this->timebaseSteps.end(); ++timebase)
+	for(QList<double>::iterator timebase = this->timebaseSteps.begin(); timebase != this->timebaseSteps.end(); timebase++)
 		this->timebaseStrings << Helper::valueToString(*timebase, Helper::UNIT_SECONDS, 0);
 	this->frequencybaseSteps
 			<<  1.0 <<  2.0 <<  5.0 <<  1e1 <<  2e1 <<  5e1 <<  1e2 <<  2e2 <<  5e2
 			<<  1e3 <<  2e3 <<  5e3 <<  1e4 <<  2e4 <<  4e4 <<  1e5 <<  2e5 <<  5e5
 			<<  1e6 <<  2e6 <<  5e6 <<  1e7; ///< Frequencybase steps in Hz/div
-	for(QList<double>::iterator frequencybase = this->frequencybaseSteps.begin(); frequencybase != this->frequencybaseSteps.end(); ++frequencybase)
+	for(QList<double>::iterator frequencybase = this->frequencybaseSteps.begin(); frequencybase != this->frequencybaseSteps.end(); frequencybase++)
 		this->frequencybaseStrings << Helper::valueToString(*frequencybase, Helper::UNIT_HERTZ, 0);
 	// Initialize elements
@@ -323,7 +323,7 @@ SpectrumDock::SpectrumDock(DsoSettings *settings, QWidget *parent, Qt::WindowFla
 	// Initialize lists for comboboxes
 	this->magnitudeSteps                <<  1e0 <<  2e0 <<  3e0 <<  6e0
 			<<  1e1 <<  2e1 <<  3e1 <<  6e1 <<  1e2 <<  2e2 <<  3e2 <<  6e2; ///< Magnitude steps in dB/div
-	for(QList<double>::iterator magnitude = this->magnitudeSteps.begin(); magnitude != this->magnitudeSteps.end(); ++magnitude)
+	for(QList<double>::iterator magnitude = this->magnitudeSteps.begin(); magnitude != this->magnitudeSteps.end(); magnitude++)
 		this->magnitudeStrings << Helper::valueToString(*magnitude, Helper::UNIT_DECIBEL, 0);
 	// Initialize elements
@@ -86,7 +86,7 @@ GlGenerator::GlGenerator(DsoSettings *settings, QObject *parent) : QObject(paren
 /// \brief Deletes OpenGL objects.
 GlGenerator::~GlGenerator() {
-	delete[] this->vaChannel;
+	// todo: Clean up vaChannel
 }
 /// \brief Set the data analyzer whose data will be drawn.
@@ -5,7 +5,7 @@
 //
 //  Copyright (C) 2008, 2009  Oleg Khudyakov
 //  prcoder@potrebitel.ru
-//  Copyright (C) 2010  Oliver Haag
+//  Copyright (C) 2010, 2011  Oliver Haag
 //  oliver.haag@gmail.com
 //
 //  This program is free software: you can redistribute it and/or modify it
@@ -24,6 +24,8 @@
 ////////////////////////////////////////////////////////////////////////////////
+#include <limits>
+
 #include <QList>
 #include <QMutex>
@@ -39,38 +41,60 @@ namespace Hantek {
 	/// \brief Initializes the command buffers and lists.
 	/// \param parent The parent widget.
 	Control::Control(QObject *parent) : DsoControl(parent) {
-		// Values for the Gain and Timebase enums
-		this->gainSteps             << 0.08 << 0.16 << 0.40 << 0.80 << 1.60 << 4.00
-				<<  8.0 << 16.0 << 40.0;
-		this->samplerateChannelMax = 50e6;
-		this->samplerateFastMax = 100e6;
-		this->samplerateMax = this->samplerateChannelMax;
-		this->samplerateDivider = 1;
-		this->triggerPosition = 0;
-		this->triggerSlope = Dso::SLOPE_POSITIVE;
-		this->triggerSpecial = false;
-		this->triggerSource = 0;
-		this->commandVersion = 0;
+		// Use DSO-2090 specification as default
+		this->specification.command.bulk.setBuffer = BULK_SETTRIGGERANDSAMPLERATE;
+		this->specification.command.bulk.setFilter = BULK_SETFILTER;
+		this->specification.command.bulk.setGain = BULK_SETGAIN;
+		this->specification.command.bulk.setSamplerate = BULK_SETTRIGGERANDSAMPLERATE;
+		this->specification.command.bulk.setTrigger = BULK_SETTRIGGERANDSAMPLERATE;
+		this->specification.command.control.setOffset = CONTROL_SETOFFSET;
+		this->specification.command.control.setRelays = CONTROL_SETRELAYS;
+		this->specification.command.values.offsetLimits = VALUE_OFFSETLIMITS;
+		this->specification.command.values.voltageLimits = (ControlValue) -1;
+		
+		this->specification.gainSteps       << 0.08 << 0.16 << 0.40 << 0.80 << 1.60
+				<< 4.00 <<  8.0 << 16.0 << 40.0;
+		
+		this->specification.samplerate.single.base = 50e6;
+		this->specification.samplerate.single.max = 50e6;
+		this->specification.samplerate.multi.base = 100e6;
+		this->specification.samplerate.multi.max = 100e6;
+		
+		for(unsigned int channel = 0; channel < HANTEK_CHANNELS; channel++) {
+			for(unsigned int gainId = 0; gainId < GAIN_COUNT; gainId++) {
+				this->specification.offsetLimit[channel][gainId][OFFSET_START] = 0x0000;
+				this->specification.offsetLimit[channel][gainId][OFFSET_END] = 0xffff;
+			}
+		}
+		
+		// Set settings to default values
+		this->settings.bufferSizeId = 0;
+		this->settings.samplerate.limits = &(this->specification.samplerate.single);
+		this->settings.samplerate.downsampling = 1;
+		this->settings.trigger.position = 0;
+		this->settings.trigger.slope = Dso::SLOPE_POSITIVE;
+		this->settings.trigger.special = false;
+		this->settings.trigger.source = 0;
 		// Special trigger sources
 		this->specialTriggerSources << tr("EXT") << tr("EXT/10");
 		// Transmission-ready bulk commands
-		this->command[COMMAND_SETFILTER] = new CommandSetFilter();
-		this->command[COMMAND_SETTRIGGERANDSAMPLERATE] = new CommandSetTriggerAndSamplerate();
-		this->command[COMMAND_FORCETRIGGER] = new CommandForceTrigger();
-		this->command[COMMAND_STARTSAMPLING] = new CommandCaptureStart();
-		this->command[COMMAND_ENABLETRIGGER] = new CommandTriggerEnabled();
-		this->command[COMMAND_GETDATA] = new CommandGetData();
-		this->command[COMMAND_GETCAPTURESTATE] = new CommandGetCaptureState();
-		this->command[COMMAND_SETGAIN] = new CommandSetGain();
-		this->command[COMMAND_SETLOGICALDATA] = new CommandSetLogicalData();
-		this->command[COMMAND_GETLOGICALDATA] = new CommandGetLogicalData();
-		this->command[COMMAND_SETSAMPLERATE5200] = new CommandSetSamplerate5200();
-		this->command[COMMAND_SETBUFFER5200] = new CommandSetBuffer5200();
-		this->command[COMMAND_SETTRIGGER5200] = new CommandSetTrigger5200();
-		
-		for(int command = 0; command < COMMAND_COUNT; command++)
+		this->command[BULK_SETFILTER] = new BulkSetFilter();
+		this->command[BULK_SETTRIGGERANDSAMPLERATE] = new BulkSetTriggerAndSamplerate();
+		this->command[BULK_FORCETRIGGER] = new BulkForceTrigger();
+		this->command[BULK_STARTSAMPLING] = new BulkCaptureStart();
+		this->command[BULK_ENABLETRIGGER] = new BulkTriggerEnabled();
+		this->command[BULK_GETDATA] = new BulkGetData();
+		this->command[BULK_GETCAPTURESTATE] = new BulkGetCaptureState();
+		this->command[BULK_SETGAIN] = new BulkSetGain();
+		this->command[BULK_SETLOGICALDATA] = new BulkSetLogicalData();
+		this->command[BULK_GETLOGICALDATA] = new BulkGetLogicalData();
+		this->command[BULK_SETSAMPLERATE5200] = new BulkSetSamplerate5200();
+		this->command[BULK_SETBUFFER5200] = new BulkSetBuffer5200();
+		this->command[BULK_SETTRIGGER5200] = new BulkSetTrigger5200();
+		
+		for(int command = 0; command < BULK_COUNT; command++)
 			this->commandPending[command] = false;
 		// Transmission-ready control commands
@@ -82,14 +106,6 @@ namespace Hantek {
 		for(int control = 0; control < CONTROLINDEX_COUNT; control++)
 			this->controlPending[control] = false;
-		// Channel level data
-		for(unsigned int channel = 0; channel < HANTEK_CHANNELS; channel++) {
-			for(unsigned int gainId = 0; gainId < GAIN_COUNT; gainId++) {
-				this->channelLevels[channel][gainId][OFFSET_START] = 0x0000;
-				this->channelLevels[channel][gainId][OFFSET_END] = 0xffff;
-			}
-		}
-		
 		// USB device
 		this->device = new Device(this);
@@ -124,7 +140,7 @@ namespace Hantek {
 		while(captureState != LIBUSB_ERROR_NO_DEVICE && !this->terminate) {
 			// Send all pending bulk commands
-			for(int command = 0; command < COMMAND_COUNT; command++) {
+			for(int command = 0; command < BULK_COUNT; command++) {
 				if(!this->commandPending[command])
 					continue;
@@ -134,7 +150,7 @@ namespace Hantek {
 				errorCode = this->device->bulkCommand(this->command[command]);
 				if(errorCode < 0) {
-					qDebug("Sending bulk command 0x%02x failed: %s", command, Helper::libUsbErrorString(errorCode).toLocal8Bit().data());
+					qWarning("Sending bulk command 0x%02x failed: %s", command, Helper::libUsbErrorString(errorCode).toLocal8Bit().data());
 					if(errorCode == LIBUSB_ERROR_NO_DEVICE) {
 						captureState = LIBUSB_ERROR_NO_DEVICE;
@@ -158,7 +174,7 @@ namespace Hantek {
 				errorCode = this->device->controlWrite(this->controlCode[control], this->control[control]->data(), this->control[control]->getSize());
 				if(errorCode < 0) {
-					qDebug("Sending control command 0x%2x failed: %s", control, Helper::libUsbErrorString(errorCode).toLocal8Bit().data());
+					qWarning("Sending control command 0x%2x failed: %s", control, Helper::libUsbErrorString(errorCode).toLocal8Bit().data());
 					if(errorCode == LIBUSB_ERROR_NO_DEVICE) {
 						captureState = LIBUSB_ERROR_NO_DEVICE;
@@ -171,9 +187,9 @@ namespace Hantek {
 			if(captureState == LIBUSB_ERROR_NO_DEVICE)
 				break;
-			// Check the current oscilloscope state everytime 25% of the buffer should be refilled
+			// Check the current oscilloscope state everytime 25% of the time the buffer should be refilled
 			// Not more often than every 10 ms though
-			int cycleTime = qMax(this->samplerateDivider * this->bufferSize * 250 / this->samplerateMax, (long unsigned int) 10);
+			int cycleTime = qMax((unsigned long int) (this->specification.bufferSizes[this->settings.bufferSizeId] / this->settings.samplerate.current * 250), (long unsigned int) 10);
 			this->msleep(cycleTime);
 			if(!this->sampling) {
@@ -195,10 +211,10 @@ namespace Hantek {
 					// Get data and process it, if we're still sampling
 					errorCode = this->getSamples(samplingStarted);
 					if(errorCode < 0)
-						qDebug("Getting sample data failed: %s", Helper::libUsbErrorString(errorCode).toLocal8Bit().data());
+						qWarning("Getting sample data failed: %s", Helper::libUsbErrorString(errorCode).toLocal8Bit().data());
 					// Check if we're in single trigger mode
-					if(this->triggerMode == Dso::TRIGGERMODE_SINGLE && samplingStarted)
+					if(this->settings.trigger.mode == Dso::TRIGGERMODE_SINGLE && samplingStarted)
 						this->stopSampling();
 					// Sampling completed, restart it when necessary
@@ -209,29 +225,29 @@ namespace Hantek {
 						break;
 				case CAPTURE_WAITING:
-					if(samplingStarted && lastTriggerMode == this->triggerMode) {
+					if(samplingStarted && lastTriggerMode == this->settings.trigger.mode) {
 						cycleCounter++;
 						if(cycleCounter == startCycle) {
 							// Buffer refilled completely since start of sampling, enable the trigger now
-							errorCode = this->device->bulkCommand(this->command[COMMAND_ENABLETRIGGER]);
+							errorCode = this->device->bulkCommand(this->command[BULK_ENABLETRIGGER]);
 							if(errorCode < 0) {
 								if(errorCode == LIBUSB_ERROR_NO_DEVICE)
 									captureState = LIBUSB_ERROR_NO_DEVICE;
 								break;
 							}
-		#ifdef DEBUG
+#ifdef DEBUG
 							qDebug("Enabling trigger");
-		#endif
+#endif
 						}
-						else if(cycleCounter >= 8 + startCycle && this->triggerMode == Dso::TRIGGERMODE_AUTO) {
+						else if(cycleCounter >= 8 + startCycle && this->settings.trigger.mode == Dso::TRIGGERMODE_AUTO) {
 							// Force triggering
-							errorCode = this->device->bulkCommand(this->command[COMMAND_FORCETRIGGER]);
+							errorCode = this->device->bulkCommand(this->command[BULK_FORCETRIGGER]);
 							if(errorCode == LIBUSB_ERROR_NO_DEVICE)
 								captureState = LIBUSB_ERROR_NO_DEVICE;
-		#ifdef DEBUG
+#ifdef DEBUG
 							qDebug("Forcing trigger");
-		#endif
+#endif
 						}
 						if(cycleCounter < 50 || cycleCounter < 4000 / cycleTime)
@@ -239,7 +255,7 @@ namespace Hantek {
 					}
 					// Start capturing
-					errorCode = this->device->bulkCommand(this->command[COMMAND_STARTSAMPLING]);
+					errorCode = this->device->bulkCommand(this->command[BULK_STARTSAMPLING]);
 					if(errorCode < 0) {
 						if(errorCode == LIBUSB_ERROR_NO_DEVICE)
 							captureState = LIBUSB_ERROR_NO_DEVICE;
@@ -251,15 +267,15 @@ namespace Hantek {
 					samplingStarted = true;
 					cycleCounter = 0;
-					startCycle = this->triggerPosition * 1000 / cycleTime + 1;
-					lastTriggerMode = this->triggerMode;
+					startCycle = this->settings.trigger.position * 1000 / cycleTime + 1;
+					lastTriggerMode = this->settings.trigger.mode;
 					break;
 				case CAPTURE_SAMPLING:
 					break;
 				default:
 					if(captureState < 0)
-						qDebug("Getting capture state failed: %s", Helper::libUsbErrorString(captureState).toLocal8Bit().data());
+						qWarning("Getting capture state failed: %s", Helper::libUsbErrorString(captureState).toLocal8Bit().data());
 					break;
 			}
 		}
@@ -287,16 +303,16 @@ namespace Hantek {
 	int Control::getCaptureState() {
 		int errorCode;
-		errorCode = this->device->bulkCommand(this->command[COMMAND_GETCAPTURESTATE], 1);
+		errorCode = this->device->bulkCommand(this->command[BULK_GETCAPTURESTATE], 1);
 		if(errorCode < 0)
 			return errorCode;
-		ResponseGetCaptureState response;
+		BulkResponseGetCaptureState response;
 		errorCode = this->device->bulkRead(response.data(), response.getSize());
 		if(errorCode < 0)
 			return errorCode;
-		this->triggerPoint = this->calculateTriggerPoint(response.getTriggerPoint());
+		this->settings.trigger.point = this->calculateTriggerPoint(response.getTriggerPoint());
 		return (int) response.getCaptureState();
 	}
@@ -307,12 +323,12 @@ namespace Hantek {
 		int errorCode;
 		// Request data
-		errorCode = this->device->bulkCommand(this->command[COMMAND_GETDATA], 1);
+		errorCode = this->device->bulkCommand(this->command[BULK_GETDATA], 1);
 		if(errorCode < 0)
 			return errorCode;
 		// Save raw data to temporary buffer
-		unsigned int dataCount = this->bufferSize * HANTEK_CHANNELS;
+		unsigned int dataCount = this->specification.bufferSizes[this->settings.bufferSizeId] * HANTEK_CHANNELS;
 		unsigned int dataLength = dataCount;
 		bool using10Bits = false;
 		if(this->device->getModel() == MODEL_DSO5200 || this->device->getModel() == MODEL_DSO5200A) {
@@ -339,13 +355,13 @@ namespace Hantek {
 			// Get oscilloscope settings
 			bool fastRate;
 			UsedChannels usedChannels;
-			if(this->commandVersion == 0) {
-				fastRate = ((CommandSetTriggerAndSamplerate *) this->command[COMMAND_SETTRIGGERANDSAMPLERATE])->getFastRate();
-				usedChannels = (UsedChannels) ((CommandSetTriggerAndSamplerate *) this->command[COMMAND_SETTRIGGERANDSAMPLERATE])->getUsedChannels();
+			if(this->specification.command.bulk.setTrigger == BULK_SETTRIGGERANDSAMPLERATE) {
+				fastRate = ((BulkSetTriggerAndSamplerate *) this->command[BULK_SETTRIGGERANDSAMPLERATE])->getFastRate();
+				usedChannels = (UsedChannels) ((BulkSetTriggerAndSamplerate *) this->command[BULK_SETTRIGGERANDSAMPLERATE])->getUsedChannels();
 			}
 			else {
-				fastRate = ((CommandSetTrigger5200 *) this->command[COMMAND_SETTRIGGER5200])->getFastRate();
-				usedChannels = (UsedChannels) ((CommandSetTrigger5200 *) this->command[COMMAND_SETTRIGGER5200])->getUsedChannels();
+				fastRate = ((BulkSetTrigger5200 *) this->command[BULK_SETTRIGGER5200])->getFastRate();
+				usedChannels = (UsedChannels) ((BulkSetTrigger5200 *) this->command[BULK_SETTRIGGER5200])->getUsedChannels();
 			}
 			// Convert channel data
 			if(fastRate) {
@@ -374,7 +390,7 @@ namespace Hantek {
 					}
 					// Convert data from the oscilloscope and write it into the sample buffer
-					unsigned int bufferPosition = (this->triggerPoint + 1) * 2;
+					unsigned int bufferPosition = (this->settings.trigger.point + 1) * 2;
 					if(using10Bits) {
 						// Additional 2 most significant bits after the normal data
 						unsigned int extraBitsPosition; // Track the position of the extra bits in the additional byte
@@ -385,7 +401,7 @@ namespace Hantek {
 							extraBitsPosition = bufferPosition % HANTEK_CHANNELS;
-							this->samples[channel][realPosition] = ((double) ((unsigned short int) data[bufferPosition] + (((unsigned short int) data[dataCount + bufferPosition - extraBitsPosition] << (8 - (HANTEK_CHANNELS - 1 - extraBitsPosition) * 2)) & 0x0200)) / this->sampleRange[HANTEK_CHANNELS - 1 - extraBitsPosition] - this->offsetReal[channel]) * this->gainSteps[this->gain[channel]];
+							this->samples[channel][realPosition] = ((double) ((unsigned short int) data[bufferPosition] + (((unsigned short int) data[dataCount + bufferPosition - extraBitsPosition] << (8 - (HANTEK_CHANNELS - 1 - extraBitsPosition) * 2)) & 0x0200)) / this->specification.voltageLimit[HANTEK_CHANNELS - 1 - extraBitsPosition][this->settings.voltage[channel].gain] - this->settings.voltage[channel].offsetReal) * this->specification.gainSteps[this->settings.voltage[channel].gain];
 						}
 					}
 					else {
@@ -393,7 +409,7 @@ namespace Hantek {
 							if(bufferPosition >= dataCount)
 								bufferPosition %= dataCount;
-							this->samples[channel][realPosition] = ((double) data[bufferPosition] / this->sampleRange[channel] - this->offsetReal[channel]) * this->gainSteps[this->gain[channel]];
+							this->samples[channel][realPosition] = ((double) data[bufferPosition] / this->specification.voltageLimit[channel][this->settings.voltage[channel].gain] - this->settings.voltage[channel].offsetReal) * this->specification.gainSteps[this->settings.voltage[channel].gain];
 						}
 					}
 				}
@@ -413,14 +429,14 @@ namespace Hantek {
 						}
 						// Convert data from the oscilloscope and write it into the sample buffer
-						unsigned int bufferPosition = (this->triggerPoint + 1) * 2;
+						unsigned int bufferPosition = (this->settings.trigger.point + 1) * 2;
 						if(using10Bits) {
 							// Additional 2 most significant bits after the normal data
 							for(unsigned int realPosition = 0; realPosition < channelDataCount; realPosition++, bufferPosition += 2) {
 								if(bufferPosition >= dataCount)
 									bufferPosition %= dataCount;
-								this->samples[channel][realPosition] = ((double) ((unsigned short int) data[bufferPosition + HANTEK_CHANNELS - 1 - channel] + (((unsigned short int) data[dataCount + bufferPosition] << (8 - channel * 2)) & 0x0200)) / this->sampleRange[channel] - this->offsetReal[channel]) * this->gainSteps[this->gain[channel]];
+								this->samples[channel][realPosition] = ((double) ((unsigned short int) data[bufferPosition + HANTEK_CHANNELS - 1 - channel] + (((unsigned short int) data[dataCount + bufferPosition] << (8 - channel * 2)) & 0x0200)) / this->specification.voltageLimit[channel][this->settings.voltage[channel].gain] - this->settings.voltage[channel].offsetReal) * this->specification.gainSteps[this->settings.voltage[channel].gain];
 							}
 						}
 						else {
@@ -428,7 +444,7 @@ namespace Hantek {
 								if(bufferPosition >= dataCount)
 									bufferPosition %= dataCount;
-								this->samples[channel][realPosition] = ((double) data[bufferPosition + HANTEK_CHANNELS - 1 - channel] / this->sampleRange[channel] - this->offsetReal[channel]) * this->gainSteps[this->gain[channel]];
+								this->samples[channel][realPosition] = ((double) data[bufferPosition + HANTEK_CHANNELS - 1 - channel] / this->specification.voltageLimit[channel][this->settings.voltage[channel].gain] - this->settings.voltage[channel].offsetReal) * this->specification.gainSteps[this->settings.voltage[channel].gain];
 							}
 						}
 					}
@@ -442,7 +458,7 @@ namespace Hantek {
 			}
 			this->samplesMutex.unlock();
-			emit samplesAvailable(&(this->samples), &(this->samplesSize), (double) this->samplerateMax / this->samplerateDivider, &(this->samplesMutex));
+			emit samplesAvailable(&(this->samples), &(this->samplesSize), this->settings.samplerate.current, &(this->samplesMutex));
 		}
 		return 0;
@@ -450,32 +466,49 @@ namespace Hantek {
 	/// \brief Sets the size of the sample buffer without updating dependencies.
 	/// \param size The buffer size that should be met (S).
-	/// \return The buffer size that has been set.
+	/// \return The buffer size that has been set, 0 on error.
 	unsigned long int Control::updateBufferSize(unsigned long int size) {
-		BufferSizeId sizeId = (size <= BUFFER_SMALL) ? BUFFERID_SMALL : BUFFERID_LARGE;
+		// Get the buffer size supporting the highest samplerate while meeting the requirement
+		int bestSizeId = -1;
+		for(int sizeId = 0; sizeId < this->specification.bufferSizes.count(); sizeId++) {
+			if(this->specification.bufferSizes[sizeId] >= size) {
+				// We meet the size-requirement, check if we provide the highest possible samplerate
+				if(bestSizeId == -1 || this->specification.bufferSizes[bestSizeId] < size || this->specification.bufferDividers[sizeId] < this->specification.bufferDividers[bestSizeId])
+					bestSizeId = sizeId;
+			}
+			else {
+				// We don't meet the size-requirement, but maybe we're still the one coming closest
+				if(bestSizeId == -1 || this->specification.bufferSizes[sizeId] > this->specification.bufferSizes[bestSizeId])
+					bestSizeId = sizeId;
+			}
+		}
-		switch(this->commandVersion) {
-			case 0:
+		switch(this->specification.command.bulk.setBuffer) {
+			case BULK_SETTRIGGERANDSAMPLERATE:
 				// SetTriggerAndSamplerate bulk command for buffer size
-				((CommandSetTriggerAndSamplerate *) this->command[COMMAND_SETTRIGGERANDSAMPLERATE])->setBufferSize(sizeId);
-				this->commandPending[COMMAND_SETTRIGGERANDSAMPLERATE] = true;
+				((BulkSetTriggerAndSamplerate *) this->command[BULK_SETTRIGGERANDSAMPLERATE])->setBufferSize(bestSizeId);
+				this->commandPending[BULK_SETTRIGGERANDSAMPLERATE] = true;
-				this->bufferSize = (sizeId == BUFFERID_SMALL) ? BUFFER_SMALL : BUFFER_LARGE;
 				break;
-			case 1:
+			case BULK_SETBUFFER5200: {
 				// SetBuffer5200 bulk command for buffer size
-				CommandSetBuffer5200 *commandSetBuffer5200 = (CommandSetBuffer5200 *) this->command[COMMAND_SETBUFFER5200];
+				BulkSetBuffer5200 *commandSetBuffer5200 = (BulkSetBuffer5200 *) this->command[BULK_SETBUFFER5200];
 				commandSetBuffer5200->setUsedPre(DTRIGGERPOSITION_ON);
 				commandSetBuffer5200->setUsedPost(DTRIGGERPOSITION_ON);
-				commandSetBuffer5200->setBufferSize(sizeId);
-				this->commandPending[COMMAND_SETBUFFER5200] = true;
+				commandSetBuffer5200->setBufferSize(bestSizeId);
+				this->commandPending[BULK_SETBUFFER5200] = true;
-				this->bufferSize = (sizeId == BUFFERID_SMALL) ? BUFFER_SMALL : BUFFER_LARGE5200;
 				break;
+			}
+			
+			default:
+				return 0;
 		}
-		return this->bufferSize;
+		this->settings.bufferSizeId = bestSizeId;
+		
+		return this->specification.bufferSizes[this->settings.bufferSizeId];
 	}
 	/// \brief Try to connect to the oscilloscope.
@@ -486,16 +519,32 @@ namespace Hantek {
 		if(!this->device->isConnected())
 			return;
-		// Set all necessary configuration commands as pending
-		this->commandPending[COMMAND_SETFILTER] = true;
-		this->commandPending[COMMAND_FORCETRIGGER] = false;
-		this->commandPending[COMMAND_STARTSAMPLING] = false;
-		this->commandPending[COMMAND_ENABLETRIGGER] = false;
-		this->commandPending[COMMAND_GETDATA] = false;
-		this->commandPending[COMMAND_GETCAPTURESTATE] = false;
-		this->commandPending[COMMAND_SETGAIN] = true;
-		this->commandPending[COMMAND_SETLOGICALDATA] = false;
-		this->commandPending[COMMAND_GETLOGICALDATA] = false;
+		// Initialize the commands used on the DSO-2090 as pending
+		this->commandPending[BULK_SETFILTER] = true;
+		this->commandPending[BULK_SETTRIGGERANDSAMPLERATE] = true;
+		this->commandPending[BULK_FORCETRIGGER] = false;
+		this->commandPending[BULK_STARTSAMPLING] = false;
+		this->commandPending[BULK_ENABLETRIGGER] = false;
+		this->commandPending[BULK_GETDATA] = false;
+		this->commandPending[BULK_GETCAPTURESTATE] = false;
+		this->commandPending[BULK_SETGAIN] = true;
+		this->commandPending[BULK_SETLOGICALDATA] = false;
+		this->commandPending[BULK_GETLOGICALDATA] = false;
+		this->commandPending[BULK_UNKNOWN_0A] = false;
+		this->commandPending[BULK_UNKNOWN_0B] = false;
+		this->commandPending[BULK_SETSAMPLERATE5200] = false;
+		this->commandPending[BULK_SETBUFFER5200] = false;
+		this->commandPending[BULK_SETTRIGGER5200] = false;
+		// Initialize the command versions to the ones used on the DSO-2090
+		this->specification.command.bulk.setBuffer = BULK_SETTRIGGERANDSAMPLERATE;
+		this->specification.command.bulk.setFilter = BULK_SETFILTER;
+		this->specification.command.bulk.setGain = BULK_SETGAIN;
+		this->specification.command.bulk.setSamplerate = BULK_SETTRIGGERANDSAMPLERATE;
+		this->specification.command.bulk.setTrigger = BULK_SETTRIGGERANDSAMPLERATE;
+		this->specification.command.control.setOffset = CONTROL_SETOFFSET;
+		this->specification.command.control.setRelays = CONTROL_SETRELAYS;
+		this->specification.command.values.offsetLimits = VALUE_OFFSETLIMITS;
+		this->specification.command.values.voltageLimits = (ControlValue) -1;
 		// Determine the command version we need for this model
 		bool unsupported = false;
@@ -503,23 +552,26 @@ namespace Hantek {
 			case MODEL_DSO2100:
 			case MODEL_DSO2150:
 				unsupported = true;
+			
 			case MODEL_DSO2090:
-				this->commandPending[COMMAND_SETTRIGGERANDSAMPLERATE] = true;
-				this->commandPending[COMMAND_SETSAMPLERATE5200] = false;
-				this->commandPending[COMMAND_SETBUFFER5200] = false;
-				this->commandPending[COMMAND_SETTRIGGER5200] = false;
-				this->commandVersion = 0;
+				// Keep the defaults we've set before
 				break;
 			case MODEL_DSO2250:
 			case MODEL_DSO5200A:
 				unsupported = true;
+			
 			case MODEL_DSO5200:
-				this->commandPending[COMMAND_SETTRIGGERANDSAMPLERATE] = false;
-				this->commandPending[COMMAND_SETSAMPLERATE5200] = true;
-				this->commandPending[COMMAND_SETBUFFER5200] = true;
-				this->commandPending[COMMAND_SETTRIGGER5200] = true;
-				this->commandVersion = 1;
+				this->specification.command.bulk.setBuffer = BULK_SETBUFFER5200;
+				this->specification.command.bulk.setSamplerate = BULK_SETSAMPLERATE5200;
+				this->specification.command.bulk.setTrigger = BULK_SETTRIGGER5200;
+				this->specification.command.values.voltageLimits = VALUE_VOLTAGELIMITS;
+				
+				this->commandPending[BULK_SETTRIGGERANDSAMPLERATE] = false;
+				this->commandPending[BULK_SETSAMPLERATE5200] = true;
+				this->commandPending[BULK_SETBUFFER5200] = true;
+				this->commandPending[BULK_SETTRIGGER5200] = true;
+				
 				break;
 			default:
@@ -529,34 +581,50 @@ namespace Hantek {
 		}
 		if(unsupported)
-			qDebug("Warning: This Hantek DSO model isn't supported officially, so it may not be working as expected. Reports about your experiences are very welcome though (Please open a feature request in the tracker at https://sf.net/projects/openhantek/ or email me directly to oliver.haag@gmail.com). If it's working perfectly I can remove this warning, if not it should be possible to get it working with your help soon.");
+			qWarning("Warning: This Hantek DSO model isn't supported officially, so it may not be working as expected. Reports about your experiences are very welcome though (Please open a feature request in the tracker at https://sf.net/projects/openhantek/ or email me directly to oliver.haag@gmail.com). If it's working perfectly I can remove this warning, if not it should be possible to get it working with your help soon.");
 		for(int control = 0; control < CONTROLINDEX_COUNT; control++)
 			this->controlPending[control] = true;
-		// Maximum possible samplerate for a single channel
+		// Maximum possible samplerate for a single channel and dividers for buffer sizes
+		this->specification.bufferDividers.clear();
+		this->specification.bufferSizes.clear();
+		
 		switch(this->device->getModel()) {
-			case MODEL_DSO2090:
-			case MODEL_DSO2100:
-				this->samplerateChannelMax = 50e6;
-				this->samplerateFastMax = 100e6;
+			case MODEL_DSO2250:
+			case MODEL_DSO5200:
+			case MODEL_DSO5200A:
+				this->specification.samplerate.single.base = 100e6;
+				this->specification.samplerate.single.max = 125e6;
+				this->specification.samplerate.multi.base = 200e6;
+				this->specification.samplerate.multi.max = 250e6;
+				this->specification.bufferDividers << 1000 << 1 << 2;
+				this->specification.bufferSizes << ULONG_MAX << 10240 << 14336;
 				break;
 			case MODEL_DSO2150:
-				this->samplerateChannelMax = 50e6;
-				this->samplerateFastMax = 150e6;
+				this->specification.samplerate.single.base = 50e6;
+				this->specification.samplerate.single.max = 75e6;
+				this->specification.samplerate.multi.base = 100e6;
+				this->specification.samplerate.multi.max = 150e6;
+				this->specification.bufferDividers << 1000 << 1 << 2;
+				this->specification.bufferSizes << ULONG_MAX << 10240 << 32768;
 				break;
 			default:
-				this->samplerateChannelMax = 100e6;
-				this->samplerateFastMax = 250e6;
+				this->specification.samplerate.single.base = 50e6;
+				this->specification.samplerate.single.max = 50e6;
+				this->specification.samplerate.multi.base = 100e6;
+				this->specification.samplerate.multi.max = 100e6;
+				this->specification.bufferDividers << 1000 << 1 << 2;
+				this->specification.bufferSizes << ULONG_MAX << 10240 << 32768;
 				break;
 		}
-		this->samplerateMax = this->samplerateChannelMax;
-		this->samplerateDivider = 1;
+		this->settings.samplerate.limits = &(this->specification.samplerate.single);
+		this->settings.samplerate.downsampling = 1;
 		// Get channel level data
-		errorCode = this->device->controlRead(CONTROL_VALUE, (unsigned char*) &(this->channelLevels), sizeof(this->channelLevels), (int) VALUE_CHANNELLEVEL);
+		errorCode = this->device->controlRead(CONTROL_VALUE, (unsigned char *) &(this->specification.offsetLimit), sizeof(this->specification.offsetLimit), (int) VALUE_OFFSETLIMITS);
 		if(errorCode < 0) {
 			this->device->disconnect();
 			emit statusMessage(tr("Couldn't get channel level data from oscilloscope"), 0);
@@ -575,70 +643,66 @@ namespace Hantek {
 		this->updateBufferSize(size);
-		this->setTriggerPosition(this->triggerPosition);
-		this->setSamplerate(this->samplerateMax / this->samplerateDivider);
-		this->setTriggerSlope(this->triggerSlope);
+		this->setTriggerPosition(this->settings.trigger.position);
+		this->setSamplerate();
-		return this->bufferSize;
+		return this->specification.bufferSizes[this->settings.bufferSizeId];
 	}
 	/// \brief Sets the samplerate of the oscilloscope.
 	/// \param samplerate The samplerate that should be met (S/s).
 	/// \return The samplerate that has been set.
 	unsigned long int Control::setSamplerate(unsigned long int samplerate) {
-		if(!this->device->isConnected() || samplerate == 0)
+		if(!this->device->isConnected())
 			return 0;
-		// Pointers to needed commands
-		CommandSetTriggerAndSamplerate *commandSetTriggerAndSamplerate = (CommandSetTriggerAndSamplerate *) this->command[COMMAND_SETTRIGGERANDSAMPLERATE];
-		CommandSetSamplerate5200 *commandSetSamplerate5200 = (CommandSetSamplerate5200 *) this->command[COMMAND_SETSAMPLERATE5200];
-		CommandSetBuffer5200 *commandSetBuffer5200 = (CommandSetBuffer5200 *) this->command[COMMAND_SETBUFFER5200];
-		CommandSetTrigger5200 *commandSetTrigger5200 = (CommandSetTrigger5200 *) this->command[COMMAND_SETTRIGGER5200];
+		// Keep samplerate if no parameter was given
+		if(!samplerate)
+			samplerate = this->settings.samplerate.current;
+		// Abort samplerate calculation if we didn't get a valid value yet
+		if(!samplerate)
+			return samplerate;
 		// Calculate with fast rate first if only one channel is used
 		bool fastRate = false;
-		this->samplerateMax = this->samplerateChannelMax;
-		if(((this->commandVersion == 0) ? commandSetTriggerAndSamplerate->getUsedChannels() : commandSetTrigger5200->getUsedChannels()) != USED_CH1CH2) {
+		this->settings.samplerate.limits = &(this->specification.samplerate.single);
+		if(this->settings.usedChannels <= 1) {
 			fastRate = true;
-			this->samplerateMax = this->samplerateFastMax;
-		}
-		
-		// The maximum sample rate depends on the buffer size
-		unsigned int bufferDivider = 1;
-		switch((this->commandVersion == 0) ? commandSetTriggerAndSamplerate->getBufferSize() : commandSetBuffer5200->getBufferSize()) {
-			case BUFFERID_ROLL:
-				bufferDivider = 1000;
-				break;
-			case BUFFERID_LARGE:
-				bufferDivider = 2;
-				break;
-			default:
-				break;
+			this->settings.samplerate.limits = &(this->specification.samplerate.multi);
 		}
-		// Get divider that would provide the requested rate, can't be zero
-		this->samplerateMax /= bufferDivider;
-		this->samplerateDivider = qMax(this->samplerateMax / samplerate, (long unsigned int) 1);
+		// Get downsampling factor that would provide the requested rate
+		this->settings.samplerate.downsampling = this->settings.samplerate.limits->base / this->specification.bufferDividers[this->settings.bufferSizeId] / samplerate;
+		// A downsampling factor of zero will result in the maximum rate
+		if(this->settings.samplerate.downsampling)
+			this->settings.samplerate.current = this->settings.samplerate.limits->base / this->specification.bufferDividers[this->settings.bufferSizeId] / this->settings.samplerate.downsampling;
+		else
+			this->settings.samplerate.current = this->settings.samplerate.limits->max / this->specification.bufferDividers[this->settings.bufferSizeId];
-		// Use normal mode if we need valueSlow or it would meet the rate at least as exactly as fast rate mode
+		// Maybe normal mode would be sufficient or even better than fast rate mode
 		if(fastRate) {
-			unsigned long int slowSamplerate = this->samplerateChannelMax / bufferDivider;
-			unsigned long int slowDivider = qMax(slowSamplerate / samplerate, (long unsigned int) 1);
+			// Don't set the downsampling factor to zero (maximum rate) if we could use fast rate mode anyway
+			unsigned long int slowDownsampling = qMax(this->specification.samplerate.single.base / this->specification.bufferDividers[this->settings.bufferSizeId] / samplerate, (long unsigned int) 1);
-			if(this->samplerateDivider > 4 || (qAbs((double) slowSamplerate / slowDivider - samplerate) <= qAbs(((double) this->samplerateMax / this->samplerateDivider) - samplerate))) {
+			// Use normal mode if we need valueSlow or it would meet the rate at least as exactly as fast rate mode
+			if(this->settings.samplerate.downsampling > 4 || (qAbs((double) this->specification.samplerate.single.base / this->specification.bufferDividers[this->settings.bufferSizeId] / slowDownsampling - samplerate) <= qAbs(this->settings.samplerate.current - samplerate))) {
 				fastRate = false;
-				this->samplerateMax = slowSamplerate;
-				this->samplerateDivider = slowDivider;
+				this->settings.samplerate.limits = &(this->specification.samplerate.single);
+				this->settings.samplerate.downsampling = slowDownsampling;
+				this->settings.samplerate.current = this->specification.samplerate.single.base / this->specification.bufferDividers[this->settings.bufferSizeId] / this->settings.samplerate.downsampling;
 			}
 		}
 		// Split the resulting divider into the values understood by the device
 		// The fast value is kept at 4 (or 3) for slow sample rates
-		long int valueSlow = qMax(((long int) this->samplerateDivider - 3) / 2, (long int) 0);
-		unsigned char valueFast = this->samplerateDivider - valueSlow * 2;
+		long int valueSlow = qMax(((long int) this->settings.samplerate.downsampling - 3) / 2, (long int) 0);
+		unsigned char valueFast = this->settings.samplerate.downsampling - valueSlow * 2;
-		switch(this->commandVersion) {
-			case 0:
+		switch(this->specification.command.bulk.setSamplerate) {
+			case BULK_SETTRIGGERANDSAMPLERATE: {
+				// Pointers to needed commands
+				BulkSetTriggerAndSamplerate *commandSetTriggerAndSamplerate = (BulkSetTriggerAndSamplerate *) this->command[BULK_SETTRIGGERANDSAMPLERATE];
+				
 				// Store samplerate fast value
 				commandSetTriggerAndSamplerate->setSamplerateFast(valueFast);
 				// Store samplerate slow value (two's complement)
@@ -646,11 +710,14 @@ namespace Hantek {
 				// Set fast rate when used
 				commandSetTriggerAndSamplerate->setFastRate(fastRate);
-				this->commandPending[COMMAND_SETTRIGGERANDSAMPLERATE] = true;
+				this->commandPending[BULK_SETTRIGGERANDSAMPLERATE] = true;
 				break;
-				
-			default:
+			}
+			case BULK_SETSAMPLERATE5200: {
+				// Pointers to needed commands
+				BulkSetSamplerate5200 *commandSetSamplerate5200 = (BulkSetSamplerate5200 *) this->command[BULK_SETSAMPLERATE5200];
+				BulkSetTrigger5200 *commandSetTrigger5200 = (BulkSetTrigger5200 *) this->command[BULK_SETTRIGGER5200];
 				// Store samplerate fast value
 				commandSetSamplerate5200->setSamplerateFast(4 - valueFast);
 				// Store samplerate slow value (two's complement)
@@ -658,15 +725,18 @@ namespace Hantek {
 				// Set fast rate when used
 				commandSetTrigger5200->setFastRate(fastRate);
-				this->commandPending[COMMAND_SETSAMPLERATE5200] = true;
-				this->commandPending[COMMAND_SETTRIGGER5200] = true;
+				this->commandPending[BULK_SETSAMPLERATE5200] = true;
+				this->commandPending[BULK_SETTRIGGER5200] = true;
 				break;
+			}
+			default:
+				return 0;
 		}
-		this->updateBufferSize(this->bufferSize);
-		this->setTriggerPosition(this->triggerPosition);
-		return this->samplerateMax / this->samplerateDivider;
+		this->updateBufferSize(this->specification.bufferSizes[this->settings.bufferSizeId]);
+		this->setTriggerPosition(this->settings.trigger.position);
+		return this->settings.samplerate.current;
 	}	
 	/// \brief Enables/disables filtering of the given channel.
@@ -681,9 +751,9 @@ namespace Hantek {
 			return -1;
 		// SetFilter bulk command for channel filter (used has to be inverted!)
-		CommandSetFilter *commandSetFilter = (CommandSetFilter *) this->command[COMMAND_SETFILTER];
+		BulkSetFilter *commandSetFilter = (BulkSetFilter *) this->command[BULK_SETFILTER];
 		commandSetFilter->setChannel(channel, !used);
-		this->commandPending[COMMAND_SETFILTER] = true;
+		this->commandPending[BULK_SETFILTER] = true;
 		unsigned char usedChannels = USED_CH1;
 		if(!commandSetFilter->getChannel(1)) {
@@ -693,17 +763,17 @@ namespace Hantek {
 				usedChannels = USED_CH1CH2;
 		}
-		switch(this->commandVersion) {
-			case 0: {
-				// SetTriggerAndSamplerate bulk command for trigger source
-				((CommandSetTriggerAndSamplerate *) this->command[COMMAND_SETTRIGGERANDSAMPLERATE])->setUsedChannels(usedChannels);
-				this->commandPending[COMMAND_SETTRIGGERANDSAMPLERATE] = true;
+		switch(this->specification.command.bulk.setTrigger) {
+			case BULK_SETTRIGGER5200: {
+				// SetTrigger5200s bulk command for trigger source
+				((BulkSetTrigger5200 *) this->command[BULK_SETTRIGGER5200])->setUsedChannels(usedChannels);
+				this->commandPending[BULK_SETTRIGGER5200] = true;
 				break;
 			}
-			case 1: {
-				// SetTrigger5200s bulk command for trigger source
-				((CommandSetTrigger5200 *) this->command[COMMAND_SETTRIGGER5200])->setUsedChannels(usedChannels);
-				this->commandPending[COMMAND_SETTRIGGER5200] = true;
+			default: {
+				// SetTriggerAndSamplerate bulk command for trigger source
+				((BulkSetTriggerAndSamplerate *) this->command[BULK_SETTRIGGERANDSAMPLERATE])->setUsedChannels(usedChannels);
+				this->commandPending[BULK_SETTRIGGERANDSAMPLERATE] = true;
 				break;
 			}
 		}
@@ -743,64 +813,67 @@ namespace Hantek {
 		// Find lowest gain voltage thats at least as high as the requested
 		int gainId;
 		for(gainId = 0; gainId < GAIN_COUNT - 1; gainId++)
-			if(this->gainSteps[gainId] >= gain)
+			if(this->specification.gainSteps[gainId] >= gain)
 				break;
 		// Get the voltage scaler id and it's sample range for this gain
 		int scalerId;
-		switch(this->commandVersion) {
-			case 0:
-				scalerId = gainId % 3;
-				this->sampleRange[channel] = 0xff;
-				break;
-			default:
-				/// \todo Use calibration data to get the DSO-5200 sample ranges
+		switch(this->device->getModel()) {
+			case MODEL_DSO5200:
+			case MODEL_DSO5200A:
+				/// \todo Use calibration data to get the DSO-5200(A) sample ranges
 				if(gainId == GAIN_10MV) {
 					scalerId = 1;
-					this->sampleRange[channel] = 184;
+					this->specification.voltageLimit[channel][gainId] = 184;
 				}
 				else {
 					switch(gainId % 3) {
 						case 1:
 							scalerId = 1;
-							this->sampleRange[channel] = 368;
+							this->specification.voltageLimit[channel][gainId] = 368;
 							break;
 						case 2:
 							scalerId = 0;
-							this->sampleRange[channel] = 454;
+							this->specification.voltageLimit[channel][gainId] = 454;
 							break;
 						default:
 							scalerId = 0;
-							this->sampleRange[channel] = 908;
+							this->specification.voltageLimit[channel][gainId] = 908;
 							break;
 					}
 				}
 				break;
+			
+			default:
+				scalerId = gainId % 3;
+				this->specification.voltageLimit[channel][gainId] = 0xff;
+				break;
 		}
 		// SetGain bulk command for gain
-		((CommandSetGain *) this->command[COMMAND_SETGAIN])->setGain(channel, scalerId);
-		this->commandPending[COMMAND_SETGAIN] = true;
+		((BulkSetGain *) this->command[BULK_SETGAIN])->setGain(channel, scalerId);
+		this->commandPending[BULK_SETGAIN] = true;
 		// SetRelays control command for gain relays
 		ControlSetRelays *controlSetRelays = (ControlSetRelays *) this->control[CONTROLINDEX_SETRELAYS];
-		switch(this->commandVersion) {
-			case 0:
-				controlSetRelays->setBelow1V(channel, gainId < GAIN_1V);
-				controlSetRelays->setBelow100mV(channel, gainId < GAIN_100MV);
-				break;
-			case 1:
+		switch(this->device->getModel()) {
+			case MODEL_DSO5200:
+			case MODEL_DSO5200A:
 				controlSetRelays->setBelow1V(channel, gainId <= GAIN_1V);
 				controlSetRelays->setBelow100mV(channel, gainId <= GAIN_100MV);
 				break;
+			default:
+				controlSetRelays->setBelow1V(channel, gainId < GAIN_1V);
+				controlSetRelays->setBelow100mV(channel, gainId < GAIN_100MV);
+				break;
 		}
 		this->controlPending[CONTROLINDEX_SETRELAYS] = true;
-		this->gain[channel] = (Gain) gainId;
+		this->settings.voltage[channel].gain = (Gain) gainId;
-		this->setOffset(channel, this->offset[channel]);
+		this->setOffset(channel, this->settings.voltage[channel].offset);
-		return this->gainSteps[gainId];
+		return this->specification.gainSteps[gainId];
 	}
 	/// \brief Set the offset for the given channel.
@@ -816,8 +889,8 @@ namespace Hantek {
 		// Calculate the offset value
 		// The range is given by the calibration data (convert from big endian)
-		unsigned short int minimum = ((unsigned short int) *((unsigned char *) &(this->channelLevels[channel][this->gain[channel]][OFFSET_START])) << 8) + *((unsigned char *) &(this->channelLevels[channel][this->gain[channel]][OFFSET_START]) + 1);
-		unsigned short int maximum = ((unsigned short int) *((unsigned char *) &(this->channelLevels[channel][this->gain[channel]][OFFSET_START])) << 8) + *((unsigned char *) &(this->channelLevels[channel][this->gain[channel]][OFFSET_END]) + 1);
+		unsigned short int minimum = ((unsigned short int) *((unsigned char *) &(this->specification.offsetLimit[channel][this->settings.voltage[channel].gain][OFFSET_START])) << 8) + *((unsigned char *) &(this->specification.offsetLimit[channel][this->settings.voltage[channel].gain][OFFSET_START]) + 1);
+		unsigned short int maximum = ((unsigned short int) *((unsigned char *) &(this->specification.offsetLimit[channel][this->settings.voltage[channel].gain][OFFSET_START])) << 8) + *((unsigned char *) &(this->specification.offsetLimit[channel][this->settings.voltage[channel].gain][OFFSET_END]) + 1);
 		unsigned short int offsetValue = offset * (maximum - minimum) + minimum + 0.5;
 		double offsetReal = (double) (offsetValue - minimum) / (maximum - minimum);
@@ -825,10 +898,10 @@ namespace Hantek {
 		((ControlSetOffset *) this->control[CONTROLINDEX_SETOFFSET])->setChannel(channel, offsetValue);
 		this->controlPending[CONTROLINDEX_SETOFFSET] = true;
-		this->offset[channel] = offset;
-		this->offsetReal[channel] = offsetReal;
+		this->settings.voltage[channel].offset = offset;
+		this->settings.voltage[channel].offsetReal = offsetReal;
-		this->setTriggerLevel(channel, this->triggerLevel[channel]);
+		this->setTriggerLevel(channel, this->settings.trigger.level[channel]);
 		return offsetReal;
 	}
@@ -842,7 +915,7 @@ namespace Hantek {
 		if(mode < Dso::TRIGGERMODE_AUTO || mode > Dso::TRIGGERMODE_SINGLE)
 			return -1;
-		this->triggerMode = mode;
+		this->settings.trigger.mode = mode;
 		return 0;
 	}
@@ -864,17 +937,17 @@ namespace Hantek {
 		else
 			sourceValue = TRIGGER_CH1 - id;
-		switch(this->commandVersion) {
-			case 0:
-				// SetTriggerAndSamplerate bulk command for trigger source
-				((CommandSetTriggerAndSamplerate *) this->command[COMMAND_SETTRIGGERANDSAMPLERATE])->setTriggerSource(sourceValue);
-				this->commandPending[COMMAND_SETTRIGGERANDSAMPLERATE] = true;
+		switch(this->specification.command.bulk.setTrigger) {
+			case BULK_SETTRIGGER5200:
+				// SetTrigger5200 bulk command for trigger source
+				((BulkSetTrigger5200 *) this->command[BULK_SETTRIGGER5200])->setTriggerSource(sourceValue);
+				this->commandPending[BULK_SETTRIGGER5200] = true;
 				break;
-			case 1:
-				// SetTrigger5200 bulk command for trigger source
-				((CommandSetTrigger5200 *) this->command[COMMAND_SETTRIGGER5200])->setTriggerSource(sourceValue);
-				this->commandPending[COMMAND_SETTRIGGER5200] = true;
+			default:
+				// SetTriggerAndSamplerate bulk command for trigger source
+				((BulkSetTriggerAndSamplerate *) this->command[BULK_SETTRIGGERANDSAMPLERATE])->setTriggerSource(sourceValue);
+				this->commandPending[BULK_SETTRIGGERANDSAMPLERATE] = true;
 				break;
 		}
@@ -882,8 +955,8 @@ namespace Hantek {
 		((ControlSetRelays *) this->control[CONTROLINDEX_SETRELAYS])->setTrigger(special);
 		this->controlPending[CONTROLINDEX_SETRELAYS] = true;
-		this->triggerSpecial = special;
-		this->triggerSource = id;
+		this->settings.trigger.special = special;
+		this->settings.trigger.source = id;
 		// Apply trigger level of the new source
 		if(special) {
@@ -892,7 +965,7 @@ namespace Hantek {
 			this->controlPending[CONTROLINDEX_SETOFFSET] = true;
 		}
 		else
-			this->setTriggerLevel(id, this->triggerLevel[id]);
+			this->setTriggerLevel(id, this->settings.trigger.level[id]);
 		return 0;
 	}
@@ -910,25 +983,26 @@ namespace Hantek {
 		// Calculate the trigger level value
 		unsigned short int minimum, maximum;
-		switch(this->commandVersion) {
-			case 0:
-				// It's from 0x00 to 0xfd for the 8 bit models
-				minimum = 0x00;
-				maximum = 0xfd;
+		switch(this->device->getModel()) {
+			case MODEL_DSO5200:
+			case MODEL_DSO5200A:
+				// The range is the same as used for the offsets for 10 bit models
+				minimum = ((unsigned short int) *((unsigned char *) &(this->specification.offsetLimit[channel][this->settings.voltage[channel].gain][OFFSET_START])) << 8) + *((unsigned char *) &(this->specification.offsetLimit[channel][this->settings.voltage[channel].gain][OFFSET_START]) + 1);
+				maximum = ((unsigned short int) *((unsigned char *) &(this->specification.offsetLimit[channel][this->settings.voltage[channel].gain][OFFSET_START])) << 8) + *((unsigned char *) &(this->specification.offsetLimit[channel][this->settings.voltage[channel].gain][OFFSET_END]) + 1);
 				break;
 			default:
-				// The range is the same as used for the offsets for 10 bit models
-				minimum = ((unsigned short int) *((unsigned char *) &(this->channelLevels[channel][this->gain[channel]][OFFSET_START])) << 8) + *((unsigned char *) &(this->channelLevels[channel][this->gain[channel]][OFFSET_START]) + 1);
-				maximum = ((unsigned short int) *((unsigned char *) &(this->channelLevels[channel][this->gain[channel]][OFFSET_START])) << 8) + *((unsigned char *) &(this->channelLevels[channel][this->gain[channel]][OFFSET_END]) + 1);
+				// It's from 0x00 to 0xfd for the 8 bit models
+				minimum = 0x00;
+				maximum = 0xfd;
 				break;
 		}
 		// Never get out of the limits
-		unsigned short int levelValue = qBound((long int) minimum, (long int) ((this->offsetReal[channel] + level / this->gainSteps[this->gain[channel]]) * (maximum - minimum) + 0.5) + minimum, (long int) maximum);
+		unsigned short int levelValue = qBound((long int) minimum, (long int) ((this->settings.voltage[channel].offsetReal + level / this->specification.gainSteps[this->settings.voltage[channel].gain]) * (maximum - minimum) + 0.5) + minimum, (long int) maximum);
 		// Check if the set channel is the trigger source
-		if(!this->triggerSpecial && channel == this->triggerSource) {
+		if(!this->settings.trigger.special && channel == this->settings.trigger.source) {
 			// SetOffset control command for trigger level
 			((ControlSetOffset *) this->control[CONTROLINDEX_SETOFFSET])->setTrigger(levelValue);
 			this->controlPending[CONTROLINDEX_SETOFFSET] = true;
@@ -936,8 +1010,8 @@ namespace Hantek {
 		/// \todo Get alternating trigger in here
-		this->triggerLevel[channel] = level;
-		return (double) ((levelValue - minimum) / (maximum - minimum) - this->offsetReal[channel]) * this->gainSteps[this->gain[channel]];
+		this->settings.trigger.level[channel] = level;
+		return (double) ((levelValue - minimum) / (maximum - minimum) - this->settings.voltage[channel].offsetReal) * this->specification.gainSteps[this->settings.voltage[channel].gain];
 	}
 	/// \brief Set the trigger slope.
@@ -950,24 +1024,24 @@ namespace Hantek {
 		if(slope != Dso::SLOPE_NEGATIVE && slope != Dso::SLOPE_POSITIVE)
 			return -1;
-		switch(this->commandVersion) {
-			case 0: {
+		switch(this->specification.command.bulk.setTrigger) {
+			case BULK_SETTRIGGER5200: {
+				// SetTrigger5200 bulk command for trigger slope
+				((BulkSetTrigger5200 *) this->command[BULK_SETTRIGGER5200])->setTriggerSlope(slope);
+				this->commandPending[BULK_SETTRIGGER5200] = true;
+				break;
+			}
+			default: {
 				// SetTriggerAndSamplerate bulk command for trigger slope
-				CommandSetTriggerAndSamplerate *commandSetTriggerAndSamplerate = (CommandSetTriggerAndSamplerate *) this->command[COMMAND_SETTRIGGERANDSAMPLERATE];
+				BulkSetTriggerAndSamplerate *commandSetTriggerAndSamplerate = (BulkSetTriggerAndSamplerate *) this->command[BULK_SETTRIGGERANDSAMPLERATE];
 				commandSetTriggerAndSamplerate->setTriggerSlope(slope);
-				this->commandPending[COMMAND_SETTRIGGERANDSAMPLERATE] = true;
-				break;
-			}
-			case 1: {
-				// SetTrigger5200 bulk command for trigger slope
-				((CommandSetTrigger5200 *) this->command[COMMAND_SETTRIGGER5200])->setTriggerSlope(slope);
-				this->commandPending[COMMAND_SETTRIGGER5200] = true;
+				this->commandPending[BULK_SETTRIGGERANDSAMPLERATE] = true;
 				break;
 			}
 		}
-		this->triggerSlope = slope;
+		this->settings.trigger.slope = slope;
 		return 0;
 	}
@@ -979,44 +1053,44 @@ namespace Hantek {
 			return -2;
 		// All trigger positions are measured in samples
-		unsigned long int positionSamples = position * this->samplerateMax / this->samplerateDivider;
+		unsigned long int positionSamples = position * this->settings.samplerate.current;
-		switch(this->commandVersion) {
-			case 0: {
+		switch(this->specification.command.bulk.setTrigger) {
+			case BULK_SETTRIGGER5200: {
 				// Fast rate mode uses both channels
-				if(((CommandSetTriggerAndSamplerate *) this->command[COMMAND_SETTRIGGERANDSAMPLERATE])->getFastRate())
+				if(((BulkSetTrigger5200 *) this->command[BULK_SETTRIGGER5200])->getFastRate())
 					positionSamples /= HANTEK_CHANNELS;
-				// Calculate the position value (Start point depending on buffer size)
-				unsigned long int position = 0x7ffff - this->bufferSize + positionSamples;
-				
-				// SetTriggerAndSamplerate bulk command for trigger position
-				((CommandSetTriggerAndSamplerate *) this->command[COMMAND_SETTRIGGERANDSAMPLERATE])->setTriggerPosition(position);
-				this->commandPending[COMMAND_SETTRIGGERANDSAMPLERATE] = true;
-				
-				break;
-			}
-			case 1: {
-					// Fast rate mode uses both channels
-					if(((CommandSetTrigger5200 *) this->command[COMMAND_SETTRIGGER5200])->getFastRate())
-						positionSamples /= HANTEK_CHANNELS;
-					
-					// Calculate the position values (Inverse, maximum is 0xffff)
-				unsigned short int positionPre = 0xffff - this->bufferSize + positionSamples;
+				// Calculate the position values (Inverse, maximum is 0xffff)
+				unsigned short int positionPre = 0xffff - this->specification.bufferSizes[this->settings.bufferSizeId] + positionSamples;
 				unsigned short int positionPost = 0xffff - positionSamples;
 				// SetBuffer5200 bulk command for trigger position
-				CommandSetBuffer5200 *commandSetBuffer5200 = (CommandSetBuffer5200 *) this->command[COMMAND_SETBUFFER5200];
+				BulkSetBuffer5200 *commandSetBuffer5200 = (BulkSetBuffer5200 *) this->command[BULK_SETBUFFER5200];
 				commandSetBuffer5200->setTriggerPositionPre(positionPre);
 				commandSetBuffer5200->setTriggerPositionPost(positionPost);
-				this->commandPending[COMMAND_SETBUFFER5200] = true;
+				this->commandPending[BULK_SETBUFFER5200] = true;
+				
+				break;
+			}
+			default: {
+				// Fast rate mode uses both channels
+				if(((BulkSetTriggerAndSamplerate *) this->command[BULK_SETTRIGGERANDSAMPLERATE])->getFastRate())
+					positionSamples /= HANTEK_CHANNELS;
+				
+				// Calculate the position value (Start point depending on buffer size)
+				unsigned long int position = 0x7ffff - this->specification.bufferSizes[this->settings.bufferSizeId] + positionSamples;
+				
+				// SetTriggerAndSamplerate bulk command for trigger position
+				((BulkSetTriggerAndSamplerate *) this->command[BULK_SETTRIGGERANDSAMPLERATE])->setTriggerPosition(position);
+				this->commandPending[BULK_SETTRIGGERANDSAMPLERATE] = true;
 				break;
 			}
 		}
-		this->triggerPosition = position;
-		return (double) positionSamples / this->samplerateMax * this->samplerateDivider;
+		this->settings.trigger.position = position;
+		return (double) positionSamples / this->settings.samplerate.current;
 	}
 #ifdef DEBUG
@@ -1038,7 +1112,7 @@ namespace Hantek {
 						// Read command code (First byte)
 						Helper::hexParse(data, &commandCode, 1);
-						if(commandCode > COMMAND_COUNT)
+						if(commandCode > BULK_COUNT)
 							return -2;
 						// Update bulk command and mark as pending
@@ -6,7 +6,7 @@
 //
 //  Copyright (C) 2008, 2009  Oleg Khudyakov
 //  prcoder@potrebitel.ru
-//  Copyright (C) 2010  Oliver Haag
+//  Copyright (C) 2010, 2011  Oliver Haag
 //  oliver.haag@gmail.com
 //
 //  This program is free software: you can redistribute it and/or modify it
@@ -53,6 +53,122 @@ namespace Hantek {
 	};
 	//////////////////////////////////////////////////////////////////////////////
+	/// \struct ControlSpecificationCommandsBulk                  hantek/control.h
+	/// \brief Stores the bulk command codes used for this device.
+	struct ControlSpecificationCommandsBulk {
+		BulkCode setFilter; ///< Command for setting used channels
+		BulkCode setSamplerate; ///< Command for samplerate settings
+		BulkCode setGain; ///< Command for gain settings (Usually in combination with CONTROL_SETRELAYS)
+		BulkCode setBuffer; ///< Command for buffer settings
+		BulkCode setTrigger; ///< Command for trigger settings
+	};
+	
+	//////////////////////////////////////////////////////////////////////////////
+	/// \struct ControlSpecificationCommandsControl               hantek/control.h
+	/// \brief Stores the control command codes used for this device.
+	struct ControlSpecificationCommandsControl {
+		ControlCode setOffset; ///< Command for setting offset calibration data
+		ControlCode setRelays; ///< Command for setting gain relays (Usually in combination with BULK_SETGAIN)
+	};
+	
+	//////////////////////////////////////////////////////////////////////////////
+	/// \struct ControlSpecificationCommandsControlValues         hantek/control.h
+	/// \brief Stores the control value codes used for this device.
+	struct ControlSpecificationCommandsValues {
+		ControlValue offsetLimits; ///< Code for channel offset limits
+		ControlValue voltageLimits; ///< Code for voltage limits
+	};
+	
+	//////////////////////////////////////////////////////////////////////////////
+	/// \struct ControlSpecificationCommands                      hantek/control.h
+	/// \brief Stores the command codes used for this device.
+	struct ControlSpecificationCommands {
+		ControlSpecificationCommandsBulk bulk; ///< The used bulk commands
+		ControlSpecificationCommandsControl control; ///< The used control commands
+		ControlSpecificationCommandsValues values; ///< The used control values
+	};
+	
+	//////////////////////////////////////////////////////////////////////////////
+	/// \struct ControlSamplerateLimits                           hantek/control.h
+	/// \brief Stores the samplerate limits for calculations.
+	struct ControlSamplerateLimits {
+		unsigned long int base; ///< The base for sample rate calculations
+		unsigned long int max; ///< The maximum sample rate
+	};
+	
+	//////////////////////////////////////////////////////////////////////////////
+	/// \struct ControlSpecificationSamplerate                    hantek/control.h
+	/// \brief Stores the samplerate limits.
+	struct ControlSpecificationSamplerate {
+		ControlSamplerateLimits single; ///< The limits for single channel mode
+		ControlSamplerateLimits multi; ///< The limits for multi channel mode
+	};
+	
+	//////////////////////////////////////////////////////////////////////////////
+	/// \struct ControlSpecification                              hantek/control.h
+	/// \brief Stores the specifications of the currently connected device.
+	struct ControlSpecification {
+		// Interface
+		ControlSpecificationCommands command; ///< The commands for this device
+		
+		// Limits
+		ControlSpecificationSamplerate samplerate; ///< The samplerate specifications
+		QList<unsigned long int> bufferSizes; ///< Available buffer sizes, ULONG_MAX means rolling
+		QList<unsigned long int> bufferDividers; ///< Samplerate dividers for buffer sizes
+		QList<double> gainSteps; ///< Available voltage steps in V/screenheight
+		
+		// Calibration
+		/// The sample values at the top of the screen
+		unsigned short int voltageLimit[HANTEK_CHANNELS][GAIN_COUNT];
+		/// Calibration data for the channel offsets
+		unsigned short int offsetLimit[HANTEK_CHANNELS][GAIN_COUNT][OFFSET_COUNT];
+	};
+	
+	//////////////////////////////////////////////////////////////////////////////
+	/// \struct ControlSettingsSamplerate                         hantek/control.h
+	/// \brief Stores the current samplerate settings of the device.
+	struct ControlSettingsSamplerate {
+		ControlSamplerateLimits *limits; ///< The samplerate limits
+		//unsigned long int divider; ///< The fixed samplerate divider
+		unsigned long int downsampling; ///< The variable downsampling factor
+		double current; ///< The current samplerate
+	};
+	
+	//////////////////////////////////////////////////////////////////////////////
+	/// \struct ControlSettingsSamplerate                         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
+		double position; ///< The current pretrigger position
+		unsigned int point; ///< The trigger point value
+		Dso::TriggerMode mode; ///< The trigger mode
+		Dso::Slope slope; ///< The trigger slope
+		bool special; ///< true, if the trigger source is special
+		unsigned int source; ///< The trigger source
+	};
+	
+	//////////////////////////////////////////////////////////////////////////////
+	/// \struct ControlSettingsSamplerate                         hantek/control.h
+	/// \brief Stores the current amplification settings of the device.
+	struct ControlSettingsVoltage {
+		Gain gain; ///< The gain id
+		double offset; ///< The screen offset for each channel
+		double offsetReal; ///< The real offset for each channel (Due to quantization)
+		bool used; ///< true, if the channel is used
+	};
+	
+	//////////////////////////////////////////////////////////////////////////////
+	/// \struct ControlSettings                                   hantek/control.h
+	/// \brief Stores the current settings of the device.
+	struct ControlSettings {
+		ControlSettingsSamplerate samplerate; ///< The samplerate settings
+		ControlSettingsVoltage voltage[HANTEK_CHANNELS]; ///< The amplification settings
+		ControlSettingsTrigger trigger; ///< The trigger settings
+		unsigned int bufferSizeId; ///< The id in the buffer size array
+		unsigned short int usedChannels; ///< Number of activated channels
+	};
+	
+	//////////////////////////////////////////////////////////////////////////////
 	/// \class Control                                            hantek/control.h
 	/// \brief The DsoControl abstraction layer for %Hantek USB DSOs.
 	class Control : public DsoControl {
@@ -72,48 +188,28 @@ namespace Hantek {
 			int getSamples(bool process);
 			unsigned long int updateBufferSize(unsigned long int size);
+			// Communication with device
 			Device *device; ///< The USB device for the oscilloscope
-			Helper::DataArray<unsigned char> *command[COMMAND_COUNT]; ///< Pointers to commands, ready to be transmitted
-			bool commandPending[COMMAND_COUNT]; ///< true, when the command should be executed
+			Helper::DataArray<unsigned char> *command[BULK_COUNT]; ///< Pointers to bulk commands, ready to be transmitted
+			bool commandPending[BULK_COUNT]; ///< true, when the command should be executed
 			Helper::DataArray<unsigned char> *control[CONTROLINDEX_COUNT]; ///< Pointers to control commands
 			unsigned char controlCode[CONTROLINDEX_COUNT]; ///< Request codes for control commands
 			bool controlPending[CONTROLINDEX_COUNT]; ///< true, when the control command should be executed
-			short int commandVersion; ///< The used version of the commands
-			
-			/// Calibration data for the channel offsets
-			unsigned short int channelLevels[HANTEK_CHANNELS][GAIN_COUNT][OFFSET_COUNT];
-			
-			// Various cached settings
-			unsigned long int samplerateDivider; ///< The samplerate divider
-			unsigned long int samplerateMax; ///< The maximum sample rate for the current setup
-			unsigned long int samplerateChannelMax; ///< The maximum sample rate for a single channel
-			unsigned long int samplerateFastMax; ///< The maximum sample rate for fast rate mode
-			Gain gain[HANTEK_CHANNELS]; ///< The gain id
-			unsigned short int sampleRange[HANTEK_CHANNELS]; ///< The sample values at the top of the screen
-			double offset[HANTEK_CHANNELS]; ///< The current screen offset for each channel
-			double offsetReal[HANTEK_CHANNELS]; ///< The real offset for each channel (Due to quantization)
-			double triggerLevel[HANTEK_CHANNELS]; ///< The trigger level for each channel in V
-			double triggerPosition; ///< The current pretrigger position
-			unsigned int bufferSize; ///< The buffer size in samples
-			unsigned int triggerPoint; ///< The trigger point value
-			Dso::TriggerMode triggerMode; ///< The trigger mode
-			Dso::Slope triggerSlope; ///< The trigger slope
-			bool triggerSpecial; ///< true, if the trigger source is special
-			unsigned int triggerSource; ///< The trigger source
+			// Device setup
+			ControlSpecification specification; ///< The specifications of the device
+			ControlSettings settings; ///< The current settings of the device
+			// Results
 			QList<double *> samples; ///< Sample data arrays
 			QList<unsigned int> samplesSize; ///< Number of samples data array
 			QMutex samplesMutex; ///< Mutex for the sample data
-			
-			// Lists for enums
-			QList<double> gainSteps; ///< Voltage steps in V/screenheight
 		public slots:
 			virtual void connectDevice();
-			unsigned long int setSamplerate(unsigned long int samplerate);
+			unsigned long int setSamplerate(unsigned long int samplerate = 0);
 			unsigned long int setBufferSize(unsigned long int size);
 			int setChannelUsed(unsigned int channel, bool used);
@@ -99,13 +99,6 @@ namespace Hantek {
 			}
 		}
-		/// \todo Use 9 bit data model of DSO-5200(A)
-		/* if ((deviceModel == DSO_5200) || (deviceModel == DSO_5200A))
-		{
-			extraBitsData = true;
-			qDebug("Using a 9-bita data model");
-		}*/
-		
 		if(this->model >= 0) {
 			// Open device
 			deviceAddress = QString("%1:%2").arg(device->bus->location, 3, 10, QLatin1Char('0')).arg(device->devnum, 3, 10, QLatin1Char('0'));
@@ -32,9 +32,9 @@
 namespace Hantek {
 	//////////////////////////////////////////////////////////////////////////////
-	// class CommandSetFilter
+	// class BulkSetFilter
 	/// \brief Sets the data array to the default values.
-	CommandSetFilter::CommandSetFilter() : Helper::DataArray<unsigned char>(8) {
+	BulkSetFilter::BulkSetFilter() : Helper::DataArray<unsigned char>(8) {
 		this->init();
 	}
@@ -42,7 +42,7 @@ namespace Hantek {
 	/// \param channel1 true if channel 1 is filtered.
 	/// \param channel2 true if channel 2 is filtered.
 	/// \param trigger true if trigger is filtered.
-	CommandSetFilter::CommandSetFilter(bool channel1, bool channel2, bool trigger) : Helper::DataArray<unsigned char>(8) {
+	BulkSetFilter::BulkSetFilter(bool channel1, bool channel2, bool trigger) : Helper::DataArray<unsigned char>(8) {
 		this->init();
 		this->setChannel(0, channel1);
@@ -53,7 +53,7 @@ namespace Hantek {
 	/// \brief Gets the filtering state of one channel.
 	/// \param channel The channel whose filtering state should be returned.
 	/// \return The filtering state of the channel.
-	bool CommandSetFilter::getChannel(unsigned int channel) {
+	bool BulkSetFilter::getChannel(unsigned int channel) {
 		FilterBits *filterBits = (FilterBits *) &(this->array[2]);
 		if(channel == 0)
 			return filterBits->channel1 == 1;
@@ -64,7 +64,7 @@ namespace Hantek {
 	/// \brief Enables/disables filtering of one channel.
 	/// \param channel The channel that should be set.
 	/// \param filtered true if the channel should be filtered.
-	void CommandSetFilter::setChannel(unsigned int channel, bool filtered) {
+	void BulkSetFilter::setChannel(unsigned int channel, bool filtered) {
 		FilterBits *filterBits = (FilterBits *) &(this->array[2]);
 		if(channel == 0)
 			filterBits->channel1 = filtered ? 1 : 0;
@@ -74,29 +74,29 @@ namespace Hantek {
 	/// \brief Gets the filtering state for the trigger.
 	/// \return The filtering state of the trigger.
-	bool CommandSetFilter::getTrigger() {
+	bool BulkSetFilter::getTrigger() {
 		return ((FilterBits *) &(this->array[2]))->trigger == 1;
 	}
 	/// \brief Enables/disables filtering for the trigger.
 	/// \param filtered true if the trigger should be filtered.
-	void CommandSetFilter::setTrigger(bool filtered) {
+	void BulkSetFilter::setTrigger(bool filtered) {
 		FilterBits *filterBits = (FilterBits *) &(this->array[2]);
 		filterBits->trigger = filtered ? 1 : 0;
 	}
 	/// \brief Initialize the array to the needed values.
-	void CommandSetFilter::init() {
-		this->array[0] = COMMAND_SETFILTER;
+	void BulkSetFilter::init() {
+		this->array[0] = BULK_SETFILTER;
 		this->array[1] = 0x0f;
 	}
 	//////////////////////////////////////////////////////////////////////////////
-	// class CommandSetTriggerAndSamplerate
+	// class BulkSetTriggerAndSamplerate
 	/// \brief Sets the data array to the default values.
-	CommandSetTriggerAndSamplerate::CommandSetTriggerAndSamplerate() : Helper::DataArray<unsigned char>(12) {
+	BulkSetTriggerAndSamplerate::BulkSetTriggerAndSamplerate() : Helper::DataArray<unsigned char>(12) {
 		this->init();
 	}
@@ -109,7 +109,7 @@ namespace Hantek {
 	/// \param usedChannels The enabled channels (Tsr2).
 	/// \param fastRate The fastRate state (Tsr2).
 	/// \param triggerSlope The triggerSlope value (Tsr2).
-	CommandSetTriggerAndSamplerate::CommandSetTriggerAndSamplerate(unsigned short int samplerateSlow, unsigned long int triggerPosition, unsigned char triggerSource, unsigned char bufferSize, unsigned char samplerateFast, unsigned char usedChannels, bool fastRate, unsigned char triggerSlope) : Helper::DataArray<unsigned char>(12) {
+	BulkSetTriggerAndSamplerate::BulkSetTriggerAndSamplerate(unsigned short int samplerateSlow, unsigned long int triggerPosition, unsigned char triggerSource, unsigned char bufferSize, unsigned char samplerateFast, unsigned char usedChannels, bool fastRate, unsigned char triggerSlope) : Helper::DataArray<unsigned char>(12) {
 		this->init();
 		this->setTriggerSource(triggerSource);
@@ -124,179 +124,179 @@ namespace Hantek {
 	/// \brief Get the triggerSource value in Tsr1Bits.
 	/// \return The triggerSource value.
-	unsigned char CommandSetTriggerAndSamplerate::getTriggerSource() {
+	unsigned char BulkSetTriggerAndSamplerate::getTriggerSource() {
 		return ((Tsr1Bits *) &(this->array[2]))->triggerSource;
 	}
 	/// \brief Set the triggerSource in Tsr1Bits to the given value.
 	/// \param value The new triggerSource value.
-	void CommandSetTriggerAndSamplerate::setTriggerSource(unsigned char value) {
+	void BulkSetTriggerAndSamplerate::setTriggerSource(unsigned char value) {
 		((Tsr1Bits *) &(this->array[2]))->triggerSource = value;
 	}
 	/// \brief Get the bufferSize value in Tsr1Bits.
 	/// \return The #BufferSizeId value.
-	unsigned char CommandSetTriggerAndSamplerate::getBufferSize() {
+	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.
-	void CommandSetTriggerAndSamplerate::setBufferSize(unsigned char value) {
+	void BulkSetTriggerAndSamplerate::setBufferSize(unsigned char value) {
 		((Tsr1Bits *) &(this->array[2]))->bufferSize = value;
 	}
 	/// \brief Get the samplerateFast value in Tsr1Bits.
 	/// \return The samplerateFast value.
-	unsigned char CommandSetTriggerAndSamplerate::getSamplerateFast() {
+	unsigned char BulkSetTriggerAndSamplerate::getSamplerateFast() {
 		return ((Tsr1Bits *) &(this->array[2]))->samplerateFast;
 	}
 	/// \brief Set the samplerateFast in Tsr1Bits to the given value.
 	/// \param value The new samplerateFast value.
-	void CommandSetTriggerAndSamplerate::setSamplerateFast(unsigned char value) {
+	void BulkSetTriggerAndSamplerate::setSamplerateFast(unsigned char value) {
 		((Tsr1Bits *) &(this->array[2]))->samplerateFast = value;
 	}
 	/// \brief Get the usedChannels value in Tsr2Bits.
 	/// \return The usedChannels value.
-	unsigned char CommandSetTriggerAndSamplerate::getUsedChannels() {
+	unsigned char BulkSetTriggerAndSamplerate::getUsedChannels() {
 		return ((Tsr2Bits *) &(this->array[3]))->usedChannels;
 	}
 	/// \brief Set the usedChannels in Tsr2Bits to the given value.
 	/// \param value The new usedChannels value.
-	void CommandSetTriggerAndSamplerate::setUsedChannels(unsigned char value) {
+	void BulkSetTriggerAndSamplerate::setUsedChannels(unsigned char value) {
 		((Tsr2Bits *) &(this->array[3]))->usedChannels = value;
 	}
 	/// \brief Get the fastRate state in Tsr2Bits.
 	/// \return The fastRate state.
-	bool CommandSetTriggerAndSamplerate::getFastRate() {
+	bool BulkSetTriggerAndSamplerate::getFastRate() {
 		return ((Tsr2Bits *) &(this->array[3]))->fastRate == 1;
 	}
 	/// \brief Set the fastRate in Tsr2Bits to the given state.
 	/// \param fastRate The new fastRate state.
-	void CommandSetTriggerAndSamplerate::setFastRate(bool fastRate) {
+	void BulkSetTriggerAndSamplerate::setFastRate(bool fastRate) {
 		((Tsr2Bits *) &(this->array[3]))->fastRate = fastRate ? 1 : 0;
 	}
 	/// \brief Get the triggerSlope value in Tsr2Bits.
 	/// \return The triggerSlope value.
-	unsigned char CommandSetTriggerAndSamplerate::getTriggerSlope() {
+	unsigned char BulkSetTriggerAndSamplerate::getTriggerSlope() {
 		return ((Tsr2Bits *) &(this->array[3]))->triggerSlope;
 	}
 	/// \brief Set the triggerSlope in Tsr2Bits to the given value.
 	/// \param slope The new triggerSlope value.
-	void CommandSetTriggerAndSamplerate::setTriggerSlope(unsigned char slope) {
+	void BulkSetTriggerAndSamplerate::setTriggerSlope(unsigned char slope) {
 		((Tsr2Bits *) &(this->array[3]))->triggerSlope = slope;
 	}
 	/// \brief Get the SamplerateSlow value.
 	/// \return The SamplerateSlow value.
-	unsigned short int CommandSetTriggerAndSamplerate::getSamplerateSlow() {
+	unsigned short int BulkSetTriggerAndSamplerate::getSamplerateSlow() {
 		return (unsigned short int) this->array[4] | ((unsigned short int) this->array[5] << 8);
 	}
 	/// \brief Set the SamplerateSlow to the given value.
 	/// \param samplerate The new SamplerateSlow value.
-	void CommandSetTriggerAndSamplerate::setSamplerateSlow(unsigned short int samplerate) {
+	void BulkSetTriggerAndSamplerate::setSamplerateSlow(unsigned short int samplerate) {
 		this->array[4] = (unsigned char) samplerate;
 		this->array[5] = (unsigned char) (samplerate >> 8);
 	}
 	/// \brief Get the TriggerPosition value.
 	/// \return The horizontal trigger position.
-	unsigned long int CommandSetTriggerAndSamplerate::getTriggerPosition() {
+	unsigned long int BulkSetTriggerAndSamplerate::getTriggerPosition() {
 		return (unsigned long int) this->array[6] | ((unsigned long int) this->array[7] << 8) | ((unsigned long int) this->array[10] << 16);
 	}
 	/// \brief Set the TriggerPosition to the given value.
 	/// \param position The new horizontal trigger position.
-	void CommandSetTriggerAndSamplerate::setTriggerPosition(unsigned long int position) {
+	void BulkSetTriggerAndSamplerate::setTriggerPosition(unsigned long int position) {
 		this->array[6] = (unsigned char) position;
 		this->array[7] = (unsigned char) (position >> 8);
 		this->array[10] = (unsigned char) (position >> 16);
 	}
 	/// \brief Initialize the array to the needed values.
-	void CommandSetTriggerAndSamplerate::init() {
-		this->array[0] = COMMAND_SETTRIGGERANDSAMPLERATE;
+	void BulkSetTriggerAndSamplerate::init() {
+		this->array[0] = BULK_SETTRIGGERANDSAMPLERATE;
 	}
 	//////////////////////////////////////////////////////////////////////////////
-	// class CommandForceTrigger
+	// class BulkForceTrigger
 	/// \brief Sets the data array to needed values.
-	CommandForceTrigger::CommandForceTrigger() : Helper::DataArray<unsigned char>(2) {
-		this->array[0] = COMMAND_FORCETRIGGER;
+	BulkForceTrigger::BulkForceTrigger() : Helper::DataArray<unsigned char>(2) {
+		this->array[0] = BULK_FORCETRIGGER;
 	}
 	//////////////////////////////////////////////////////////////////////////////
-	// class CommandCaptureStart
+	// class BulkCaptureStart
 	/// \brief Sets the data array to needed values.
-	CommandCaptureStart::CommandCaptureStart() : Helper::DataArray<unsigned char>(2) {
-		this->array[0] = COMMAND_STARTSAMPLING;
+	BulkCaptureStart::BulkCaptureStart() : Helper::DataArray<unsigned char>(2) {
+		this->array[0] = BULK_STARTSAMPLING;
 	}
 	//////////////////////////////////////////////////////////////////////////////
-	// class CommandTriggerEnabled
+	// class BulkTriggerEnabled
 	/// \brief Sets the data array to needed values.
-	CommandTriggerEnabled::CommandTriggerEnabled() : Helper::DataArray<unsigned char>(2) {
-		this->array[0] = COMMAND_ENABLETRIGGER;
+	BulkTriggerEnabled::BulkTriggerEnabled() : Helper::DataArray<unsigned char>(2) {
+		this->array[0] = BULK_ENABLETRIGGER;
 	}
 	//////////////////////////////////////////////////////////////////////////////
-	// class CommandGetData
+	// class BulkGetData
 	/// \brief Sets the data array to needed values.
-	CommandGetData::CommandGetData() : Helper::DataArray<unsigned char>(2) {
-		this->array[0] = COMMAND_GETDATA;
+	BulkGetData::BulkGetData() : Helper::DataArray<unsigned char>(2) {
+		this->array[0] = BULK_GETDATA;
 	}
 	//////////////////////////////////////////////////////////////////////////////
-	// class CommandGetCaptureState
+	// class BulkGetCaptureState
 	/// \brief Sets the data array to needed values.
-	CommandGetCaptureState::CommandGetCaptureState() : Helper::DataArray<unsigned char>(2) {
-		this->array[0] = COMMAND_GETCAPTURESTATE;
+	BulkGetCaptureState::BulkGetCaptureState() : Helper::DataArray<unsigned char>(2) {
+		this->array[0] = BULK_GETCAPTURESTATE;
 	}
 	//////////////////////////////////////////////////////////////////////////////
-	// class ResponseGetCaptureState
+	// class BulkResponseGetCaptureState
 	/// \brief Initializes the array.
-	ResponseGetCaptureState::ResponseGetCaptureState() : Helper::DataArray<unsigned char>(512) {
+	BulkResponseGetCaptureState::BulkResponseGetCaptureState() : Helper::DataArray<unsigned char>(512) {
 	}
 	/// \brief Gets the capture state.
 	/// \return The CaptureState of the oscilloscope.
-	CaptureState ResponseGetCaptureState::getCaptureState() {
+	CaptureState BulkResponseGetCaptureState::getCaptureState() {
 		return (CaptureState) this->array[0];
 	}
 	/// \brief Gets the trigger point.
 	/// \return The trigger point for the captured samples.
-	unsigned int ResponseGetCaptureState::getTriggerPoint() {
+	unsigned int BulkResponseGetCaptureState::getTriggerPoint() {
 		return this->array[2] | (this->array[3] << 8);
 	}
 	//////////////////////////////////////////////////////////////////////////////
-	// class CommandSetGain
+	// class BulkSetGain
 	/// \brief Sets the data array to needed values.
-	CommandSetGain::CommandSetGain() : Helper::DataArray<unsigned char>(8) {
+	BulkSetGain::BulkSetGain() : Helper::DataArray<unsigned char>(8) {
 		this->init();
 	}
 	/// \brief Sets the gain to the given values.
 	/// \param channel1 The gain value for channel 1.
 	/// \param channel2 The gain value for channel 2.
-	CommandSetGain::CommandSetGain(unsigned char channel1, unsigned char channel2) : Helper::DataArray<unsigned char>(8) {
+	BulkSetGain::BulkSetGain(unsigned char channel1, unsigned char channel2) : Helper::DataArray<unsigned char>(8) {
 		this->init();
 		this->setGain(0, channel1);
@@ -306,7 +306,7 @@ namespace Hantek {
 	/// \brief Get the gain for the given channel.
 	/// \param channel The channel whose gain should be returned.
 	/// \returns The gain value.
-	unsigned char CommandSetGain::getGain(unsigned int channel) {
+	unsigned char BulkSetGain::getGain(unsigned int channel) {
 		GainBits *gainBits = (GainBits *) &(this->array[2]);
 		if(channel == 0)
 			return gainBits->channel1;
@@ -317,7 +317,7 @@ namespace Hantek {
 	/// \brief Set the gain for the given channel.
 	/// \param channel The channel that should be set.
 	/// \param value The new gain value for the channel.
-	void CommandSetGain::setGain(unsigned int channel, unsigned char value) {
+	void BulkSetGain::setGain(unsigned int channel, unsigned char value) {
 		GainBits *gainBits = (GainBits *) &(this->array[2]);
 		if(channel == 0)
 			gainBits->channel1 = value;
@@ -326,23 +326,23 @@ namespace Hantek {
 	}
 	/// \brief Initialize the array to the needed values.
-	void CommandSetGain::init() {
-		this->array[0] = COMMAND_SETGAIN;
+	void BulkSetGain::init() {
+		this->array[0] = BULK_SETGAIN;
 		this->array[1] = 0x0f;
 		((GainBits *) &(this->array[2]))->reserved = 3;
 	}
 	//////////////////////////////////////////////////////////////////////////////
-	// class CommandSetLogicalData
+	// class BulkSetLogicalData
 	/// \brief Sets the data array to needed values.
-	CommandSetLogicalData::CommandSetLogicalData() : Helper::DataArray<unsigned char>(8) {
+	BulkSetLogicalData::BulkSetLogicalData() : Helper::DataArray<unsigned char>(8) {
 		this->init();
 	}
 	/// \brief Sets the data to the given value.
 	/// \param data The data byte.
-	CommandSetLogicalData::CommandSetLogicalData(unsigned char data) : Helper::DataArray<unsigned char>(8) {
+	BulkSetLogicalData::BulkSetLogicalData(unsigned char data) : Helper::DataArray<unsigned char>(8) {
 		this->init();
 		this->setData(data);
@@ -350,33 +350,33 @@ namespace Hantek {
 	/// \brief Gets the data.
 	/// \returns The data byte.
-	unsigned char CommandSetLogicalData::getData() {
+	unsigned char BulkSetLogicalData::getData() {
 		return this->array[2];
 	}
 	/// \brief Sets the data to the given value.
 	/// \param data The new data byte.
-	void CommandSetLogicalData::setData(unsigned char data) {
+	void BulkSetLogicalData::setData(unsigned char data) {
 		this->array[2] = data;
 	}
 	/// \brief Initialize the array to the needed values.
-	void CommandSetLogicalData::init() {
-		this->array[0] = COMMAND_SETLOGICALDATA;
+	void BulkSetLogicalData::init() {
+		this->array[0] = BULK_SETLOGICALDATA;
 		this->array[1] = 0x0f;
 	}
 	//////////////////////////////////////////////////////////////////////////////
-	// class CommandGetLogicalData
+	// class BulkGetLogicalData
 	/// \brief Sets the data array to needed values.
-	CommandGetLogicalData::CommandGetLogicalData() : Helper::DataArray<unsigned char>(2) {
-		this->array[0] = COMMAND_GETLOGICALDATA;
+	BulkGetLogicalData::BulkGetLogicalData() : Helper::DataArray<unsigned char>(2) {
+		this->array[0] = BULK_GETLOGICALDATA;
 	}
 	//////////////////////////////////////////////////////////////////////////////
-	// class ControlGetSpeed
+	// class BulkGetSpeed
 	/// \brief Initializes the array.
 	ControlGetSpeed::ControlGetSpeed() : Helper::DataArray<unsigned char>(10) {
 	}
@@ -389,10 +389,10 @@ namespace Hantek {
 	//////////////////////////////////////////////////////////////////////////////
-	// class ControlBeginCommand
+	// class BulkBeginCommand
 	/// \brief Sets the command index to the given value.
 	/// \param index The CommandIndex for the command.
-	ControlBeginCommand::ControlBeginCommand(CommandIndex index) : Helper::DataArray<unsigned char>(10) {
+	ControlBeginCommand::ControlBeginCommand(BulkIndex index) : Helper::DataArray<unsigned char>(10) {
 		this->init();
 		this->setIndex(index);
@@ -400,13 +400,13 @@ namespace Hantek {
 	/// \brief Gets the command index.
 	/// \return The CommandIndex for the command.
-	CommandIndex ControlBeginCommand::getIndex() {
-		return (CommandIndex) this->array[1];
+	BulkIndex ControlBeginCommand::getIndex() {
+		return (BulkIndex) this->array[1];
 	}
 	/// \brief Sets the command index to the given value.
 	/// \param index The new CommandIndex for the command.
-	void ControlBeginCommand::setIndex(CommandIndex index) {
+	void ControlBeginCommand::setIndex(BulkIndex index) {
 		memset(&(this->array[1]), (unsigned char) index, 3);
 	}
@@ -417,7 +417,7 @@ namespace Hantek {
 	//////////////////////////////////////////////////////////////////////////////
-	// class ControlSetOffset
+	// class BulkSetOffset
 	/// \brief Sets the data array to the default values.
 	ControlSetOffset::ControlSetOffset() : Helper::DataArray<unsigned char>(17) {
 	}
@@ -471,7 +471,7 @@ namespace Hantek {
 	//////////////////////////////////////////////////////////////////////////////
-	// class ControlSetRelays
+	// class BulkSetRelays
 	/// \brief Sets all relay states.
 	/// \param ch1Below1V Sets the state of the Channel 1 below 1 V relay.
 	/// \param ch1Below100mV Sets the state of the Channel 1 below 100 mV relay.
@@ -564,16 +564,16 @@ namespace Hantek {
 	//////////////////////////////////////////////////////////////////////////////
-	// class CommandSetSamplerate5200
+	// class BulkSetSamplerate5200
 	/// \brief Sets the data array to the default values.
-	CommandSetSamplerate5200::CommandSetSamplerate5200() : Helper::DataArray<unsigned char>(6) {
+	BulkSetSamplerate5200::BulkSetSamplerate5200() : Helper::DataArray<unsigned char>(6) {
 		this->init();
 	}
 	/// \brief Sets the data bytes to the specified values.
 	/// \param samplerateSlow The SamplerateSlow value.
 	/// \param samplerateFast The SamplerateFast value.
-	CommandSetSamplerate5200::CommandSetSamplerate5200(unsigned short int samplerateSlow, unsigned char samplerateFast) : Helper::DataArray<unsigned char>(6) {
+	BulkSetSamplerate5200::BulkSetSamplerate5200(unsigned short int samplerateSlow, unsigned char samplerateFast) : Helper::DataArray<unsigned char>(6) {
 		this->init();
 		this->setSamplerateFast(samplerateFast);
@@ -582,39 +582,39 @@ namespace Hantek {
 	/// \brief Get the SamplerateFast value.
 	/// \return The SamplerateFast value.
-	unsigned char CommandSetSamplerate5200::getSamplerateFast() {
+	unsigned char BulkSetSamplerate5200::getSamplerateFast() {
 		return this->array[4];
 	}
 	/// \brief Set the SamplerateFast to the given value.
 	/// \param value The new SamplerateFast value.
-	void CommandSetSamplerate5200::setSamplerateFast(unsigned char value) {
+	void BulkSetSamplerate5200::setSamplerateFast(unsigned char value) {
 		this->array[4] = value;
 	}
 	/// \brief Get the SamplerateSlow value.
 	/// \return The SamplerateSlow value.
-	unsigned short int CommandSetSamplerate5200::getSamplerateSlow() {
+	unsigned short int BulkSetSamplerate5200::getSamplerateSlow() {
 		return (unsigned short int) this->array[2] | ((unsigned short int) this->array[3] << 8);
 	}
 	/// \brief Set the SamplerateSlow to the given value.
 	/// \param samplerate The new SamplerateSlow value.
-	void CommandSetSamplerate5200::setSamplerateSlow(unsigned short int samplerate) {
+	void BulkSetSamplerate5200::setSamplerateSlow(unsigned short int samplerate) {
 		this->array[2] = (unsigned char) samplerate;
 		this->array[3] = (unsigned char) (samplerate >> 8);
 	}
 	/// \brief Initialize the array to the needed values.
-	void CommandSetSamplerate5200::init() {
-		this->array[0] = COMMAND_SETSAMPLERATE5200;
+	void BulkSetSamplerate5200::init() {
+		this->array[0] = BULK_SETSAMPLERATE5200;
 	}
 	//////////////////////////////////////////////////////////////////////////////
-	// class CommandSetBuffer5200
+	// class BulkSetBuffer5200
 	/// \brief Sets the data array to the default values.
-	CommandSetBuffer5200::CommandSetBuffer5200() : Helper::DataArray<unsigned char>(10) {
+	BulkSetBuffer5200::BulkSetBuffer5200() : Helper::DataArray<unsigned char>(10) {
 		this->init();
 	}
@@ -624,7 +624,7 @@ namespace Hantek {
 	/// \param usedPre The TriggerPositionUsedPre value.
 	/// \param usedPost The TriggerPositionUsedPost value.
 	/// \param bufferSize The #BufferSizeId value.
-	CommandSetBuffer5200::CommandSetBuffer5200(unsigned short int triggerPositionPre, unsigned short int triggerPositionPost, unsigned char usedPre, unsigned char usedPost, unsigned char bufferSize) : Helper::DataArray<unsigned char>(10) {
+	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();
 		this->setTriggerPositionPre(triggerPositionPre);
@@ -636,78 +636,78 @@ namespace Hantek {
 	/// \brief Get the TriggerPositionPre value.
 	/// \return The TriggerPositionPre value.
-	unsigned short int CommandSetBuffer5200::getTriggerPositionPre() {
+	unsigned short int BulkSetBuffer5200::getTriggerPositionPre() {
 		return (unsigned short int) this->array[2] | ((unsigned short int) this->array[3] << 8);
 	}
 	/// \brief Set the TriggerPositionPre to the given value.
 	/// \param position The new TriggerPositionPre value.
-	void CommandSetBuffer5200::setTriggerPositionPre(unsigned short int position) {
+	void BulkSetBuffer5200::setTriggerPositionPre(unsigned short int position) {
 		this->array[2] = (unsigned char) position;
 		this->array[3] = (unsigned char) (position >> 8);
 	}
 	/// \brief Get the TriggerPositionPost value.
 	/// \return The TriggerPositionPost value.
-	unsigned short int CommandSetBuffer5200::getTriggerPositionPost() {
+	unsigned short int BulkSetBuffer5200::getTriggerPositionPost() {
 		return (unsigned short int) this->array[6] | ((unsigned short int) this->array[7] << 8);
 	}
 	/// \brief Set the TriggerPositionPost to the given value.
 	/// \param position The new TriggerPositionPost value.
-	void CommandSetBuffer5200::setTriggerPositionPost(unsigned short int position) {
+	void BulkSetBuffer5200::setTriggerPositionPost(unsigned short int position) {
 		this->array[6] = (unsigned char) position;
 		this->array[7] = (unsigned char) (position >> 8);
 	}
 	/// \brief Get the TriggerPositionUsedPre value.
 	/// \return The #DTriggerPositionUsed value for the pre position.
-	unsigned char CommandSetBuffer5200::getUsedPre() {
+	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.
-	void CommandSetBuffer5200::setUsedPre(unsigned char value) {
+	void BulkSetBuffer5200::setUsedPre(unsigned char value) {
 		this->array[4] = value;
 	}
 	/// \brief Get the TriggerPositionUsedPost value.
 	/// \return The #DTriggerPositionUsed value for the post position.
-	unsigned char CommandSetBuffer5200::getUsedPost() {
+	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.
-	void CommandSetBuffer5200::setUsedPost(unsigned char value) {
+	void BulkSetBuffer5200::setUsedPost(unsigned char value) {
 		((DBufferBits *) &(this->array[8]))->triggerPositionUsed = value;
 	}
 	/// \brief Get the bufferSize value in DBufferBits.
 	/// \return The #BufferSizeId value.
-	unsigned char CommandSetBuffer5200::getBufferSize() {
+	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.
-	void CommandSetBuffer5200::setBufferSize(unsigned char value) {
+	void BulkSetBuffer5200::setBufferSize(unsigned char value) {
 		((DBufferBits *) &(this->array[8]))->bufferSize = value;
 	}
 	/// \brief Initialize the array to the needed values.
-	void CommandSetBuffer5200::init() {
-		this->array[0] = COMMAND_SETBUFFER5200;
+	void BulkSetBuffer5200::init() {
+		this->array[0] = BULK_SETBUFFER5200;
 		this->array[5] = 0xff;
 		this->array[9] = 0xff;
 	}
 	//////////////////////////////////////////////////////////////////////////////
-	// class CommandSetTrigger5200
+	// class BulkSetTrigger5200
 	/// \brief Sets the data array to the default values.
-	CommandSetTrigger5200::CommandSetTrigger5200() : Helper::DataArray<unsigned char>(8) {
+	BulkSetTrigger5200::BulkSetTrigger5200() : Helper::DataArray<unsigned char>(8) {
 		this->init();
 	}
@@ -717,7 +717,7 @@ namespace Hantek {
 	/// \param fastRate The fastRate state.
 	/// \param triggerSlope The triggerSlope value.
 	/// \param triggerPulse The triggerPulse value.
-	CommandSetTrigger5200::CommandSetTrigger5200(unsigned char triggerSource, unsigned char usedChannels, bool fastRate, unsigned char triggerSlope, unsigned char triggerPulse) : Helper::DataArray<unsigned char>(8) {
+	BulkSetTrigger5200::BulkSetTrigger5200(unsigned char triggerSource, unsigned char usedChannels, bool fastRate, unsigned char triggerSlope, unsigned char triggerPulse) : Helper::DataArray<unsigned char>(8) {
 		this->init();
 		this->setTriggerSource(triggerSource);
@@ -729,67 +729,67 @@ namespace Hantek {
 	/// \brief Get the triggerSource value in ETsrBits.
 	/// \return The #TriggerSource value.
-	unsigned char CommandSetTrigger5200::getTriggerSource() {
+	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.
-	void CommandSetTrigger5200::setTriggerSource(unsigned char value) {
+	void BulkSetTrigger5200::setTriggerSource(unsigned char value) {
 		((ETsrBits *) &(this->array[2]))->triggerSource = value;
 	}
 	/// \brief Get the usedChannels value in ETsrBits.
 	/// \return The #UsedChannels value.
-	unsigned char CommandSetTrigger5200::getUsedChannels() {
+	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.
-	void CommandSetTrigger5200::setUsedChannels(unsigned char value) {
+	void BulkSetTrigger5200::setUsedChannels(unsigned char value) {
 		((ETsrBits *) &(this->array[2]))->usedChannels = value;
 	}
 	/// \brief Get the fastRate state in ETsrBits.
 	/// \return The fastRate state (Already inverted).
-	bool CommandSetTrigger5200::getFastRate() {
+	bool BulkSetTrigger5200::getFastRate() {
 		return ((ETsrBits *) &(this->array[2]))->fastRate == 0;
 	}
 	/// \brief Set the fastRate in ETsrBits to the given state.
 	/// \param fastRate The new fastRate state (Automatically inverted).
-	void CommandSetTrigger5200::setFastRate(bool fastRate) {
+	void BulkSetTrigger5200::setFastRate(bool fastRate) {
 		((ETsrBits *) &(this->array[2]))->fastRate = fastRate ? 0 : 1;
 	}
 	/// \brief Get the triggerSlope value in ETsrBits.
 	/// \return The triggerSlope value.
-	unsigned char CommandSetTrigger5200::getTriggerSlope() {
+	unsigned char BulkSetTrigger5200::getTriggerSlope() {
 		return ((ETsrBits *) &(this->array[2]))->triggerSlope;
 	}
 	/// \brief Set the triggerSlope in ETsrBits to the given value.
 	/// \param slope The new triggerSlope value.
-	void CommandSetTrigger5200::setTriggerSlope(unsigned char slope) {
+	void BulkSetTrigger5200::setTriggerSlope(unsigned char slope) {
 		((ETsrBits *) &(this->array[2]))->triggerSlope = slope;
 	}
 	/// \brief Get the triggerPulse state in ETsrBits.
 	/// \return The triggerPulse state.
-	bool CommandSetTrigger5200::getTriggerPulse() {
+	bool BulkSetTrigger5200::getTriggerPulse() {
 		return ((ETsrBits *) &(this->array[2]))->triggerPulse == 1;
 	}
 	/// \brief Set the triggerPulse in ETsrBits to the given state.
 	/// \param pulse The new triggerPulse state.
-	void CommandSetTrigger5200::setTriggerPulse(bool pulse) {
+	void BulkSetTrigger5200::setTriggerPulse(bool pulse) {
 		((ETsrBits *) &(this->array[2]))->triggerPulse = pulse ? 1 : 0;
 	}
 	/// \brief Initialize the array to the needed values.
-	void CommandSetTrigger5200::init() {
-		this->array[0] = COMMAND_SETTRIGGER5200;
+	void BulkSetTrigger5200::init() {
+		this->array[0] = BULK_SETTRIGGER5200;
 		this->array[4] = 0x02;
 	}
 }
@@ -47,10 +47,10 @@
 /// \brief All %Hantek DSO device specific things.
 namespace Hantek {
 	//////////////////////////////////////////////////////////////////////////////
-	/// \enum CommandCode                                           hantek/types.h
+	/// \enum BulkCode                                              hantek/types.h
 	/// \brief All supported bulk commands.
 	/// Indicies given in square brackets specify byte numbers in little endian format.
-	enum CommandCode {
+	enum BulkCode {
 		/// <p>
 		///   This command sets channel and trigger filter:
 		///   <table>
@@ -66,7 +66,7 @@ namespace Hantek {
 		///     </tr>
 		///   </table>
 		/// </p>
-		COMMAND_SETFILTER,
+		BULK_SETFILTER,
 		/// <p>
 		///   This command sets trigger and timebase:
@@ -101,7 +101,7 @@ 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>
-		COMMAND_SETTRIGGERANDSAMPLERATE,
+		BULK_SETTRIGGERANDSAMPLERATE,
 		/// <p>
 		///   This command forces triggering:
@@ -112,7 +112,7 @@ namespace Hantek {
 		///     </tr>
 		///   </table>
 		/// </p>
-		COMMAND_FORCETRIGGER,
+		BULK_FORCETRIGGER,
 		/// <p>
 		///   This command starts to capture data:
@@ -123,7 +123,7 @@ namespace Hantek {
 		///     </tr>
 		///   </table>
 		/// </p>
-		COMMAND_STARTSAMPLING,
+		BULK_STARTSAMPLING,
 		/// <p>
 		///   This command sets the trigger:
@@ -134,7 +134,7 @@ namespace Hantek {
 		///     </tr>
 		///   </table>
 		/// </p>
-		COMMAND_ENABLETRIGGER,
+		BULK_ENABLETRIGGER,
 		/// <p>
 		///   This command reads data from the hardware:
@@ -160,13 +160,27 @@ namespace Hantek {
 		///     </tr>
 		///     <tr>
 		///       <td>Sample[1024]</td>
+		///       <td colspan="2">...</td>
+		///     </tr>
+		///   </table>
+		///   Because of the 10 bit data model, the DSO-5200 transmits the two extra bits for each sample afterwards:
+		///   <table>
+		///     <tr>
+		///       <td>Extra[0] << 2 | Extra[1]</td>
+		///       <td>0</td>
+		///       <td>Extra[2] << 2 | Extra[3]</td>
+		///       <td>0</td>
 		///       <td>...</td>
-		///       <td>...</td>
+		///       <td>Extra[510] << 2 | Extra[511]</td>
+		///       <td>0</td>
+		///     </tr>
+		///     <tr>
+		///       <td>Extra[512] << 2 | Extra[513]</td>
+		///       <td colspan="6">...</td>
 		///     </tr>
 		///   </table>
-		///   Because of the 9 bit data model, the DSO-5200 transmits an additional MSB for each sample afterwards.
 		/// </p>
-		COMMAND_GETDATA,
+		BULK_GETDATA,
 		/// <p>
 		///   This command checks the capture state:
@@ -189,7 +203,7 @@ namespace Hantek {
 		///     </tr>
 		///   </table>
 		/// </p>
-		COMMAND_GETCAPTURESTATE,
+		BULK_GETCAPTURESTATE,
 		/// <p>
 		///   This command sets the gain:
@@ -207,10 +221,10 @@ namespace Hantek {
 		///   </table>
 		///   It is usually used in combination with #CONTROL_SETRELAYS.
 		/// </p>
-		COMMAND_SETGAIN,
+		BULK_SETGAIN,
 		/// <p>
-		///   This command sets the logical data (And what the hell is this?...):
+		///   This command sets the logical data (Not used in official Hantek software):
 		///   <table>
 		///     <tr>
 		///       <td>0x08</td>
@@ -224,10 +238,10 @@ namespace Hantek {
 		///     </tr>
 		///   </table>
 		/// </p>
-		COMMAND_SETLOGICALDATA,
+		BULK_SETLOGICALDATA,
 		/// <p>
-		///   This command reads the logical data (And what the hell is this?...):
+		///   This command reads the logical data (Not used in official Hantek software):
 		///   <table>
 		///     <tr>
 		///       <td>0x09</td>
@@ -236,17 +250,15 @@ namespace Hantek {
 		///   </table>
 		/// </p>
 		/// <p>
-		///   The oscilloscope returns the logical data, which is 64 or 512 bytes long:
+		///   The oscilloscope returns the logical data, which contains valid data in the first byte although it is 64 or 512 bytes long:
 		///   <table>
 		///     <tr>
-		///       <td>?</td>
-		///       <td>?</td>
-		///       <td>?</td>
+		///       <td>Data</td>
 		///       <td>...</td>
 		///     </tr>
 		///   </table>
 		/// </p>
-		COMMAND_GETLOGICALDATA,
+		BULK_GETLOGICALDATA,
 		/// <p>
 		///   This command isn't used for the DSO-2090 and DSO-5200:
@@ -257,7 +269,7 @@ namespace Hantek {
 		///     </tr>
 		///   </table>
 		/// </p>
-		COMMAND_UNKNOWN_0A,
+		BULK_UNKNOWN_0A,
 		/// <p>
 		///   This command isn't used for the DSO-2090 and DSO-5200:
@@ -268,7 +280,7 @@ namespace Hantek {
 		///     </tr>
 		///   </table>
 		/// </p>
-		COMMAND_UNKNOWN_0B,
+		BULK_UNKNOWN_0B,
 		/// <p>
 		///   This command sets the sampling rate for the DSO-5200:
@@ -288,7 +300,7 @@ namespace Hantek {
 		///   <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>
-		COMMAND_SETSAMPLERATE5200,
+		BULK_SETSAMPLERATE5200,
 		/// <p>
 		///   This command sets the trigger position and buffer size for the DSO-5200:
@@ -314,7 +326,7 @@ 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>
-		COMMAND_SETBUFFER5200,
+		BULK_SETBUFFER5200,
 		/// <p>
 		///   This command sets the channel and trigger settings for the DSO-5200:
@@ -331,9 +343,9 @@ namespace Hantek {
 		///     </tr>
 		///   </table>
 		/// </p>
-		COMMAND_SETTRIGGER5200,
+		BULK_SETTRIGGER5200,
-		COMMAND_COUNT ///< Total number of commands
+		BULK_COUNT ///< Total number of commands
 	};
 	//////////////////////////////////////////////////////////////////////////////
@@ -457,16 +469,16 @@ namespace Hantek {
 	enum ControlValue {
 		/// 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>
-		VALUE_CHANNELLEVEL = 0x08,
+		VALUE_OFFSETLIMITS = 0x08,
 		/// Value 0x0a is the address of the device. It has a length of one byte.
 		VALUE_DEVICEADDRESS = 0x0a,
-		/// Value 0x60 seems to be some calibration data with a length of four bytes. What it is good for is unknown so far.
+		/// 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 .
 		VALUE_CALIBRATIONDATA = 0x60,
-		/// Value 0x70 is an additional data that is used on the DSO-5200, it's six bytes long.
-		VALUE_UNKNOWN_70 = 0x70
+		/// Value 0x70 contains correction values for the ETS functionality of the DSO-5200.
+		VALUE_VOLTAGELIMITS = 0x70
 	};
 	//////////////////////////////////////////////////////////////////////////////
@@ -556,13 +568,13 @@ namespace Hantek {
 	};
 	//////////////////////////////////////////////////////////////////////////////
-	/// \enum CommandIndex                                          hantek/types.h
+	/// \enum BulkIndex                                             hantek/types.h
 	/// \brief Can be set by CONTROL_BEGINCOMMAND, maybe it allows multiple commands at the same time?
-	enum CommandIndex {
+	enum BulkIndex {
 		COMMANDINDEX_0 = 0x03, ///< Used most of the time
 		COMMANDINDEX_1 = 0x0a,
 		COMMANDINDEX_2 = 0x09,
-		COMMANDINDEX_3 = 0x01, ///< Used for #COMMAND_SETTRIGGERANDSAMPLERATE sometimes
+		COMMANDINDEX_3 = 0x01, ///< Used for #BULK_SETTRIGGERANDSAMPLERATE sometimes
 		COMMANDINDEX_4 = 0x02,
 		COMMANDINDEX_5 = 0x08
 	};
@@ -586,7 +598,7 @@ namespace Hantek {
 	//////////////////////////////////////////////////////////////////////////////
 	/// \struct FilterBits                                          hantek/types.h
-	/// \brief The bits for COMMAND_SETFILTER.
+	/// \brief The bits for BULK_SETFILTER.
 	struct FilterBits {
 		unsigned char channel1:1; ///< Set to true when channel 1 isn't used
 		unsigned char channel2:1; ///< Set to true when channel 2 isn't used
@@ -596,7 +608,7 @@ namespace Hantek {
 	//////////////////////////////////////////////////////////////////////////////
 	/// \struct GainBits                                            hantek/types.h
-	/// \brief The gain bits for COMMAND_SETGAIN.
+	/// \brief The gain bits for BULK_SETGAIN.
 	struct GainBits {
 		unsigned char channel1:2; ///< Gain for CH1, 0 = 1e* V, 1 = 2e*, 2 = 5e*
 		unsigned char channel2:2; ///< Gain for CH1, 0 = 1e* V, 1 = 2e*, 2 = 5e*
@@ -643,12 +655,12 @@ namespace Hantek {
 	};
 	//////////////////////////////////////////////////////////////////////////////
-	/// \class CommandSetFilter                                     hantek/types.h
-	/// \brief The COMMAND_SETFILTER builder.
-	class CommandSetFilter : public Helper::DataArray<unsigned char> {
+	/// \class BulkSetFilter                                        hantek/types.h
+	/// \brief The BULK_SETFILTER builder.
+	class BulkSetFilter : public Helper::DataArray<unsigned char> {
 		public:
-			CommandSetFilter();
-			CommandSetFilter(bool channel1, bool channel2, bool trigger);
+			BulkSetFilter();
+			BulkSetFilter(bool channel1, bool channel2, bool trigger);
 			bool getChannel(unsigned int channel);
 			void setChannel(unsigned int channel, bool filtered);
@@ -660,12 +672,12 @@ namespace Hantek {
 	};
 	//////////////////////////////////////////////////////////////////////////////
-	/// \class CommandSetTriggerAndSamplerate                       hantek/types.h
-	/// \brief The COMMAND_SETTRIGGERANDSAMPLERATE builder.
-	class CommandSetTriggerAndSamplerate : public Helper::DataArray<unsigned char> {
+	/// \class BulkSetTriggerAndSamplerate                          hantek/types.h
+	/// \brief The BULK_SETTRIGGERANDSAMPLERATE builder.
+	class BulkSetTriggerAndSamplerate : public Helper::DataArray<unsigned char> {
 		public:
-			CommandSetTriggerAndSamplerate();
-			CommandSetTriggerAndSamplerate(unsigned short int samplerateSlow, unsigned long int triggerPosition, unsigned char triggerSource = 0, unsigned char bufferSize = 0, unsigned char samplerateFast = 0, unsigned char usedChannels = 0, bool fastRate = false, unsigned char triggerSlope = 0);
+			BulkSetTriggerAndSamplerate();
+			BulkSetTriggerAndSamplerate(unsigned short int samplerateSlow, unsigned long int triggerPosition, unsigned char triggerSource = 0, unsigned char bufferSize = 0, unsigned char samplerateFast = 0, unsigned char usedChannels = 0, bool fastRate = false, unsigned char triggerSlope = 0);
 			unsigned char getTriggerSource();
 			void setTriggerSource(unsigned char value);
@@ -689,63 +701,63 @@ namespace Hantek {
 	};
 	//////////////////////////////////////////////////////////////////////////////
-	/// \class CommandForceTrigger                                  hantek/types.h
-	/// \brief The COMMAND_FORCETRIGGER builder.
-	class CommandForceTrigger : public Helper::DataArray<unsigned char> {
+	/// \class BulkForceTrigger                                     hantek/types.h
+	/// \brief The BULK_FORCETRIGGER builder.
+	class BulkForceTrigger : public Helper::DataArray<unsigned char> {
 		public:
-			CommandForceTrigger();
+			BulkForceTrigger();
 	};
 	//////////////////////////////////////////////////////////////////////////////
-	/// \class CommandCaptureStart                                  hantek/types.h
-	/// \brief The COMMAND_CAPTURESTART builder.
-	class CommandCaptureStart : public Helper::DataArray<unsigned char> {
+	/// \class BulkCaptureStart                                     hantek/types.h
+	/// \brief The BULK_CAPTURESTART builder.
+	class BulkCaptureStart : public Helper::DataArray<unsigned char> {
 		public:
-			CommandCaptureStart();
+			BulkCaptureStart();
 	};
 	//////////////////////////////////////////////////////////////////////////////
-	/// \class CommandTriggerEnabled                                hantek/types.h
-	/// \brief The COMMAND_TRIGGERENABLED builder.
-	class CommandTriggerEnabled : public Helper::DataArray<unsigned char> {
+	/// \class BulkTriggerEnabled                                   hantek/types.h
+	/// \brief The BULK_TRIGGERENABLED builder.
+	class BulkTriggerEnabled : public Helper::DataArray<unsigned char> {
 		public:
-			CommandTriggerEnabled();
+			BulkTriggerEnabled();
 	};
 	//////////////////////////////////////////////////////////////////////////////
-	/// \class CommandGetData                                       hantek/types.h
-	/// \brief The COMMAND_GETDATA builder.
-	class CommandGetData : public Helper::DataArray<unsigned char> {
+	/// \class BulkGetData                                          hantek/types.h
+	/// \brief The BULK_GETDATA builder.
+	class BulkGetData : public Helper::DataArray<unsigned char> {
 		public:
-			CommandGetData();
+			BulkGetData();
 	};
 	//////////////////////////////////////////////////////////////////////////////
-	/// \class CommandGetCaptureState                               hantek/types.h
-	/// \brief The COMMAND_GETCAPTURESTATE builder.
-	class CommandGetCaptureState : public Helper::DataArray<unsigned char> {
+	/// \class BulkGetCaptureState                                  hantek/types.h
+	/// \brief The BULK_GETCAPTURESTATE builder.
+	class BulkGetCaptureState : public Helper::DataArray<unsigned char> {
 		public:
-			CommandGetCaptureState();
+			BulkGetCaptureState();
 	};
 	//////////////////////////////////////////////////////////////////////////////
-	/// \class ResponseGetCaptureState                              hantek/types.h
-	/// \brief The parser for the COMMAND_GETCAPTURESTATE response.
-	class ResponseGetCaptureState : public Helper::DataArray<unsigned char> {
+	/// \class BulkResponseGetCaptureState                          hantek/types.h
+	/// \brief The parser for the BULK_GETCAPTURESTATE response.
+	class BulkResponseGetCaptureState : public Helper::DataArray<unsigned char> {
 		public:
-			ResponseGetCaptureState();
+			BulkResponseGetCaptureState();
 			CaptureState getCaptureState();
 			unsigned int getTriggerPoint();
 	};
 	//////////////////////////////////////////////////////////////////////////////
-	/// \class CommandSetGain                                       hantek/types.h
-	/// \brief The COMMAND_SETGAIN builder.
-	class CommandSetGain : public Helper::DataArray<unsigned char> {
+	/// \class BulkSetGain                                          hantek/types.h
+	/// \brief The BULK_SETGAIN builder.
+	class BulkSetGain : public Helper::DataArray<unsigned char> {
 		public:
-			CommandSetGain();
-			CommandSetGain(unsigned char channel1, unsigned char channel2);
+			BulkSetGain();
+			BulkSetGain(unsigned char channel1, unsigned char channel2);
 			unsigned char getGain(unsigned int channel);
 			void setGain(unsigned int channel, unsigned char value);
@@ -755,12 +767,12 @@ namespace Hantek {
 	};
 	//////////////////////////////////////////////////////////////////////////////
-	/// \class CommandSetLogicalData                                hantek/types.h
-	/// \brief The COMMAND_SETLOGICALDATA builder.
-	class CommandSetLogicalData : public Helper::DataArray<unsigned char> {
+	/// \class BulkSetLogicalData                                   hantek/types.h
+	/// \brief The BULK_SETLOGICALDATA builder.
+	class BulkSetLogicalData : public Helper::DataArray<unsigned char> {
 		public:
-			CommandSetLogicalData();
-			CommandSetLogicalData(unsigned char data);
+			BulkSetLogicalData();
+			BulkSetLogicalData(unsigned char data);
 			unsigned char getData();
 			void setData(unsigned char data);
@@ -770,11 +782,74 @@ namespace Hantek {
 	};
 	//////////////////////////////////////////////////////////////////////////////
-	/// \class CommandGetLogicalData                                hantek/types.h
-	/// \brief The COMMAND_GETLOGICALDATA builder.
-	class CommandGetLogicalData : public Helper::DataArray<unsigned char> {
+	/// \class BulkGetLogicalData                                   hantek/types.h
+	/// \brief The BULK_GETLOGICALDATA builder.
+	class BulkGetLogicalData : public Helper::DataArray<unsigned char> {
+		public:
+			BulkGetLogicalData();
+	};
+	
+	//////////////////////////////////////////////////////////////////////////////
+	/// \class BulkSetSamplerate5200                                hantek/types.h
+	/// \brief The BULK_SETSAMPLERATE5200 builder.
+	class BulkSetSamplerate5200 : public Helper::DataArray<unsigned char> {
+		public:
+			BulkSetSamplerate5200();
+			BulkSetSamplerate5200(unsigned short int samplerateSlow, unsigned char samplerateFast);
+			
+			unsigned char getSamplerateFast();
+			void setSamplerateFast(unsigned char value);
+			unsigned short int getSamplerateSlow();
+			void setSamplerateSlow(unsigned short int samplerate);
+		
+		private:
+			void init();
+	};
+	
+	//////////////////////////////////////////////////////////////////////////////
+	/// \class BulkSetBuffer5200                                    hantek/types.h
+	/// \brief The BULK_SETBUFFER5200 builder.
+	class BulkSetBuffer5200 : public Helper::DataArray<unsigned char> {
 		public:
-			CommandGetLogicalData();
+			BulkSetBuffer5200();
+			BulkSetBuffer5200(unsigned short int triggerPositionPre, unsigned short int triggerPositionPost, unsigned char usedPre = 0, unsigned char usedPost = 0, unsigned char bufferSize = 0);
+			
+			unsigned short int getTriggerPositionPre();
+			void setTriggerPositionPre(unsigned short int value);
+			unsigned short int getTriggerPositionPost();
+			void setTriggerPositionPost(unsigned short int value);
+			unsigned char getUsedPre();
+			void setUsedPre(unsigned char value);
+			unsigned char getUsedPost();
+			void setUsedPost(unsigned char value);
+			unsigned char getBufferSize();
+			void setBufferSize(unsigned char value);
+		
+		private:
+			void init();
+	};
+	
+	//////////////////////////////////////////////////////////////////////////////
+	/// \class BulkSetTrigger5200                                   hantek/types.h
+	/// \brief The BULK_SETTRIGGER5200 builder.
+	class BulkSetTrigger5200 : public Helper::DataArray<unsigned char> {
+		public:
+			BulkSetTrigger5200();
+			BulkSetTrigger5200(unsigned char triggerSource, unsigned char usedChannels, bool fastRate = false, unsigned char triggerSlope = 0, unsigned char triggerPulse = 0);
+			
+			unsigned char getTriggerSource();
+			void setTriggerSource(unsigned char value);
+			unsigned char getUsedChannels();
+			void setUsedChannels(unsigned char value);
+			bool getFastRate();
+			void setFastRate(bool fastRate);
+			unsigned char getTriggerSlope();
+			void setTriggerSlope(unsigned char slope);
+			bool getTriggerPulse();
+			void setTriggerPulse(bool pulse);
+		
+		private:
+			void init();
 	};
 	//////////////////////////////////////////////////////////////////////////////
@@ -792,10 +867,10 @@ namespace Hantek {
 	/// \brief The CONTROL_BEGINCOMMAND builder.
 	class ControlBeginCommand : public Helper::DataArray<unsigned char> {
 		public:
-			ControlBeginCommand(CommandIndex index = COMMANDINDEX_0);
+			ControlBeginCommand(BulkIndex index = COMMANDINDEX_0);
-			CommandIndex getIndex();
-			void setIndex(CommandIndex index);
+			BulkIndex getIndex();
+			void setIndex(BulkIndex index);
 		private:
 			void init();
@@ -834,69 +909,6 @@ namespace Hantek {
 			bool getTrigger();
 			void setTrigger(bool ext);
 	};
-	
-	//////////////////////////////////////////////////////////////////////////////
-	/// \class CommandSetSamplerate5200                             hantek/types.h
-	/// \brief The COMMAND_SETSAMPLERATE5200 builder.
-	class CommandSetSamplerate5200 : public Helper::DataArray<unsigned char> {
-		public:
-			CommandSetSamplerate5200();
-			CommandSetSamplerate5200(unsigned short int samplerateSlow, unsigned char samplerateFast);
-			
-			unsigned char getSamplerateFast();
-			void setSamplerateFast(unsigned char value);
-			unsigned short int getSamplerateSlow();
-			void setSamplerateSlow(unsigned short int samplerate);
-		
-		private:
-			void init();
-	};
-	
-	//////////////////////////////////////////////////////////////////////////////
-	/// \class CommandSetBuffer5200                                 hantek/types.h
-	/// \brief The COMMAND_SETBUFFER5200 builder.
-	class CommandSetBuffer5200 : public Helper::DataArray<unsigned char> {
-		public:
-			CommandSetBuffer5200();
-			CommandSetBuffer5200(unsigned short int triggerPositionPre, unsigned short int triggerPositionPost, unsigned char usedPre = 0, unsigned char usedPost = 0, unsigned char bufferSize = 0);
-			
-			unsigned short int getTriggerPositionPre();
-			void setTriggerPositionPre(unsigned short int value);
-			unsigned short int getTriggerPositionPost();
-			void setTriggerPositionPost(unsigned short int value);
-			unsigned char getUsedPre();
-			void setUsedPre(unsigned char value);
-			unsigned char getUsedPost();
-			void setUsedPost(unsigned char value);
-			unsigned char getBufferSize();
-			void setBufferSize(unsigned char value);
-		
-		private:
-			void init();
-	};
-	
-	//////////////////////////////////////////////////////////////////////////////
-	/// \class CommandSetTrigger5200                                hantek/types.h
-	/// \brief The COMMAND_SETTRIGGER5200 builder.
-	class CommandSetTrigger5200 : public Helper::DataArray<unsigned char> {
-		public:
-			CommandSetTrigger5200();
-			CommandSetTrigger5200(unsigned char triggerSource, unsigned char usedChannels, bool fastRate = false, unsigned char triggerSlope = 0, unsigned char triggerPulse = 0);
-			
-			unsigned char getTriggerSource();
-			void setTriggerSource(unsigned char value);
-			unsigned char getUsedChannels();
-			void setUsedChannels(unsigned char value);
-			bool getFastRate();
-			void setFastRate(bool fastRate);
-			unsigned char getTriggerSlope();
-			void setTriggerSlope(unsigned char slope);
-			bool getTriggerPulse();
-			void setTriggerPulse(bool pulse);
-		
-		private:
-			void init();
-	};
 }