Bugfixes

oliverhaag
1 parent dfda706a
Showing 3 changed files with 8 additions and 2 deletions
openhantek/ChangeLog
openhantek/src/hantek/control.cpp
openhantek/src/openhantek.cpp
@@ -144,6 +144,10 @@
 * Updated documentation with first DSO-2250 details
 * General documentation improvements
  
-2012-09-01 Oliver Haag  <oliver.haag@gmail.com>
+2012-09-20 Oliver Haag  <oliver.haag@gmail.com>
 * First attempt to add DSO-2250 support
 * More documentation updates
+
+2012-09-21 Oliver Haag  <oliver.haag@gmail.com>
+* Bugfix: Uninitialized bulk command pointer for BULK_FSETBUFFER
+* Bugfix: Slot setTriggerPosition wasn't renamed
@@ -583,6 +583,7 @@ namespace Hantek {
 				this->command[BULK_CSETTRIGGERORSAMPLERATE] = new BulkSetTrigger2250();
 				this->command[BULK_DSETBUFFER] = new BulkSetRecordLength2250();
 				this->command[BULK_ESETTRIGGERORSAMPLERATE] = new BulkSetSamplerate2250();
+				this->command[BULK_FSETBUFFER] = new BulkSetBuffer2250();
 				this->specification.command.bulk.setRecordLength = BULK_DSETBUFFER;
 				this->specification.command.bulk.setFilter = BULK_BSETFILTER;
 				this->specification.command.bulk.setSamplerate = BULK_ESETTRIGGERORSAMPLERATE;
@@ -593,6 +594,7 @@ namespace Hantek {
 				this->commandPending[BULK_CSETTRIGGERORSAMPLERATE] = true;
 				this->commandPending[BULK_DSETBUFFER] = true;
 				this->commandPending[BULK_ESETTRIGGERORSAMPLERATE] = true;
+				this->commandPending[BULK_FSETBUFFER] = true;
  
 				break;
  
@@ -110,7 +110,7 @@ OpenHantekMainWindow::OpenHantekMainWindow(QWidget *parent, Qt::WindowFlags flag
 	connect(this->triggerDock, SIGNAL(sourceChanged(bool, unsigned int)), this->dsoWidget, SLOT(updateTriggerSource()));
 	connect(this->triggerDock, SIGNAL(slopeChanged(Dso::Slope)), this->dsoControl, SLOT(setTriggerSlope(Dso::Slope)));
 	connect(this->triggerDock, SIGNAL(slopeChanged(Dso::Slope)), this->dsoWidget, SLOT(updateTriggerSlope()));
-	connect(this->dsoWidget, SIGNAL(triggerPositionChanged(double)), this->dsoControl, SLOT(setTriggerPosition(double)));
+	connect(this->dsoWidget, SIGNAL(triggerPositionChanged(double)), this->dsoControl, SLOT(setPretriggerPosition(double)));
 	connect(this->dsoWidget, SIGNAL(triggerLevelChanged(unsigned int, double)), this->dsoControl, SLOT(setTriggerLevel(unsigned int, double)));
  
 	connect(this->voltageDock, SIGNAL(usedChanged(unsigned int, bool)), this, SLOT(updateUsed(unsigned int)));