Skip to content

Commit ffc3fc1

Browse files
committed
minor corrections/improvement
Signed-off-by: Martin <Ho-Ro@users.noreply.github.com>
1 parent e83fa10 commit ffc3fc1

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

.travis.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,12 @@ script:
5353
- ls -l openhantek || true
5454

5555
before_deploy:
56-
- if test -d openhantek/OpenHantek.dmg; then
56+
- if test -d openhantek/OpenHantek.app; then
5757
cd openhantek ;
5858
sudo tar -cvzf ../packages/openhantek_*_osx_*.tar.gz OpenHantek.app ;
59-
sudo mv OpenHantek.dmg ../packages/$(basename ../packages/openhantek_*_osx_*.tar.gz .tar.gz).dmg ;
59+
if test -f OpenHantek.dmg ; then
60+
sudo mv OpenHantek.dmg ../packages/$(basename ../packages/openhantek_*_osx_*.tar.gz .tar.gz).dmg ;
61+
fi ;
6062
cd .. ;
6163
else
6264
true;

docs/limitations.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ layout: default
55

66
- The device has no internal storage (except for a small fifo buffer), all data is streamed in real time as USB bulk transfer.
77
- Supports 48, 30, 24, 16, 15, 12, 10, 8, 6, 5, 4, 3, 2, 1 MS/s and 500, 200, 100, 60 kS/s samplerates.
8-
- Due to the USB bandwith constraints the max usable samplerate is limited: Max 30 MS/s for CH1 only and max 16 MS/s for CH1+CH2 and also CH2 only - otherwise data overrun occurs.
8+
- Due to the USB bandwith constraints the max usable samplerate is limited: Max 30 MS/s for CH1 only and max 15 MS/s for CH1+CH2 and also CH2 only - otherwise data overrun occurs.
99
- The scope program works with blocks of 20000 samples - either 8 bit samples for CH1 only or 16 bit samples otherwise.
1010
- Two analog input channels with 8-bit sample-width, max input voltage range is -5 V..+5 V, values outside this range are clipped (shown as minimum or maximum value).
1111
- For low effective sampling rates < 1 MS/s a 10X..100X oversampling is used to increase the signal-to-noise ratio by 10..20 dB and to get a better voltage resolution (up to > 11 effective bits).
1212
- The first samples are unstable (due to the use of the ADC far outside the common mode voltage specifications) -> take about 2000 additional values to settle the ADC and drop the first samples.
1313
- No AC coupling available, all signals are measured as DC. (Use either a BNC DC-block or the math mode "CHx AC").
14+
- A [little HW modification](HANTEK6022_AC_Modification.pdf) adds AC coupling. OpenHantek6022 supports this feature since v2.17-rc5 / FW0204.
1415
- No HW trigger available, SW trigger seaches for trigger condition and positions the trace window accordingly.
1516
- Can detect rising or falling edge (also alternating from trace to trace) of the signal, displayed trigger position can be at 0..100% of screen width.
1617
- At fast timebase settings (<1µs/div) only few sampled values are available on screen. In these cases a bandlimited sinc interpolation creates additional points in between without adding spectral components outside the Nyquist frequency band.

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 "20191105 build 537"
2+
#define OH_BUILD "20191105 build 538"

openhantek/src/OH_VERSION.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// define the version that is shown on top of the program
22
// if undefined (for development commits) the build will be shown by OpenHantek
33

4-
#define OH_VERSION "v2.17-rc6"
4+
//#define OH_VERSION "v2.17-rc7"
55

66

77
# ifdef OH_VERSION

readme.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ After David [stopped maintaining](https://github.com/OpenHantek/openhantek/issue
1717

1818
<p><img alt="Image of main window on linux" width="100%" src="docs/images/screenshot_mainwindow.png"></p>
1919

20-
* Supported devices: Hantek 6022BE and 6022BL as well as compatible scopes (e.g. Voltcraft DSO-2020).
20+
* Supported devices: Hantek 6022BE and 6022BL as well as compatible scopes (e.g. Voltcraft DSO-2020) and SainSmart DDS120 (thx [msiegert](https://github.com/msiegert)).
2121
* Fully supported operating system: Linux; developed under debian stable for amd64 architecture.
2222
* Raspberry Pi packages (raspbian stable) are available on the [Releases](https://github.com/OpenHantek/OpenHantek6022/releases) page.
2323
* Compiles under FreeBSD (packaging / installation: work in progress, thx [tspspi](https://github.com/tspspi)).
@@ -60,7 +60,6 @@ After David [stopped maintaining](https://github.com/OpenHantek/openhantek/issue
6060
* [Download (untested) Windows build from last commit](https://ci.appveyor.com/project/Ho-Ro/openhantek6022/build/artifacts).
6161
* The MacOSX archive from Releases contains only the dynamic linked binary, you have to provide the necessary libraries on your own! Please have a look at the [build instructions](docs/build.md#apple).
6262

63-
6463
## Building OpenHantek from source
6564
You need the following software, to build OpenHantek from source:
6665
* [CMake 3.5+](https://cmake.org/download/)
@@ -85,7 +84,7 @@ The original Hantek driver doesn't work.
8584
## Important!
8685
The scope doesn't store the firmware permanently in flash or eeprom, it must be uploaded after each power-up and is kept in ram 'til power-down.
8786
If the scope was used with a different software (old openhantek, sigrok or the windows software) the scope must be unplugged and replugged one-time before using it with OpenHantek6022 to enable the automatic loading of the correct firmware.
88-
The top line of the program must display the correct firmware version (FW0202).
87+
The top line of the program must display the correct firmware version (FW0204).
8988

9089
## Specifications, features, limitations and developer documentation
9190
I use this project mainly to explore how DSP can improve and extend the [limitations](docs/limitations.md) of this kind of low level hardware. It would have been easy to spend a few bucks more to buy a powerful scope - but it would be much less fun :)

0 commit comments

Comments
 (0)