Commit 63d526194c5de77cffd2f16dfd360a74ea3ad5e4
1 parent
2ae4b439
DSO-2250 fix
Showing
2 changed files
with
5 additions
and
4 deletions
openhantek/ChangeLog
| @@ -180,3 +180,6 @@ | @@ -180,3 +180,6 @@ | ||
| 180 | 2012-11-05 Oliver Haag <oliver.haag@gmail.com> | 180 | 2012-11-05 Oliver Haag <oliver.haag@gmail.com> |
| 181 | * Added new SiSpinBox | 181 | * Added new SiSpinBox |
| 182 | * Replaced ComboBox with SiSpinBox for time- and frequencybase | 182 | * Replaced ComboBox with SiSpinBox for time- and frequencybase |
| 183 | + | ||
| 184 | +2012-11-21 Oliver Haag <oliver.haag@gmail.com> | ||
| 185 | +* Bugfix: DSO-2250 detection failed |
openhantek/src/hantek/device.cpp
| @@ -40,10 +40,8 @@ namespace Hantek { | @@ -40,10 +40,8 @@ namespace Hantek { | ||
| 40 | /// \param parent The parent widget. | 40 | /// \param parent The parent widget. |
| 41 | Device::Device(QObject *parent) : QObject(parent) { | 41 | Device::Device(QObject *parent) : QObject(parent) { |
| 42 | // Product ids and names for the Model enum | 42 | // Product ids and names for the Model enum |
| 43 | - this->modelIds << 0x2090 << 0x2100 << 0x2150 << 0x2250 | ||
| 44 | - << 0x5200 << 0x520A; | ||
| 45 | - this->modelStrings << "DSO-2090" << "DSO-2100" << "DSO-2150" << "DSO-2250" | ||
| 46 | - << "DSO-5200" << "DSO-5200A"; | 43 | + this->modelIds << 0x2090 << 0x2150 << 0x2250 << 0x5200 << 0x520A; |
| 44 | + this->modelStrings << "DSO-2090" << "DSO-2150" << "DSO-2250" << "DSO-5200" << "DSO-5200A"; | ||
| 47 | this->model = MODEL_UNKNOWN; | 45 | this->model = MODEL_UNKNOWN; |
| 48 | 46 | ||
| 49 | this->beginCommandControl = new ControlBeginCommand(); | 47 | this->beginCommandControl = new ControlBeginCommand(); |