Some more enhancements to distribution

3 files changed, 21 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 466651c..3288a2f 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,9 @@ dist: clean firmware
 	mkdir -p dist
 	mkdir -p build/firmware
 	python setup.py sdist
+	cp usb_boot/df10ch_usb_boot.hex build/firmware/df10ch_usb_boot.hex
 	cp usb_appl/df10ch_usb_appl.dff build/firmware/df10ch_usb_appl.dff
+	cp pwm_boot/df10ch_pwm_boot.hex build/firmware/df10ch_pwm_boot.hex
 	cp pwm_appl/df10ch_pwm_appl.dff build/firmware/df10ch_pwm_appl.dff
 	tar -C build -cvzf dist/df10ch_firmware.tar.gz firmware
 
diff --git a/README b/README
index 9719752..8c152b4 100644
--- a/README
+++ b/README
@@ -40,7 +40,9 @@ MANIFEST.in           File used by Python installation script
 windows/              MS Windows related files
 linux/                Linux related files
 project/              Visual C++ 2010 project files for building the df10ch_test program for windows
-
+dist/df10ch_firmware.tar.gz  Archive with recent build of firmware files
+dist/df10ch_setup-??.tar.gz  Recent build of setup program for linux platform
+dist/df10ch_win_dist.tar.gz	 Binary distribution for Windows
 
 ----------------------
 Building the hardware:
@@ -61,6 +63,9 @@ You can download KiCad from here: http://kicad.sourceforge.net
 Building the firmware:
 ----------------------
 
+Note: "dist/df10ch_firmware.tar.gz" contains already a recent version of the compiled
+firmware ready for programming.
+ 
 For building the firmware for the two Atmel AVR microcontrollers you need AVR-GCC installed.
 On debian based systems these are packages avr-gcc, binutils-avr, avr-libc, avrdude
 
@@ -92,6 +97,9 @@ lose the firmware update feature of the DF10CH setup program.
 Installation of USB driver for DF10CH controller
 ------------------------------------------------
 
+Note: "dist/df10ch_win_dist.tar.gz" contains the "zadig" executable and libusb-1.0
+for windows.
+
 The DF10CH setup program and test application uses the USB library "libusb 1.0" for communication to the controllers.
 
 On debian based systems this is packages: libusb-1.0-0.
@@ -116,6 +124,10 @@ In case there is already a (older) driver installed for the controller the devic
 Installation of DF10CH setup program
 ------------------------------------
 
+Note: "dist/df10ch_setup-??.tar.gz" contains a recent compiled version of the setup program
+for Linux. "dist/df10ch_win_dist.tar.gz" contains are ready to execute version of the
+setup program for Windows.
+
 For running the DF10CH setup program under Linux you need a installed python environment version 2.6,
 the python modules TKinter, Image, ImageTk, ImageDraw and a installed 'libusb 1.0' library.
 On debian based systems these are packages: python2.6, python-tk, python-imaging, python-imaging-tk,
@@ -157,6 +169,9 @@ The setup program understands the following command line option:
 Compiling and running the controller test application
 -----------------------------------------------------
 
+Note: "dist/df10ch_win_dist.tar.gz" contains already the compiled controller test
+application for Windows.
+
 In sub directory test_appl there is a controller test application that could be executed
 at your host computer. It sends brightness values from min to max and max to min in one
 test loop to each connected controller in parallel with the maximum possible speed.
diff --git a/test_appl/df10ch_test.c b/test_appl/df10ch_test.c
index ee879a0..7a7ba2c 100644
--- a/test_appl/df10ch_test.c
+++ b/test_appl/df10ch_test.c
@@ -33,10 +33,11 @@
 #else
 #include <unistd.h>
 #include <sys/time.h>
+#endif
+
 #ifndef LIBUSB_CALL
 #define LIBUSB_CALL
 #endif
-#endif
 
 #include "../df10ch_usb_proto.h"
 
@@ -72,7 +73,7 @@ struct df10ch_output_driver_s {
   int transfer_err_cnt;             // Number of transfer errors
 };
 
-#ifndef WIN32
+#ifndef HAVE_LIBUSB_STRERROR
 static const char *libusb_strerror(int rc) {
   switch (rc) {
   case LIBUSB_SUCCESS: