OP-958: rename opHID plugin directory to lower case (same as all other plugins)

ground/openpilotgcs/src/plugins/opHID/opHID.pro

@@ -1,76 +0,0 @@
-TEMPLATE = lib
-TARGET = opHID
-include(../../openpilotgcsplugin.pri)
-include(opHID_dependencies.pri)
-HEADERS += inc/opHID_global.h \
-           inc/opHID_plugin.h \
-           inc/opHID.h \
-           inc/opHID_hidapi.h \
-           inc/opHID_const.h \
-           inc/opHID_usbmon.h \
-           inc/opHID_usbsignal.h \
-           hidapi/hidapi.h
-SOURCES += src/opHID_plugin.cpp \
-           src/opHID.cpp \
-           src/opHID_usbsignal.cpp \
-           src/opHID_hidapi.cpp
-FORMS += 
-RESOURCES += 
-DEFINES += OPHID_LIBRARY
-OTHER_FILES += opHID.pluginspec
-INCLUDEPATH += ./inc
-# Platform Specific
-win32 { 
-    SOURCES += src/opHID_usbmon_win.cpp \
-               hidapi/windows/hid.c
-    LIBS += -lhid -lsetupapi
-}
-macx { 
-    SOURCES += src/opHID_usbmon_mac.cpp \
-               hidapi/mac/hid.c
-    SDK = /Developer/SDKs/MacOSX10.5.sdk
-    ARCH = -mmacosx-version-min=10.5 \
-           -arch \
-           ppc \
-           -arch \
-           i386
-    LIBS += $(ARCH) \
-            -Wl,-syslibroot,$(SDK) \
-            -framework \
-            IOKit \
-            -framework \
-            CoreFoundation
-}
-linux-g++ {
-    SOURCES += src/opHID_usbmon_linux.cpp
-    LIBS += -lusb -ludev
-
-# hidapi library
-## rawhid
-#    SOURCES += hidapi/linux/hid.c
-## libusb
-    SOURCES += hidapi/libusb/hid.c
-    LIBS += `pkg-config libusb-1.0 --libs` -lrt -lpthread
-    INCLUDEPATH += /usr/include/libusb-1.0 
-#    INCLUDEPATH += `pkg-config libusb-1.0 --cflags`
-!exists(/usr/include/libusb-1.0) {
-    error(Install libusb-1.0.0-dev using your package manager.)
- }
-}
-linux-g++-64 {
-    SOURCES += src/opHID_usbmon_linux.cpp
-    LIBS += -lusb -ludev
-
-# hidapi library
-## rawhid
-#    SOURCES += hidapi/linux/hid.c
-## libusb
-    SOURCES += hidapi/libusb/hid.c
-    LIBS += `pkg-config libusb-1.0 --libs` -lrt -lpthread
-    INCLUDEPATH += /usr/include/libusb-1.0
-#    INCLUDEPATH += `pkg-config libusb-1.0 --cflags`
-!exists(/usr/include/libusb-1.0) {
-    error(Install libusb-1.0.0-dev using your package manager.)
- }
-}
-

ground/openpilotgcs/src/plugins/ophid/hidapi/libusb/hid.c

@@ -47,7 +47,7 @@
 #include "libusb.h"
 #include "iconv.h"
 
