Skip to content

Commit a029ce8

Browse files
Ho-RoHo-Ro
committed
FW 0207 with new sample rates; timebase 10s/div
Signed-off-by: Martin <Ho-Ro@users.noreply.github.com>
1 parent fa73a8d commit a029ce8

File tree

7 files changed

+283
-319
lines changed

7 files changed

+283
-319
lines changed

‎openhantek/res/firmware/dds120-firmware.hex

+213-255
Large diffs are not rendered by default.

‎openhantek/res/firmware/dso6022be-firmware.hex

+25-23
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
:2003A3008C838EF01213D390E625F074012DFAE43CFB8E078A828B838FF01213D390E624B3
3838
:2003C300F02290E61274D8F090E614E4F090E6D204F08D828C838EF01213D390E621F00D82
3939
:2003E300BD00010C8D828C838EF01213D3FF90E62074075FF08D828C838EF01213D3C423C2
40-
:20040300541F90E64004F002024BAF827E00EE75F005A4FCADF024B8F582ED3416F583E443
41-
:2004230093FBB5070280080EBE14E375820022EC24B8FCED3416FD8C828D83A3A3A3A3E483
40+
:20040300541F90E64004F002024BAF827E00EE75F005A4FCADF024F8F582ED3416F583E403
41+
:2004230093FBB5070280080EBE16E375820022EC24F8FCED3416FD8C828D83A3A3A3A3E441
4242
:200443009390E601F08C828D83A3E493FDA3E493FEA3E493FF75AF07759DE4759E007C2069
4343
:200463008C031CEB60168D828E838FF01213D3FBA3AD82AE8390E67CEBF080E47F608F0633
4444
:200483001FEE600790E67CE4F080F375820122AF82BF00028064BF0103020529BF02030203
@@ -94,28 +94,30 @@
9494
:201438000F0E0000000000000200010000000000505555000000000000000000000000007A
9595
:20145800010100000000000002000100000000005055550000000000000000000000000075
9696
:20147800FAFAFAFAFAF9000002000000000001005055555555555500000000000000000028
97-
:20149800C8C8C700000000000200000100000000505555550000000000000000000000008B
98-
:2014B800FAFAF90000000000020000010000000050555555000000000000000000000000D5
99-
:2014D8009695000000000000020001000000000050555500000000000000000000000000CC
100-
:2014F8000201000000000000020001000000000050555500000000000000000000000000D4
101-
:201518004B4A00000000000002000100000000005055550000000000000000000000000021
102-
:201538000100000000000000020100000000000050550000000000000000000000000000EA
103-
:201558001E1D0000000000000200010000000000505555000000000000000000000000003B
104-
:20157800010100000000000002000100000000005055550000000000000000000000000054
105-
:20159800070700000000000002000100000000005055550000000000000000000000000028
106-
:2015B80001000000000000000201000000000000505500000000000000000000000000006A
107-
:2015D8000504000000000000020001000000000050555500000000000000000000000000ED
108-
:2015F800800000000000000003000000000000000000000000000000000000000000000050
109-
:201618000605000000000000020001000000000050555500000000000000000000000000AA
97+
:20149800FAFAF90000000000020000010000000050555555000000000000000000000000F5
98+
:2014B800C8C8C700000000000200000100000000505555550000000000000000000000006B
99+
:2014D800FAFAF90000000000020000010000000050555555000000000000000000000000B5
100+
:2014F8009695000000000000020001000000000050555500000000000000000000000000AC
101+
:201518000201000000000000020001000000000050555500000000000000000000000000B3
102+
:201538004B4A00000000000002000100000000005055550000000000000000000000000001
103+
:2015580025250000000000000200010000000000505555000000000000000000000000002C
104+
:201578000100000000000000020100000000000050550000000000000000000000000000AA
105+
:201598001E1D000000000000020001000000000050555500000000000000000000000000FB
106+
:2015B800010100000000000002000100000000005055550000000000000000000000000014
107+
:2015D8000707000000000000020001000000000050555500000000000000000000000000E8
108+
:2015F80001000000000000000201000000000000505500000000000000000000000000002A
109+
:201618000504000000000000020001000000000050555500000000000000000000000000AC
110110
:2016380080000000000000000300000000000000000000000000000000000000000000000F
111-
:20165800030200000000000002000100000000005055550000000000000000000000000070
112-
:20167800020200000000000002000100000000005055550000000000000000000000000051
111+
:2016580006050000000000000200010000000000505555000000000000000000000000006A
112+
:201678008000000000000000030000000000000000000000000000000000000000000000CF
113113
:20169800030200000000000002000100000000005055550000000000000000000000000030
114-
:2016B80030381680EA1EF81580AA18B81580CA10781580CA0F3815808A0CF81480CA0A5895
115-
:2016D80014808A08981680CA067816808A055816808A04181680CA03D815808A0298158014
116-
:2016F8008A013814808A965815808A781815808A6ED814808A6AB81480CA699814808A66CC
117-
:041718007814808A37
118-
:203D000012010002FFFFFF40B50422600602010203010A0600020000004001000902890020
114+
:2016B800020200000000000002000100000000005055550000000000000000000000000011
115+
:2016D8000302000000000000020001000000000050555500000000000000000000000000F0
116+
:2016F80030781680EA1E381680AA18F81580CA10B81580CA0F7815808A0C181580CA0A58F3
117+
:2017180014808A08D81680CA06B816808A059816808A04581680CA031816808A02D8158052
118+
:201738008A013814808A969815808A8C5815808A783815808A6EF814808A6AD81480CA6904
119+
:0E175800B814808A689814808A667814808A93
120+
:203D000012010002FFFFFF40B50422600702010203010A060002000000400100090289001F
119121
:203D200001010080FA0904000001FF000000070586020002000904000101FF000100070549
120122
:203D400082010014010904000201FF00010007058201000C010904000301FF000100070502
121123
:203D600082010004010904000401FF000100070582010004020904000501FF0001000705F5
@@ -196,7 +198,7 @@
196198
:2012DC000490E6B3ECF090E6B4EDF02290E6A0E0FF43070190E6A0EFF0227E127F3D90E6A7
197199
:2012FC00B3EFF090E6B47412F02290E6B3E517F090E6B4E516F02290E6A0E0FF4307019062
198200
:05131C00E6A0EFF02245
199-
:200066007900E94400601B7A0090171C780175923CE493F2A308B800020592D9F4DAF275ED
201+
:200066007900E94400601B7A00901766780175923CE493F2A308B800020592D9F4DAF275A3
200202
:0200860092FFE7
201203
:1B13210020F71130F6138883A88220F509F6A8837583002280FEF280F5F022CB
202204
:203F0000020135000214360002142B000201E30002014D0002019800021428000213700048

