Voltage dock math improves attenuation voltage

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,43 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+**IMPORTANT:** Always unplug and replug the scope if used before with a different application, e.g. sigrok or the original Hantek software.
+
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Select '....'
+3. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots or a video to help explain your problem.
+
+**Computer environment (please complete the following information):**
+ - OpenHantek version: [use always the latest commit, e.g. *release v2.03, commit 1a2b3c4, ...*]
+ - OS: [e.g. *linux, macOS, windows, ...*]
+ - Distribution, version: [e.g. *debian stable amd64, ...*]
+ - Video hardware: [e.g. *Intel Xeon ... Integrated Graphics*]
+ - OpenGL version: [e.g. *OpenGL 4.5, Mesa 19.0.3*]
+ - Qt version: [e.g. *Qt 5.11.x*]
+ - C++ compiler version: [e.g. *gcc 8.3.x*]
+
+**Scope device (please complete the following information):**
+ - Device [e.g. *Hantek 6022BE, ...*]
+ - Program top line [e.g. *OpenHantek6022 (Build ...) - Device ... (FW ...)*]
+ - Input signal: [e.g. *calibration out 1 kHz, sine wave 1 Veff @ 50 Hz, ...*]
+ - Probe setting: [e.g. *no probe, probe X1, probe X10, ...*]
+
+**Additional context**
+Add any other context about the problem here, e.g. the program output if started in a console like xterm.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitignore

@@ -2,6 +2,16 @@
 .o
 .so
 .*~
+*~
+*.orig
+*.new
+*.diff
 CMakeLists.txt.user
-build/
+build*
 firmware/hex
+*.json
+*.kate-swp
+.directory
+*.autosave
+ui_*.h
+*.sh

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "macdeployqtfix"]
+	path = utils/macdeployqtfix
+	url = https://github.com/iltommi/macdeployqtfix

.travis.yml

@@ -1,38 +1,67 @@
 language: cpp
-dist: xenial
+dist: bionic
 
 addons:
   apt:
     packages:
     - qtbase5-dev
-    - qttools5-dev-tools
+    - qttools5-dev
     - libqt5opengl5-dev
     - libusb-1.0-0-dev
     - libfftw3-dev
+    - binutils-dev
+    - rpm
 
 matrix:
   include:
     - compiler: gcc
-      env: CMAKE_CXX_COMPILER=g++-5
+      env: CMAKE_CXX_COMPILER=/usr/bin/g++
       os: linux
     - compiler: clang
       env: CMAKE_CXX_COMPILER=/usr/bin/clang++
       os: osx
-  
+
 before_install:
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install qt5 fftw binutils; export CMAKE_PREFIX_PATH=$(brew --prefix qt5); fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+          brew update; brew install qt5 fftw binutils create-dmg ;
+          export CMAKE_PREFIX_PATH=$(brew --prefix qt5) ;
+          echo "CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}" ;
+      fi
     - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then pip install cmake --user; fi
 
 before_script:
     - mkdir build
     - cd build
-    - cmake -DCMAKE_CXX_COMPILER=$CMAKE_CXX_COMPILER -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH ../
+    - cmake -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} ../
 
 script:
-    - make -j4
+    - make -j4 # create either a bin or a bundle (.app) - depending on openhantek/CMakeLists.txt
+    - sudo make -j4 package # simply pack the binary, otherwise populate the bundle below
+    - if test -d openhantek/OpenHantek.app; then
+          export PATH=${CMAKE_PREFIX_PATH}/bin:${PATH} ;
+          cd openhantek ;
+          macdeployqt OpenHantek.app -always-overwrite -verbose=1 ;
+          python ../../utils/macdeployqtfix/macdeployqtfix.py OpenHantek.app/Contents/MacOS/OpenHantek ${CMAKE_PREFIX_PATH} ;
+          create-dmg --volname OpenHantek --volicon ../../openhantek/res/images/openhantek.icns --window-pos 200 120 --window-size 800 400 --icon-size 100 --icon "OpenHantek.app" 200 190 --hide-extension "OpenHantek.app" --app-drop-link 600 185 --eula ../../LICENSE OpenHantek.dmg OpenHantek.app ;
+          cd .. ;
+      else
+          ls -l packages ;
+          true;
+      fi
+    - ls -l openhantek || true
 
 before_deploy:
-    - sudo make package
+    - if test -d openhantek/OpenHantek.app; then
+          cd openhantek ;
+          sudo tar -cvzf ../packages/openhantek_*_osx_*.tar.gz OpenHantek.app ;
+          if test -f OpenHantek.dmg ; then
+            sudo mv OpenHantek.dmg ../packages/$(basename ../packages/openhantek_*_osx_*.tar.gz .tar.gz).dmg ;
+          fi ;
+          cd .. ;
+      else
+          true;
+      fi
+    - ls -l packages || true
 
 deploy:
   provider: releases

