Commit 55bcdc0fc6741527cb9e006793bc87f67207e7d3
1 parent
dfda706a
Bugfixes
Showing
3 changed files
with
8 additions
and
2 deletions
openhantek/ChangeLog
| @@ -144,6 +144,10 @@ | @@ -144,6 +144,10 @@ | ||
| 144 | * Updated documentation with first DSO-2250 details | 144 | * Updated documentation with first DSO-2250 details |
| 145 | * General documentation improvements | 145 | * General documentation improvements |
| 146 | 146 | ||
| 147 | -2012-09-01 Oliver Haag <oliver.haag@gmail.com> | 147 | +2012-09-20 Oliver Haag <oliver.haag@gmail.com> |
| 148 | * First attempt to add DSO-2250 support | 148 | * First attempt to add DSO-2250 support |
| 149 | * More documentation updates | 149 | * More documentation updates |
| 150 | + | ||
| 151 | +2012-09-21 Oliver Haag <oliver.haag@gmail.com> | ||
| 152 | +* Bugfix: Uninitialized bulk command pointer for BULK_FSETBUFFER | ||
| 153 | +* Bugfix: Slot setTriggerPosition wasn't renamed |
openhantek/src/hantek/control.cpp
| @@ -583,6 +583,7 @@ namespace Hantek { | @@ -583,6 +583,7 @@ namespace Hantek { | ||
| 583 | this->command[BULK_CSETTRIGGERORSAMPLERATE] = new BulkSetTrigger2250(); | 583 | this->command[BULK_CSETTRIGGERORSAMPLERATE] = new BulkSetTrigger2250(); |
| 584 | this->command[BULK_DSETBUFFER] = new BulkSetRecordLength2250(); | 584 | this->command[BULK_DSETBUFFER] = new BulkSetRecordLength2250(); |
| 585 | this->command[BULK_ESETTRIGGERORSAMPLERATE] = new BulkSetSamplerate2250(); | 585 | this->command[BULK_ESETTRIGGERORSAMPLERATE] = new BulkSetSamplerate2250(); |
| 586 | + this->command[BULK_FSETBUFFER] = new BulkSetBuffer2250(); | ||
| 586 | this->specification.command.bulk.setRecordLength = BULK_DSETBUFFER; | 587 | this->specification.command.bulk.setRecordLength = BULK_DSETBUFFER; |
| 587 | this->specification.command.bulk.setFilter = BULK_BSETFILTER; | 588 | this->specification.command.bulk.setFilter = BULK_BSETFILTER; |
| 588 | this->specification.command.bulk.setSamplerate = BULK_ESETTRIGGERORSAMPLERATE; | 589 | this->specification.command.bulk.setSamplerate = BULK_ESETTRIGGERORSAMPLERATE; |
| @@ -593,6 +594,7 @@ namespace Hantek { | @@ -593,6 +594,7 @@ namespace Hantek { | ||
| 593 | this->commandPending[BULK_CSETTRIGGERORSAMPLERATE] = true; | 594 | this->commandPending[BULK_CSETTRIGGERORSAMPLERATE] = true; |
| 594 | this->commandPending[BULK_DSETBUFFER] = true; | 595 | this->commandPending[BULK_DSETBUFFER] = true; |
| 595 | this->commandPending[BULK_ESETTRIGGERORSAMPLERATE] = true; | 596 | this->commandPending[BULK_ESETTRIGGERORSAMPLERATE] = true; |
| 597 | + this->commandPending[BULK_FSETBUFFER] = true; | ||
| 596 | 598 | ||
| 597 | break; | 599 | break; |
| 598 | 600 |
openhantek/src/openhantek.cpp
| @@ -110,7 +110,7 @@ OpenHantekMainWindow::OpenHantekMainWindow(QWidget *parent, Qt::WindowFlags flag | @@ -110,7 +110,7 @@ OpenHantekMainWindow::OpenHantekMainWindow(QWidget *parent, Qt::WindowFlags flag | ||
| 110 | connect(this->triggerDock, SIGNAL(sourceChanged(bool, unsigned int)), this->dsoWidget, SLOT(updateTriggerSource())); | 110 | connect(this->triggerDock, SIGNAL(sourceChanged(bool, unsigned int)), this->dsoWidget, SLOT(updateTriggerSource())); |
| 111 | connect(this->triggerDock, SIGNAL(slopeChanged(Dso::Slope)), this->dsoControl, SLOT(setTriggerSlope(Dso::Slope))); | 111 | connect(this->triggerDock, SIGNAL(slopeChanged(Dso::Slope)), this->dsoControl, SLOT(setTriggerSlope(Dso::Slope))); |
| 112 | connect(this->triggerDock, SIGNAL(slopeChanged(Dso::Slope)), this->dsoWidget, SLOT(updateTriggerSlope())); | 112 | connect(this->triggerDock, SIGNAL(slopeChanged(Dso::Slope)), this->dsoWidget, SLOT(updateTriggerSlope())); |
| 113 | - connect(this->dsoWidget, SIGNAL(triggerPositionChanged(double)), this->dsoControl, SLOT(setTriggerPosition(double))); | 113 | + connect(this->dsoWidget, SIGNAL(triggerPositionChanged(double)), this->dsoControl, SLOT(setPretriggerPosition(double))); |
| 114 | connect(this->dsoWidget, SIGNAL(triggerLevelChanged(unsigned int, double)), this->dsoControl, SLOT(setTriggerLevel(unsigned int, double))); | 114 | connect(this->dsoWidget, SIGNAL(triggerLevelChanged(unsigned int, double)), this->dsoControl, SLOT(setTriggerLevel(unsigned int, double))); |
| 115 | 115 | ||
| 116 | connect(this->voltageDock, SIGNAL(usedChanged(unsigned int, bool)), this, SLOT(updateUsed(unsigned int))); | 116 | connect(this->voltageDock, SIGNAL(usedChanged(unsigned int, bool)), this, SLOT(updateUsed(unsigned int))); |