-#include "hidapi.h"
+#include "../hidapi.h"
 
 #ifdef __cplusplus
 extern "C" {

ground/openpilotgcs/src/plugins/ophid/hidapi/linux/hid.c

@@ -43,7 +43,7 @@
 #include <linux/input.h>
 #include <libudev.h>
 
-#include "hidapi.h"
+#include "../hidapi.h"
 
 /* Definitions from linux/hidraw.h. Since these are new, some distros
    may not have header files which contain them. */

ground/openpilotgcs/src/plugins/ophid/hidapi/mac/hid.c

@@ -32,7 +32,7 @@
 #include <sys/time.h>
 #include <unistd.h>
 
-#include "hidapi.h"
+#include "../hidapi.h"
 
 /* Barrier implementation because Mac OSX doesn't have pthread_barrier.
    It also doesn't have clock_gettime(). So much for POSIX and SUSv2.

ground/openpilotgcs/src/plugins/ophid/hidapi/windows/hid.c

@@ -60,7 +60,7 @@ extern "C" {
 #include <stdlib.h>
 
 
-#include "hidapi.h"
+#include "../hidapi.h"
 
 #ifdef _MSC_VER
 	/* Thanks Microsoft, but I know how to use strncpy(). */

ground/openpilotgcs/src/plugins/ophid/inc/ophid.h

@@ -1,7 +1,7 @@
 /**
  ******************************************************************************
  *
- * @file       rawhid.h
+ * @file       ophid.h
  * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2013.
  * @addtogroup GCSPlugins GCS Plugins
  * @{
@@ -28,14 +28,14 @@
 #ifndef OPHID_H
 #define OPHID_H
 
-#include "opHID_global.h"
+#include "ophid_global.h"
 
 #include <QThread>
 #include <QIODevice>
 #include <QMutex>
 #include <QByteArray>
-#include "opHID_hidapi.h"
-#include "opHID_usbmon.h"
+#include "ophid_hidapi.h"
+#include "ophid_usbmon.h"
 
 class RawHIDReadThread;
 class RawHIDWriteThread;

ground/openpilotgcs/src/plugins/ophid/inc/ophid_const.h

@@ -1,7 +1,7 @@
 /**
  ******************************************************************************
  *
- * @file       rawhid_const.h
+ * @file       ophid_const.h
  * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
  * @addtogroup GCSPlugins GCS Plugins
  * @{

ground/openpilotgcs/src/plugins/ophid/inc/ophid_global.h

@@ -1,7 +1,7 @@
 /**
  ******************************************************************************
  *
- * @file       rawhid_global.h
+ * @file       ophid_global.h
  * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2013.
  * @addtogroup GCSPlugins GCS Plugins
  * @{

ground/openpilotgcs/src/plugins/ophid/inc/ophid_hidapi.h

@@ -1,7 +1,7 @@
 /**
  ******************************************************************************
  *
- * @file       pjrc_rawhid.h
+ * @file       ophid_hidapi.h
  * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2013.
  * @addtogroup GCSPlugins GCS Plugins
  * @{
@@ -36,9 +36,9 @@
 #if defined(Q_OS_LINUX)
 #include <usb.h>
 #endif
-#include "hidapi.h"
-#include "opHID_const.h"
-#include "opHID_global.h"
+#include "../hidapi/hidapi.h"
+#include "ophid_const.h"
+#include "ophid_global.h"
 
 
 class OPHID_EXPORT opHID_hidapi : public QObject {

ground/openpilotgcs/src/plugins/ophid/inc/ophid_plugin.h

@@ -1,7 +1,7 @@
 /**
  ******************************************************************************
  *
- * @file       rawhid.h
+ * @file       ophid_plugin.h
  * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2013.
  * @addtogroup GCSPlugins GCS Plugins
  * @{
@@ -33,9 +33,9 @@
 #include <extensionsystem/iplugin.h>
 #include "coreplugin/iconnection.h"
 
-#include "opHID.h"
-#include "opHID_global.h"
-#include "opHID_usbmon.h"
+#include "ophid.h"
+#include "ophid_global.h"
+#include "ophid_usbmon.h"
 
 class IConnection;
 class RawHIDConnection;

ground/openpilotgcs/src/plugins/ophid/inc/ophid_usbmon.h

@@ -1,7 +1,7 @@
 /**
  ******************************************************************************
  *
- * @file       usbmonitor.h
+ * @file       ophid_usbmon.h
  * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2013.
  * @addtogroup GCSPlugins GCS Plugins
  * @{
@@ -28,7 +28,7 @@
 #ifndef OPHID_USBMON_H
 #define OPHID_USBMON_H
 
-#include "opHID_global.h"
+#include "ophid_global.h"
 
 #include <QThread>
 #include <QMutex>

ground/openpilotgcs/src/plugins/ophid/inc/ophid_usbsignal.h

@@ -1,7 +1,7 @@
 /**
  ******************************************************************************
  *
- * @file       usbmonitor.h
+ * @file       ophid_usbsignal.h
  * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2013.
  * @addtogroup GCSPlugins GCS Plugins
  * @{
@@ -29,7 +29,7 @@
 #define OPHID_USBSIGNAL_H
 
 #include <QObject>
-#include "opHID_usbmon.h"
+#include "ophid_usbmon.h"
 
 class OPHID_EXPORT USBSignalFilter : public QObject {
     Q_OBJECT

ground/openpilotgcs/src/plugins/ophid/ophid.pri

@@ -1,3 +1,3 @@
-include(opHID_dependencies.pri)
+include(ophid_dependencies.pri)
 
 LIBS *= -l$$qtLibraryName(opHID)

ground/openpilotgcs/src/plugins/ophid/ophid.pro

@@ -0,0 +1,81 @@
+TEMPLATE = lib
+TARGET = opHID
+
+include(../../openpilotgcsplugin.pri)
+include(ophid_dependencies.pri)
+
+HEADERS += inc/ophid_global.h \
+           inc/ophid_plugin.h \
+           inc/ophid.h \
+           inc/ophid_hidapi.h \
+           inc/ophid_const.h \
+           inc/ophid_usbmon.h \
+           inc/ophid_usbsignal.h \
+           hidapi/hidapi.h
+SOURCES += src/ophid_plugin.cpp \
+           src/ophid.cpp \
+           src/ophid_usbsignal.cpp \
+           src/ophid_hidapi.cpp
+FORMS += 
+RESOURCES += 
+DEFINES += OPHID_LIBRARY
+OTHER_FILES += opHID.pluginspec
+
+INCLUDEPATH += ./inc
+
+# Platform Specific
+
+win32 { 
+    SOURCES += src/ophid_usbmon_win.cpp \
+               hidapi/windows/hid.c
+    LIBS += -lhid -lsetupapi
+}
+
+macx { 
+    SOURCES += src/ophid_usbmon_mac.cpp \
+               hidapi/mac/hid.c
+    SDK = /Developer/SDKs/MacOSX10.5.sdk
+    ARCH = -mmacosx-version-min=10.5 \
+           -arch ppc \
+           -arch i386
+    LIBS += $(ARCH) \
+            -Wl,-syslibroot,$(SDK) \
+            -framework IOKit \
+            -framework CoreFoundation
+}
+
+linux-g++ {
+    SOURCES += src/ophid_usbmon_linux.cpp
+    LIBS += -lusb -ludev
+
+    # hidapi library
+    ## rawhid
+    #  SOURCES += hidapi/linux/hid.c
+    ## libusb
+    SOURCES += hidapi/libusb/hid.c
+    LIBS += `pkg-config libusb-1.0 --libs` -lrt -lpthread
+    INCLUDEPATH += /usr/include/libusb-1.0 
+#   INCLUDEPATH += `pkg-config libusb-1.0 --cflags`
+
+    !exists(/usr/include/libusb-1.0) {
+        error(Install libusb-1.0.0-dev using your package manager.)
+    }
+}
+
+linux-g++-64 {
+    SOURCES += src/ophid_usbmon_linux.cpp
+    LIBS += -lusb -ludev
+
+    # hidapi library
+    ## rawhid
+    #  SOURCES += hidapi/linux/hid.c
+    ## libusb
+    SOURCES += hidapi/libusb/hid.c
+    LIBS += `pkg-config libusb-1.0 --libs` -lrt -lpthread
+    INCLUDEPATH += /usr/include/libusb-1.0
+#   INCLUDEPATH += `pkg-config libusb-1.0 --cflags`
+    !exists(/usr/include/libusb-1.0) {
+        error(Install libusb-1.0.0-dev using your package manager.)
+    }
+}
+

ground/openpilotgcs/src/plugins/ophid/src/ophid.cpp

@@ -25,8 +25,8 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "opHID.h"
-#include "opHID_const.h"
+#include "ophid.h"
+#include "ophid_const.h"
 #include "coreplugin/connectionmanager.h"
 #include <extensionsystem/pluginmanager.h>
 #include <QtGlobal>

ground/openpilotgcs/src/plugins/ophid/src/ophid_hidapi.cpp

@@ -30,8 +30,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include "opHID_const.h"
-#include "opHID_hidapi.h"
+#include "ophid_const.h"
+#include "ophid_hidapi.h"
 
 /**
  * \brief Constructor

ground/openpilotgcs/src/plugins/ophid/src/ophid_plugin.cpp

@@ -25,15 +25,15 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "opHID_global.h"
-#include "opHID_plugin.h"
+#include "ophid_global.h"
+#include "ophid_plugin.h"
 #include <extensionsystem/pluginmanager.h>
 
 #include <QtCore/QtPlugin>
 #include <QtCore/QMutexLocker>
 
-#include "opHID_hidapi.h"
-#include "opHID_const.h"
+#include "ophid_hidapi.h"
+#include "ophid_const.h"
 
 
 /**

ground/openpilotgcs/src/plugins/ophid/src/ophid_usbmon_linux.cpp

@@ -25,9 +25,9 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "opHID_usbmon.h"
+#include "ophid_usbmon.h"
 #include <QDebug>
-#include "opHID_const.h"
+#include "ophid_const.h"
 
 
 /**

ground/openpilotgcs/src/plugins/ophid/src/ophid_usbmon_mac.cpp

@@ -26,14 +26,14 @@
  */
 
 
-#include "opHID_usbmon.h"
+#include "ophid_usbmon.h"
 #include <IOKit/IOKitLib.h>
 #include <IOKit/hid/IOHIDLib.h>
 #include <CoreFoundation/CFString.h>
 #include <CoreFoundation/CFArray.h>
 #include <QMutexLocker>
 #include <QDebug>
-#include "opHID_const.h"
+#include "ophid_const.h"
 
 // Local helper functions
 static bool HID_GetIntProperty(IOHIDDeviceRef dev, CFStringRef property, int *value);

ground/openpilotgcs/src/plugins/ophid/src/ophid_usbmon_win.cpp

@@ -30,9 +30,9 @@
 #include <initguid.h>
 #include <QEventLoop>
 #include <QTimer>
-#include "opHID_usbmon.h"
+#include "ophid_usbmon.h"
 #include <QDebug>
-#include "opHID_const.h"
+#include "ophid_const.h"
 
 #define printf qDebug
 

ground/openpilotgcs/src/plugins/ophid/src/ophid_usbsignal.cpp

@@ -25,7 +25,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "opHID_usbsignal.h"
+#include "ophid_usbsignal.h"
 #include <QDebug>
 
 

ground/openpilotgcs/src/plugins/plugins.pro

@@ -30,7 +30,7 @@ SUBDIRS += plugin_welcome
 
 # opHID connection plugin
 SUBDIRS += plugin_opHID
-plugin_opHID.subdir = opHID
+plugin_opHID.subdir = ophid
 plugin_opHID.depends = plugin_coreplugin
 
 # Serial port connection plugin