From fd91a31b114382a65abbce419f569983ccd7fb00 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 4 Nov 2020 14:25:10 +0100 Subject: [PATCH 01/11] WIP: Add zigbee plugins --- nymea-plugins.pro | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nymea-plugins.pro b/nymea-plugins.pro index 1194d48..5c1f18c 100644 --- a/nymea-plugins.pro +++ b/nymea-plugins.pro @@ -64,6 +64,8 @@ PLUGIN_DIRS = \ wakeonlan \ wemo \ ws2812fx \ + zigbee-generic \ + zigbee-lumi \ message(============================================) From 730864c6b061a33d50decdf5f7512ccc1760dde1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Thu, 12 Nov 2020 15:40:03 +0100 Subject: [PATCH 02/11] Add zigbee debian packages and introduce nymea-plugins-zigbee metapackage --- debian/control | 65 +++++++++++++++++++ ...ea-plugin-zigbee-generic-lights.install.in | 1 + debian/nymea-plugin-zigbee-generic.install.in | 1 + debian/nymea-plugin-zigbee-lumi.install.in | 1 + nymea-plugins.pro | 1 + 5 files changed, 69 insertions(+) create mode 100644 debian/nymea-plugin-zigbee-generic-lights.install.in create mode 100644 debian/nymea-plugin-zigbee-generic.install.in create mode 100644 debian/nymea-plugin-zigbee-lumi.install.in diff --git a/debian/control b/debian/control index e1975c7..770c31f 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Build-depends: libboblight-dev, debhelper (>= 0.0.0), libnymea1-dev (>= 0.17), libnymea-mqtt-dev, + libnymea-zigbee-dev, libqt5serialport5-dev, libqt5websockets5-dev, nymea-dev-tools:native, @@ -1013,6 +1014,54 @@ Description: nymea.io plugin to connect to your Tado account This package will install the nymea.io plugin for Tado +Package: nymea-plugin-zigbee-lumi +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libnymea-zigbee1, + nymea-plugins-translations, +Description: nymea.io zigbee plugin for lumi/aquara/xiaomi things + The nymea daemon is a plugin based IoT (Internet of Things) server. The + server works like a translator for devices, things and services and + allows them to interact. + With the powerful rule engine you are able to connect any device available + in the system and create individual scenes and behaviors for your environment. + . + This package will install the nymea.io plugin for Lumi + + +Package: nymea-plugin-zigbee-generic +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libnymea-zigbee1, + nymea-plugins-translations, +Description: nymea.io zigbee plugin for different generic recognizable devices + The nymea daemon is a plugin based IoT (Internet of Things) server. The + server works like a translator for devices, things and services and + allows them to interact. + With the powerful rule engine you are able to connect any device available + in the system and create individual scenes and behaviors for your environment. + . + This package will install the nymea.io plugin for generic recognizable zigbee devices + + +Package: nymea-plugin-zigbee-generic-lights +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libnymea-zigbee1, + nymea-plugins-translations, +Description: nymea.io zigbee plugin for different generic recognizable lights + The nymea daemon is a plugin based IoT (Internet of Things) server. The + server works like a translator for devices, things and services and + allows them to interact. + With the powerful rule engine you are able to connect any device available + in the system and create individual scenes and behaviors for your environment. + . + This package will install the nymea.io plugin for generic recognizable lights + + Package: nymea-plugins-translations Section: misc Architecture: all @@ -1079,6 +1128,21 @@ Description: Plugins for nymea IoT server - the default plugin collection . This package will install the default nymea plugins. +Package: nymea-plugins-zigbee +Section: libs +Architecture: all +Depends: nymea-plugin-zigbee-lumi, + nymea-plugin-zigbee-generic, + nymea-plugin-zigbee-generic-lights +Description: Zigbee plugins for nymea IoT server - meta package for all zigbee replated plugins + The nymea daemon is a plugin based IoT (Internet of Things) server. The + server works like a translator for devices, things and services and + allows them to interact. + With the powerful rule engine you are able to connect any device available + in the system and create individual scenes and behaviors for your environment. + . + This package will install all nymea zigbee related plugins. + Package: nymea-plugins-maker Section: libs @@ -1125,6 +1189,7 @@ Package: nymea-plugins-all Section: libs Architecture: all Depends: nymea-plugins, + nymea-plugins-zigbee, nymea-plugin-simulation, nymea-plugin-snapd, nymea-plugins-maker, diff --git a/debian/nymea-plugin-zigbee-generic-lights.install.in b/debian/nymea-plugin-zigbee-generic-lights.install.in new file mode 100644 index 0000000..c02aec2 --- /dev/null +++ b/debian/nymea-plugin-zigbee-generic-lights.install.in @@ -0,0 +1 @@ +usr/lib/@DEB_HOST_MULTIARCH@/nymea/plugins/libnymea_integrationpluginzigbee-generic-lights.so diff --git a/debian/nymea-plugin-zigbee-generic.install.in b/debian/nymea-plugin-zigbee-generic.install.in new file mode 100644 index 0000000..c01e09e --- /dev/null +++ b/debian/nymea-plugin-zigbee-generic.install.in @@ -0,0 +1 @@ +usr/lib/@DEB_HOST_MULTIARCH@/nymea/plugins/libnymea_integrationpluginzigbee-generic.so diff --git a/debian/nymea-plugin-zigbee-lumi.install.in b/debian/nymea-plugin-zigbee-lumi.install.in new file mode 100644 index 0000000..357171e --- /dev/null +++ b/debian/nymea-plugin-zigbee-lumi.install.in @@ -0,0 +1 @@ +usr/lib/@DEB_HOST_MULTIARCH@/nymea/plugins/libnymea_integrationpluginzigbee-lumi.so diff --git a/nymea-plugins.pro b/nymea-plugins.pro index 5c1f18c..13b4599 100644 --- a/nymea-plugins.pro +++ b/nymea-plugins.pro @@ -65,6 +65,7 @@ PLUGIN_DIRS = \ wemo \ ws2812fx \ zigbee-generic \ + zigbee-generic-lights \ zigbee-lumi \ From 4a51fbd100090834351cdb50cb11fcedf2fb5503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Thu, 19 Nov 2020 15:41:17 +0100 Subject: [PATCH 03/11] Add trafri plugin with on/off switch basic structure --- debian/control | 18 +++++++++++++++++- nymea-plugins.pro | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 770c31f..4fc83b7 100644 --- a/debian/control +++ b/debian/control @@ -1061,6 +1061,21 @@ Description: nymea.io zigbee plugin for different generic recognizable lights . This package will install the nymea.io plugin for generic recognizable lights +Package: nymea-plugin-zigbee-tradfri +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libnymea-zigbee1, + nymea-plugins-translations, +Description: nymea.io zigbee plugin for Ikea TRADRFI devices + The nymea daemon is a plugin based IoT (Internet of Things) server. The + server works like a translator for devices, things and services and + allows them to interact. + With the powerful rule engine you are able to connect any device available + in the system and create individual scenes and behaviors for your environment. + . + This package will install the nymea.io plugin for Ikea TRADFRI zigbee devices + Package: nymea-plugins-translations Section: misc @@ -1133,7 +1148,8 @@ Section: libs Architecture: all Depends: nymea-plugin-zigbee-lumi, nymea-plugin-zigbee-generic, - nymea-plugin-zigbee-generic-lights + nymea-plugin-zigbee-generic-lights, + nymea-plugin-zigbee-tradfri Description: Zigbee plugins for nymea IoT server - meta package for all zigbee replated plugins The nymea daemon is a plugin based IoT (Internet of Things) server. The server works like a translator for devices, things and services and diff --git a/nymea-plugins.pro b/nymea-plugins.pro index 13b4599..bb7c08e 100644 --- a/nymea-plugins.pro +++ b/nymea-plugins.pro @@ -67,6 +67,7 @@ PLUGIN_DIRS = \ zigbee-generic \ zigbee-generic-lights \ zigbee-lumi \ + zigbee-tradfri \ message(============================================) From c5049df08bc665ee48c1bed2099dbe46a2b4bab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Wed, 25 Nov 2020 13:10:19 +0100 Subject: [PATCH 04/11] Add mre tradfri devices for testing --- debian/nymea-plugin-zigbee-tradfri.install.in | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/nymea-plugin-zigbee-tradfri.install.in diff --git a/debian/nymea-plugin-zigbee-tradfri.install.in b/debian/nymea-plugin-zigbee-tradfri.install.in new file mode 100644 index 0000000..1d842d8 --- /dev/null +++ b/debian/nymea-plugin-zigbee-tradfri.install.in @@ -0,0 +1 @@ +usr/lib/@DEB_HOST_MULTIARCH@/nymea/plugins/libnymea_integrationpluginzigbee-tradfri.so From b667d47e54ca19a5c4844aaf98f3e3de1d31610e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Thu, 26 Nov 2020 18:22:55 +0100 Subject: [PATCH 05/11] Add philips hue zigbee plugin with hue dimmer switch support --- debian/control | 18 ++++++++++++++++++ .../nymea-plugin-zigbee-philipshue.install.in | 1 + nymea-plugins.pro | 1 + 3 files changed, 20 insertions(+) create mode 100644 debian/nymea-plugin-zigbee-philipshue.install.in diff --git a/debian/control b/debian/control index 4fc83b7..f06ac68 100644 --- a/debian/control +++ b/debian/control @@ -1061,6 +1061,23 @@ Description: nymea.io zigbee plugin for different generic recognizable lights . This package will install the nymea.io plugin for generic recognizable lights + +Package: nymea-plugin-zigbee-philipshue +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libnymea-zigbee1, + nymea-plugins-translations, +Description: nymea.io zigbee plugin for Philips Hue devices + The nymea daemon is a plugin based IoT (Internet of Things) server. The + server works like a translator for devices, things and services and + allows them to interact. + With the powerful rule engine you are able to connect any device available + in the system and create individual scenes and behaviors for your environment. + . + This package will install the nymea.io plugin for Philips Hue zigbee devices + + Package: nymea-plugin-zigbee-tradfri Architecture: any Depends: ${shlibs:Depends}, @@ -1149,6 +1166,7 @@ Architecture: all Depends: nymea-plugin-zigbee-lumi, nymea-plugin-zigbee-generic, nymea-plugin-zigbee-generic-lights, + nymea-plugin-zigbee-philipshue, nymea-plugin-zigbee-tradfri Description: Zigbee plugins for nymea IoT server - meta package for all zigbee replated plugins The nymea daemon is a plugin based IoT (Internet of Things) server. The diff --git a/debian/nymea-plugin-zigbee-philipshue.install.in b/debian/nymea-plugin-zigbee-philipshue.install.in new file mode 100644 index 0000000..365ee14 --- /dev/null +++ b/debian/nymea-plugin-zigbee-philipshue.install.in @@ -0,0 +1 @@ +usr/lib/@DEB_HOST_MULTIARCH@/nymea/plugins/libnymea_integrationpluginzigbee-philipshue.so diff --git a/nymea-plugins.pro b/nymea-plugins.pro index bb7c08e..a2782cd 100644 --- a/nymea-plugins.pro +++ b/nymea-plugins.pro @@ -67,6 +67,7 @@ PLUGIN_DIRS = \ zigbee-generic \ zigbee-generic-lights \ zigbee-lumi \ + zigbee-philipshue \ zigbee-tradfri \ From df15af8b2ca51ab065684f2cd50a1c49055f414d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Sat, 28 Nov 2020 17:08:02 +0100 Subject: [PATCH 06/11] Install zigbee plugins with default plugins --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index f06ac68..f31cd34 100644 --- a/debian/control +++ b/debian/control @@ -1150,6 +1150,7 @@ Depends: nymea-plugin-anel, nymea-plugin-keba, nymea-plugin-unifi, nymea-plugin-usbrelay, + nymea-plugins-zigbee, Replaces: guh-plugins Description: Plugins for nymea IoT server - the default plugin collection The nymea daemon is a plugin based IoT (Internet of Things) server. The @@ -1223,7 +1224,6 @@ Package: nymea-plugins-all Section: libs Architecture: all Depends: nymea-plugins, - nymea-plugins-zigbee, nymea-plugin-simulation, nymea-plugin-snapd, nymea-plugins-maker, From c80e1579b18abd6531c6d930b520f8ce710674b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Wed, 9 Dec 2020 14:08:48 +0100 Subject: [PATCH 07/11] Rename zigbee-generic plugin to zigbeegeneric for consistancy --- debian/nymea-plugin-zigbee-generic.install.in | 2 +- nymea-plugins.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/nymea-plugin-zigbee-generic.install.in b/debian/nymea-plugin-zigbee-generic.install.in index c01e09e..e36eada 100644 --- a/debian/nymea-plugin-zigbee-generic.install.in +++ b/debian/nymea-plugin-zigbee-generic.install.in @@ -1 +1 @@ -usr/lib/@DEB_HOST_MULTIARCH@/nymea/plugins/libnymea_integrationpluginzigbee-generic.so +usr/lib/@DEB_HOST_MULTIARCH@/nymea/plugins/libnymea_integrationpluginzigbeegeneric.so diff --git a/nymea-plugins.pro b/nymea-plugins.pro index a2782cd..9690ed8 100644 --- a/nymea-plugins.pro +++ b/nymea-plugins.pro @@ -64,7 +64,7 @@ PLUGIN_DIRS = \ wakeonlan \ wemo \ ws2812fx \ - zigbee-generic \ + zigbeegeneric \ zigbee-generic-lights \ zigbee-lumi \ zigbee-philipshue \ From 6832f8884e55ab9956f95821559d60b189f68ca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Wed, 9 Dec 2020 14:11:44 +0100 Subject: [PATCH 08/11] Rename zigbee-generic-lights plugin to zigbeegenericlights for consistancy --- debian/nymea-plugin-zigbee-generic-lights.install.in | 2 +- nymea-plugins.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/nymea-plugin-zigbee-generic-lights.install.in b/debian/nymea-plugin-zigbee-generic-lights.install.in index c02aec2..f46b810 100644 --- a/debian/nymea-plugin-zigbee-generic-lights.install.in +++ b/debian/nymea-plugin-zigbee-generic-lights.install.in @@ -1 +1 @@ -usr/lib/@DEB_HOST_MULTIARCH@/nymea/plugins/libnymea_integrationpluginzigbee-generic-lights.so +usr/lib/@DEB_HOST_MULTIARCH@/nymea/plugins/libnymea_integrationpluginzigbeegenericlights.so diff --git a/nymea-plugins.pro b/nymea-plugins.pro index 9690ed8..5fe093f 100644 --- a/nymea-plugins.pro +++ b/nymea-plugins.pro @@ -65,7 +65,7 @@ PLUGIN_DIRS = \ wemo \ ws2812fx \ zigbeegeneric \ - zigbee-generic-lights \ + zigbeegenericlights \ zigbee-lumi \ zigbee-philipshue \ zigbee-tradfri \ From 3eef58f8c3b84b24841422c276343b8d15356234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Wed, 9 Dec 2020 14:14:02 +0100 Subject: [PATCH 09/11] Rename zigbee-lumi plugin to zigbeelumi for consistancy --- debian/nymea-plugin-zigbee-lumi.install.in | 2 +- nymea-plugins.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/nymea-plugin-zigbee-lumi.install.in b/debian/nymea-plugin-zigbee-lumi.install.in index 357171e..06ebdbf 100644 --- a/debian/nymea-plugin-zigbee-lumi.install.in +++ b/debian/nymea-plugin-zigbee-lumi.install.in @@ -1 +1 @@ -usr/lib/@DEB_HOST_MULTIARCH@/nymea/plugins/libnymea_integrationpluginzigbee-lumi.so +usr/lib/@DEB_HOST_MULTIARCH@/nymea/plugins/libnymea_integrationpluginzigbeelumi.so diff --git a/nymea-plugins.pro b/nymea-plugins.pro index 5fe093f..bdb5ed3 100644 --- a/nymea-plugins.pro +++ b/nymea-plugins.pro @@ -66,7 +66,7 @@ PLUGIN_DIRS = \ ws2812fx \ zigbeegeneric \ zigbeegenericlights \ - zigbee-lumi \ + zigbeelumi \ zigbee-philipshue \ zigbee-tradfri \ From a32c96fbd751f5864cbd701e58c38d4d7d5d0ea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Wed, 9 Dec 2020 14:16:01 +0100 Subject: [PATCH 10/11] Rename zigbee-philipshue plugin to zigbeephilipshue for consistancy --- debian/nymea-plugin-zigbee-philipshue.install.in | 2 +- nymea-plugins.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/nymea-plugin-zigbee-philipshue.install.in b/debian/nymea-plugin-zigbee-philipshue.install.in index 365ee14..80a4b9a 100644 --- a/debian/nymea-plugin-zigbee-philipshue.install.in +++ b/debian/nymea-plugin-zigbee-philipshue.install.in @@ -1 +1 @@ -usr/lib/@DEB_HOST_MULTIARCH@/nymea/plugins/libnymea_integrationpluginzigbee-philipshue.so +usr/lib/@DEB_HOST_MULTIARCH@/nymea/plugins/libnymea_integrationpluginzigbeephilipshue.so diff --git a/nymea-plugins.pro b/nymea-plugins.pro index bdb5ed3..06394a3 100644 --- a/nymea-plugins.pro +++ b/nymea-plugins.pro @@ -67,7 +67,7 @@ PLUGIN_DIRS = \ zigbeegeneric \ zigbeegenericlights \ zigbeelumi \ - zigbee-philipshue \ + zigbeephilipshue \ zigbee-tradfri \ From f150a2894af5986b302eec7871314f132d8b910e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Wed, 9 Dec 2020 14:18:21 +0100 Subject: [PATCH 11/11] Rename zigbee-tradfri plugin to zigbeetradfri for consistancy --- debian/nymea-plugin-zigbee-tradfri.install.in | 2 +- nymea-plugins.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/nymea-plugin-zigbee-tradfri.install.in b/debian/nymea-plugin-zigbee-tradfri.install.in index 1d842d8..9f7f026 100644 --- a/debian/nymea-plugin-zigbee-tradfri.install.in +++ b/debian/nymea-plugin-zigbee-tradfri.install.in @@ -1 +1 @@ -usr/lib/@DEB_HOST_MULTIARCH@/nymea/plugins/libnymea_integrationpluginzigbee-tradfri.so +usr/lib/@DEB_HOST_MULTIARCH@/nymea/plugins/libnymea_integrationpluginzigbeetradfri.so diff --git a/nymea-plugins.pro b/nymea-plugins.pro index 06394a3..85f73d7 100644 --- a/nymea-plugins.pro +++ b/nymea-plugins.pro @@ -68,7 +68,7 @@ PLUGIN_DIRS = \ zigbeegenericlights \ zigbeelumi \ zigbeephilipshue \ - zigbee-tradfri \ + zigbeetradfri \ message(============================================)