Bugfix in Hantek::Control::setOffset, thanks to tinosnitso for reporting

oliverhaag
1 parent 15b7950a
Showing 2 changed files with 4 additions and 1 deletions
openhantek/ChangeLog
openhantek/src/hantek/control.cpp
@@ -130,3 +130,6 @@
 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
+
+2011-11-16 Oliver Haag  <oliver.haag@gmail.com>
+* Bugfix: Copy-paste in Hantek::Control::setOffset, thanks to tinosnitso
@@ -890,7 +890,7 @@ 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->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 maximum = ((unsigned short int) *((unsigned char *) &(this->specification.offsetLimit[channel][this->settings.voltage[channel].gain][OFFSET_END])) << 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);