From cdabfb54a57312ff18f18206441aebe58ca4d111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Mon, 17 Nov 2025 15:57:51 +0100 Subject: [PATCH] Update all guh references to nymea --- CODE_OF_CONDUCT.md | 2 +- README.md | 4 +- data/debug-interface/logo.svg | 2 +- debian-qt5/changelog | 96 +++++++++---------- debian-qt5/man/nymea-plugininfocompiler.1 | 6 +- .../devicepluginsimplebutton.json | 3 +- doc/examples/simplebutton/extern-plugininfo.h | 2 +- doc/examples/simplebutton/plugininfo.h | 2 +- .../template/deviceplugintemplate.json | 3 +- doc/main-dark.css | 2 +- doc/main.css | 2 +- doc/main.js | 4 +- doc/tutorials/plugin-wizard.qdoc | 4 +- doc/tutorials/your-first-plugin.qdoc | 2 +- icons/nymea-logo.svg | 4 +- libnymea-core/servers/webserver.cpp | 2 +- libnymea-core/usermanager/usermanager.cpp | 2 +- libnymea/hardwaremanager.cpp | 2 +- libnymea/hardwareresource.cpp | 4 +- libnymea/integrations/plugin.pri | 2 +- libnymea/network/upnp/upnpdiscoveryreply.cpp | 2 +- libnymea/plugintimer.cpp | 6 +- tests/libnymea-tests/nymeatestbase.cpp | 3 +- 23 files changed, 79 insertions(+), 82 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 30843387..01f51c26 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe ## Enforcement -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at office@guh.io. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at contact@nymea.io. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. diff --git a/README.md b/README.md index f69ee504..45752ae0 100644 --- a/README.md +++ b/README.md @@ -37,13 +37,13 @@ the latest Raspberry Pi OS Bookworm [core](https://downloads.nymea.io/images/ras

- + Android Badge

- + Openstore Badge

