From 7890975ec6394c172843cc9ecad704d23f29007e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Tue, 5 Aug 2014 16:04:31 +0200 Subject: [PATCH] added SetupMethodDisplayPin to device class --- .../lgsmarttv/devicepluginlgsmarttv.cpp | 18 ++---------------- .../lgsmarttv/devicepluginlgsmarttv.h | 2 -- .../deviceplugins/lgsmarttv/tvdiscovery.cpp | 1 - 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/plugins/deviceplugins/lgsmarttv/devicepluginlgsmarttv.cpp b/plugins/deviceplugins/lgsmarttv/devicepluginlgsmarttv.cpp index bc0f23de..b7513794 100644 --- a/plugins/deviceplugins/lgsmarttv/devicepluginlgsmarttv.cpp +++ b/plugins/deviceplugins/lgsmarttv/devicepluginlgsmarttv.cpp @@ -50,7 +50,7 @@ QList DevicePluginLgSmartTv::supportedDevices() const DeviceClass deviceClassLgSmartTv(pluginId(), lgVendorId, lgSmartTvDeviceClassId); deviceClassLgSmartTv.setName("Lg Smart Tv"); deviceClassLgSmartTv.setCreateMethod(DeviceClass::CreateMethodDiscovery); - deviceClassLgSmartTv.setSetupMethod(DeviceClass::SetupMethodEnterPin); + deviceClassLgSmartTv.setSetupMethod(DeviceClass::SetupMethodDisplayPin); QList paramTypes; paramTypes.append(ParamType("name", QVariant::String)); @@ -59,6 +59,7 @@ QList DevicePluginLgSmartTv::supportedDevices() const paramTypes.append(ParamType("host address", QVariant::String)); paramTypes.append(ParamType("location", QVariant::String)); paramTypes.append(ParamType("manufacturer", QVariant::String)); + paramTypes.append(ParamType("key", QVariant::String)); deviceClassLgSmartTv.setParamTypes(paramTypes); @@ -95,21 +96,6 @@ QPair DevicePluginLgSmartTv::executeAction( return report(); } -QPair DevicePluginLgSmartTv::confirmPairing(const QUuid &pairingTransactionId, const DeviceClassId &deviceClassId, const ParamList ¶ms) -{ - - foreach (const Param ¶m, params) { - qDebug() << "confirm pairing param" << param.name(); - } - - - - - - - return reportDeviceSetup(DeviceManager::DeviceSetupStatusAsync); -} - QString DevicePluginLgSmartTv::pluginName() const { return "Lg Smart Tv"; diff --git a/plugins/deviceplugins/lgsmarttv/devicepluginlgsmarttv.h b/plugins/deviceplugins/lgsmarttv/devicepluginlgsmarttv.h index 1e093a11..8df39754 100644 --- a/plugins/deviceplugins/lgsmarttv/devicepluginlgsmarttv.h +++ b/plugins/deviceplugins/lgsmarttv/devicepluginlgsmarttv.h @@ -42,8 +42,6 @@ public: DeviceManager::HardwareResources requiredHardware() const override; QPair executeAction(Device *device, const Action &action) override; - QPair confirmPairing(const QUuid &pairingTransactionId, const DeviceClassId &deviceClassId, const ParamList ¶ms) override; - QString pluginName() const override; PluginId pluginId() const override; diff --git a/plugins/deviceplugins/lgsmarttv/tvdiscovery.cpp b/plugins/deviceplugins/lgsmarttv/tvdiscovery.cpp index 01a1bbb0..a6f7cdea 100644 --- a/plugins/deviceplugins/lgsmarttv/tvdiscovery.cpp +++ b/plugins/deviceplugins/lgsmarttv/tvdiscovery.cpp @@ -265,6 +265,5 @@ void TvDiscovery::discover(int timeout) m_tvList.clear(); writeDatagram(searchMessage.toUtf8(),m_host,m_port); - writeDatagram(searchMessage.toUtf8(),m_host,m_port); m_timeout->start(timeout); }