diff --git a/openhantek/ChangeLog b/openhantek/ChangeLog index 399e155..a32f3cd 100644 --- a/openhantek/ChangeLog +++ b/openhantek/ChangeLog @@ -144,6 +144,10 @@ * Updated documentation with first DSO-2250 details * General documentation improvements -2012-09-01 Oliver Haag +2012-09-20 Oliver Haag * First attempt to add DSO-2250 support * More documentation updates + +2012-09-21 Oliver Haag +* Bugfix: Uninitialized bulk command pointer for BULK_FSETBUFFER +* Bugfix: Slot setTriggerPosition wasn't renamed diff --git a/openhantek/src/hantek/control.cpp b/openhantek/src/hantek/control.cpp index 70bb394..872304e 100644 --- a/openhantek/src/hantek/control.cpp +++ b/openhantek/src/hantek/control.cpp @@ -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; diff --git a/openhantek/src/openhantek.cpp b/openhantek/src/openhantek.cpp index 96b3e97..6ee88fd 100644 --- a/openhantek/src/openhantek.cpp +++ b/openhantek/src/openhantek.cpp @@ -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)));