diff options
author | Oliver Wolff <oliver.wolff@qt.io> | 2017-02-15 14:22:07 +0100 |
---|---|---|
committer | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2017-02-16 13:34:42 +0000 |
commit | 7053af71846706006ec58afbb829291909726c7a (patch) | |
tree | 22fe0c64d9bc76b284ffc524ba53bf1badf74437 | |
parent | c8ce4940c5be641b753ef943cf336963596705a4 (diff) |
iot-sensortag: Remove unused CharacteristicInfo
Change-Id: I473c28d7c6d19e633623a30d6ca8d4edd07423b2
Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
-rw-r--r-- | tradeshow/iot-sensortag/SensorTagDemo.pro | 6 | ||||
-rw-r--r-- | tradeshow/iot-sensortag/bluetoothdevice.cpp | 1 | ||||
-rw-r--r-- | tradeshow/iot-sensortag/characteristicinfo.cpp | 153 | ||||
-rw-r--r-- | tradeshow/iot-sensortag/characteristicinfo.h | 84 |
4 files changed, 2 insertions, 242 deletions
diff --git a/tradeshow/iot-sensortag/SensorTagDemo.pro b/tradeshow/iot-sensortag/SensorTagDemo.pro index c1a9fcd..9fab11c 100644 --- a/tradeshow/iot-sensortag/SensorTagDemo.pro +++ b/tradeshow/iot-sensortag/SensorTagDemo.pro @@ -67,15 +67,13 @@ BLUETOOTH_LINUX_HOST { sensortagdataproviderpool.cpp \ bluetoothdataprovider.cpp \ serviceinfo.cpp \ - bluetoothdevice.cpp \ - characteristicinfo.cpp + bluetoothdevice.cpp HEADERS += \ sensortagdataproviderpool.h \ bluetoothdataprovider.h \ serviceinfo.h \ - bluetoothdevice.h \ - characteristicinfo.h + bluetoothdevice.h } UPDATE_TO_CLOUD { diff --git a/tradeshow/iot-sensortag/bluetoothdevice.cpp b/tradeshow/iot-sensortag/bluetoothdevice.cpp index b44afab..2ae28ef 100644 --- a/tradeshow/iot-sensortag/bluetoothdevice.cpp +++ b/tradeshow/iot-sensortag/bluetoothdevice.cpp @@ -48,7 +48,6 @@ ** ****************************************************************************/ #include "bluetoothdevice.h" -#include "characteristicinfo.h" #include <QBluetoothDeviceDiscoveryAgent> #include <QBluetoothDeviceInfo> diff --git a/tradeshow/iot-sensortag/characteristicinfo.cpp b/tradeshow/iot-sensortag/characteristicinfo.cpp deleted file mode 100644 index ee9ef45..0000000 --- a/tradeshow/iot-sensortag/characteristicinfo.cpp +++ /dev/null @@ -1,153 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the examples of Qt for Device Creation. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "characteristicinfo.h" -#include <QByteArray> - -CharacteristicInfo::CharacteristicInfo() -{ -} - -CharacteristicInfo::CharacteristicInfo(const QLowEnergyCharacteristic &characteristic): - m_characteristic(characteristic) -{ -} - -void CharacteristicInfo::setCharacteristic(const QLowEnergyCharacteristic &characteristic) -{ - m_characteristic = characteristic; - emit characteristicChanged(); -} - -QString CharacteristicInfo::getName() const -{ - QString name = m_characteristic.name(); - if (!name.isEmpty()) - return name; - - // find descriptor with CharacteristicUserDescription - for (const QLowEnergyDescriptor &descriptor : m_characteristic.descriptors()) { - if (descriptor.type() == QBluetoothUuid::CharacteristicUserDescription) { - name = descriptor.value(); - break; - } - } - - if (name.isEmpty()) - name = "Unknown"; - - return name; -} - -QString CharacteristicInfo::getUuid() const -{ - const QBluetoothUuid uuid = m_characteristic.uuid(); - bool success = false; - quint16 result16 = uuid.toUInt16(&success); - if (success) - return QStringLiteral("0x") + QString::number(result16, 16); - - quint32 result32 = uuid.toUInt32(&success); - if (success) - return QStringLiteral("0x") + QString::number(result32, 16); - - return uuid.toString().remove(QLatin1Char('{')).remove(QLatin1Char('}')); -} - -QString CharacteristicInfo::getValue() const -{ - // Show raw string first and hex value below - QByteArray a = m_characteristic.value(); - QString result; - if (a.isEmpty()) { - result = QStringLiteral("<none>"); - return result; - } - - result = a; - result += QLatin1Char('\n'); - result += a.toHex(); - - return result; -} - -QString CharacteristicInfo::getHandle() const -{ - return QStringLiteral("0x") + QString::number(m_characteristic.handle(), 16); -} - -QString CharacteristicInfo::getPermission() const -{ - QString properties = "( "; - int permission = m_characteristic.properties(); - if (permission & QLowEnergyCharacteristic::Read) - properties += QStringLiteral(" Read"); - if (permission & QLowEnergyCharacteristic::Write) - properties += QStringLiteral(" Write"); - if (permission & QLowEnergyCharacteristic::Notify) - properties += QStringLiteral(" Notify"); - if (permission & QLowEnergyCharacteristic::Indicate) - properties += QStringLiteral(" Indicate"); - if (permission & QLowEnergyCharacteristic::ExtendedProperty) - properties += QStringLiteral(" ExtendedProperty"); - if (permission & QLowEnergyCharacteristic::Broadcasting) - properties += QStringLiteral(" Broadcast"); - if (permission & QLowEnergyCharacteristic::WriteNoResponse) - properties += QStringLiteral(" WriteNoResp"); - if (permission & QLowEnergyCharacteristic::WriteSigned) - properties += QStringLiteral(" WriteSigned"); - properties += " )"; - return properties; -} - -QLowEnergyCharacteristic CharacteristicInfo::getCharacteristic() const -{ - return m_characteristic; -} diff --git a/tradeshow/iot-sensortag/characteristicinfo.h b/tradeshow/iot-sensortag/characteristicinfo.h deleted file mode 100644 index 1143ec9..0000000 --- a/tradeshow/iot-sensortag/characteristicinfo.h +++ /dev/null @@ -1,84 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the examples of Qt for Device Creation. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef CHARACTERISTICINFO_H -#define CHARACTERISTICINFO_H - -#include <QObject> -#include <QString> -#include <QtBluetooth/QLowEnergyCharacteristic> - -class CharacteristicInfo: public QObject -{ - Q_OBJECT - Q_PROPERTY(QString characteristicName READ getName NOTIFY characteristicChanged) - Q_PROPERTY(QString characteristicUuid READ getUuid NOTIFY characteristicChanged) - Q_PROPERTY(QString characteristicValue READ getValue NOTIFY characteristicChanged) - Q_PROPERTY(QString characteristicHandle READ getHandle NOTIFY characteristicChanged) - Q_PROPERTY(QString characteristicPermission READ getPermission NOTIFY characteristicChanged) - -public: - CharacteristicInfo(); - CharacteristicInfo(const QLowEnergyCharacteristic &characteristic); - void setCharacteristic(const QLowEnergyCharacteristic &characteristic); - QString getName() const; - QString getUuid() const; - QString getValue() const; - QString getHandle() const; - QString getPermission() const; - QLowEnergyCharacteristic getCharacteristic() const; - -Q_SIGNALS: - void characteristicChanged(); - -private: - QLowEnergyCharacteristic m_characteristic; -}; - -#endif // CHARACTERISTICINFO_H |