From 0f33a16ed88de521418e78b6e118c4ee7f82405a Mon Sep 17 00:00:00 2001 From: Oleg Semyonov Date: Sat, 25 May 2013 02:25:49 +0300 Subject: [PATCH] OP-958: rename opHID plugin directory to lower case (same as all other plugins) --- .../openpilotgcs/src/plugins/opHID/opHID.pro | 76 ----------------- .../{opHID => ophid}/hidapi/.no-auto-format | 0 .../plugins/{opHID => ophid}/hidapi/hidapi.h | 0 .../{opHID => ophid}/hidapi/libusb/hid.c | 2 +- .../{opHID => ophid}/hidapi/linux/hid.c | 2 +- .../plugins/{opHID => ophid}/hidapi/mac/hid.c | 2 +- .../{opHID => ophid}/hidapi/windows/hid.c | 2 +- .../{opHID/inc/opHID.h => ophid/inc/ophid.h} | 8 +- .../opHID_const.h => ophid/inc/ophid_const.h} | 2 +- .../inc/ophid_global.h} | 2 +- .../inc/ophid_hidapi.h} | 8 +- .../inc/ophid_plugin.h} | 8 +- .../inc/ophid_usbmon.h} | 4 +- .../inc/ophid_usbsignal.h} | 4 +- .../plugins/{opHID => ophid}/opHID.pluginspec | 0 .../{opHID/opHID.pri => ophid/ophid.pri} | 2 +- .../openpilotgcs/src/plugins/ophid/ophid.pro | 81 +++++++++++++++++++ .../ophid_dependencies.pri} | 0 .../src/opHID.cpp => ophid/src/ophid.cpp} | 4 +- .../src/ophid_hidapi.cpp} | 4 +- .../src/ophid_plugin.cpp} | 8 +- .../src/ophid_usbmon_linux.cpp} | 4 +- .../src/ophid_usbmon_mac.cpp} | 4 +- .../src/ophid_usbmon_win.cpp} | 4 +- .../src/ophid_usbsignal.cpp} | 2 +- ground/openpilotgcs/src/plugins/plugins.pro | 2 +- 26 files changed, 120 insertions(+), 115 deletions(-) delete mode 100644 ground/openpilotgcs/src/plugins/opHID/opHID.pro rename ground/openpilotgcs/src/plugins/{opHID => ophid}/hidapi/.no-auto-format (100%) rename ground/openpilotgcs/src/plugins/{opHID => ophid}/hidapi/hidapi.h (100%) rename ground/openpilotgcs/src/plugins/{opHID => ophid}/hidapi/libusb/hid.c (99%) rename ground/openpilotgcs/src/plugins/{opHID => ophid}/hidapi/linux/hid.c (99%) rename ground/openpilotgcs/src/plugins/{opHID => ophid}/hidapi/mac/hid.c (99%) rename ground/openpilotgcs/src/plugins/{opHID => ophid}/hidapi/windows/hid.c (99%) rename ground/openpilotgcs/src/plugins/{opHID/inc/opHID.h => ophid/inc/ophid.h} (95%) rename ground/openpilotgcs/src/plugins/{opHID/inc/opHID_const.h => ophid/inc/ophid_const.h} (98%) rename ground/openpilotgcs/src/plugins/{opHID/inc/opHID_global.h => ophid/inc/ophid_global.h} (97%) rename ground/openpilotgcs/src/plugins/{opHID/inc/opHID_hidapi.h => ophid/inc/ophid_hidapi.h} (94%) rename ground/openpilotgcs/src/plugins/{opHID/inc/opHID_plugin.h => ophid/inc/ophid_plugin.h} (96%) rename ground/openpilotgcs/src/plugins/{opHID/inc/opHID_usbmon.h => ophid/inc/ophid_usbmon.h} (99%) rename ground/openpilotgcs/src/plugins/{opHID/inc/opHID_usbsignal.h => ophid/inc/ophid_usbsignal.h} (96%) rename ground/openpilotgcs/src/plugins/{opHID => ophid}/opHID.pluginspec (100%) rename ground/openpilotgcs/src/plugins/{opHID/opHID.pri => ophid/ophid.pri} (51%) create mode 100644 ground/openpilotgcs/src/plugins/ophid/ophid.pro rename ground/openpilotgcs/src/plugins/{opHID/opHID_dependencies.pri => ophid/ophid_dependencies.pri} (100%) rename ground/openpilotgcs/src/plugins/{opHID/src/opHID.cpp => ophid/src/ophid.cpp} (99%) rename ground/openpilotgcs/src/plugins/{opHID/src/opHID_hidapi.cpp => ophid/src/ophid_hidapi.cpp} (99%) rename ground/openpilotgcs/src/plugins/{opHID/src/opHID_plugin.cpp => ophid/src/ophid_plugin.cpp} (98%) rename ground/openpilotgcs/src/plugins/{opHID/src/opHID_usbmon_linux.cpp => ophid/src/ophid_usbmon_linux.cpp} (99%) rename ground/openpilotgcs/src/plugins/{opHID/src/opHID_usbmon_mac.cpp => ophid/src/ophid_usbmon_mac.cpp} (99%) rename ground/openpilotgcs/src/plugins/{opHID/src/opHID_usbmon_win.cpp => ophid/src/ophid_usbmon_win.cpp} (99%) rename ground/openpilotgcs/src/plugins/{opHID/src/opHID_usbsignal.cpp => ophid/src/ophid_usbsignal.cpp} (98%) diff --git a/ground/openpilotgcs/src/plugins/opHID/opHID.pro b/ground/openpilotgcs/src/plugins/opHID/opHID.pro deleted file mode 100644 index eccb05bdd..000000000 --- a/ground/openpilotgcs/src/plugins/opHID/opHID.pro +++ /dev/null @@ -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.) - } -} - diff --git a/ground/openpilotgcs/src/plugins/opHID/hidapi/.no-auto-format b/ground/openpilotgcs/src/plugins/ophid/hidapi/.no-auto-format similarity index 100% rename from ground/openpilotgcs/src/plugins/opHID/hidapi/.no-auto-format rename to ground/openpilotgcs/src/plugins/ophid/hidapi/.no-auto-format diff --git a/ground/openpilotgcs/src/plugins/opHID/hidapi/hidapi.h b/ground/openpilotgcs/src/plugins/ophid/hidapi/hidapi.h similarity index 100% rename from ground/openpilotgcs/src/plugins/opHID/hidapi/hidapi.h rename to ground/openpilotgcs/src/plugins/ophid/hidapi/hidapi.h diff --git a/ground/openpilotgcs/src/plugins/opHID/hidapi/libusb/hid.c b/ground/openpilotgcs/src/plugins/ophid/hidapi/libusb/hid.c similarity index 99% rename from ground/openpilotgcs/src/plugins/opHID/hidapi/libusb/hid.c rename to ground/openpilotgcs/src/plugins/ophid/hidapi/libusb/hid.c index 94c1b3b69..a25eaa6f3 100644 --- a/ground/openpilotgcs/src/plugins/opHID/hidapi/libusb/hid.c +++ b/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" { diff --git a/ground/openpilotgcs/src/plugins/opHID/hidapi/linux/hid.c b/ground/openpilotgcs/src/plugins/ophid/hidapi/linux/hid.c similarity index 99% rename from ground/openpilotgcs/src/plugins/opHID/hidapi/linux/hid.c rename to ground/openpilotgcs/src/plugins/ophid/hidapi/linux/hid.c index 38f67537c..a54543047 100644 --- a/ground/openpilotgcs/src/plugins/opHID/hidapi/linux/hid.c +++ b/ground/openpilotgcs/src/plugins/ophid/hidapi/linux/hid.c @@ -43,7 +43,7 @@ #include #include -#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. */ diff --git a/ground/openpilotgcs/src/plugins/opHID/hidapi/mac/hid.c b/ground/openpilotgcs/src/plugins/ophid/hidapi/mac/hid.c similarity index 99% rename from ground/openpilotgcs/src/plugins/opHID/hidapi/mac/hid.c rename to ground/openpilotgcs/src/plugins/ophid/hidapi/mac/hid.c index d556eac53..2d473253f 100644 --- a/ground/openpilotgcs/src/plugins/opHID/hidapi/mac/hid.c +++ b/ground/openpilotgcs/src/plugins/ophid/hidapi/mac/hid.c @@ -32,7 +32,7 @@ #include #include -#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. diff --git a/ground/openpilotgcs/src/plugins/opHID/hidapi/windows/hid.c b/ground/openpilotgcs/src/plugins/ophid/hidapi/windows/hid.c similarity index 99% rename from ground/openpilotgcs/src/plugins/opHID/hidapi/windows/hid.c rename to ground/openpilotgcs/src/plugins/ophid/hidapi/windows/hid.c index cd9e4bb0f..9b85b19bb 100644 --- a/ground/openpilotgcs/src/plugins/opHID/hidapi/windows/hid.c +++ b/ground/openpilotgcs/src/plugins/ophid/hidapi/windows/hid.c @@ -60,7 +60,7 @@ extern "C" { #include -#include "hidapi.h" +#include "../hidapi.h" #ifdef _MSC_VER /* Thanks Microsoft, but I know how to use strncpy(). */ diff --git a/ground/openpilotgcs/src/plugins/opHID/inc/opHID.h b/ground/openpilotgcs/src/plugins/ophid/inc/ophid.h similarity index 95% rename from ground/openpilotgcs/src/plugins/opHID/inc/opHID.h rename to ground/openpilotgcs/src/plugins/ophid/inc/ophid.h index fc1700deb..6f29227d8 100644 --- a/ground/openpilotgcs/src/plugins/opHID/inc/opHID.h +++ b/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 #include #include #include -#include "opHID_hidapi.h" -#include "opHID_usbmon.h" +#include "ophid_hidapi.h" +#include "ophid_usbmon.h" class RawHIDReadThread; class RawHIDWriteThread; diff --git a/ground/openpilotgcs/src/plugins/opHID/inc/opHID_const.h b/ground/openpilotgcs/src/plugins/ophid/inc/ophid_const.h similarity index 98% rename from ground/openpilotgcs/src/plugins/opHID/inc/opHID_const.h rename to ground/openpilotgcs/src/plugins/ophid/inc/ophid_const.h index 9a2e12fbb..f0928891e 100644 --- a/ground/openpilotgcs/src/plugins/opHID/inc/opHID_const.h +++ b/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 * @{ diff --git a/ground/openpilotgcs/src/plugins/opHID/inc/opHID_global.h b/ground/openpilotgcs/src/plugins/ophid/inc/ophid_global.h similarity index 97% rename from ground/openpilotgcs/src/plugins/opHID/inc/opHID_global.h rename to ground/openpilotgcs/src/plugins/ophid/inc/ophid_global.h index a08279318..d5f2217b8 100644 --- a/ground/openpilotgcs/src/plugins/opHID/inc/opHID_global.h +++ b/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 * @{ diff --git a/ground/openpilotgcs/src/plugins/opHID/inc/opHID_hidapi.h b/ground/openpilotgcs/src/plugins/ophid/inc/ophid_hidapi.h similarity index 94% rename from ground/openpilotgcs/src/plugins/opHID/inc/opHID_hidapi.h rename to ground/openpilotgcs/src/plugins/ophid/inc/ophid_hidapi.h index 3151917db..30366338a 100644 --- a/ground/openpilotgcs/src/plugins/opHID/inc/opHID_hidapi.h +++ b/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 #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 { diff --git a/ground/openpilotgcs/src/plugins/opHID/inc/opHID_plugin.h b/ground/openpilotgcs/src/plugins/ophid/inc/ophid_plugin.h similarity index 96% rename from ground/openpilotgcs/src/plugins/opHID/inc/opHID_plugin.h rename to ground/openpilotgcs/src/plugins/ophid/inc/ophid_plugin.h index 37f08d2a5..73f84dadc 100644 --- a/ground/openpilotgcs/src/plugins/opHID/inc/opHID_plugin.h +++ b/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 #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; diff --git a/ground/openpilotgcs/src/plugins/opHID/inc/opHID_usbmon.h b/ground/openpilotgcs/src/plugins/ophid/inc/ophid_usbmon.h similarity index 99% rename from ground/openpilotgcs/src/plugins/opHID/inc/opHID_usbmon.h rename to ground/openpilotgcs/src/plugins/ophid/inc/ophid_usbmon.h index 2b3849044..c169e7040 100644 --- a/ground/openpilotgcs/src/plugins/opHID/inc/opHID_usbmon.h +++ b/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 #include diff --git a/ground/openpilotgcs/src/plugins/opHID/inc/opHID_usbsignal.h b/ground/openpilotgcs/src/plugins/ophid/inc/ophid_usbsignal.h similarity index 96% rename from ground/openpilotgcs/src/plugins/opHID/inc/opHID_usbsignal.h rename to ground/openpilotgcs/src/plugins/ophid/inc/ophid_usbsignal.h index 221359911..ad461d9fb 100644 --- a/ground/openpilotgcs/src/plugins/opHID/inc/opHID_usbsignal.h +++ b/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 -#include "opHID_usbmon.h" +#include "ophid_usbmon.h" class OPHID_EXPORT USBSignalFilter : public QObject { Q_OBJECT diff --git a/ground/openpilotgcs/src/plugins/opHID/opHID.pluginspec b/ground/openpilotgcs/src/plugins/ophid/opHID.pluginspec similarity index 100% rename from ground/openpilotgcs/src/plugins/opHID/opHID.pluginspec rename to ground/openpilotgcs/src/plugins/ophid/opHID.pluginspec diff --git a/ground/openpilotgcs/src/plugins/opHID/opHID.pri b/ground/openpilotgcs/src/plugins/ophid/ophid.pri similarity index 51% rename from ground/openpilotgcs/src/plugins/opHID/opHID.pri rename to ground/openpilotgcs/src/plugins/ophid/ophid.pri index 2c05da83d..8ddbc3c4f 100644 --- a/ground/openpilotgcs/src/plugins/opHID/opHID.pri +++ b/ground/openpilotgcs/src/plugins/ophid/ophid.pri @@ -1,3 +1,3 @@ -include(opHID_dependencies.pri) +include(ophid_dependencies.pri) LIBS *= -l$$qtLibraryName(opHID) diff --git a/ground/openpilotgcs/src/plugins/ophid/ophid.pro b/ground/openpilotgcs/src/plugins/ophid/ophid.pro new file mode 100644 index 000000000..d5f2d04cb --- /dev/null +++ b/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.) + } +} + diff --git a/ground/openpilotgcs/src/plugins/opHID/opHID_dependencies.pri b/ground/openpilotgcs/src/plugins/ophid/ophid_dependencies.pri similarity index 100% rename from ground/openpilotgcs/src/plugins/opHID/opHID_dependencies.pri rename to ground/openpilotgcs/src/plugins/ophid/ophid_dependencies.pri diff --git a/ground/openpilotgcs/src/plugins/opHID/src/opHID.cpp b/ground/openpilotgcs/src/plugins/ophid/src/ophid.cpp similarity index 99% rename from ground/openpilotgcs/src/plugins/opHID/src/opHID.cpp rename to ground/openpilotgcs/src/plugins/ophid/src/ophid.cpp index db38ad42d..afcc28446 100644 --- a/ground/openpilotgcs/src/plugins/opHID/src/opHID.cpp +++ b/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 #include diff --git a/ground/openpilotgcs/src/plugins/opHID/src/opHID_hidapi.cpp b/ground/openpilotgcs/src/plugins/ophid/src/ophid_hidapi.cpp similarity index 99% rename from ground/openpilotgcs/src/plugins/opHID/src/opHID_hidapi.cpp rename to ground/openpilotgcs/src/plugins/ophid/src/ophid_hidapi.cpp index 8c214612e..baacd5502 100644 --- a/ground/openpilotgcs/src/plugins/opHID/src/opHID_hidapi.cpp +++ b/ground/openpilotgcs/src/plugins/ophid/src/ophid_hidapi.cpp @@ -30,8 +30,8 @@ #include #include #include -#include "opHID_const.h" -#include "opHID_hidapi.h" +#include "ophid_const.h" +#include "ophid_hidapi.h" /** * \brief Constructor diff --git a/ground/openpilotgcs/src/plugins/opHID/src/opHID_plugin.cpp b/ground/openpilotgcs/src/plugins/ophid/src/ophid_plugin.cpp similarity index 98% rename from ground/openpilotgcs/src/plugins/opHID/src/opHID_plugin.cpp rename to ground/openpilotgcs/src/plugins/ophid/src/ophid_plugin.cpp index d471965b1..34b2bf790 100644 --- a/ground/openpilotgcs/src/plugins/opHID/src/opHID_plugin.cpp +++ b/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 #include #include -#include "opHID_hidapi.h" -#include "opHID_const.h" +#include "ophid_hidapi.h" +#include "ophid_const.h" /** diff --git a/ground/openpilotgcs/src/plugins/opHID/src/opHID_usbmon_linux.cpp b/ground/openpilotgcs/src/plugins/ophid/src/ophid_usbmon_linux.cpp similarity index 99% rename from ground/openpilotgcs/src/plugins/opHID/src/opHID_usbmon_linux.cpp rename to ground/openpilotgcs/src/plugins/ophid/src/ophid_usbmon_linux.cpp index d6aa168f3..9e6f3ef70 100644 --- a/ground/openpilotgcs/src/plugins/opHID/src/opHID_usbmon_linux.cpp +++ b/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 -#include "opHID_const.h" +#include "ophid_const.h" /** diff --git a/ground/openpilotgcs/src/plugins/opHID/src/opHID_usbmon_mac.cpp b/ground/openpilotgcs/src/plugins/ophid/src/ophid_usbmon_mac.cpp similarity index 99% rename from ground/openpilotgcs/src/plugins/opHID/src/opHID_usbmon_mac.cpp rename to ground/openpilotgcs/src/plugins/ophid/src/ophid_usbmon_mac.cpp index 06574b0a5..c3a804531 100644 --- a/ground/openpilotgcs/src/plugins/opHID/src/opHID_usbmon_mac.cpp +++ b/ground/openpilotgcs/src/plugins/ophid/src/ophid_usbmon_mac.cpp @@ -26,14 +26,14 @@ */ -#include "opHID_usbmon.h" +#include "ophid_usbmon.h" #include #include #include #include #include #include -#include "opHID_const.h" +#include "ophid_const.h" // Local helper functions static bool HID_GetIntProperty(IOHIDDeviceRef dev, CFStringRef property, int *value); diff --git a/ground/openpilotgcs/src/plugins/opHID/src/opHID_usbmon_win.cpp b/ground/openpilotgcs/src/plugins/ophid/src/ophid_usbmon_win.cpp similarity index 99% rename from ground/openpilotgcs/src/plugins/opHID/src/opHID_usbmon_win.cpp rename to ground/openpilotgcs/src/plugins/ophid/src/ophid_usbmon_win.cpp index 4492106c2..5c3d90251 100644 --- a/ground/openpilotgcs/src/plugins/opHID/src/opHID_usbmon_win.cpp +++ b/ground/openpilotgcs/src/plugins/ophid/src/ophid_usbmon_win.cpp @@ -30,9 +30,9 @@ #include #include #include -#include "opHID_usbmon.h" +#include "ophid_usbmon.h" #include -#include "opHID_const.h" +#include "ophid_const.h" #define printf qDebug diff --git a/ground/openpilotgcs/src/plugins/opHID/src/opHID_usbsignal.cpp b/ground/openpilotgcs/src/plugins/ophid/src/ophid_usbsignal.cpp similarity index 98% rename from ground/openpilotgcs/src/plugins/opHID/src/opHID_usbsignal.cpp rename to ground/openpilotgcs/src/plugins/ophid/src/ophid_usbsignal.cpp index ae39e497d..6e1335f16 100644 --- a/ground/openpilotgcs/src/plugins/opHID/src/opHID_usbsignal.cpp +++ b/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 diff --git a/ground/openpilotgcs/src/plugins/plugins.pro b/ground/openpilotgcs/src/plugins/plugins.pro index f397a67d6..20b402704 100644 --- a/ground/openpilotgcs/src/plugins/plugins.pro +++ b/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