|
|
|
|
@ -3,40 +3,32 @@
@@ -3,40 +3,32 @@
|
|
|
|
|
** Copyright (C) 2011-2012 Denis Shienkov <denis.shienkov@gmail.com> |
|
|
|
|
** Copyright (C) 2011 Sergey Belyashov <Sergey.Belyashov@gmail.com> |
|
|
|
|
** Copyright (C) 2012 Laszlo Papp <lpapp@kde.org> |
|
|
|
|
** Contact: http://www.qt-project.org/legal
|
|
|
|
|
** Contact: http://www.qt.io/licensing/
|
|
|
|
|
** |
|
|
|
|
** This file is part of the QtSerialPort module of the Qt Toolkit. |
|
|
|
|
** |
|
|
|
|
** $QT_BEGIN_LICENSE:LGPL$ |
|
|
|
|
** $QT_BEGIN_LICENSE:LGPL21$ |
|
|
|
|
** Commercial License Usage |
|
|
|
|
** Licensees holding valid commercial Qt licenses may use this file in |
|
|
|
|
** accordance with the commercial license agreement provided with the |
|
|
|
|
** Software or, alternatively, in accordance with the terms contained in |
|
|
|
|
** a written agreement between you and Digia. For licensing terms and |
|
|
|
|
** conditions see http://qt.digia.com/licensing. For further information
|
|
|
|
|
** use the contact form at http://qt.digia.com/contact-us.
|
|
|
|
|
** a written agreement between you and The Qt Company. For licensing terms |
|
|
|
|
** and conditions see http://www.qt.io/terms-conditions. For further
|
|
|
|
|
** information use the contact form at http://www.qt.io/contact-us.
|
|
|
|
|
** |
|
|
|
|
** GNU Lesser General Public License Usage |
|
|
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser |
|
|
|
|
** General Public License version 2.1 as published by the Free Software |
|
|
|
|
** Foundation and appearing in the file LICENSE.LGPL included in the |
|
|
|
|
** packaging of this file. Please review the following information to |
|
|
|
|
** ensure the GNU Lesser General Public License version 2.1 requirements |
|
|
|
|
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
|
|
|
** General Public License version 2.1 or version 3 as published by the Free |
|
|
|
|
** Software Foundation and appearing in the file LICENSE.LGPLv21 and |
|
|
|
|
** LICENSE.LGPLv3 included in the packaging of this file. Please review the |
|
|
|
|
** following information to ensure the GNU Lesser General Public License |
|
|
|
|
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
|
|
|
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
|
|
|
** |
|
|
|
|
** In addition, as a special exception, Digia gives you certain additional |
|
|
|
|
** rights. These rights are described in the Digia Qt LGPL Exception |
|
|
|
|
** As a special exception, The Qt Company gives you certain additional |
|
|
|
|
** rights. These rights are described in The Qt Company LGPL Exception |
|
|
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. |
|
|
|
|
** |
|
|
|
|
** GNU General Public License Usage |
|
|
|
|
** Alternatively, this file may be used under the terms of the GNU |
|
|
|
|
** General Public License version 3.0 as published by the Free Software |
|
|
|
|
** Foundation and appearing in the file LICENSE.GPL included in the |
|
|
|
|
** packaging of this file. Please review the following information to |
|
|
|
|
** ensure the GNU General Public License version 3.0 requirements will be |
|
|
|
|
** met: http://www.gnu.org/copyleft/gpl.html.
|
|
|
|
|
** |
|
|
|
|
** |
|
|
|
|
** $QT_END_LICENSE$ |
|
|
|
|
** |
|
|
|
|
****************************************************************************/ |
|
|
|
|
@ -56,11 +48,11 @@ QT_BEGIN_NAMESPACE
@@ -56,11 +48,11 @@ QT_BEGIN_NAMESPACE
|
|
|
|
|
static const char V_jniClassName[] {"org/qgroundcontrol/qgchelper/UsbDeviceJNI"}; |
|
|
|
|
static const char V_TAG[] {"QGC_QSerialPortInfo"}; |
|
|
|
|
|
|
|
|
|
QList<QSerialPortInfo> availablePortsByFiltersOfDevices() |
|
|
|
|
QList<QSerialPortInfo> availablePortsByFiltersOfDevices(bool &ok) |
|
|
|
|
{ |
|
|
|
|
QList<QSerialPortInfo> serialPortInfoList; |
|
|
|
|
|
|
|
|
|
__android_log_print(ANDROID_LOG_INFO, V_TAG, "Collecting device list"); |
|
|
|
|
//__android_log_print(ANDROID_LOG_INFO, V_TAG, "Collecting device list");
|
|
|
|
|
QAndroidJniObject resultL = QAndroidJniObject::callStaticObjectMethod( |
|
|
|
|
V_jniClassName, |
|
|
|
|
"availableDevicesInfo", |
|
|
|
|
@ -68,6 +60,7 @@ QList<QSerialPortInfo> availablePortsByFiltersOfDevices()
@@ -68,6 +60,7 @@ QList<QSerialPortInfo> availablePortsByFiltersOfDevices()
|
|
|
|
|
|
|
|
|
|
if (!resultL.isValid()) { |
|
|
|
|
__android_log_print(ANDROID_LOG_ERROR, V_TAG, "Error from availableDevicesInfo"); |
|
|
|
|
ok = false; |
|
|
|
|
return serialPortInfoList; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -75,24 +68,24 @@ QList<QSerialPortInfo> availablePortsByFiltersOfDevices()
@@ -75,24 +68,24 @@ QList<QSerialPortInfo> availablePortsByFiltersOfDevices()
|
|
|
|
|
jobjectArray objArrayL = resultL.object<jobjectArray>(); |
|
|
|
|
int countL = envL->GetArrayLength(objArrayL); |
|
|
|
|
|
|
|
|
|
for (int iL=0; iL<countL; iL++) |
|
|
|
|
for (int iL = 0; iL < countL; iL++) |
|
|
|
|
{ |
|
|
|
|
QSerialPortInfo infoL; |
|
|
|
|
QSerialPortInfoPrivate priv; |
|
|
|
|
jstring stringL = (jstring)(envL->GetObjectArrayElement(objArrayL, iL)); |
|
|
|
|
const char *rawStringL = envL->GetStringUTFChars(stringL, 0); |
|
|
|
|
__android_log_print(ANDROID_LOG_INFO, V_TAG, "Adding device: %s", rawStringL); |
|
|
|
|
//__android_log_print(ANDROID_LOG_INFO, V_TAG, "Adding device: %s", rawStringL);
|
|
|
|
|
QStringList strListL = QString::fromUtf8(rawStringL).split(QStringLiteral(":")); |
|
|
|
|
envL->ReleaseStringUTFChars(stringL, rawStringL); |
|
|
|
|
|
|
|
|
|
infoL.d_ptr->portName = strListL[0]; |
|
|
|
|
infoL.d_ptr->device = strListL[0]; |
|
|
|
|
infoL.d_ptr->manufacturer = strListL[1]; |
|
|
|
|
infoL.d_ptr->productIdentifier = strListL[2].toInt(); |
|
|
|
|
infoL.d_ptr->hasProductIdentifier = (infoL.d_ptr->productIdentifier != 0) ? true: false; |
|
|
|
|
infoL.d_ptr->vendorIdentifier = strListL[3].toInt(); |
|
|
|
|
infoL.d_ptr->hasVendorIdentifier = (infoL.d_ptr->vendorIdentifier != 0) ? true: false; |
|
|
|
|
priv.portName = strListL[0]; |
|
|
|
|
priv.device = strListL[0]; |
|
|
|
|
priv.manufacturer = strListL[1]; |
|
|
|
|
priv.productIdentifier = strListL[2].toInt(); |
|
|
|
|
priv.hasProductIdentifier = (priv.productIdentifier != 0) ? true: false; |
|
|
|
|
priv.vendorIdentifier = strListL[3].toInt(); |
|
|
|
|
priv.hasVendorIdentifier = (priv.vendorIdentifier != 0) ? true: false; |
|
|
|
|
|
|
|
|
|
serialPortInfoList.append(infoL); |
|
|
|
|
serialPortInfoList.append(priv); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return serialPortInfoList; |
|
|
|
|
@ -100,17 +93,20 @@ QList<QSerialPortInfo> availablePortsByFiltersOfDevices()
@@ -100,17 +93,20 @@ QList<QSerialPortInfo> availablePortsByFiltersOfDevices()
|
|
|
|
|
|
|
|
|
|
QList<QSerialPortInfo> availablePortsBySysfs() |
|
|
|
|
{ |
|
|
|
|
return availablePortsByFiltersOfDevices(); |
|
|
|
|
bool ok; |
|
|
|
|
return availablePortsByFiltersOfDevices(ok); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
QList<QSerialPortInfo> availablePortsByUdev() |
|
|
|
|
{ |
|
|
|
|
return availablePortsByFiltersOfDevices(); |
|
|
|
|
bool ok; |
|
|
|
|
return availablePortsByFiltersOfDevices(ok); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
QList<QSerialPortInfo> QSerialPortInfo::availablePorts() |
|
|
|
|
{ |
|
|
|
|
return availablePortsByFiltersOfDevices(); |
|
|
|
|
bool ok; |
|
|
|
|
return availablePortsByFiltersOfDevices(ok); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
QList<qint32> QSerialPortInfo::standardBaudRates() |
|
|
|
|
|
dogmaphobic
10 years ago