‎openhantek/res/firmware/dso6022bl-firmware.hex

+25-23
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
:2003A3008D828C838EF01213D890E625F074012DFAE43CFB8E078A828B838FF01213D890A4
3838
:2003C300E624F02290E61274D8F090E614E4F090E6D204F08D828C838EF01213D890E62170
3939
:2003E300F00DBD00010C8D828C838EF01213D8FF90E62074075FF08D828C838EF01213D8A2
40-
:20040300C423541F90E64004F002024BAF827E00EE75F005A4FCADF024BDF582ED3416F5BE
41-
:2004230083E493FBB5070280080EBE14E375820022EC24BDFCED3416FD8C828D83A3A3A39E
40+
:20040300C423541F90E64004F002024BAF827E00EE75F005A4FCADF024FDF582ED3416F57E
41+
:2004230083E493FBB5070280080EBE16E375820022EC24FDFCED3416FD8C828D83A3A3A35C
4242
:20044300A3E49390E601F08C828D83A3E493FDA3E493FEA3E493FF75AF07759DE4759E007E
4343
:200463007C208C031CEB60168D828E838FF01213D8FBA3AD82AE8390E67CEBF080E47F6027
4444
:200483008F061FEE600790E67CE4F080F375820122AF82BF00028064BF010302052BBF0271
@@ -95,28 +95,30 @@
9595
:20143D000F0E00000000000002000100000000005055550000000000000000000000000075
9696
:20145D00010100000000000002000100000000005055550000000000000000000000000070
9797
:20147D00FAFAFAFAFAF9000002000000000001005055555555555500000000000000000023
98-
:20149D00C8C8C7000000000002000001000000005055555500000000000000000000000086
99-
:2014BD00FAFAF90000000000020000010000000050555555000000000000000000000000D0
100-
:2014DD009695000000000000020001000000000050555500000000000000000000000000C7
101-
:2014FD000201000000000000020001000000000050555500000000000000000000000000CF
102-
:20151D004B4A0000000000000200010000000000505555000000000000000000000000001C
103-
:20153D000100000000000000020100000000000050550000000000000000000000000000E5
104-
:20155D001E1D00000000000002000100000000005055550000000000000000000000000036
105-
:20157D0001010000000000000200010000000000505555000000000000000000000000004F
106-
:20159D00070700000000000002000100000000005055550000000000000000000000000023
107-
:2015BD00010000000000000002010000000000005055000000000000000000000000000065
108-
:2015DD000504000000000000020001000000000050555500000000000000000000000000E8
109-
:2015FD0080000000000000000300000000000000000000000000000000000000000000004B
110-
:20161D000605000000000000020001000000000050555500000000000000000000000000A5
98+
:20149D00FAFAF90000000000020000010000000050555555000000000000000000000000F0
99+
:2014BD00C8C8C7000000000002000001000000005055555500000000000000000000000066
100+
:2014DD00FAFAF90000000000020000010000000050555555000000000000000000000000B0
101+
:2014FD009695000000000000020001000000000050555500000000000000000000000000A7
102+
:20151D000201000000000000020001000000000050555500000000000000000000000000AE
103+
:20153D004B4A000000000000020001000000000050555500000000000000000000000000FC
104+
:20155D00252500000000000002000100000000005055550000000000000000000000000027
105+
:20157D000100000000000000020100000000000050550000000000000000000000000000A5
106+
:20159D001E1D000000000000020001000000000050555500000000000000000000000000F6
107+
:2015BD0001010000000000000200010000000000505555000000000000000000000000000F
108+
:2015DD000707000000000000020001000000000050555500000000000000000000000000E3
109+
:2015FD00010000000000000002010000000000005055000000000000000000000000000025
110+
:20161D000504000000000000020001000000000050555500000000000000000000000000A7
111111
:20163D0080000000000000000300000000000000000000000000000000000000000000000A
112-
:20165D0003020000000000000200010000000000505555000000000000000000000000006B
113-
:20167D0002020000000000000200010000000000505555000000000000000000000000004C
112+
:20165D00060500000000000002000100000000005055550000000000000000000000000065
113+
:20167D008000000000000000030000000000000000000000000000000000000000000000CA
114114
:20169D0003020000000000000200010000000000505555000000000000000000000000002B
115-
:2016BD00303D1680EA1EFD1580AA18BD1580CA107D1580CA0F3D15808A0CFD1480CA0A5D6D
116-
:2016DD0014808A089D1680CA067D16808A055D16808A041D1680CA03DD15808A029D1580F1
117-
:2016FD008A013D14808A965D15808A781D15808A6EDD14808A6ABD1480CA699D14808A66A9
118-
:04171D007D14808A2D
119-
:203D000012010002FFFFFF40B5042A600602010203010A0600020000004001000902890018
115+
:2016BD0002020000000000000200010000000000505555000000000000000000000000000C
116+
:2016DD000302000000000000020001000000000050555500000000000000000000000000EB
117+
:2016FD00307D1680EA1E3D1680AA18FD1580CA10BD1580CA0F7D15808A0C1D1580CA0A5DCB
118+
:20171D0014808A08DD1680CA06BD16808A059D16808A045D1680CA031D16808A02DD15802F
119+
:20173D008A013D14808A969D15808A8C5D15808A783D15808A6EFD14808A6ADD1480CA69E1
120+
:0E175D00BD14808A689D14808A667D14808A7F
121+
:203D000012010002FFFFFF40B5042A600702010203010A0600020000004001000902890017
120122
:203D200001010080FA0904000001FF000000070586020002000904000101FF000100070549
121123
:203D400082010014010904000201FF00010007058201000C010904000301FF000100070502
122124
:203D600082010004010904000401FF000100070582010004020904000501FF0001000705F5
@@ -197,7 +199,7 @@
197199
:2012E1000490E6B3ECF090E6B4EDF02290E6A0E0FF43070190E6A0EFF0227E127F3D90E6A2
198200
:20130100B3EFF090E6B47412F02290E6B3E517F090E6B4E516F02290E6A0E0FF430701905C
199201
:05132100E6A0EFF02240
200-
:200066007900E94400601B7A00901721780175923CE493F2A308B800020592D9F4DAF275E8
202+
:200066007900E94400601B7A0090176B780175923CE493F2A308B800020592D9F4DAF2759E
201203
:0200860092FFE7
202204
:1B13260020F71130F6138883A88220F509F6A8837583002280FEF280F5F022C6
203205
:203F00000201350002143B00021430000201E30002014D000201980002142D000213750034

