From 231faffa7697c09d329fc4c90f381e45ff6f0713 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Mon, 5 Aug 2013 14:44:53 +0200 Subject: [PATCH] Move/rename firmware extractor tools. Since sigrok-util will be released as tarball with the usual build system at some point, and the tools will be installed in /usr/bin by most distros, the tools need to have unique names as to not conflict with other things in /usr/bin. We use a common 'sigrok-fwextract-' prefix for all current and future firmware extractor tools to keep the names consistent and unique. Drop the .py suffix from the executables, since the implementation language doesn't matter and is generally not encoded in the filename in things installed in /usr/bin. Later on, every tool will also get a manpage, of course. --- firmware/{ => hantek-dso}/README.parsepe | 0 .../README.sigrok-fwextract-hantek-dso} | 6 +++--- firmware/{ => hantek-dso}/parsepe.py | 0 .../sigrok-fwextract-hantek-dso} | 2 +- .../README.sigrok-fwextract-saleae-logic16} | 4 ++-- firmware/{ => saleae-logic16}/parseelf.py | 0 .../sigrok-fwextract-saleae-logic16} | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename firmware/{ => hantek-dso}/README.parsepe (100%) rename firmware/{README.hantek-dso-extract => hantek-dso/README.sigrok-fwextract-hantek-dso} (76%) rename firmware/{ => hantek-dso}/parsepe.py (100%) rename firmware/{hantek-dso-extract.py => hantek-dso/sigrok-fwextract-hantek-dso} (97%) rename firmware/{README.saleae-logic16-extract => saleae-logic16/README.sigrok-fwextract-saleae-logic16} (80%) rename firmware/{ => saleae-logic16}/parseelf.py (100%) rename firmware/{saleae-logic16-extract.py => saleae-logic16/sigrok-fwextract-saleae-logic16} (96%) diff --git a/firmware/README.parsepe b/firmware/hantek-dso/README.parsepe similarity index 100% rename from firmware/README.parsepe rename to firmware/hantek-dso/README.parsepe diff --git a/firmware/README.hantek-dso-extract b/firmware/hantek-dso/README.sigrok-fwextract-hantek-dso similarity index 76% rename from firmware/README.hantek-dso-extract rename to firmware/hantek-dso/README.sigrok-fwextract-hantek-dso index f0a765a..4dc7d48 100644 --- a/firmware/README.hantek-dso-extract +++ b/firmware/hantek-dso/README.sigrok-fwextract-hantek-dso @@ -1,10 +1,10 @@ -The hantek-dso-extract.py tool extracts firmware from the driver that comes +This tool extracts firmware from the driver that comes with the Hantek DSO-2xxx/52xx series USB oscilloscopes. Find the 32-bit driver installed on the windows system -- typically called DSOxxxx1.sys or DsoxxxxX861.sys, where xxxx is your device's model. Use it like this: -$ ./hantek-dso-extract.py Dso2090X861.sys +$ sigrok-fwextract-hantek-dso Dso2090X861.sys saved 4730 bytes to hantek-dso-2090.fw Copy the resulting file over to the location where sigrok installed its -firmware files. By default this is /usr/local/share/sigrok-firmware +firmware files. By default this is /usr/local/share/sigrok-firmware. diff --git a/firmware/parsepe.py b/firmware/hantek-dso/parsepe.py similarity index 100% rename from firmware/parsepe.py rename to firmware/hantek-dso/parsepe.py diff --git a/firmware/hantek-dso-extract.py b/firmware/hantek-dso/sigrok-fwextract-hantek-dso similarity index 97% rename from firmware/hantek-dso-extract.py rename to firmware/hantek-dso/sigrok-fwextract-hantek-dso index 045e50a..c90e36f 100755 --- a/firmware/hantek-dso-extract.py +++ b/firmware/hantek-dso/sigrok-fwextract-hantek-dso @@ -66,7 +66,7 @@ def unsparse(data): def usage(): - print("hantek-dso-extract.py ") + print("sigrok-fwextract-hantek-dso ") sys.exit() diff --git a/firmware/README.saleae-logic16-extract b/firmware/saleae-logic16/README.sigrok-fwextract-saleae-logic16 similarity index 80% rename from firmware/README.saleae-logic16-extract rename to firmware/saleae-logic16/README.sigrok-fwextract-saleae-logic16 index ad7d355..4f7fb3b 100644 --- a/firmware/README.saleae-logic16-extract +++ b/firmware/saleae-logic16/README.sigrok-fwextract-saleae-logic16 @@ -1,11 +1,11 @@ -The saleae-logic16-extract.py tool extracts FPGA bitstreams from the +This tool extracts FPGA bitstreams from the vendor software for the Saleae Logic16 USB logic analyzer. Download the Linux version (either 32-bit or 64-bit will do), and unpack it to find the main binary called "Logic". Usage: -$ ./saleae-logic16-extract.py Logic +$ ./sigrok-fwextract-saleae-logic16 Logic saved 149516 bytes to saleae-logic16-fpga-18.bitstream saved 149516 bytes to saleae-logic16-fpga-33.bitstream diff --git a/firmware/parseelf.py b/firmware/saleae-logic16/parseelf.py similarity index 100% rename from firmware/parseelf.py rename to firmware/saleae-logic16/parseelf.py diff --git a/firmware/saleae-logic16-extract.py b/firmware/saleae-logic16/sigrok-fwextract-saleae-logic16 similarity index 96% rename from firmware/saleae-logic16-extract.py rename to firmware/saleae-logic16/sigrok-fwextract-saleae-logic16 index c325174..09b8730 100755 --- a/firmware/saleae-logic16-extract.py +++ b/firmware/saleae-logic16/sigrok-fwextract-saleae-logic16 @@ -33,7 +33,7 @@ def extract_bitstream(elf, lv): 'saleae-logic16-fpga-'+lv+'.bitstream') def usage(): - print("saleae-logic16-extract.py ") + print("sigrok-fwextract-saleae-logic16 ") sys.exit() -- 2.30.2