X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=README;h=548749fa908433e7f21d34b3982a8d7d6dd5bc0c;hb=38e32023c4b2dc92d51d969e1958bd1ee941804f;hp=f937a5c8d5a345211391f9ab4ab235f61662fe71;hpb=70b415b64e67a93ab39f86862fada1381b503bbb;p=sigrok-firmware-fx2lafw.git

diff --git a/README b/README
index f937a5c8..548749fa 100644
--- a/README
+++ b/README
@@ -7,7 +7,8 @@ Free/Libre/Open-Source signal analysis software suite that supports various
 device types (such as logic analyzers, oscilloscopes, multimeters, and more).
 
 sigrok-firmware-fx2lafw is a Free/Libre/Open-source firmware for logic
-analyzers based on the Cypress EZ-USB FX2(LP) chip.
+analyzers based on the Cypress EZ-USB FX2(LP) chip, as well as the
+Hantek 6022BE USB oscilloscope.
 
 
 Status
@@ -33,7 +34,7 @@ Notes:
 
      $ apt-get install sdcc
 
-   This project has been tested to work with sdcc 2.9, 3.0, 3.1, and 3.2.
+   This project has been tested to work with sdcc 2.9 and 3.x.
 
  - You need libsigrok >= 0.1.1 in order to make use of fx2lafw. Earlier
    versions didn't have support for FX2 devices using this firmware.
@@ -69,9 +70,9 @@ Pre-built firmware files
 ------------------------
 
 There are also pre-built firmware files that can be used without having
-to build them from source. You can download those from SourceForge:
+to build them from source. You can download those from:
 
-  http://sourceforge.net/projects/sigrok/files/binary/sigrok-firmware-fx2lafw/
+  http://sigrok.org/download/binary/sigrok-firmware-fx2lafw/
 
 
 fx2lib
@@ -89,14 +90,48 @@ The following files/directories were removed, as they're not needed
 for our purposes: CHANGELOG, COPYING*, docs/, examples/, fw/, and utils/.
 
 
+Hantek 6022BE firmware
+----------------------
+
+The Hantek 6022BE firmware was originally created by Jochen Hoenicke in
+05/2015 for the Hantek6022API github project by Robert Cope. Full credit
+for the implementation of the firmware goes to Jochen Hoenicke, thanks!
+
+Github project:
+
+  https://github.com/rpcope1/Hantek6022API
+
+We've incorporated the Hantek 6022BE firmware into the sigrok-firmware-fx2lafw
+repo/tarball for convenience of sigrok users. E.g. so that they can
+easily get it with the other fx2lafw firmware files from distro
+packages, the build scripts in sigrok-util automatically build/install
+it, the sigrok Windows installers automatically ship it, the sigrok
+Android APKs automatically ship it, etc. etc.
+
+The files we've integrated into fx2lafw from Hantek6022API were taken from
+the PyHT6022/HantekFirmware/custom directory of that repo, using the state
+as of 03/2016 (the files were last modified in 05/2015, though).
+
+The git hash of the last relevant commit there was:
+
+  0498e2ab239aabb1084c19e1e24faf56764b217e
+
+Files integrated into fx2lafw:
+
+ - hw/hantek-6022be/dscr.a51: Copied unmodified.
+
+ - hantek_6022be.c: This file was originally created by appending the
+   contents of the original device.c and fw.c together.
+
+
 Copyright and license
 ---------------------
 
 sigrok-firmware-fx2lafw is licensed under the terms of the GNU General Public
 License (GPL), version 2 or later.
 
-It uses additional helper code (fx2lib), licensed under the GNU LGPL
-(version 2.1 or later).
+It uses additional helper code (fx2lib, Hantek 6022BE firmware), licensed
+under the GNU LGPL (version 2.1 or later).
 
 While some individual source code files are licensed under the LGPLv2.1+, and
 some files are licensed under the GPLv2+, this doesn't change the fact that