‎openhantek/src/OH_BUILD.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
// Do not edit, will be re-created at each commit!
2-
#define OH_BUILD "20200615 build 704"
2+
#define OH_BUILD "20200616 build 705"

‎openhantek/src/configdialog/DsoConfigScopePage.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ DsoConfigScopePage::DsoConfigScopePage( DsoSettings *settings, QWidget *parent )
1212
maxTimebaseSiSpinBox = new SiSpinBox();
1313
maxTimebaseSiSpinBox = new SiSpinBox( UNIT_SECONDS );
1414
maxTimebaseSiSpinBox->setSteps( timebaseSteps );
15-
maxTimebaseSiSpinBox->setMinimum( 0.1 ); // default 100 ms/div
16-
maxTimebaseSiSpinBox->setMaximum( 5.0 ); // possible steps: 200, 500, 1000, 2000, 5000 ms
15+
maxTimebaseSiSpinBox->setMinimum( 0.1 ); // default 100 ms/div
16+
maxTimebaseSiSpinBox->setMaximum( 10.0 ); // possible steps: 200, 500, 1000, 2000, 5000, 10000 ms
1717
maxTimebaseSiSpinBox->setValue( settings->scope.horizontal.maxTimebase );
1818

1919
acquireIntervalLabel = new QLabel( tr( "Minimal time between captured frames<br/>(Longer times reduce the CPU load)" ) );

