From 7fdc9828fae32bf423e413fea087d66a38e9c80e Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Mon, 17 Jun 2019 13:28:03 +0200
Subject: [PATCH] FlowerCare: Drop unneeded name parameter

---
 flowercare/devicepluginflowercare.cpp  | 6 ++----
 flowercare/devicepluginflowercare.json | 7 -------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/flowercare/devicepluginflowercare.cpp b/flowercare/devicepluginflowercare.cpp
index 6e492253..586bbcb8 100644
--- a/flowercare/devicepluginflowercare.cpp
+++ b/flowercare/devicepluginflowercare.cpp
@@ -74,8 +74,7 @@ DeviceManager::DeviceSetupStatus DevicePluginFlowercare::setupDevice(Device *dev
 
     if (device->deviceClassId() == flowerCareDeviceClassId) {
         QBluetoothAddress address = QBluetoothAddress(device->paramValue(flowerCareDeviceMacParamTypeId).toString());
-        QString name = device->paramValue(flowerCareDeviceNameParamTypeId).toString();
-        QBluetoothDeviceInfo deviceInfo = QBluetoothDeviceInfo(address, name, 0);
+        QBluetoothDeviceInfo deviceInfo = QBluetoothDeviceInfo(address, device->name(), 0);
 
         BluetoothLowEnergyDevice *bluetoothDevice = hardwareManager()->bluetoothLowEnergyManager()->registerDevice(deviceInfo, QLowEnergyController::PublicAddress);
         FlowerCare *flowerCare = new FlowerCare(bluetoothDevice, this);
@@ -167,9 +166,8 @@ void DevicePluginFlowercare::onBluetoothDiscoveryFinished()
         qCDebug(dcFlowerCare()) << "Discovered device" << deviceInfo.name();
         if (deviceInfo.name().contains("Flower care")) {
             if (!verifyExistingDevices(deviceInfo)) {
-                DeviceDescriptor descriptor(flowerCareDeviceClassId, "Flower Care", deviceInfo.address().toString());
+                DeviceDescriptor descriptor(flowerCareDeviceClassId, deviceInfo.name(), deviceInfo.address().toString());
                 ParamList params;
-                params.append(Param(flowerCareDeviceNameParamTypeId, deviceInfo.name()));
                 params.append(Param(flowerCareDeviceMacParamTypeId, deviceInfo.address().toString()));
                 descriptor.setParams(params);
                 foreach (Device *existingDevice, myDevices()) {
diff --git a/flowercare/devicepluginflowercare.json b/flowercare/devicepluginflowercare.json
index e21efe83..468aa2eb 100644
--- a/flowercare/devicepluginflowercare.json
+++ b/flowercare/devicepluginflowercare.json
@@ -15,13 +15,6 @@
                     "createMethods": ["discovery"],
                     "interfaces": ["temperaturesensor", "lightsensor", "moisturesensor", "conductivitysensor", "connectable", "batterylevel"],
                     "paramTypes": [
-                        {
-                            "id": "65f95e3c-59fe-47d6-ba4a-2469e5f554e2",
-                            "name": "name",
-                            "displayName": "Name",
-                            "type": "QString",
-                            "inputType": "TextLine"
-                        },
                         {
                             "id": "fe2dba0f-2a47-463e-a645-bcd55cf09750",
                             "name": "mac",