From 9ebc32da3df84652296d81280d515bb98378ddd0 Mon Sep 17 00:00:00 2001 From: Kenz Dale Date: Thu, 23 Aug 2012 18:03:17 +0200 Subject: [PATCH] Eliminated several (dozen) compiler warnings. Conflicts: ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp --- .../src/libs/opmapcontrol/src/core/opmaps.cpp | 2 + .../projections/platecarreeprojection.cpp | 1 + .../platecarreeprojectionpergo.cpp | 1 + .../opmapcontrol/src/mapwidget/trailitem.cpp | 3 + .../src/mapwidget/waypointcircle.cpp | 3 + .../src/mapwidget/waypointline.cpp | 2 + .../src/libs/utils/mytabbedstackwidget.cpp | 2 + .../cfg_vehicletypes/configccpmwidget.cpp | 1 + .../config/cfg_vehicletypes/vehicleconfig.cpp | 2 + .../src/plugins/config/configgadgetwidget.cpp | 2 + .../src/plugins/config/configinputwidget.cpp | 2 +- .../plugins/config/configpipxtremewidget.cpp | 4 +- .../src/plugins/coreplugin/modemanager.cpp | 4 ++ .../plugins/gcscontrol/gcscontrolgadget.cpp | 4 +- .../gcscontrolgadgetoptionspage.cpp | 4 ++ .../gcscontrol/gcscontrolgadgetwidget.cpp | 2 + .../gpsdisplaygadgetoptionspage.cpp | 2 + .../src/plugins/gpsdisplay/nmeaparser.cpp | 2 +- .../ipconnectionconfiguration.cpp | 2 + .../ipconnection/ipconnectionplugin.cpp | 4 ++ .../src/plugins/opmap/modelmapproxy.cpp | 6 ++ .../opmap/opmap_edit_waypoint_dialog.cpp | 2 + .../src/plugins/pfd/pfdgadgetoptionspage.cpp | 1 + .../qmlview/qmlviewgadgetoptionspage.cpp | 1 + .../src/plugins/rawhid/pjrc_rawhid_mac.cpp | 55 +++++++++++++------ .../src/plugins/rawhid/usbmonitor_mac.cpp | 8 +++ .../serialpluginconfiguration.cpp | 2 + .../src/plugins/uploader/SSP/qssp.cpp | 2 + .../uploader/uploadergadgetoptionspage.cpp | 2 + 29 files changed, 108 insertions(+), 20 deletions(-) diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/core/opmaps.cpp b/ground/openpilotgcs/src/libs/opmapcontrol/src/core/opmaps.cpp index 86660fd3e..3b858d82f 100644 --- a/ground/openpilotgcs/src/libs/opmapcontrol/src/core/opmaps.cpp +++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/core/opmaps.cpp @@ -43,6 +43,8 @@ namespace core { LanguageStr=LanguageType().toShortString(Language); Cache::Instance(); +// OPMaps::MemoryCache(); + } diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/internals/projections/platecarreeprojection.cpp b/ground/openpilotgcs/src/libs/opmapcontrol/src/internals/projections/platecarreeprojection.cpp index 18688ca06..27fd90808 100644 --- a/ground/openpilotgcs/src/libs/opmapcontrol/src/internals/projections/platecarreeprojection.cpp +++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/internals/projections/platecarreeprojection.cpp @@ -91,6 +91,7 @@ Size PlateCarreeProjection::GetTileMatrixMaxXY(const int &zoom) Size PlateCarreeProjection::GetTileMatrixMinXY(const int &zoom) { + Q_UNUSED(zoom); return Size(0, 0); } } diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/internals/projections/platecarreeprojectionpergo.cpp b/ground/openpilotgcs/src/libs/opmapcontrol/src/internals/projections/platecarreeprojectionpergo.cpp index 106674ad2..89d598bd6 100644 --- a/ground/openpilotgcs/src/libs/opmapcontrol/src/internals/projections/platecarreeprojectionpergo.cpp +++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/internals/projections/platecarreeprojectionpergo.cpp @@ -90,6 +90,7 @@ Size PlateCarreeProjectionPergo::GetTileMatrixMaxXY(const int &zoom) Size PlateCarreeProjectionPergo::GetTileMatrixMinXY(const int &zoom) { + Q_UNUSED(zoom) return Size(0, 0); } } diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/trailitem.cpp b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/trailitem.cpp index fabf6ee9a..ae13de21b 100644 --- a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/trailitem.cpp +++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/trailitem.cpp @@ -37,6 +37,9 @@ TrailItem::TrailItem(internals::PointLatLng const& coord,int const& altitude, QB void TrailItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { + Q_UNUSED(option); + Q_UNUSED(widget); + painter->setBrush(m_brush); painter->drawEllipse(-2,-2,4,4); } diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointcircle.cpp b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointcircle.cpp index 9f045a701..aad50ef0b 100644 --- a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointcircle.cpp +++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointcircle.cpp @@ -60,6 +60,9 @@ int WayPointCircle::type() const void WayPointCircle::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { + Q_UNUSED(option); + Q_UNUSED(widget); + QPointF p1; QPointF p2; p1=QPointF(line.p1().x(),line.p1().y()+line.length()); diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointline.cpp b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointline.cpp index 527ca46f9..ad245cbc1 100644 --- a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointline.cpp +++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointline.cpp @@ -75,6 +75,8 @@ QPainterPath WayPointLine::shape() const } void WayPointLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { + Q_UNUSED(option); + Q_UNUSED(widget); QPen myPen = pen(); myPen.setColor(myColor); diff --git a/ground/openpilotgcs/src/libs/utils/mytabbedstackwidget.cpp b/ground/openpilotgcs/src/libs/utils/mytabbedstackwidget.cpp index c412a475c..7c26acf45 100644 --- a/ground/openpilotgcs/src/libs/utils/mytabbedstackwidget.cpp +++ b/ground/openpilotgcs/src/libs/utils/mytabbedstackwidget.cpp @@ -114,6 +114,8 @@ void MyTabbedStackWidget::showWidget(int index) void MyTabbedStackWidget::insertCornerWidget(int index, QWidget *widget) { + Q_UNUSED(index); + widget->hide(); } diff --git a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configccpmwidget.cpp b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configccpmwidget.cpp index e7ca51fd1..47b730dbf 100644 --- a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configccpmwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configccpmwidget.cpp @@ -218,6 +218,7 @@ ConfigCcpmWidget::~ConfigCcpmWidget() void ConfigCcpmWidget::setupUI(QString frameType) { + Q_UNUSED(frameType); } void ConfigCcpmWidget::ResetActuators(GUIConfigDataUnion* configData) diff --git a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.cpp b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.cpp index fe76f1660..63f4351bb 100644 --- a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.cpp +++ b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.cpp @@ -112,7 +112,9 @@ void VehicleConfig::SetConfigData(GUIConfigDataUnion configData) { void VehicleConfig::ResetActuators(GUIConfigDataUnion* configData) { + Q_UNUSED(configData); } + QStringList VehicleConfig::getChannelDescriptions() { QStringList channelDesc; diff --git a/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp b/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp index c466df760..b512a2642 100644 --- a/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp @@ -218,6 +218,8 @@ void ConfigGadgetWidget::tabAboutToChange(int i,bool * proceed) */ void ConfigGadgetWidget::updatePipXStatus(UAVObject *object) { + Q_UNUSED(object); + // Restart the disconnection timer. pipxTimeout->start(5000); if (!pipxConnected) diff --git a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp index e0425d963..7f6c6339f 100644 --- a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp @@ -1268,7 +1268,7 @@ void ConfigInputWidget::simpleCalibration(bool enable) restoreMdata(); - for (int i = 0; i < ManualControlCommand::CHANNEL_NUMELEM; i++) + for (unsigned int i = 0; i < ManualControlCommand::CHANNEL_NUMELEM; i++) manualSettingsData.ChannelNeutral[i] = manualCommandData.Channel[i]; // Force flight mode neutral to middle diff --git a/ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp b/ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp index 7808b6dfa..7d46840ac 100644 --- a/ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp @@ -266,7 +266,9 @@ void ConfigPipXtremeWidget::updateStatus(UAVObject *object) */ void ConfigPipXtremeWidget::updateSettings(UAVObject *object) { - if (!settingsUpdated) + Q_UNUSED(object); + + if (!settingsUpdated) { settingsUpdated = true; enableControls(true); diff --git a/ground/openpilotgcs/src/plugins/coreplugin/modemanager.cpp b/ground/openpilotgcs/src/plugins/coreplugin/modemanager.cpp index a4479bae2..aa5356705 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/modemanager.cpp +++ b/ground/openpilotgcs/src/plugins/coreplugin/modemanager.cpp @@ -84,6 +84,8 @@ void ModeManager::init() void ModeManager::addWidget(QWidget *widget) { + Q_UNUSED(widget); + // We want the actionbar to stay on the bottom // so m_modeStack->cornerWidgetCount() -1 inserts it at the position immediately above // the actionbar @@ -220,6 +222,8 @@ void ModeManager::aboutToRemoveObject(QObject *obj) void ModeManager::addAction(Command *command, int priority, QMenu *menu) { + Q_UNUSED(menu); + m_actions.insert(command, priority); // Count the number of commands with a higher priority diff --git a/ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadget.cpp b/ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadget.cpp index b95082fb9..485cd7b31 100644 --- a/ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadget.cpp +++ b/ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadget.cpp @@ -198,6 +198,8 @@ void GCSControlGadget::sticksChangedLocally(double leftX, double leftY, double r void GCSControlGadget::gamepads(quint8 count) { + Q_UNUSED(count); + // sdlGamepad.setGamepad(0); // sdlGamepad.setTickRate(JOYSTICK_UPDATE_RATE); } @@ -291,7 +293,7 @@ double GCSControlGadget::constrain(double value) void GCSControlGadget::buttonState(ButtonNumber number, bool pressed) { - int state; +// int state; if ((buttonSettings[number].ActionID>0)&&(buttonSettings[number].FunctionID>0)&&(pressed)) {//this button is configured ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); diff --git a/ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadgetoptionspage.cpp b/ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadgetoptionspage.cpp index 1a68c6be6..d85390725 100644 --- a/ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadgetoptionspage.cpp +++ b/ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadgetoptionspage.cpp @@ -71,6 +71,8 @@ void GCSControlGadgetOptionsPage::buttonState(ButtonNumber number, bool pressed) void GCSControlGadgetOptionsPage::gamepads(quint8 count) { + Q_UNUSED(count); + /*options_page->AvailableControllerList->clear(); for (int i=0;igetObject(); UAVDataObject* flightStatus = dynamic_cast( objManager->getObject(QString("FlightStatus")) ); diff --git a/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplaygadgetoptionspage.cpp b/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplaygadgetoptionspage.cpp index 10d89d26e..e6e9c49d1 100644 --- a/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplaygadgetoptionspage.cpp +++ b/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplaygadgetoptionspage.cpp @@ -165,6 +165,8 @@ return s1.portNamesetupUi(optionsPageWidget); diff --git a/ground/openpilotgcs/src/plugins/gpsdisplay/nmeaparser.cpp b/ground/openpilotgcs/src/plugins/gpsdisplay/nmeaparser.cpp index e856251ab..cca79a565 100644 --- a/ground/openpilotgcs/src/plugins/gpsdisplay/nmeaparser.cpp +++ b/ground/openpilotgcs/src/plugins/gpsdisplay/nmeaparser.cpp @@ -301,7 +301,7 @@ void NMEAParser::nmeaProcessGPGSV(char *packet) const int sentence_total = tokenslist.at(1).toInt(); // Number of sentences for full data const int sentence_index = tokenslist.at(2).toInt(); // sentence x of y - const int sat_count = tokenslist.at(3).toInt(); // Number of satellites in view +// const int sat_count = tokenslist.at(3).toInt(); // Number of satellites in view int sats = (tokenslist.size() - 4) /4; for(int sat = 0; sat < sats; sat++) { diff --git a/ground/openpilotgcs/src/plugins/ipconnection/ipconnectionconfiguration.cpp b/ground/openpilotgcs/src/plugins/ipconnection/ipconnectionconfiguration.cpp index e90f52ab2..2fabfa8bb 100644 --- a/ground/openpilotgcs/src/plugins/ipconnection/ipconnectionconfiguration.cpp +++ b/ground/openpilotgcs/src/plugins/ipconnection/ipconnectionconfiguration.cpp @@ -34,6 +34,8 @@ IPconnectionConfiguration::IPconnectionConfiguration(QString classId, QSettings* m_Port(1000), m_UseTCP(1) { + Q_UNUSED(qSettings); + settings = Core::ICore::instance()->settings(); } diff --git a/ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.cpp b/ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.cpp index 78a056378..ed0d42d86 100644 --- a/ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.cpp +++ b/ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.cpp @@ -177,6 +177,8 @@ QList IPconnectionConnection::availableDevices() QIODevice *IPconnectionConnection::openDevice(const QString &deviceName) { + Q_UNUSED(deviceName); + QString HostName; int Port; bool UseTCP; @@ -211,6 +213,8 @@ QIODevice *IPconnectionConnection::openDevice(const QString &deviceName) void IPconnectionConnection::closeDevice(const QString &deviceName) { + Q_UNUSED(deviceName); + if (ipSocket){ ipConMutex.lock(); emit CloseSocket(ipSocket); diff --git a/ground/openpilotgcs/src/plugins/opmap/modelmapproxy.cpp b/ground/openpilotgcs/src/plugins/opmap/modelmapproxy.cpp index 406d8e23d..a802d69f8 100644 --- a/ground/openpilotgcs/src/plugins/opmap/modelmapproxy.cpp +++ b/ground/openpilotgcs/src/plugins/opmap/modelmapproxy.cpp @@ -60,6 +60,8 @@ void modelMapProxy::WPValuesChanged(WayPointItem * wp) void modelMapProxy::currentRowChanged(QModelIndex current, QModelIndex previous) { + Q_UNUSED(previous); + QList list; WayPointItem * wp=findWayPointNumber(current.row()); if(!wp) @@ -202,6 +204,8 @@ WayPointItem * modelMapProxy::findWayPointNumber(int number) void modelMapProxy::rowsRemoved(const QModelIndex &parent, int first, int last) { + Q_UNUSED(parent); + for(int x=last;x>first-1;x--) { myMap->WPDelete(x); @@ -211,6 +215,8 @@ void modelMapProxy::rowsRemoved(const QModelIndex &parent, int first, int last) void modelMapProxy::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) { + Q_UNUSED(bottomRight); + WayPointItem * item=findWayPointNumber(topLeft.row()); if(!item) return; diff --git a/ground/openpilotgcs/src/plugins/opmap/opmap_edit_waypoint_dialog.cpp b/ground/openpilotgcs/src/plugins/opmap/opmap_edit_waypoint_dialog.cpp index cab739b8e..11df41f88 100644 --- a/ground/openpilotgcs/src/plugins/opmap/opmap_edit_waypoint_dialog.cpp +++ b/ground/openpilotgcs/src/plugins/opmap/opmap_edit_waypoint_dialog.cpp @@ -287,5 +287,7 @@ void opmap_edit_waypoint_dialog::enableEditWidgets(bool value) void opmap_edit_waypoint_dialog::currentRowChanged(QModelIndex current, QModelIndex previous) { + Q_UNUSED(previous); + mapper->setCurrentIndex(current.row()); } diff --git a/ground/openpilotgcs/src/plugins/pfd/pfdgadgetoptionspage.cpp b/ground/openpilotgcs/src/plugins/pfd/pfdgadgetoptionspage.cpp index 89a877a0f..4268742e9 100644 --- a/ground/openpilotgcs/src/plugins/pfd/pfdgadgetoptionspage.cpp +++ b/ground/openpilotgcs/src/plugins/pfd/pfdgadgetoptionspage.cpp @@ -46,6 +46,7 @@ PFDGadgetOptionsPage::PFDGadgetOptionsPage(PFDGadgetConfiguration *config, QObje //creates options page widget (uses the UI file) QWidget *PFDGadgetOptionsPage::createPage(QWidget *parent) { + Q_UNUSED(parent); options_page = new Ui::PFDGadgetOptionsPage(); //main widget diff --git a/ground/openpilotgcs/src/plugins/qmlview/qmlviewgadgetoptionspage.cpp b/ground/openpilotgcs/src/plugins/qmlview/qmlviewgadgetoptionspage.cpp index 8cc110d1a..f88299cdb 100644 --- a/ground/openpilotgcs/src/plugins/qmlview/qmlviewgadgetoptionspage.cpp +++ b/ground/openpilotgcs/src/plugins/qmlview/qmlviewgadgetoptionspage.cpp @@ -46,6 +46,7 @@ QmlViewGadgetOptionsPage::QmlViewGadgetOptionsPage(QmlViewGadgetConfiguration *c //creates options page widget (uses the UI file) QWidget *QmlViewGadgetOptionsPage::createPage(QWidget *parent) { + Q_UNUSED(parent); options_page = new Ui::QmlViewGadgetOptionsPage(); //main widget diff --git a/ground/openpilotgcs/src/plugins/rawhid/pjrc_rawhid_mac.cpp b/ground/openpilotgcs/src/plugins/rawhid/pjrc_rawhid_mac.cpp index b490f5ddc..490ea2fdd 100644 --- a/ground/openpilotgcs/src/plugins/rawhid/pjrc_rawhid_mac.cpp +++ b/ground/openpilotgcs/src/plugins/rawhid/pjrc_rawhid_mac.cpp @@ -90,7 +90,7 @@ static void hid_close(hid_t *); static void attach_callback(void *, IOReturn, void *, IOHIDDeviceRef); static void detach_callback(void *, IOReturn, void *hid_mgr, IOHIDDeviceRef dev); static void input_callback(void *, IOReturn, void *, IOHIDReportType, uint32_t, uint8_t *, CFIndex); -static void output_callback(hid_t *context, IOReturn ret, void *sender, IOHIDReportType type, uint32_t id, uint8_t *data, CFIndex len); +//static void output_callback(hid_t *context, IOReturn ret, void *sender, IOHIDReportType type, uint32_t id, uint8_t *data, CFIndex len); static void timeout_callback(CFRunLoopTimerRef, void *); @@ -173,7 +173,7 @@ int pjrc_rawhid::open(int max, int vid, int pid, int usage_page, int usage) IOHIDManagerRegisterDeviceRemovalCallback(hid_manager, detach_callback, NULL); ret = IOHIDManagerOpen(hid_manager, kIOHIDOptionsTypeNone); if (ret != kIOReturnSuccess) { - printf("Could not start IOHIDManager"); + qDebug()<< "Could not start IOHIDManager"; IOHIDManagerUnscheduleFromRunLoop(hid_manager, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); CFRelease(hid_manager); @@ -181,7 +181,7 @@ int pjrc_rawhid::open(int max, int vid, int pid, int usage_page, int usage) } // Set the run loop reference: the_correct_runloop = CFRunLoopGetCurrent(); - printf("run loop\n"); + qDebug() << "run loop"; // let it do the callback for all devices while (CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, true) == kCFRunLoopRunHandledSource) ; // count up how many were added by the callback @@ -240,7 +240,7 @@ int pjrc_rawhid::receive(int num, void *buf, int len, int timeout) break; } if (!hid->open) { - printf("pjrc_rawhid_recv, device not open\n"); + qDebug() << "pjrc_rawhid_recv, device not open\n"; ret = -1; break; } @@ -263,6 +263,8 @@ int pjrc_rawhid::receive(int num, void *buf, int len, int timeout) // int pjrc_rawhid::send(int num, void *buf, int len, int timeout) { + Q_UNUSED(timeout); + hid_t *hid; int result=-100; @@ -287,6 +289,7 @@ int pjrc_rawhid::send(int num, void *buf, int len, int timeout) #endif #if 0 +#define TIMEOUT_FIXED // No matter what I tried this never actually sends an output // report and output_callback never gets called. Why?? // Did I miss something? This is exactly the same params as @@ -358,6 +361,9 @@ void pjrc_rawhid::close(int num) // static void input_callback(void *context, IOReturn ret, void *sender, IOHIDReportType type, uint32_t id, uint8_t *data, CFIndex len) { + Q_UNUSED(type); + Q_UNUSED(id); + buffer_t *n; hid_t *hid; @@ -365,7 +371,7 @@ static void input_callback(void *context, IOReturn ret, void *sender, IOHIDRepor if (ret != kIOReturnSuccess || len < 1) return; hid = (hid_t*)context; if (!hid || hid->ref != sender) return; - printf("Processing packet"); + qDebug() << "Processing packet"; n = (buffer_t *)malloc(sizeof(buffer_t)); if (!n) return; if (len > BUFFER_SIZE) len = BUFFER_SIZE; @@ -385,6 +391,8 @@ static void input_callback(void *context, IOReturn ret, void *sender, IOHIDRepor static void timeout_callback(CFRunLoopTimerRef timer, void *info) { + Q_UNUSED(timer); + //qDebug("timeout_callback\n"); *(int *)info = 1; //qDebug() << "Stop CFRunLoop from timeout_callback" << CFRunLoopGetCurrent(); @@ -440,9 +448,13 @@ static void hid_close(hid_t *hid) static void detach_callback(void *context, IOReturn r, void *hid_mgr, IOHIDDeviceRef dev) { + Q_UNUSED(context); + Q_UNUSED(r); + Q_UNUSED(hid_mgr); + hid_t *p; - printf("detach callback\n"); + qDebug()<< "detach callback"; for (p = first_hid; p; p = p->next) { if (p->ref == dev) { p->open = 0; @@ -454,9 +466,13 @@ static void detach_callback(void *context, IOReturn r, void *hid_mgr, IOHIDDevic static void attach_callback(void *context, IOReturn r, void *hid_mgr, IOHIDDeviceRef dev) { + Q_UNUSED(context); + Q_UNUSED(r); + Q_UNUSED(hid_mgr); + struct hid_struct *h; - printf("attach callback\n"); + qDebug() << "attach callback"; if (IOHIDDeviceOpen(dev, kIOHIDOptionsTypeNone) != kIOReturnSuccess) return; h = (hid_t *)malloc(sizeof(hid_t)); if (!h) return; @@ -468,15 +484,22 @@ static void attach_callback(void *context, IOReturn r, void *hid_mgr, IOHIDDevic add_hid(h); } +#ifdef TIMEOUT_FIXED static void output_callback(hid_t *context, IOReturn ret, void *sender, IOHIDReportType type, uint32_t id, uint8_t *data, CFIndex len) { - printf("output_callback, r=%d\n", ret); - if (ret == kIOReturnSuccess) { - *(int *)context = len; - } else { - // timeout if not success? - *(int *)context = 0; - } - CFRunLoopStop(CFRunLoopGetCurrent()); -} + Q_UNUSED(sender); + Q_UNUSED(type); + Q_UNUSED(id); + Q_UNUSED(data); + qDebug()<< QString("output_callback, r=%1").arg(ret); +// printf("output_callback, r=%d\n", ret); + if (ret == kIOReturnSuccess) { + *(int *)context = len; + } else { + // timeout if not success? + *(int *)context = 0; + } + CFRunLoopStop(CFRunLoopGetCurrent()); +} +#endif diff --git a/ground/openpilotgcs/src/plugins/rawhid/usbmonitor_mac.cpp b/ground/openpilotgcs/src/plugins/rawhid/usbmonitor_mac.cpp index 3e661c598..d803512e4 100644 --- a/ground/openpilotgcs/src/plugins/rawhid/usbmonitor_mac.cpp +++ b/ground/openpilotgcs/src/plugins/rawhid/usbmonitor_mac.cpp @@ -117,6 +117,10 @@ void USBMonitor::removeDevice(IOHIDDeviceRef dev) { */ void USBMonitor::detach_callback(void *context, IOReturn r, void *hid_mgr, IOHIDDeviceRef dev) { + Q_UNUSED(context); + Q_UNUSED(r); + Q_UNUSED(hid_mgr); + qDebug() << "USBMonitor: Device detached event"; instance()->removeDevice(dev); } @@ -129,6 +133,10 @@ void USBMonitor::addDevice(USBPortInfo info) { void USBMonitor::attach_callback(void *context, IOReturn r, void *hid_mgr, IOHIDDeviceRef dev) { + Q_UNUSED(context); + Q_UNUSED(r); + Q_UNUSED(hid_mgr); + bool got_properties = true; // CFTypeRef prop; diff --git a/ground/openpilotgcs/src/plugins/serialconnection/serialpluginconfiguration.cpp b/ground/openpilotgcs/src/plugins/serialconnection/serialpluginconfiguration.cpp index 789085596..75510f52c 100644 --- a/ground/openpilotgcs/src/plugins/serialconnection/serialpluginconfiguration.cpp +++ b/ground/openpilotgcs/src/plugins/serialconnection/serialpluginconfiguration.cpp @@ -38,6 +38,8 @@ SerialPluginConfiguration::SerialPluginConfiguration(QString classId, QSettings* IUAVGadgetConfiguration(classId, parent), m_speed("57600") { + Q_UNUSED(qSettings); + settings = Core::ICore::instance()->settings(); } diff --git a/ground/openpilotgcs/src/plugins/uploader/SSP/qssp.cpp b/ground/openpilotgcs/src/plugins/uploader/SSP/qssp.cpp index 356cb3604..b5eb5b1b7 100644 --- a/ground/openpilotgcs/src/plugins/uploader/SSP/qssp.cpp +++ b/ground/openpilotgcs/src/plugins/uploader/SSP/qssp.cpp @@ -802,6 +802,8 @@ qssp::qssp(port * info,bool debug):debug(debug) } void qssp::pfCallBack( uint8_t * buf, uint16_t size) { + Q_UNUSED(size); + if (debug) qDebug()<<"receive callback"<