‎openhantek/src/hantekdso/models/modelDEMO.cpp

+6-5
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,12 @@ static void initSpecifications( Dso::ControlSpecification &specification ) {
8686

8787
specification.fixedSampleRates = {
8888
// samplerate, sampleId, downsampling
89-
{200, 102, 100}, // very slow! 100x downsampling from 20, 50 kS/s
90-
{500, 105, 100}, // very slow!
91-
{1e3, 110, 100}, // slow! 100x downsampling from 100, 200, 500 kS/s!
92-
{2e3, 120, 100}, // slow!
93-
{5e3, 150, 100}, // slow!
89+
{100, 102, 200}, // very slow! 200x downsampling from 20 kS/s
90+
{200, 104, 200}, // very slow! 200x downsampling from 40 kS/s
91+
{500, 110, 200}, // very slow! 200x downsampling from 100 kS/s
92+
{1e3, 120, 200}, // slow! 200x downsampling from 200 kS/s
93+
{2e3, 140, 200}, // slow! 200x downsampling from 400 kS/s
94+
{5e3, 1, 200}, // slow! 200x downsampling from 1 MS/s
9495
{10e3, 1, 100}, // 100x downsampling from 1, 2, 5, 10 MS/s
9596
{20e3, 2, 100}, //
9697
{50e3, 5, 100}, //

‎openhantek/src/hantekdso/models/modelDSO6022.cpp

+11-10
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,12 @@ static void initSpecifications( Dso::ControlSpecification &specification ) {
107107

108108
specification.fixedSampleRates = {
109109
// samplerate, sampleId, downsampling
110-
{200, 102, 100}, // very slow! 100x downsampling from 20 kS/s
111-
{500, 105, 100}, // very slow! 100x downsampling from 50 kS/s
112-
{1e3, 110, 100}, // slow! 100x downsampling from 100, 200, 500 kS/s
113-
{2e3, 120, 100}, // slow!
114-
{5e3, 150, 100}, // slow!
110+
{100, 102, 200}, // very slow! 200x downsampling from 20 kS/s
111+
{200, 104, 200}, // very slow! 200x downsampling from 40 kS/s
112+
{500, 110, 200}, // very slow! 200x downsampling from 100 kS/s
113+
{1e3, 120, 200}, // slow! 200x downsampling from 200 kS/s
114+
{2e3, 140, 200}, // slow! 200x downsampling from 400 kS/s
115+
{5e3, 1, 200}, // slow! 200x downsampling from 1 MS/s
115116
{10e3, 1, 100}, // 100x downsampling from 1, 2, 5, 10 MS/s
116117
{20e3, 2, 100}, //
117118
{50e3, 5, 100}, //
@@ -164,7 +165,7 @@ static void applyRequirements_( HantekDsoControl *dsoControl ) {
164165
// VID/PID active VID/PID no FW FW ver FW name Scope name
165166
// |------------| |------------| |----| |---------| |----------|
166167
ModelDSO6022BE::ModelDSO6022BE()
167-
: DSOModel( ID, 0x04b5, 0x6022, 0x04b4, 0x6022, 0x0206, "dso6022be", "DSO-6022BE", Dso::ControlSpecification( 2 ) ) {
168+
: DSOModel( ID, 0x04b5, 0x6022, 0x04b4, 0x6022, 0x0207, "dso6022be", "DSO-6022BE", Dso::ControlSpecification( 2 ) ) {
168169
initSpecifications( specification );
169170
}
170171

@@ -173,7 +174,7 @@ void ModelDSO6022BE::applyRequirements( HantekDsoControl *dsoControl ) const { a
173174

174175
// Hantek DSO-6022BL (scope or logic analyzer)
175176
ModelDSO6022BL::ModelDSO6022BL()
176-
: DSOModel( ID, 0x04b5, 0x602a, 0x04b4, 0x602a, 0x0206, "dso6022bl", "DSO-6022BL", Dso::ControlSpecification( 2 ) ) {
177+
: DSOModel( ID, 0x04b5, 0x602a, 0x04b4, 0x602a, 0x0207, "dso6022bl", "DSO-6022BL", Dso::ControlSpecification( 2 ) ) {
177178
initSpecifications( specification );
178179
}
179180

@@ -183,7 +184,7 @@ void ModelDSO6022BL::applyRequirements( HantekDsoControl *dsoControl ) const { a
183184
// Voltcraft DSO-2020 USB Oscilloscope (HW is identical to 6022)
184185
// Scope starts up as model DS-2020 (VID/PID = 04b4/2020) but loads 6022BE firmware and looks like a 6022BE
185186
ModelDSO2020::ModelDSO2020()
186-
: DSOModel( ID, 0x04b5, 0x6022, 0x04b4, 0x2020, 0x0206, "dso6022be", "DSO-2020", Dso::ControlSpecification( 2 ) ) {
187+
: DSOModel( ID, 0x04b5, 0x6022, 0x04b4, 0x2020, 0x0207, "dso6022be", "DSO-2020", Dso::ControlSpecification( 2 ) ) {
187188
initSpecifications( specification );
188189
}
189190

@@ -202,7 +203,7 @@ static ModelSaleae modelInstance_Saleae;
202203

203204
// LCSOFT without EEPROM reports EzUSB VID/PID
204205
ModelEzUSB::ModelEzUSB()
205-
: DSOModel( ID, 0x04b5, 0x6022, 0x04b4, 0x8613, 0x0206, "dso6022be", "LCsoft-EzUSB", Dso::ControlSpecification( 2 ) ) {
206+
: DSOModel( ID, 0x04b5, 0x6022, 0x04b4, 0x8613, 0x0207, "dso6022be", "LCsoft-EzUSB", Dso::ControlSpecification( 2 ) ) {
206207
initSpecifications( specification );
207208
specification.hasCalibrationEEPROM = false; // (big) EEPROM, disabled by address jumper
208209
}
@@ -212,7 +213,7 @@ void ModelEzUSB::applyRequirements( HantekDsoControl *dsoControl ) const { apply
212213

213214
// Saleae VID/PID in EEPROM
214215
ModelSaleae::ModelSaleae()
215-
: DSOModel( ID, 0x04b5, 0x6022, 0x0925, 0x3881, 0x0206, "dso6022be", "LCsoft-Saleae", Dso::ControlSpecification( 2 ) ) {
216+
: DSOModel( ID, 0x04b5, 0x6022, 0x0925, 0x3881, 0x0207, "dso6022be", "LCsoft-Saleae", Dso::ControlSpecification( 2 ) ) {
216217
initSpecifications( specification );
217218
specification.hasCalibrationEEPROM = false; // we have a big EEPROM
218219
}

0 commit comments

Comments
 (0)