diff --git a/avahimonitor/devicepluginavahimonitor.json b/avahimonitor/devicepluginavahimonitor.json index 0e614e14..ac018f3b 100644 --- a/avahimonitor/devicepluginavahimonitor.json +++ b/avahimonitor/devicepluginavahimonitor.json @@ -4,8 +4,8 @@ "id": "d83fb167-cef7-4347-8c58-fa39df7bea4f", "vendors": [ { - "displayName": "guh GmbH", - "name": "guh", + "displayName": "nymea", + "name": "nymea", "id": "2062d64d-3232-433c-88bc-0d33c0ba2ba6", "deviceClasses": [ { diff --git a/avahimonitor/translations/d83fb167-cef7-4347-8c58-fa39df7bea4f-de_DE.ts b/avahimonitor/translations/d83fb167-cef7-4347-8c58-fa39df7bea4f-de_DE.ts index f50c6c61..12c1f7b0 100644 --- a/avahimonitor/translations/d83fb167-cef7-4347-8c58-fa39df7bea4f-de_DE.ts +++ b/avahimonitor/translations/d83fb167-cef7-4347-8c58-fa39df7bea4f-de_DE.ts @@ -14,7 +14,7 @@ The name of the DeviceClass (97f0154d-6945-49b8-bd65-0a8cea0c6652) - guh GmbH + nymea The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) diff --git a/avahimonitor/translations/d83fb167-cef7-4347-8c58-fa39df7bea4f-en_US.ts b/avahimonitor/translations/d83fb167-cef7-4347-8c58-fa39df7bea4f-en_US.ts index 6421b9c4..2abcfa4f 100644 --- a/avahimonitor/translations/d83fb167-cef7-4347-8c58-fa39df7bea4f-en_US.ts +++ b/avahimonitor/translations/d83fb167-cef7-4347-8c58-fa39df7bea4f-en_US.ts @@ -14,7 +14,7 @@ The name of the DeviceClass (97f0154d-6945-49b8-bd65-0a8cea0c6652) - guh GmbH + nymea The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) diff --git a/commandlauncher/deviceplugincommandlauncher.json b/commandlauncher/deviceplugincommandlauncher.json index ceed7101..f90936e1 100644 --- a/commandlauncher/deviceplugincommandlauncher.json +++ b/commandlauncher/deviceplugincommandlauncher.json @@ -4,8 +4,8 @@ "id": "5d37b796-4872-4eab-a7af-94ca9ddd8199", "vendors": [ { - "name": "guh", - "displayName": "guh GmbH", + "name": "nymea", + "displayName": "nymea", "id": "2062d64d-3232-433c-88bc-0d33c0ba2ba6", "deviceClasses": [ { diff --git a/commandlauncher/translations/5d37b796-4872-4eab-a7af-94ca9ddd8199-de_DE.ts b/commandlauncher/translations/5d37b796-4872-4eab-a7af-94ca9ddd8199-de_DE.ts index 5fa6ad9f..63970004 100644 --- a/commandlauncher/translations/5d37b796-4872-4eab-a7af-94ca9ddd8199-de_DE.ts +++ b/commandlauncher/translations/5d37b796-4872-4eab-a7af-94ca9ddd8199-de_DE.ts @@ -9,12 +9,6 @@ The name of the plugin CommandLauncher (5d37b796-4872-4eab-a7af-94ca9ddd8199) - - - guh GmbH - The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - guh - Application launcher @@ -72,6 +66,12 @@ The name of the ActionType d21b1fed-1dd9-4c5a-a64e-0c6ba94059be of deviceClass s The name of the DeviceClass (96044325-a6fb-47c9-9117-f29c3b327978) + + + nymea + The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) + + script diff --git a/commandlauncher/translations/5d37b796-4872-4eab-a7af-94ca9ddd8199-en_US.ts b/commandlauncher/translations/5d37b796-4872-4eab-a7af-94ca9ddd8199-en_US.ts index 04ffb5ca..0de10328 100644 --- a/commandlauncher/translations/5d37b796-4872-4eab-a7af-94ca9ddd8199-en_US.ts +++ b/commandlauncher/translations/5d37b796-4872-4eab-a7af-94ca9ddd8199-en_US.ts @@ -9,12 +9,6 @@ The name of the plugin CommandLauncher (5d37b796-4872-4eab-a7af-94ca9ddd8199) - - - guh GmbH - The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - - Application launcher @@ -72,6 +66,12 @@ The name of the ActionType d21b1fed-1dd9-4c5a-a64e-0c6ba94059be of deviceClass s The name of the DeviceClass (96044325-a6fb-47c9-9117-f29c3b327978) + + + nymea + The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) + + script diff --git a/datetime/deviceplugindatetime.json b/datetime/deviceplugindatetime.json index 0e7dbeeb..a9501670 100644 --- a/datetime/deviceplugindatetime.json +++ b/datetime/deviceplugindatetime.json @@ -4,8 +4,8 @@ "id": "c26014c6-87fb-4233-85ed-01d18625018d", "vendors": [ { - "name": "guh", - "displayName": "guh GmbH", + "name": "nymea", + "displayName": "nymea", "id": "2062d64d-3232-433c-88bc-0d33c0ba2ba6", "deviceClasses": [ { diff --git a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-cs.ts b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-cs.ts index 7342e6e3..ef3a61ad 100644 --- a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-cs.ts +++ b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-cs.ts @@ -99,18 +99,18 @@ The name of the autocreated EventType (DeviceClass: today, StateType: weekdayName, ID: f627d052-cee6-4727-b9c6-0e935d41e04a) název dne v týdnu změněn - - - guh GmbH - The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - guh GmbH - Time The name of the plugin DateTime (c26014c6-87fb-4233-85ed-01d18625018d) Čas + + + nymea + The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) + + timezone @@ -265,7 +265,7 @@ The name of the EventType f40d6e0f-fda2-475e-a6ae-c3fee03138b9 of deviceClass to sunday The name of the ParamType (DeviceClass: alarm, Type: device, ID: 2d519d8f-4bda-4d30-801f-48fe6c10c540) - neděle + neděle diff --git a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-da.ts b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-da.ts index a79c81c4..e6cf2e3e 100644 --- a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-da.ts +++ b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-da.ts @@ -99,18 +99,18 @@ The name of the autocreated EventType (DeviceClass: today, StateType: weekdayName, ID: f627d052-cee6-4727-b9c6-0e935d41e04a) navn på ugedag ændret - - - guh GmbH - The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - guh GmbH - Time The name of the plugin DateTime (c26014c6-87fb-4233-85ed-01d18625018d) Tid + + + nymea + The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) + + timezone diff --git a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-de_DE.ts b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-de_DE.ts index d72b35b5..31e81c7c 100644 --- a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-de_DE.ts +++ b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-de_DE.ts @@ -99,18 +99,18 @@ The name of the autocreated EventType (DeviceClass: today, StateType: weekdayName, ID: f627d052-cee6-4727-b9c6-0e935d41e04a) Wochentagsname geändert - - - guh GmbH - The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - guh GmbH - Time The name of the plugin DateTime (c26014c6-87fb-4233-85ed-01d18625018d) Zeit/Datum + + + nymea + The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) + + timezone diff --git a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-en_US.ts b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-en_US.ts index 852e1512..6a7948bd 100644 --- a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-en_US.ts +++ b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-en_US.ts @@ -99,18 +99,18 @@ The name of the autocreated EventType (DeviceClass: today, StateType: weekdayName, ID: f627d052-cee6-4727-b9c6-0e935d41e04a) - - - guh GmbH - The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - - Time The name of the plugin DateTime (c26014c6-87fb-4233-85ed-01d18625018d) + + + nymea + The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) + + timezone diff --git a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-es.ts b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-es.ts index ea17899b..1388b102 100644 --- a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-es.ts +++ b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-es.ts @@ -99,18 +99,18 @@ The name of the autocreated EventType (DeviceClass: today, StateType: weekdayName, ID: f627d052-cee6-4727-b9c6-0e935d41e04a) nombre del día de la semana modificado - - - guh GmbH - The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - guh GmbH - Time The name of the plugin DateTime (c26014c6-87fb-4233-85ed-01d18625018d) Hora + + + nymea + The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) + + timezone diff --git a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-fr.ts b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-fr.ts index 3e21a464..bd6f4665 100644 --- a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-fr.ts +++ b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-fr.ts @@ -99,18 +99,18 @@ The name of the autocreated EventType (DeviceClass: today, StateType: weekdayName, ID: f627d052-cee6-4727-b9c6-0e935d41e04a) Nom du jour de semaine modifié - - - guh GmbH - The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - guh GmbH - Time The name of the plugin DateTime (c26014c6-87fb-4233-85ed-01d18625018d) Heure + + + nymea + The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) + + timezone diff --git a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-it.ts b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-it.ts index c4cf7e8b..a795e308 100644 --- a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-it.ts +++ b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-it.ts @@ -99,18 +99,18 @@ The name of the autocreated EventType (DeviceClass: today, StateType: weekdayName, ID: f627d052-cee6-4727-b9c6-0e935d41e04a) nome giorno settimana modificato - - - guh GmbH - The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - guh GmbH - Time The name of the plugin DateTime (c26014c6-87fb-4233-85ed-01d18625018d) Ora + + + nymea + The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) + + timezone diff --git a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-nl.ts b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-nl.ts index a2302cac..0f45b342 100644 --- a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-nl.ts +++ b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-nl.ts @@ -99,18 +99,18 @@ The name of the autocreated EventType (DeviceClass: today, StateType: weekdayName, ID: f627d052-cee6-4727-b9c6-0e935d41e04a) naam weekdag gewijzigd - - - guh GmbH - The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - guh GmbH - Time The name of the plugin DateTime (c26014c6-87fb-4233-85ed-01d18625018d) Tijd + + + nymea + The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) + + timezone diff --git a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-pt.ts b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-pt.ts index 634d2128..22032bf7 100644 --- a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-pt.ts +++ b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-pt.ts @@ -99,18 +99,18 @@ The name of the autocreated EventType (DeviceClass: today, StateType: weekdayName, ID: f627d052-cee6-4727-b9c6-0e935d41e04a) nome do dia da semana alterado - - - guh GmbH - The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - guh GmbH - Time The name of the plugin DateTime (c26014c6-87fb-4233-85ed-01d18625018d) Hora + + + nymea + The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) + + timezone diff --git a/daylightsensor/deviceplugindaylightsensor.json b/daylightsensor/deviceplugindaylightsensor.json index 0c0d5341..1ceac9e3 100644 --- a/daylightsensor/deviceplugindaylightsensor.json +++ b/daylightsensor/deviceplugindaylightsensor.json @@ -4,8 +4,8 @@ "id": "4b7d63a7-fc39-4a50-a459-457fa7653089", "vendors": [ { - "name": "guh", - "displayName": "guh GmbH", + "name": "nymea", + "displayName": "nymea", "id": "2062d64d-3232-433c-88bc-0d33c0ba2ba6", "deviceClasses": [ { diff --git a/daylightsensor/translations/4b7d63a7-fc39-4a50-a459-457fa7653089-en_US.ts b/daylightsensor/translations/4b7d63a7-fc39-4a50-a459-457fa7653089-en_US.ts index d31bd4e9..543a64ef 100644 --- a/daylightsensor/translations/4b7d63a7-fc39-4a50-a459-457fa7653089-en_US.ts +++ b/daylightsensor/translations/4b7d63a7-fc39-4a50-a459-457fa7653089-en_US.ts @@ -17,11 +17,6 @@ The name of the DeviceClass (1d43d0ed-efe2-46ab-a567-af632e550931) - - guh GmbH - The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - - Latitude The name of the ParamType (DeviceClass: daylightSensor, Type: device, ID: 124b2574-8f57-4c62-bc55-40e467d4aea3) @@ -62,5 +57,10 @@ The name of the DeviceClass (1d43d0ed-efe2-46ab-a567-af632e550931)The name of the ParamType for the autocreated EventType (DeviceClass: daylightSensor, StateType: sunsetTime, ID: 6d064789-b9c3-44c8-a5ea-b722fc2f56b7 + + nymea + The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) + + diff --git a/debian/changelog b/debian/changelog index 60d6ae8a..f8637ebb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +nymea-plugins (0.12.1) xenial; urgency=medium + + [ Michael Zanetti ] + * Rename vendor "guh GmbH" to "nymea" + * Don't use dpkg specific tools to set install path + + -- Jenkins Thu, 02 May 2019 11:56:17 +0200 + nymea-plugins (0.12.0) xenial; urgency=medium [ Michael Zanetti ] * aWATTar: Cleanup old unused code and use connectable interface diff --git a/genericelements/deviceplugingenericelements.json b/genericelements/deviceplugingenericelements.json index ef3c09cd..18688ce1 100644 --- a/genericelements/deviceplugingenericelements.json +++ b/genericelements/deviceplugingenericelements.json @@ -4,8 +4,8 @@ "id": "6e22161e-39b7-4416-8623-39e730721efb", "vendors": [ { - "name": "guh", - "displayName": "guh GmbH", + "name": "nymea", + "displayName": "nymea", "id": "2062d64d-3232-433c-88bc-0d33c0ba2ba6", "deviceClasses": [ { diff --git a/genericelements/translations/6e22161e-39b7-4416-8623-39e730721efb-de_DE.ts b/genericelements/translations/6e22161e-39b7-4416-8623-39e730721efb-de_DE.ts index ec2dbcf0..4fe900f9 100644 --- a/genericelements/translations/6e22161e-39b7-4416-8623-39e730721efb-de_DE.ts +++ b/genericelements/translations/6e22161e-39b7-4416-8623-39e730721efb-de_DE.ts @@ -11,9 +11,9 @@ - guh GmbH + nymea The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - guh + diff --git a/genericelements/translations/6e22161e-39b7-4416-8623-39e730721efb-en_US.ts b/genericelements/translations/6e22161e-39b7-4416-8623-39e730721efb-en_US.ts index 6a4d5aaa..82c971e6 100644 --- a/genericelements/translations/6e22161e-39b7-4416-8623-39e730721efb-en_US.ts +++ b/genericelements/translations/6e22161e-39b7-4416-8623-39e730721efb-en_US.ts @@ -11,7 +11,7 @@ - guh GmbH + nymea The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) diff --git a/lircd/devicepluginlircd.cpp b/lircd/devicepluginlircd.cpp deleted file mode 100644 index 4c30f4ff..00000000 --- a/lircd/devicepluginlircd.cpp +++ /dev/null @@ -1,104 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * * - * Copyright (C) 2015 Simon Stürz * - * Copyright (C) 2014 Michael Zanetti * - * * - * This file is part of nymea. * - * * - * This library is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Lesser General Public * - * License as published by the Free Software Foundation; either * - * version 2.1 of the License, or (at your option) any later version. * - * * - * This library is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this library; If not, see * - * . * - * * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -/*! - \page lirc.html - \title LIRC - \brief Plugin for the LIRC infrared daemon. - - \ingroup plugins - \ingroup nymea-plugins-maker - - This plugin allows to interact with \l{http://www.lirc.org/}{LIRC} daemon and controll commonly used remote controls. - If lircd (LIRC daemon) is configured on your system, nymea will connect to the lirc daemon and all configured remote - controls of lircd will appear in nymea. - - \chapter Plugin properties - Following JSON file contains the definition and the description of all available \l{DeviceClass}{DeviceClasses} - and \l{Vendor}{Vendors} of this \l{DevicePlugin}. - - For more details how to read this JSON file please check out the documentation for \l{The plugin JSON File}. - - \quotefile plugins/deviceplugins/lircd/devicepluginlircd.json -*/ - -#include "devicepluginlircd.h" - -#include "plugin/device.h" -#include "devicemanager.h" -#include "plugininfo.h" -#include "lircdclient.h" - -#include -#include - -DeviceClassId lircdDeviceClassId = DeviceClassId("5c2bc4cd-ba6c-4052-b6cd-1db83323ea22"); -EventTypeId LircKeypressEventTypeId = EventTypeId("8711471a-fa0e-410b-b174-dfc3d2aeffb1"); - -DevicePluginLircd::DevicePluginLircd() -{ - m_lircClient = new LircClient(this); - - //m_lircClient->connect(); - connect(m_lircClient, &LircClient::buttonPressed, this, &DevicePluginLircd::buttonPressed); -} - -DeviceManager::HardwareResources DevicePluginLircd::requiredHardware() const -{ - return DeviceManager::HardwareResourceNone; -} - -void DevicePluginLircd::buttonPressed(const QString &remoteName, const QString &buttonName, int repeat) -{ - Device *remote = nullptr; - QList configuredRemotes = deviceManager()->findConfiguredDevices(lircdDeviceClassId); - foreach (Device *device, configuredRemotes) { - if (device->paramValue(irReceiverNameParamTypeId).toString() == remoteName) { - remote = device; - break; - } - } - if (!remote) { - qCWarning(dcLircd) << "Unhandled remote" << remoteName << buttonName; - return; - } - - qCDebug(dcLircd) << "found remote" << remoteName << supportedDevices().first().eventTypes().count(); - ParamList params; - Param buttonParam(irReceiverButtonParamTypeId, buttonName); - params.append(buttonParam); - Param repeatParam(irReceiverRepeatParamTypeId, repeat); - params.append(repeatParam); - Event event(LircKeypressEventTypeId, remote->id(), params); - emitEvent(event); -} - -//QVariantMap DevicePluginLircd::configuration() const -//{ -// return m_config; -//} - -//void DevicePluginLircd::setConfiguration(const QVariantMap &configuration) -//{ -// m_config = configuration; -//} diff --git a/mailnotification/devicepluginmailnotification.json b/mailnotification/devicepluginmailnotification.json index c6e13276..c18ed934 100644 --- a/mailnotification/devicepluginmailnotification.json +++ b/mailnotification/devicepluginmailnotification.json @@ -4,8 +4,8 @@ "id": "1ae35df1-1b51-4c93-94fa-3febc77e0318", "vendors": [ { - "name": "guh", - "displayName": "guh GmbH", + "name": "nymea", + "displayName": "nymea", "id": "2062d64d-3232-433c-88bc-0d33c0ba2ba6", "deviceClasses": [ { diff --git a/mailnotification/translations/1ae35df1-1b51-4c93-94fa-3febc77e0318-de_DE.ts b/mailnotification/translations/1ae35df1-1b51-4c93-94fa-3febc77e0318-de_DE.ts index ce4bd894..f33cfce7 100644 --- a/mailnotification/translations/1ae35df1-1b51-4c93-94fa-3febc77e0318-de_DE.ts +++ b/mailnotification/translations/1ae35df1-1b51-4c93-94fa-3febc77e0318-de_DE.ts @@ -9,6 +9,12 @@ The name of the plugin MailNotification (1ae35df1-1b51-4c93-94fa-3febc77e0318) Mail Benachrichtigung + + + nymea + The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) + + Custom mail @@ -129,12 +135,6 @@ The name of the ActionType 054613b0-3666-4dad-9252-e0ebca187edc of deviceClass g The name of the ActionType 054613b0-3666-4dad-9252-e0ebca187edc of deviceClass yahooMail Sende Mail - - - guh GmbH - The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - guh GmbH - Yahoo diff --git a/mailnotification/translations/1ae35df1-1b51-4c93-94fa-3febc77e0318-en_US.ts b/mailnotification/translations/1ae35df1-1b51-4c93-94fa-3febc77e0318-en_US.ts index 686681d7..48598059 100644 --- a/mailnotification/translations/1ae35df1-1b51-4c93-94fa-3febc77e0318-en_US.ts +++ b/mailnotification/translations/1ae35df1-1b51-4c93-94fa-3febc77e0318-en_US.ts @@ -9,6 +9,12 @@ The name of the plugin MailNotification (1ae35df1-1b51-4c93-94fa-3febc77e0318) + + + nymea + The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) + + Custom mail @@ -129,12 +135,6 @@ The name of the ActionType 054613b0-3666-4dad-9252-e0ebca187edc of deviceClass g The name of the ActionType 054613b0-3666-4dad-9252-e0ebca187edc of deviceClass yahooMail - - - guh GmbH - The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - - Yahoo diff --git a/mqttclient/devicepluginmqttclient.json b/mqttclient/devicepluginmqttclient.json index 5a19379d..43bfce13 100644 --- a/mqttclient/devicepluginmqttclient.json +++ b/mqttclient/devicepluginmqttclient.json @@ -4,8 +4,8 @@ "id": "27c58205-07c8-4482-85ad-b435387803a5", "vendors": [ { - "name": "guh", - "displayName": "guh GmbH", + "name": "nymea", + "displayName": "nymea", "id": "2062d64d-3232-433c-88bc-0d33c0ba2ba6", "deviceClasses": [ { diff --git a/mqttclient/translations/27c58205-07c8-4482-85ad-b435387803a5-en_US.ts b/mqttclient/translations/27c58205-07c8-4482-85ad-b435387803a5-en_US.ts index e912dc0d..8d3654e2 100644 --- a/mqttclient/translations/27c58205-07c8-4482-85ad-b435387803a5-en_US.ts +++ b/mqttclient/translations/27c58205-07c8-4482-85ad-b435387803a5-en_US.ts @@ -10,11 +10,6 @@ The name of the DeviceClass (e325b581-8d7f-446e-b761-67554c5aacd4) - - guh GmbH - The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - - Internal MQTT client The name of the DeviceClass (19117099-a5ef-44a1-b2bb-2efafe00f197) @@ -100,5 +95,10 @@ The name of the ParamType (DeviceClass: mqttClient, EventType: triggered, ID: a9 The name of the ParamType (DeviceClass: mqttClient, Type: device, ID: d8211599-52f7-46f6-a741-a7204b987309) + + nymea + The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) + + diff --git a/networkdetector/devicepluginnetworkdetector.json b/networkdetector/devicepluginnetworkdetector.json index a9a5be46..84b06dcb 100644 --- a/networkdetector/devicepluginnetworkdetector.json +++ b/networkdetector/devicepluginnetworkdetector.json @@ -4,8 +4,8 @@ "id": "8e0f791e-b273-4267-8605-b7c2f55a68ab", "vendors": [ { - "name": "guh", - "displayName": "guh GmbH", + "name": "nymea", + "displayName": "nymea", "id": "2062d64d-3232-433c-88bc-0d33c0ba2ba6", "deviceClasses": [ { diff --git a/networkdetector/translations/8e0f791e-b273-4267-8605-b7c2f55a68ab-de_DE.ts b/networkdetector/translations/8e0f791e-b273-4267-8605-b7c2f55a68ab-de_DE.ts index 67395b5e..40245e65 100644 --- a/networkdetector/translations/8e0f791e-b273-4267-8605-b7c2f55a68ab-de_DE.ts +++ b/networkdetector/translations/8e0f791e-b273-4267-8605-b7c2f55a68ab-de_DE.ts @@ -11,9 +11,9 @@ - guh GmbH + nymea The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - guh GmbH + diff --git a/networkdetector/translations/8e0f791e-b273-4267-8605-b7c2f55a68ab-en_US.ts b/networkdetector/translations/8e0f791e-b273-4267-8605-b7c2f55a68ab-en_US.ts index dbc66905..59489599 100644 --- a/networkdetector/translations/8e0f791e-b273-4267-8605-b7c2f55a68ab-en_US.ts +++ b/networkdetector/translations/8e0f791e-b273-4267-8605-b7c2f55a68ab-en_US.ts @@ -11,7 +11,7 @@ - guh GmbH + nymea The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) diff --git a/nymea-plugins.pro b/nymea-plugins.pro index 53b41119..62962686 100644 --- a/nymea-plugins.pro +++ b/nymea-plugins.pro @@ -49,8 +49,6 @@ PLUGIN_DIRS = \ ws2812 \ -CONFIG+=all - message(============================================) message("Qt version:" $$[QT_VERSION]) @@ -73,12 +71,9 @@ QMAKE_EXTRA_TARGETS += lrelease # For Qt-Creator's code model: Add CPATH to INCLUDEPATH explicitly INCLUDEPATH += $$(CPATH) -message(" cpath is $$(CPATH)") # Verify if building only a selection of plugins contains(CONFIG, selection) { - CONFIG-=all - # Check each plugin if the subdir exists for(plugin, PLUGINS) { contains(PLUGIN_DIRS, $${plugin}) { @@ -88,9 +83,7 @@ contains(CONFIG, selection) { } } message("Building plugin selection: $${SUBDIRS}") -} - -all { +} else { SUBDIRS *= $${PLUGIN_DIRS} message("Building all plugins") } diff --git a/orderbutton/devicepluginorderbutton.json b/orderbutton/devicepluginorderbutton.json index 1af45add..127a9cca 100644 --- a/orderbutton/devicepluginorderbutton.json +++ b/orderbutton/devicepluginorderbutton.json @@ -14,8 +14,8 @@ ], "vendors": [ { - "displayName": "guh GmbH", - "name": "guh", + "displayName": "nymea", + "name": "nymea", "id": "2062d64d-3232-433c-88bc-0d33c0ba2ba6", "deviceClasses": [ { diff --git a/orderbutton/translations/939a6557-649d-43de-990b-3484f972ad86-de_DE.ts b/orderbutton/translations/939a6557-649d-43de-990b-3484f972ad86-de_DE.ts index 8807d569..3f8231f8 100644 --- a/orderbutton/translations/939a6557-649d-43de-990b-3484f972ad86-de_DE.ts +++ b/orderbutton/translations/939a6557-649d-43de-990b-3484f972ad86-de_DE.ts @@ -9,12 +9,6 @@ The name of the ParamType (DeviceClass: orderButton, Type: plugin, ID: e917e779-e01c-4095-9d62-ab46fc2deecc) - - - guh GmbH - The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - guh - OrderButton @@ -39,6 +33,12 @@ The name of the plugin orderButton (939a6557-649d-43de-990b-3484f972ad86) + + + nymea + The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) + + battery voltage diff --git a/orderbutton/translations/939a6557-649d-43de-990b-3484f972ad86-en_US.ts b/orderbutton/translations/939a6557-649d-43de-990b-3484f972ad86-en_US.ts index 5b6ce691..cdc911dd 100644 --- a/orderbutton/translations/939a6557-649d-43de-990b-3484f972ad86-en_US.ts +++ b/orderbutton/translations/939a6557-649d-43de-990b-3484f972ad86-en_US.ts @@ -9,12 +9,6 @@ The name of the ParamType (DeviceClass: orderButton, Type: plugin, ID: e917e779-e01c-4095-9d62-ab46fc2deecc) - - - guh GmbH - The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - - OrderButton @@ -39,6 +33,12 @@ The name of the plugin orderButton (939a6557-649d-43de-990b-3484f972ad86) + + + nymea + The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) + + battery voltage diff --git a/philipshue/translations/5f2e634b-b7f3-48ee-976a-b5ae22aa5c55-da.ts b/philipshue/translations/5f2e634b-b7f3-48ee-976a-b5ae22aa5c55-da.ts index 209aacc9..3f474390 100644 --- a/philipshue/translations/5f2e634b-b7f3-48ee-976a-b5ae22aa5c55-da.ts +++ b/philipshue/translations/5f2e634b-b7f3-48ee-976a-b5ae22aa5c55-da.ts @@ -109,7 +109,7 @@ The name of the autocreated EventType (DeviceClass: tap, StateType: connected, I Serial Number (optional) The name of the ParamType (DeviceClass: bridge, ActionType: searchNewDevices, ID: 1924bdb5-f8f1-4dcd-bc09-21ad7c5ce377) - + Serienummer (valgfrit) @@ -325,13 +325,13 @@ The name of the autocreated ActionType (DeviceClass: colorTemperatureLight, Stat Hue color temperature light The name of the DeviceClass (35f749f7-b60a-4922-bd25-1bdd2eddcbe3) - + Hue farvetemperatur lys Hue dimmable light The name of the DeviceClass (4fa568ef-7a3a-422b-b0c0-206d37cb4eed) - + Hue dæmpeligt lys @@ -376,139 +376,139 @@ The name of the ParamType (DeviceClass: tap, EventType: pressed, ID: 8ed643c0-1b Hue Outdoor Sensor The name of the DeviceClass (32dc6390-600f-4eb4-b349-cc2d6796a82a) - + Hue udendørs sensor Model id The name of the ParamType (DeviceClass: outdoorSensor, Type: device, ID: 3ca8632d-7bd1-45a9-86af-c856e006c334) - + Model id Uuid The name of the ParamType (DeviceClass: outdoorSensor, Type: device, ID: 4a15f861-cad6-464a-b250-08793c68ae30) - + Uuid Temperature sensor id The name of the ParamType (DeviceClass: outdoorSensor, Type: device, ID: c732fefd-ca6b-4e27-a6d2-11595c4aab3e) - + Temperaturføler id Temperature sensor uuid The name of the ParamType (DeviceClass: outdoorSensor, Type: device, ID: 2fdb34e8-25ca-4c5d-85c9-9a12bd48dbed) - + Temperaturfølerens uuid Presence sensor id The name of the ParamType (DeviceClass: outdoorSensor, Type: device, ID: 3ca82a24-5eca-4285-83c2-f862d387c3bc) - + Tilstedeværelsessensor id Presence sensor uuid The name of the ParamType (DeviceClass: outdoorSensor, Type: device, ID: 7d55ed97-3a32-41e9-9112-8cc5b44aab23) - + Tilstedeværelsessensor uuid Light sensor id The name of the ParamType (DeviceClass: outdoorSensor, Type: device, ID: 22a164fc-fa6e-427a-9a60-7a1872901fd6) - + Lyssensor id Light sensor uuid The name of the ParamType (DeviceClass: outdoorSensor, Type: device, ID: db678144-de2b-4767-a2f6-9ada8377b96c) - + Lyssensor uuid Reachable changed The name of the autocreated EventType (DeviceClass: outdoorSensor, StateType: connected, ID: 9fe43e6b-3c29-43a9-bb96-3b80eacc10db) - + Tilgængelighed ændret Reachable The name of the ParamType for the autocreated EventType (DeviceClass: outdoorSensor, StateType: connected, ID: 9fe43e6b-3c29-43a9-bb96-3b80eacc10db - + Tilgængelig Battery changed The name of the autocreated EventType (DeviceClass: outdoorSensor, StateType: batteryLevel, ID: 19b18531-61e5-4998-89d1-765d740e24eb) - + Batteriladningen ændret Battery The name of the ParamType for the autocreated EventType (DeviceClass: outdoorSensor, StateType: batteryLevel, ID: 19b18531-61e5-4998-89d1-765d740e24eb - + Batteri Battery critical changed The name of the autocreated EventType (DeviceClass: outdoorSensor, StateType: batteryCritical, ID: 617aa352-789c-46e7-bf55-7455b1e5018e) - + Batterikritisk ændret Battery critical The name of the ParamType for the autocreated EventType (DeviceClass: outdoorSensor, StateType: batteryCritical, ID: 617aa352-789c-46e7-bf55-7455b1e5018e - + Batterikritisk Temperature changed The name of the autocreated EventType (DeviceClass: outdoorSensor, StateType: temperature, ID: 88f5b708-65bb-41a7-885f-01be46074713) - + Temperatur ændret Temperature The name of the ParamType for the autocreated EventType (DeviceClass: outdoorSensor, StateType: temperature, ID: 88f5b708-65bb-41a7-885f-01be46074713 - + Temperatur Ambient light changed The name of the autocreated EventType (DeviceClass: outdoorSensor, StateType: lightIntensity, ID: 4fb12c06-981c-4c42-b55c-46bdfe68681a) - + Omgivende lys ændret Ambient light The name of the ParamType for the autocreated EventType (DeviceClass: outdoorSensor, StateType: lightIntensity, ID: 4fb12c06-981c-4c42-b55c-46bdfe68681a - + omgivende lys Person is present changed The name of the autocreated EventType (DeviceClass: outdoorSensor, StateType: isPresent, ID: 680f79cf-c17c-4ffd-96fa-a5b286e2c117) - + Person til stede ændret Person is present The name of the ParamType for the autocreated EventType (DeviceClass: outdoorSensor, StateType: isPresent, ID: 680f79cf-c17c-4ffd-96fa-a5b286e2c117 - + Person til stede Last seen time changed The name of the autocreated EventType (DeviceClass: outdoorSensor, StateType: lastSeenTime, ID: 6fa16fb2-053c-4c3c-a39b-9548c1b15089) - + Sidst set ændret Last seen time The name of the ParamType for the autocreated EventType (DeviceClass: outdoorSensor, StateType: lastSeenTime, ID: 6fa16fb2-053c-4c3c-a39b-9548c1b15089 - + Sidst set @@ -553,7 +553,7 @@ The name of the ParamType for the autocreated EventType (DeviceClass: tap, State Hue color light The name of the DeviceClass (0edba26c-96ab-44fb-a6a2-c0574d19630e) - + Hue farve lys diff --git a/plantcare/devicepluginplantcare.json b/plantcare/devicepluginplantcare.json index d0ae52dc..0ddcd2a7 100644 --- a/plantcare/devicepluginplantcare.json +++ b/plantcare/devicepluginplantcare.json @@ -14,8 +14,8 @@ ], "vendors": [ { - "displayName": "guh GmbH", - "name": "guh", + "displayName": "nymea", + "name": "nymea", "id": "2062d64d-3232-433c-88bc-0d33c0ba2ba6", "deviceClasses": [ { diff --git a/plantcare/translations/80ea115f-2a9f-49b3-9575-9e36d137c8d6-de_DE.ts b/plantcare/translations/80ea115f-2a9f-49b3-9575-9e36d137c8d6-de_DE.ts index 7883c827..5bd3073d 100644 --- a/plantcare/translations/80ea115f-2a9f-49b3-9575-9e36d137c8d6-de_DE.ts +++ b/plantcare/translations/80ea115f-2a9f-49b3-9575-9e36d137c8d6-de_DE.ts @@ -18,6 +18,12 @@ The name of the DeviceClass (3245db46-5c6f-42d6-9001-753150763385)The name of the ParamType (DeviceClass: plantCare, Type: plugin, ID: 138e19bd-a8db-472a-b3a4-f6497ef2e50c) + + + nymea + The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) + + host @@ -36,12 +42,6 @@ The name of the DeviceClass (3245db46-5c6f-42d6-9001-753150763385)The name of the autocreated EventType (DeviceClass: plantCare, StateType: moisture, ID: 8a7efda1-b6b7-41c8-ad07-4d892a532d1c) - - - guh GmbH - The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - - battery voltage diff --git a/plantcare/translations/80ea115f-2a9f-49b3-9575-9e36d137c8d6-en_US.ts b/plantcare/translations/80ea115f-2a9f-49b3-9575-9e36d137c8d6-en_US.ts index 24f8b642..c6b8bf5a 100644 --- a/plantcare/translations/80ea115f-2a9f-49b3-9575-9e36d137c8d6-en_US.ts +++ b/plantcare/translations/80ea115f-2a9f-49b3-9575-9e36d137c8d6-en_US.ts @@ -18,6 +18,12 @@ The name of the DeviceClass (3245db46-5c6f-42d6-9001-753150763385)The name of the ParamType (DeviceClass: plantCare, Type: plugin, ID: 138e19bd-a8db-472a-b3a4-f6497ef2e50c) + + + nymea + The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) + + host @@ -36,12 +42,6 @@ The name of the DeviceClass (3245db46-5c6f-42d6-9001-753150763385)The name of the autocreated EventType (DeviceClass: plantCare, StateType: moisture, ID: 8a7efda1-b6b7-41c8-ad07-4d892a532d1c) - - - guh GmbH - The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - - battery voltage diff --git a/plugins.pri b/plugins.pri index ac74e252..27e281de 100644 --- a/plugins.pri +++ b/plugins.pri @@ -4,13 +4,12 @@ CONFIG += plugin QMAKE_CXXFLAGS += -Werror -std=c++11 -g QMAKE_LFLAGS += -std=c++11 -INCLUDEPATH += /usr/include/nymea -LIBS += -lnymea +CONFIG += link_pkgconfig +PKGCONFIG += nymea + HEADERS += $${OUT_PWD}/plugininfo.h \ $${OUT_PWD}/extern-plugininfo.h -PLUGIN_PATH=/usr/lib/$$system('dpkg-architecture -q DEB_HOST_MULTIARCH')/nymea/plugins/ - # Check if this is a snap build snappy{ INCLUDEPATH+=$$(SNAPCRAFT_STAGE)/usr/include/nymea @@ -55,6 +54,6 @@ translations.files = $$[QT_SOURCE_TREE]/translations/*.qm TRANSLATIONS += $$files($$[QT_SOURCE_TREE]/translations/*.ts, true) # Install plugin -target.path = $$PLUGIN_PATH +target.path = $$[QT_INSTALL_LIBS]/nymea/plugins/ INSTALLS += target translations diff --git a/pushbullet/translations/46986575-0e62-483d-b5a8-76ac356fcce7-it.ts b/pushbullet/translations/46986575-0e62-483d-b5a8-76ac356fcce7-it.ts index c9167cc1..fcab6615 100644 --- a/pushbullet/translations/46986575-0e62-483d-b5a8-76ac356fcce7-it.ts +++ b/pushbullet/translations/46986575-0e62-483d-b5a8-76ac356fcce7-it.ts @@ -40,7 +40,7 @@ The name of the vendor (b5e1896e-b7fa-4c19-ac2b-10bd489f8302) body The name of the ParamType (DeviceClass: pushNotification, ActionType: notify, ID: f72cc56c-4d0b-4b96-ab9b-ff3ca92b00e2) - corpo + testo diff --git a/serialportcommander/devicepluginserialportcommander.json b/serialportcommander/devicepluginserialportcommander.json index a662407f..7f2c2aa0 100644 --- a/serialportcommander/devicepluginserialportcommander.json +++ b/serialportcommander/devicepluginserialportcommander.json @@ -4,8 +4,8 @@ "id": "fe93a12e-36f4-4015-8019-26b659817773", "vendors": [ { - "name": "guh", - "displayName": "guh GmbH", + "name": "nymea", + "displayName": "nymea", "id": "2062d64d-3232-433c-88bc-0d33c0ba2ba6", "deviceClasses": [ diff --git a/udpcommander/devicepluginudpcommander.json b/udpcommander/devicepluginudpcommander.json index 27b27ed7..179701a8 100644 --- a/udpcommander/devicepluginudpcommander.json +++ b/udpcommander/devicepluginudpcommander.json @@ -4,8 +4,8 @@ "id": "24a8474c-1d86-499e-a76e-9cbfbf48dd72", "vendors": [ { - "name": "guh", - "displayName": "guh GmbH", + "name": "nymea", + "displayName": "nymea", "id": "2062d64d-3232-433c-88bc-0d33c0ba2ba6", "deviceClasses": [ { diff --git a/udpcommander/translations/24a8474c-1d86-499e-a76e-9cbfbf48dd72-de_DE.ts b/udpcommander/translations/24a8474c-1d86-499e-a76e-9cbfbf48dd72-de_DE.ts index fc289908..5ba06141 100644 --- a/udpcommander/translations/24a8474c-1d86-499e-a76e-9cbfbf48dd72-de_DE.ts +++ b/udpcommander/translations/24a8474c-1d86-499e-a76e-9cbfbf48dd72-de_DE.ts @@ -14,9 +14,9 @@ The name of the DeviceClass (31b00639-8904-4522-84ed-54c46a54c63c) - guh GmbH + nymea The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - guh GmbH + diff --git a/udpcommander/translations/24a8474c-1d86-499e-a76e-9cbfbf48dd72-en_US.ts b/udpcommander/translations/24a8474c-1d86-499e-a76e-9cbfbf48dd72-en_US.ts index 52ebea56..d7619ca7 100644 --- a/udpcommander/translations/24a8474c-1d86-499e-a76e-9cbfbf48dd72-en_US.ts +++ b/udpcommander/translations/24a8474c-1d86-499e-a76e-9cbfbf48dd72-en_US.ts @@ -14,7 +14,7 @@ The name of the DeviceClass (31b00639-8904-4522-84ed-54c46a54c63c) - guh GmbH + nymea The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) diff --git a/wakeonlan/devicepluginwakeonlan.json b/wakeonlan/devicepluginwakeonlan.json index 99fec734..de96fab3 100644 --- a/wakeonlan/devicepluginwakeonlan.json +++ b/wakeonlan/devicepluginwakeonlan.json @@ -4,8 +4,8 @@ "id": "b5a87848-de56-451e-84a6-edd26ad4958f", "vendors": [ { - "name": "guh", - "displayName": "guh GmbH", + "name": "nymea", + "displayName": "nymea", "id": "2062d64d-3232-433c-88bc-0d33c0ba2ba6", "deviceClasses": [ { diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-cs.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-cs.ts index 52b39466..0d257905 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-cs.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-cs.ts @@ -11,9 +11,9 @@ - guh GmbH + nymea The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - guh GmbH + diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-da.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-da.ts index 08f6c8c5..f3068032 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-da.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-da.ts @@ -11,9 +11,9 @@ - guh GmbH + nymea The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - guh GmbH + diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-de_DE.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-de_DE.ts index bc17b466..1bc68e03 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-de_DE.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-de_DE.ts @@ -11,9 +11,9 @@ - guh GmbH + nymea The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - guh GmbH + diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-en_US.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-en_US.ts index 7378ae21..27b77df5 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-en_US.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-en_US.ts @@ -11,7 +11,7 @@ - guh GmbH + nymea The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-es.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-es.ts index 90d15733..112a9acb 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-es.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-es.ts @@ -11,9 +11,9 @@ - guh GmbH + nymea The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - guh GmbH + diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-fr.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-fr.ts index d412e8ed..118415a4 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-fr.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-fr.ts @@ -11,9 +11,9 @@ - guh GmbH + nymea The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - guh GmbH + diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-it.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-it.ts index 4c03ab24..c2963ff5 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-it.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-it.ts @@ -11,9 +11,9 @@ - guh GmbH + nymea The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - guh GmbH + diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-nl.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-nl.ts index dc8efec8..48e469cd 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-nl.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-nl.ts @@ -11,9 +11,9 @@ - guh GmbH + nymea The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - guh GmbH + diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-pt.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-pt.ts index 4a9f8221..5b9b0e82 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-pt.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-pt.ts @@ -11,9 +11,9 @@ - guh GmbH + nymea The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - guh GmbH + diff --git a/ws2812/devicepluginws2812.json b/ws2812/devicepluginws2812.json index c872e3e9..578fda6a 100644 --- a/ws2812/devicepluginws2812.json +++ b/ws2812/devicepluginws2812.json @@ -14,8 +14,8 @@ ], "vendors": [ { - "displayName": "guh GmbH", - "name": "guh", + "displayName": "nymea", + "name": "nymea", "id": "2062d64d-3232-433c-88bc-0d33c0ba2ba6", "deviceClasses": [ { diff --git a/ws2812/translations/60b68c75-3261-4bf1-8912-798d2d3bbd3b-de_DE.ts b/ws2812/translations/60b68c75-3261-4bf1-8912-798d2d3bbd3b-de_DE.ts index 37100511..a53ab065 100644 --- a/ws2812/translations/60b68c75-3261-4bf1-8912-798d2d3bbd3b-de_DE.ts +++ b/ws2812/translations/60b68c75-3261-4bf1-8912-798d2d3bbd3b-de_DE.ts @@ -18,6 +18,12 @@ The name of the DeviceClass (3142db46-5c6f-42d6-9001-753150763385)The name of the ParamType (DeviceClass: ws2812, Type: plugin, ID: 0a2898cb-ca36-4c6e-8418-993c1d9df434) + + + nymea + The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) + + host @@ -36,12 +42,6 @@ The name of the DeviceClass (3142db46-5c6f-42d6-9001-753150763385)The name of the autocreated EventType (DeviceClass: ws2812, StateType: connected, ID: 08091cde-983d-42f7-bdd7-d89c312ccbed) - - - guh GmbH - The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - - battery voltage diff --git a/ws2812/translations/60b68c75-3261-4bf1-8912-798d2d3bbd3b-en_US.ts b/ws2812/translations/60b68c75-3261-4bf1-8912-798d2d3bbd3b-en_US.ts index 89d5e441..c9deab62 100644 --- a/ws2812/translations/60b68c75-3261-4bf1-8912-798d2d3bbd3b-en_US.ts +++ b/ws2812/translations/60b68c75-3261-4bf1-8912-798d2d3bbd3b-en_US.ts @@ -18,6 +18,12 @@ The name of the DeviceClass (3142db46-5c6f-42d6-9001-753150763385)The name of the ParamType (DeviceClass: ws2812, Type: plugin, ID: 0a2898cb-ca36-4c6e-8418-993c1d9df434) + + + nymea + The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) + + host @@ -36,12 +42,6 @@ The name of the DeviceClass (3142db46-5c6f-42d6-9001-753150763385)The name of the autocreated EventType (DeviceClass: ws2812, StateType: connected, ID: 08091cde-983d-42f7-bdd7-d89c312ccbed) - - - guh GmbH - The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - - battery voltage