CHANGELOG

@@ -0,0 +1,170 @@
+3.1.3
+2020-09-30
+RPM build improvements
+New command line option --fontsize
+Display horizontal trigger level line when marker is moved
+Make smooth trigger setting persistent
+
+3.1.2
+2020-07-29
+Small improvements for FreeBSD
+Hide Windows console
+
+3.1.1
+2020-06-30
+Refresh button to restart roll mode trace
+Help menu link to AC modification howto
+Minor robustness improvements
+
+3.1.1-rc3
+2020-06-26
+Real roll mode for slow sample rates
+
+3.1.1-rc2
+2020-06-23
+Scroll wheel moves the markers
+Configuration menu parameter to use AC coupling HW modification
+
+3.1.1-rc1
+2020-06-20
+Slow timebases up to 10s/div
+Near real time screen updates with trigger mode NONE
+Screenshot and hardcopy are identical to the screen content
+Force OpenGL SL version (option --useGLSL120 or --useGLSL150)
+
+3.1.0
+2020-05-08
+Demo mode without scope hardware (option -d or --demoMode)
+Support for high-dpi displays
+Improved pdf readability
+Russian translation
+
+3.0.4
+2020-04-13
+Better marker setting/removing
+Fix sample rate spinbox handling
+Fix race condition when switching 1ch/2ch
+Persistent calibration out frequency
+FW 0206
+Updated DDS120 FW 0100 (supports more calibration out frequencies)
+Spanish translation
+
+3.0.3
+2020-03-17
+FW 0205
+Fix histogram issue when switching TY -> XY
+
+3.0.2
+2020-03-01
+Apply realtime prio and scheduler
+Histogram for TY voltage traces
+Variable probe gain setting
+French translation complete
+
+3.0.1
+2019-12-13
+More robust USB handling for all OSs
+Improve manipulation and export of frozen or single traces
+Export XY display
+Automatic icon selection for light/dark themes
+Eye candy
+Automatic start after FW upload
+
+3.0.0
+2019-11-15
+Major changes:
+Support for Sainsmart DDS120
+Support for Hantek6022 AC HW modification
+Update to FW 0203
+MacOSX bundle
+Measure duty cycle of triggered trace
+New versioning scheme
+
+v2.16
+2019-10-15
+Major changes from v2.16-rc1:
+Display measured width of triggered pulse in top line.
+Set OpenGL ES as default for Raspberry Pi.
+
+v2.16-rc1
+2019-10-11
+Major changes from v2.15:
+Fix #26 (array overrun during fast increasing of timebase setting)
+
+v2.15 - withdrawn due to #26
+2019-10-05
+Major changes from v2.14:
+Automatic translation (qt linguist),
+better automatic versioning (commit date & build number),
+Sinc interpolation for fast timebase settings,
+modification for FreeBSD compiling.
+
+v2.14
+2019-09-08
+Major changes from v2.13:
+Vpp measure, more oversampling, faster display refresh,
+alternating trigger, faster trigger (and new smooth trigger mode),
+add support for Voltcraft DSO-2020 USB oscilloscope.
+
+v2.13
+2019-08-09
+Major changes from v2.12:
+User manual, new icons.
+Calculate and display dB of AC value.
+
+v2.12
+2019-07-07
+Major changes from v2.11:
+Better frequency detection, Gauss window, 
+normalise all windows to 0 dBV display,
+new math mode CH1*CH2.
+
+v2.11
+2019-06-28
+Major changes from v2.10:
+New math mode, calculate AC part of CH1/CH2
+
+v2.10
+2019-06-10
+Major changes from v2.09:
+Use new FW 0202 that allows more and better structured sample rates,
+reload the correct FW version if the wrong version was loaded before.
+
+v2.09
+2019-05-25
+Major changes from v2.08:
+Add slower timebases 20, 50, 100 ms/div with increased samplesize.
+
+v2.08
+2019-05-24
+Major changes from v2.07:
+This release fixes the quite unstable spectrum display. The annoying amplitude jitter has gone.
+
+v2.07
+2019-05-22
+Major changes from v2.06:
+First complete free open source release.
+No longer dependent on nonfree Hantek firmware.
+
+v2.06
+2019-05-14
+Major changes from v2.05:
+Refactor triggering, move from postprocessing chain into earlier hantekdsocontrol.
+Last release with 2090,2150, 2250 and 5200 support.
+
+v2.05
+2019-05-10
+Major changes from v2.03:
+Increase sample size to 20000, better trigger modes
+
+v2.04 - removed due to issues with 10X probe display
+
+v2.03
+2019-05-05
+Major changes from v2.02:
+New checkbox for 10X probes.
+
+v2.02
+2019-04-26
+Major changes from v2.03:
+1st binary release after transfer to OpenHantek/OpenHantek6022