From 56498c085a3d93050e2e11acfebf61793ae9a814 Mon Sep 17 00:00:00 2001 From: nick Date: Tue, 1 Apr 2014 16:59:58 -0400 Subject: [PATCH 1/3] Fix Linux USB bug and compile issues on Centos. --- host/pixymon/{ => libusb}/libusb-1.0.dll | Bin host/pixymon/{ => libusb}/libusb-1.0.dll.a | Bin host/pixymon/{ => libusb}/libusb.a | Bin host/pixymon/{ => libusb}/libusb.h | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename host/pixymon/{ => libusb}/libusb-1.0.dll (100%) rename host/pixymon/{ => libusb}/libusb-1.0.dll.a (100%) rename host/pixymon/{ => libusb}/libusb.a (100%) rename host/pixymon/{ => libusb}/libusb.h (100%) diff --git a/host/pixymon/libusb-1.0.dll b/host/pixymon/libusb/libusb-1.0.dll similarity index 100% rename from host/pixymon/libusb-1.0.dll rename to host/pixymon/libusb/libusb-1.0.dll diff --git a/host/pixymon/libusb-1.0.dll.a b/host/pixymon/libusb/libusb-1.0.dll.a similarity index 100% rename from host/pixymon/libusb-1.0.dll.a rename to host/pixymon/libusb/libusb-1.0.dll.a diff --git a/host/pixymon/libusb.a b/host/pixymon/libusb/libusb.a similarity index 100% rename from host/pixymon/libusb.a rename to host/pixymon/libusb/libusb.a diff --git a/host/pixymon/libusb.h b/host/pixymon/libusb/libusb.h similarity index 100% rename from host/pixymon/libusb.h rename to host/pixymon/libusb/libusb.h From c8c6cf908c022588d2959464b09fb1317bd72e9a Mon Sep 17 00:00:00 2001 From: nick Date: Tue, 1 Apr 2014 17:05:18 -0400 Subject: [PATCH 2/3] Actually catch all the files this time. --- host/pixymon/pixymon.pro | 96 ++-------------------------------------- host/pixymon/usblink.cpp | 1 + 2 files changed, 4 insertions(+), 93 deletions(-) diff --git a/host/pixymon/pixymon.pro b/host/pixymon/pixymon.pro index b476c074..45f487e6 100644 --- a/host/pixymon/pixymon.pro +++ b/host/pixymon/pixymon.pro @@ -45,7 +45,6 @@ HEADERS += mainwindow.h \ dfu_info.h \ connectevent.h \ pixy.h \ - libusb.h \ flash.h \ reader.h \ ../../common/pixytypes.h \ @@ -73,7 +72,8 @@ FORMS += mainwindow.ui \ # LIBS += ./libusb-1.0.dll.a win32 { - LIBS += ./libusb-1.0.dll.a + LIBS += ./libusb/libusb-1.0.dll.a + HEADERS += ./libusb/libusb.h } macx { @@ -89,99 +89,9 @@ macx { unix:!macx { PKGCONFIG += libusb-1.0 LIBS += -lusb-1.0 + INCLUDEPATH += /usr/include/libusb-1.0 } RESOURCES += \ resources.qrc - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/host/pixymon/usblink.cpp b/host/pixymon/usblink.cpp index 0152ea76..1b69ed43 100644 --- a/host/pixymon/usblink.cpp +++ b/host/pixymon/usblink.cpp @@ -59,6 +59,7 @@ int USBLink::open() m_handle = 0; return -1; } + libusb_reset_device(m_handle); return 0; } From 9cf4414aa893c1eaef96610abd903570515dcf11 Mon Sep 17 00:00:00 2001 From: nick Date: Tue, 1 Apr 2014 17:10:56 -0400 Subject: [PATCH 3/3] Missed a missing header. (stdlib.h) --- host/pixymon/dfu.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/host/pixymon/dfu.cpp b/host/pixymon/dfu.cpp index 8c078183..57beefc2 100644 --- a/host/pixymon/dfu.cpp +++ b/host/pixymon/dfu.cpp @@ -15,6 +15,7 @@ #include #include +#include #include #include "dfu.h" #include "sleeper.h"