diff --git a/data/debug-interface/logo.svg b/data/debug-interface/logo.svg index d065589f..943a50cf 100644 --- a/data/debug-interface/logo.svg +++ b/data/debug-interface/logo.svg @@ -15,7 +15,7 @@ version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="logo.svg" - inkscape:export-filename="/home/timon/guh/guh/guh/icons/guh-logo-512x512.png" + inkscape:export-filename="/home/timon/nymea/nymea/nymea/icons/nymea-logo-512x512.png" inkscape:export-xdpi="92.160004" inkscape:export-ydpi="92.160004"> Tue, 09 Oct 2018 22:54:50 +0200 + -- Michael Zanetti Tue, 09 Oct 2018 22:54:50 +0200 -guh (0.8.3) xenial; urgency=medium +nymea (0.8.3) xenial; urgency=medium * Add debug server * Add interfaces - -- Simon Stürz Thu, 08 Feb 2018 23:10:42 +0100 + -- Simon Stürz Thu, 08 Feb 2018 23:10:42 +0100 -guh (0.8.2) xenial; urgency=medium +nymea (0.8.2) xenial; urgency=medium * New hardware manager api * Introduce push button authentication - -- Simon Stürz Fri, 01 Dec 2017 07:56:26 +0100 + -- Simon Stürz Fri, 01 Dec 2017 07:56:26 +0100 -guh (0.8.1) xenial; urgency=medium +nymea (0.8.1) xenial; urgency=medium * Avahi interfaces and collision handling * JSON RPC traffic standardized * Settings fixed - -- Simon Stürz Mon, 02 Oct 2017 12:52:44 +0200 + -- Simon Stürz Mon, 02 Oct 2017 12:52:44 +0200 -guh (0.8.0) xenial; urgency=medium +nymea (0.8.0) xenial; urgency=medium * Add support for SSL on all connection interfaces * Add support for authentication on TCP and WebSocket Servers * Allow fine grained configuration of server interfaces through config file - -- Michael Zanetti Wed, 06 Sep 2017 14:34:56 +0200 + -- Michael Zanetti Wed, 06 Sep 2017 14:34:56 +0200 -guh (0.7.10) xenial; urgency=medium +nymea (0.7.10) xenial; urgency=medium * Make it cross compilable - -- Michael Zanetti Wed, 12 Jul 2017 15:14:56 +0100 + -- Michael Zanetti Wed, 12 Jul 2017 15:14:56 +0100 -guh (0.7.9) xenial; urgency=medium +nymea (0.7.9) xenial; urgency=medium * Fixing some bugs - -- Simon Stürz Thu, 16 Feb 2017 15:12:56 +0100 + -- Simon Stürz Thu, 16 Feb 2017 15:12:56 +0100 -guh (0.7.8) xenial; urgency=medium +nymea (0.7.8) xenial; urgency=medium * Add networkmanager - -- Simon Stürz Thu, 6 Oct 2016 14:31:48 +0200 + -- Simon Stürz Thu, 6 Oct 2016 14:31:48 +0200 -guh (0.7.6) xenial; urgency=medium +nymea (0.7.6) xenial; urgency=medium * Add translations * Add bluetooth server - -- Simon Stürz Wed, 14 Sep 2016 15:43:22 +0200 + -- Simon Stürz Wed, 14 Sep 2016 15:43:22 +0200 -guh (0.7.5) xenial; urgency=medium +nymea (0.7.5) xenial; urgency=medium * Configuration API and server settings - -- Simon Stürz Mon, 11 Jul 2016 23:15:13 +0200 + -- Simon Stürz Mon, 11 Jul 2016 23:15:13 +0200 -guh (0.7.4) xenial; urgency=medium +nymea (0.7.4) xenial; urgency=medium * Add cloud connection - * Add guhd configuration + * Add nymead configuration - -- Simon Stürz Thu, 17 Jun 2016 18:35:02 +0200 + -- Simon Stürz Thu, 17 Jun 2016 18:35:02 +0200 -guh (0.7.3) xenial; urgency=medium +nymea (0.7.3) xenial; urgency=medium * Add plugin property recommendations for client applications - -- Simon Stürz Thu, 16 May 2016 11:24:06 +0200 + -- Simon Stürz Thu, 16 May 2016 11:24:06 +0200 -guh (0.7.2) xenial; urgency=medium +nymea (0.7.2) xenial; urgency=medium * Add Avahi support - * Add guh-plugins-maker package + * Add nymea-plugins-maker package - -- Simon Stürz Thu, 28 Apr 2016 14:56:17 +0200 + -- Simon Stürz Thu, 28 Apr 2016 14:56:17 +0200 -guh (0.7.1) wily; urgency=medium +nymea (0.7.1) wily; urgency=medium * Add Timemanager * Add Time based rules - -- Simon Stürz Mon, 18 Apr 2016 13:43:01 +0200 + -- Simon Stürz Mon, 18 Apr 2016 13:43:01 +0200 -guh (0.7.0) wily; urgency=medium +nymea (0.7.0) wily; urgency=medium * Add CoAP * Add OAuth2 * Parent/child device relation - -- Simon Stürz Mon, 30 Nov 2015 11:29:03 +0100 + -- Simon Stürz Mon, 30 Nov 2015 11:29:03 +0100 -guh (0.6.0) vivid; urgency=medium +nymea (0.6.0) vivid; urgency=medium * Add websocket server - -- Simon Stürz Sat, 04 Aug 2015 16:13:43 +0200 + -- Simon Stürz Sat, 04 Aug 2015 16:13:43 +0200 -guh (0.5.0) vivid; urgency=medium +nymea (0.5.0) vivid; urgency=medium * Add webserver and REST API - -- Simon Stürz Sat, 01 Aug 2015 14:52:12 +0200 + -- Simon Stürz Sat, 01 Aug 2015 14:52:12 +0200 -guh (0.4.0) vivid; urgency=medium +nymea (0.4.0) vivid; urgency=medium * add EditDevice and notifications - -- Simon Stürz Wed, 06 May 2015 10:13:58 +0200 + -- Simon Stürz Wed, 06 May 2015 10:13:58 +0200 -guh (0.3.0) utopic; urgency=medium +nymea (0.3.0) utopic; urgency=medium * update rule engine and many other small changes - -- Simon Stürz Mon, 16 Mar 2015 09:52:40 +0100 + -- Simon Stürz Mon, 16 Mar 2015 09:52:40 +0100 -guh (0.2.0) UNRELEASED; urgency=medium +nymea (0.2.0) UNRELEASED; urgency=medium * split plugins into dynamic libs and packages -- Michael Zanetti Sat, 11 Oct 2014 05:09:41 +0200 -guh (0.1.8) utopic; urgency=medium +nymea (0.1.8) utopic; urgency=medium * allow calling AddRule with a single eventDescriptor but also with a list -- Michael Zanetti Sun, 15 Jun 2014 00:33:36 +0200 -guh (0.1.7) utopic; urgency=medium +nymea (0.1.7) utopic; urgency=medium * implement StateEvaluators -- Michael Zanetti Sun, 08 Jun 2014 23:27:31 +0200 -guh (0.1.6) utopic; urgency=medium +nymea (0.1.6) utopic; urgency=medium * state changes auto generate events now -- Michael Zanetti Sun, 08 Jun 2014 20:28:17 +0200 -guh (0.1.5) utopic; urgency=medium +nymea (0.1.5) utopic; urgency=medium * align params/paramTypes with the rest of the type system -- Michael Zanetti Sun, 08 Jun 2014 20:24:25 +0200 -guh (0.1.4) trusty; urgency=medium +nymea (0.1.4) trusty; urgency=medium * Add discoveryParams to DeviceClass -- Michael Zanetti Mon, 05 May 2014 20:30:49 +0200 -guh (0.1.3) trusty; urgency=medium +nymea (0.1.3) trusty; urgency=medium * Added Actions.GetActionType(actionTypeId) to JSONRPC -- Michael Zanetti Mon, 05 May 2014 20:30:38 +0200 -guh (0.1.2) trusty; urgency=medium +nymea (0.1.2) trusty; urgency=medium * Added Plugin configs -- Michael Zanetti Mon, 05 May 2014 20:26:46 +0200 -guh (0.1.1) trusty; urgency=low +nymea (0.1.1) trusty; urgency=low * Initial release. diff --git a/debian-qt5/man/nymea-plugininfocompiler.1 b/debian-qt5/man/nymea-plugininfocompiler.1 index 36a23ba9..1eb4bdab 100644 --- a/debian-qt5/man/nymea-plugininfocompiler.1 +++ b/debian-qt5/man/nymea-plugininfocompiler.1 @@ -28,11 +28,11 @@ The extern-plugininfo.h output file with the uuid forward declarations. .SH SEE ALSO Full developer documentation at: .br -Wiki on github: +Wiki on github: .SH "REPORTING BUGS" -Issue tracker on github: +Issue tracker on github: .br -How to report bugs: +How to report bugs: .SH AUTHOR Written by Simon Stürz .SH COPYRIGHT diff --git a/doc/examples/simplebutton/devicepluginsimplebutton.json b/doc/examples/simplebutton/devicepluginsimplebutton.json index 9184dec1..8a66cfa1 100644 --- a/doc/examples/simplebutton/devicepluginsimplebutton.json +++ b/doc/examples/simplebutton/devicepluginsimplebutton.json @@ -4,7 +4,7 @@ "id": "28c7b102-3ac8-41f6-8dc0-f4787222a186", "vendors": [ { - "name": "guh", + "name": "nymea", "displayName": "nymea", "id": "2062d64d-3232-433c-88bc-0d33c0ba2ba6", "deviceClasses": [ @@ -44,4 +44,3 @@ } - diff --git a/doc/examples/simplebutton/extern-plugininfo.h b/doc/examples/simplebutton/extern-plugininfo.h index 06c27e87..2797154b 100644 --- a/doc/examples/simplebutton/extern-plugininfo.h +++ b/doc/examples/simplebutton/extern-plugininfo.h @@ -29,7 +29,7 @@ // Id definitions extern PluginId pluginId; -extern VendorId guhVendorId; +extern VendorId nymeaVendorId; extern DeviceClassId simplebuttonDeviceClassId; extern ActionTypeId simplebuttonPressActionTypeId; extern EventTypeId simplebuttonPressedEventTypeId; diff --git a/doc/examples/simplebutton/plugininfo.h b/doc/examples/simplebutton/plugininfo.h index 7ce0be5f..5e527333 100644 --- a/doc/examples/simplebutton/plugininfo.h +++ b/doc/examples/simplebutton/plugininfo.h @@ -32,7 +32,7 @@ // Id definitions PluginId pluginId = PluginId("28c7b102-3ac8-41f6-8dc0-f4787222a186"); -VendorId guhVendorId = VendorId("2062d64d-3232-433c-88bc-0d33c0ba2ba6"); +VendorId nymeaVendorId = VendorId("2062d64d-3232-433c-88bc-0d33c0ba2ba6"); DeviceClassId simplebuttonDeviceClassId = DeviceClassId("c16ba02d-c982-4b45-8ca2-1945d94d8e66"); ActionTypeId simplebuttonPressActionTypeId = ActionTypeId("64c4ced5-9a1a-4858-81dd-1b5c94dba495"); EventTypeId simplebuttonPressedEventTypeId = EventTypeId("f9652210-9aed-4f38-8c19-2fd54f703fbe"); diff --git a/doc/examples/template/deviceplugintemplate.json b/doc/examples/template/deviceplugintemplate.json index cc68e551..31620e18 100644 --- a/doc/examples/template/deviceplugintemplate.json +++ b/doc/examples/template/deviceplugintemplate.json @@ -4,7 +4,7 @@ "id": "00000000-0000-0000-0000-000000000000", "vendors": [ { - "name": "guh", + "name": "nymea", "displayName": "nymea", "id": "2062d64d-3232-433c-88bc-0d33c0ba2ba6", "deviceClasses": [ @@ -36,4 +36,3 @@ } - diff --git a/doc/main-dark.css b/doc/main-dark.css index c4fec945..30fdf9ad 100644 --- a/doc/main-dark.css +++ b/doc/main-dark.css @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2017 Georgi Yatsev * + * Copyright (C) 2017 Georgi Yatsev * * * * Permission is hereby granted, free of charge, to any person obtaining a copy * * of this software and associated documentation files (the "Software"), to deal * diff --git a/doc/main.css b/doc/main.css index 6ce9f15a..c41e948a 100644 --- a/doc/main.css +++ b/doc/main.css @@ -1,6 +1,6 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2017 Georgi Yatsev * + * Copyright (C) 2017 Georgi Yatsev * * * * Permission is hereby granted, free of charge, to any person obtaining a copy * * of this software and associated documentation files (the "Software"), to deal * diff --git a/doc/main.js b/doc/main.js index 57b09441..63dd70d2 100644 --- a/doc/main.js +++ b/doc/main.js @@ -1,7 +1,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright (C) 2017 Georgi Yatsev * - * Copyright (C) 2018 Simon Stürz * + * Copyright (C) 2017 Georgi Yatsev * + * Copyright (C) 2018 Simon Stürz * * * * Permission is hereby granted, free of charge, to any person obtaining a copy * * of this software and associated documentation files (the "Software"), to deal * diff --git a/doc/tutorials/plugin-wizard.qdoc b/doc/tutorials/plugin-wizard.qdoc index fc24d343..8f79cbf9 100644 --- a/doc/tutorials/plugin-wizard.qdoc +++ b/doc/tutorials/plugin-wizard.qdoc @@ -6,7 +6,7 @@ This tutorial shows you how to start a new plugin project using the nymea-qtcreator wizard. You can find the source code of the - qt-creator wizard on our \l{https://github.com/guh/nymea-qtcreator-wizards}{github page}. + qt-creator wizard on our \l{https://github.com/nymea/nymea-qtcreator-wizards}{github page}. \section1 Create the plugin project @@ -125,7 +125,7 @@ \printuntil "vendors" In the vendors section you can see the vendor specific properties. There can be multiple vendors defined in one plugin, - each with its own device classes. The uuid of the vendor guh is known, and therefore already filled out. You have to update + each with its own device classes. The uuid of the vendor nymea is known, and therefore already filled out. You have to update the vendor uuid, name and id with your plugin information. \printuntil "thingClasses" diff --git a/doc/tutorials/your-first-plugin.qdoc b/doc/tutorials/your-first-plugin.qdoc index 6a604b26..fb43ae62 100644 --- a/doc/tutorials/your-first-plugin.qdoc +++ b/doc/tutorials/your-first-plugin.qdoc @@ -63,7 +63,7 @@ \section2 The device class definition - The Vendor section has not changed, since this example was developed from the guh Vendor. + The Vendor section has not changed, since this example was developed from the nymea vendor. In order to give this simple button the required action and event described in the beginning of this tutorial, we have to define the appropriate types: diff --git a/icons/nymea-logo.svg b/icons/nymea-logo.svg index 17065d0b..d6f01cc5 100644 --- a/icons/nymea-logo.svg +++ b/icons/nymea-logo.svg @@ -14,8 +14,8 @@ id="svg2" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="guh-logo.svg" - inkscape:export-filename="/home/timon/guh/guh/guh/icons/guh-logo-512x512.png" + sodipodi:docname="nymea-logo.svg" + inkscape:export-filename="/home/timon/nymea/nymea/nymea/icons/nymea-logo-512x512.png" inkscape:export-xdpi="92.160004" inkscape:export-ydpi="92.160004"> (-1, QString()); } diff --git a/libnymea/hardwaremanager.cpp b/libnymea/hardwaremanager.cpp index da090fff..c272f399 100644 --- a/libnymea/hardwaremanager.cpp +++ b/libnymea/hardwaremanager.cpp @@ -26,7 +26,7 @@ \class HardwareManager \brief The main entry point when interacting with \l{HardwareResource}{hardware resources} - \inmodule libguh + \inmodule libnymea \sa HardwareResource */ diff --git a/libnymea/hardwareresource.cpp b/libnymea/hardwareresource.cpp index e049acb8..3683bcef 100644 --- a/libnymea/hardwareresource.cpp +++ b/libnymea/hardwareresource.cpp @@ -26,7 +26,7 @@ \class HardwareResource \brief The base class for hardware resources. - \inmodule libguh + \inmodule libnymea \sa HardwareResource */ @@ -73,7 +73,7 @@ HardwareResource::HardwareResource(const QString &name, QObject *parent) : QObject(parent), m_name(name) { - new NymeaDBusService("/io/guh/nymead/HardwareManager/" + name, this); + new NymeaDBusService("/io/nymea/nymead/HardwareManager/" + name, this); } /*! Returns the name of this resource. */ diff --git a/libnymea/integrations/plugin.pri b/libnymea/integrations/plugin.pri index c348a4c8..b76fa5a8 100644 --- a/libnymea/integrations/plugin.pri +++ b/libnymea/integrations/plugin.pri @@ -1,5 +1,5 @@ # Copyright (C) 2019 Michael Zanetti -# Copyright (C) 2018 Simon Stürz +# Copyright (C) 2018 Simon Stürz # # This file is part of nymea. # diff --git a/libnymea/network/upnp/upnpdiscoveryreply.cpp b/libnymea/network/upnp/upnpdiscoveryreply.cpp index 421e8cda..f50f7ffe 100644 --- a/libnymea/network/upnp/upnpdiscoveryreply.cpp +++ b/libnymea/network/upnp/upnpdiscoveryreply.cpp @@ -27,7 +27,7 @@ \brief Allows to handle UPnP discovery request in the network. \ingroup hardware - \inmodule libguh + \inmodule libnymea \sa UpnpDevice, UpnpDiscovery */ diff --git a/libnymea/plugintimer.cpp b/libnymea/plugintimer.cpp index bd701dd0..5269350f 100644 --- a/libnymea/plugintimer.cpp +++ b/libnymea/plugintimer.cpp @@ -27,7 +27,7 @@ \brief The plugin timer class for plugins. \ingroup hardware - \inmodule libguh + \inmodule libnymea The plugin timer allows to trigger repeating actions in a device plugin. This timer does not represent a precise timer should be used for not time critical things. The PluginTimerManager will schedule the requested timer as needed and @@ -154,10 +154,10 @@ /*! \class PluginTimerManager - \brief The plugin timer manager for guh. + \brief The plugin timer manager for nymea. \ingroup hardware - \inmodule libguh + \inmodule libnymea The plugin timer manager allows to register and unregister generic timers for device plugins. In order to save resources the PluginTimerManager is responsible to schedule the timers appropriate and stop them if the HardwareResource diff --git a/tests/libnymea-tests/nymeatestbase.cpp b/tests/libnymea-tests/nymeatestbase.cpp index 438e3bd4..0dcff3ab 100644 --- a/tests/libnymea-tests/nymeatestbase.cpp +++ b/tests/libnymea-tests/nymeatestbase.cpp @@ -96,7 +96,7 @@ void NymeaTestBase::initTestCase(const QString &loggingRules, bool disableLogEng // Yes, we're intentionally mixing upper/lower case email here... username should not be case sensitive NymeaCore::instance()->userManager()->removeUser("dummy"); - NymeaCore::instance()->userManager()->createUser("dummy", "DummyPW1!", "dummy@guh.io", "Dummy", Types::PermissionScopeAdmin); + NymeaCore::instance()->userManager()->createUser("dummy", "DummyPW1!", "dummy@nymea.io", "Dummy", Types::PermissionScopeAdmin); m_apiToken = NymeaCore::instance()->userManager()->authenticate("Dummy", "DummyPW1!", "testcase"); if (MockTcpServer::servers().isEmpty()) { @@ -465,4 +465,3 @@ void NymeaTestBase::createMock() m_mockThingId = ThingId(response.toMap().value("params").toMap().value("thingId").toString()); QVERIFY2(!m_mockThingId.isNull(), "Newly created mock thing id must not be null."); } -