diff --git a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-cs.ts b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-cs.ts index dc5187a7..16a4122e 100644 --- a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-cs.ts +++ b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-cs.ts @@ -7,247 +7,247 @@ Today The name of the DeviceClass (fbf665fb-9aca-423f-a5f2-924e50ebe6ca) - + Dnes timezone changed The name of the autocreated EventType (ab16997c-be29-438e-b588-2507d723d264) - + zóna času změněna city changed The name of the autocreated EventType (65d2a5ff-bcab-43a8-b043-f88cf01586f4) - + město změněno city The name of the ParamType of the autocreated EventType (65d2a5ff-bcab-43a8-b043-f88cf01586f4) of DeviceClass today - + město country changed The name of the autocreated EventType (a534bd8b-6826-4d71-b9f9-df1433964b94) - + země změněna country The name of the ParamType of the autocreated EventType (a534bd8b-6826-4d71-b9f9-df1433964b94) of DeviceClass today - + země day changed The name of the autocreated EventType (eb5231ea-6a1b-4d7e-a95f-d49e7b25122e) - + den změněn day The name of the ParamType of the autocreated EventType (eb5231ea-6a1b-4d7e-a95f-d49e7b25122e) of DeviceClass today - + den month changed The name of the autocreated EventType (fcd8ec96-4488-438a-8b30-58bfe2a7fae2) - + měsíc změněn month The name of the ParamType of the autocreated EventType (fcd8ec96-4488-438a-8b30-58bfe2a7fae2) of DeviceClass today - + měsíc month name changed The name of the autocreated EventType (a37acc9c-5cfb-4687-adce-e56beb32586f) - + název měsíce změněn year changed The name of the autocreated EventType (79d4ae9b-ea27-4346-8229-1d90f1ddfc9d) - + rok změněn year The name of the ParamType of the autocreated EventType (79d4ae9b-ea27-4346-8229-1d90f1ddfc9d) of DeviceClass today - + rok weekday changed The name of the autocreated EventType (452c0388-7fa1-414e-aeb2-8c7c385824b4) - + den v týdnu změněn weekday The name of the ParamType of the autocreated EventType (452c0388-7fa1-414e-aeb2-8c7c385824b4) of DeviceClass today - + den v týdnu weekday name changed The name of the autocreated EventType (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 timezone The name of the ParamType of the autocreated EventType (ab16997c-be29-438e-b588-2507d723d264) of DeviceClass today - + zóna času month name The name of the ParamType of the autocreated EventType (a37acc9c-5cfb-4687-adce-e56beb32586f) of DeviceClass today - + název měsíce weekday name The name of the ParamType of the autocreated EventType (f627d052-cee6-4727-b9c6-0e935d41e04a) of DeviceClass today - + název dne v týdnu weekend changed The name of the autocreated EventType (4de5b57b-bb1a-4d66-9ce3-22bb280b075d) - + víkend změněn weekend The name of the ParamType of the autocreated EventType (4de5b57b-bb1a-4d66-9ce3-22bb280b075d) of DeviceClass today - + víkend dusk changed The name of the autocreated EventType (44a99419-fbcd-4d8e-9441-897848b8f77c) - + soumrak změněn dusk The name of the ParamType of the autocreated EventType (44a99419-fbcd-4d8e-9441-897848b8f77c) of DeviceClass today - + soumrak sunrise changed The name of the autocreated EventType (3a08824d-285b-412e-a515-9664b491a85c) - + východ slunce změněn sunrise The name of the ParamType of the autocreated EventType (3a08824d-285b-412e-a515-9664b491a85c) of DeviceClass today - + východ slunce noon changed The name of the autocreated EventType (d92be29a-929c-4240-91a0-30153850f838) - + poledne změněno noon The name of the ParamType of the autocreated EventType (d92be29a-929c-4240-91a0-30153850f838) of DeviceClass today - + poledne dawn changed The name of the autocreated EventType (a5779b11-0499-4a6d-a7bd-8143dcc546b4) - + svítání změněno dawn The name of the ParamType of the autocreated EventType (a5779b11-0499-4a6d-a7bd-8143dcc546b4) of DeviceClass today - + svítání sunset changed The name of the autocreated EventType (377f04a7-df58-42ad-a234-e9e23bdc2f85) - + západ slunce změněn sunset The name of the ParamType of the autocreated EventType (377f04a7-df58-42ad-a234-e9e23bdc2f85) of DeviceClass today - + západ slunce Alarm The name of the DeviceClass (3f3c7ecc-9915-4e4e-95a1-e11f4f9d174d) - + Poplach monday The name of the paramType (b36f1f62-60d7-49dd-926d-836c03563efa) of alarm - + pondělí tuesday The name of the paramType (6bcbecd9-d3b8-4a63-9a41-e3ee3f4c3bab) of alarm - + úterý wednesday The name of the paramType (66bf302c-a7de-41cd-9e12-415276b82e65) of alarm - + středa thursday The name of the paramType (97aa24dc-a741-48db-ad13-7ba14ab71ea1) of alarm - + čtvrtek friday The name of the paramType (8d99b490-9b59-4812-a18d-d43c1259d1b0) of alarm - + pátek saturday The name of the paramType (59cc3316-8de7-4602-9ee2-71559f7b665a) of alarm - + sobota sunday The name of the paramType (2d519d8f-4bda-4d30-801f-48fe6c10c540) of alarm - + neděle @@ -256,7 +256,7 @@ The name of the paramType (3e38649d-f415-400f-bec2-81f374cad1cb) of alarm ---------- The name of the paramType (733e4174-dc42-4bf1-9a1d-65e785c2e580) of countdown - + minuty @@ -265,79 +265,79 @@ The name of the paramType (733e4174-dc42-4bf1-9a1d-65e785c2e580) of countdownThe name of the paramType (85c1d50d-509b-4a6a-840f-fc8fdbf46a52) of alarm ---------- The name of the paramType (0a54fe54-45a7-4fc5-a8d2-f9b6a92033de) of countdown - + hodiny time type The name of the paramType (5c285d83-284b-4ab2-bff8-d9a0ebbecbe4) of alarm - + typ času offset The name of the paramType (b37ec6bb-9f37-4520-ae34-d788ac2d5056) of alarm - + ofset alarm The name of the EventType 5ec9a4af-d5ea-4f68-ab32-f7a3fcd75ccc of deviceClass alarm - + poplach Countdown The name of the DeviceClass (805c8948-e663-4ba6-aa67-df7446ed7098) - + Odpočítávání seconds The name of the paramType (7c1d33d8-bcc3-4890-a4be-2c753d9c14be) of countdown - + sekundy repeating The name of the paramType (7b0c11cd-64c5-4cfc-9860-aa9ce7b7b3b5) of countdown - + opakování running changed The name of the autocreated EventType (b21ccd53-1ebd-41a0-a2a3-662874e79837) - + běh změněn running The name of the ParamType of the autocreated EventType (b21ccd53-1ebd-41a0-a2a3-662874e79837) of DeviceClass countdown - + běh start The name of the ActionType 436e9923-6eff-444e-bde7-a61228a4d748 of deviceClass countdown - + spustit stop The name of the ActionType bf4d1def-4159-4254-a76d-fd31aaa84e2d of deviceClass countdown - + zastavit restart The name of the ActionType 14aad613-b972-411f-93c9-f00bfd254285 of deviceClass countdown - + restartovat timeout The name of the EventType 1db11351-ad67-448e-a784-216741a06a58 of deviceClass countdown - + přestávka diff --git a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-fr.ts b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-fr.ts index f72f0b0b..29d2a752 100644 --- a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-fr.ts +++ b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-fr.ts @@ -7,7 +7,7 @@ Today The name of the DeviceClass (fbf665fb-9aca-423f-a5f2-924e50ebe6ca) - aujourd'hui + Aujourd’hui @@ -19,13 +19,13 @@ city changed The name of the autocreated EventType (65d2a5ff-bcab-43a8-b043-f88cf01586f4) - Domicile modifié + Ville modifiée city The name of the ParamType of the autocreated EventType (65d2a5ff-bcab-43a8-b043-f88cf01586f4) of DeviceClass today - ville + Ville @@ -37,7 +37,7 @@ country The name of the ParamType of the autocreated EventType (a534bd8b-6826-4d71-b9f9-df1433964b94) of DeviceClass today - pays + Pays @@ -49,7 +49,7 @@ day The name of the ParamType of the autocreated EventType (eb5231ea-6a1b-4d7e-a95f-d49e7b25122e) of DeviceClass today - jour + Jour @@ -61,7 +61,7 @@ month The name of the ParamType of the autocreated EventType (fcd8ec96-4488-438a-8b30-58bfe2a7fae2) of DeviceClass today - mois + Mois @@ -73,13 +73,13 @@ year changed The name of the autocreated EventType (79d4ae9b-ea27-4346-8229-1d90f1ddfc9d) - L'année modifié + Année modifiée year The name of the ParamType of the autocreated EventType (79d4ae9b-ea27-4346-8229-1d90f1ddfc9d) of DeviceClass today - an + Année @@ -91,13 +91,13 @@ weekday The name of the ParamType of the autocreated EventType (452c0388-7fa1-414e-aeb2-8c7c385824b4) of DeviceClass today - jour de la semaine + Jour de la semaine weekday name changed The name of the autocreated EventType (f627d052-cee6-4727-b9c6-0e935d41e04a) - Nom du jour modifié + Nom du jour de semaine modifié @@ -109,7 +109,7 @@ Time The name of the plugin DateTime (c26014c6-87fb-4233-85ed-01d18625018d) - L'heure/Date + Heure @@ -121,13 +121,13 @@ month name The name of the ParamType of the autocreated EventType (a37acc9c-5cfb-4687-adce-e56beb32586f) of DeviceClass today - Nom de mois + Nom du mois weekday name The name of the ParamType of the autocreated EventType (f627d052-cee6-4727-b9c6-0e935d41e04a) of DeviceClass today - Nom du jour + Nom du jour de la semaine @@ -169,85 +169,85 @@ noon changed The name of the autocreated EventType (d92be29a-929c-4240-91a0-30153850f838) - Niveau maximum de soleil modifié + Midi modifié noon The name of the ParamType of the autocreated EventType (d92be29a-929c-4240-91a0-30153850f838) of DeviceClass today - Niveau maximum de soleil + Midi dawn changed The name of the autocreated EventType (a5779b11-0499-4a6d-a7bd-8143dcc546b4) - Point du jour modifié + Aube modifié dawn The name of the ParamType of the autocreated EventType (a5779b11-0499-4a6d-a7bd-8143dcc546b4) of DeviceClass today - Point du Jour + Aube sunset changed The name of the autocreated EventType (377f04a7-df58-42ad-a234-e9e23bdc2f85) - Couche du soleil modifié + Coucher du soleil modifié sunset The name of the ParamType of the autocreated EventType (377f04a7-df58-42ad-a234-e9e23bdc2f85) of DeviceClass today - Couche du soleil + Coucher du soleil Alarm The name of the DeviceClass (3f3c7ecc-9915-4e4e-95a1-e11f4f9d174d) - Réveil + Alarme monday The name of the paramType (b36f1f62-60d7-49dd-926d-836c03563efa) of alarm - lundi + Lundi tuesday The name of the paramType (6bcbecd9-d3b8-4a63-9a41-e3ee3f4c3bab) of alarm - mardi + Mardi wednesday The name of the paramType (66bf302c-a7de-41cd-9e12-415276b82e65) of alarm - mercredi + Mercredi thursday The name of the paramType (97aa24dc-a741-48db-ad13-7ba14ab71ea1) of alarm - jeudi + Jeudi friday The name of the paramType (8d99b490-9b59-4812-a18d-d43c1259d1b0) of alarm - vendredi + Vendredi saturday The name of the paramType (59cc3316-8de7-4602-9ee2-71559f7b665a) of alarm - samedi + Samedi sunday The name of the paramType (2d519d8f-4bda-4d30-801f-48fe6c10c540) of alarm - dimanche + Dimanche @@ -277,7 +277,7 @@ The name of the paramType (0a54fe54-45a7-4fc5-a8d2-f9b6a92033de) of countdown offset The name of the paramType (b37ec6bb-9f37-4520-ae34-d788ac2d5056) of alarm - Différence + Décalage @@ -295,37 +295,37 @@ The name of the paramType (0a54fe54-45a7-4fc5-a8d2-f9b6a92033de) of countdown seconds The name of the paramType (7c1d33d8-bcc3-4890-a4be-2c753d9c14be) of countdown - secondes + Secondes repeating The name of the paramType (7b0c11cd-64c5-4cfc-9860-aa9ce7b7b3b5) of countdown - répéter + Répéter running changed The name of the autocreated EventType (b21ccd53-1ebd-41a0-a2a3-662874e79837) - Cours modifié + Course modifiée running The name of the ParamType of the autocreated EventType (b21ccd53-1ebd-41a0-a2a3-662874e79837) of DeviceClass countdown - fonctionner + Course start The name of the ActionType 436e9923-6eff-444e-bde7-a61228a4d748 of deviceClass countdown - D'epart + Démarrage stop The name of the ActionType bf4d1def-4159-4254-a76d-fd31aaa84e2d of deviceClass countdown - Stop + Arrêt @@ -337,7 +337,7 @@ The name of the paramType (0a54fe54-45a7-4fc5-a8d2-f9b6a92033de) of countdown timeout The name of the EventType 1db11351-ad67-448e-a784-216741a06a58 of deviceClass countdown - Timeout + Pause diff --git a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-it.ts b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-it.ts index ff334c90..d5320616 100644 --- a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-it.ts +++ b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-it.ts @@ -7,247 +7,247 @@ Today The name of the DeviceClass (fbf665fb-9aca-423f-a5f2-924e50ebe6ca) - + Oggi timezone changed The name of the autocreated EventType (ab16997c-be29-438e-b588-2507d723d264) - + fuso orario modificato city changed The name of the autocreated EventType (65d2a5ff-bcab-43a8-b043-f88cf01586f4) - + città modificata city The name of the ParamType of the autocreated EventType (65d2a5ff-bcab-43a8-b043-f88cf01586f4) of DeviceClass today - + città country changed The name of the autocreated EventType (a534bd8b-6826-4d71-b9f9-df1433964b94) - + paese modificato country The name of the ParamType of the autocreated EventType (a534bd8b-6826-4d71-b9f9-df1433964b94) of DeviceClass today - + paese day changed The name of the autocreated EventType (eb5231ea-6a1b-4d7e-a95f-d49e7b25122e) - + giorno modificato day The name of the ParamType of the autocreated EventType (eb5231ea-6a1b-4d7e-a95f-d49e7b25122e) of DeviceClass today - + giorno month changed The name of the autocreated EventType (fcd8ec96-4488-438a-8b30-58bfe2a7fae2) - + mese modificato month The name of the ParamType of the autocreated EventType (fcd8ec96-4488-438a-8b30-58bfe2a7fae2) of DeviceClass today - + mese month name changed The name of the autocreated EventType (a37acc9c-5cfb-4687-adce-e56beb32586f) - + nome mese modificato year changed The name of the autocreated EventType (79d4ae9b-ea27-4346-8229-1d90f1ddfc9d) - + anno modificato year The name of the ParamType of the autocreated EventType (79d4ae9b-ea27-4346-8229-1d90f1ddfc9d) of DeviceClass today - + anno weekday changed The name of the autocreated EventType (452c0388-7fa1-414e-aeb2-8c7c385824b4) - + giorno settimana modificato weekday The name of the ParamType of the autocreated EventType (452c0388-7fa1-414e-aeb2-8c7c385824b4) of DeviceClass today - + giorno settimana weekday name changed The name of the autocreated EventType (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 timezone The name of the ParamType of the autocreated EventType (ab16997c-be29-438e-b588-2507d723d264) of DeviceClass today - + fuso orario month name The name of the ParamType of the autocreated EventType (a37acc9c-5cfb-4687-adce-e56beb32586f) of DeviceClass today - + nome mese weekday name The name of the ParamType of the autocreated EventType (f627d052-cee6-4727-b9c6-0e935d41e04a) of DeviceClass today - + nome giorno settimana weekend changed The name of the autocreated EventType (4de5b57b-bb1a-4d66-9ce3-22bb280b075d) - + weekend modificato weekend The name of the ParamType of the autocreated EventType (4de5b57b-bb1a-4d66-9ce3-22bb280b075d) of DeviceClass today - + weekend dusk changed The name of the autocreated EventType (44a99419-fbcd-4d8e-9441-897848b8f77c) - + orario crepuscolo modificato dusk The name of the ParamType of the autocreated EventType (44a99419-fbcd-4d8e-9441-897848b8f77c) of DeviceClass today - + orario crepuscolo sunrise changed The name of the autocreated EventType (3a08824d-285b-412e-a515-9664b491a85c) - + orario alba modificato sunrise The name of the ParamType of the autocreated EventType (3a08824d-285b-412e-a515-9664b491a85c) of DeviceClass today - + orario alba noon changed The name of the autocreated EventType (d92be29a-929c-4240-91a0-30153850f838) - + mezzogiorno modificato noon The name of the ParamType of the autocreated EventType (d92be29a-929c-4240-91a0-30153850f838) of DeviceClass today - + mezzogiorno dawn changed The name of the autocreated EventType (a5779b11-0499-4a6d-a7bd-8143dcc546b4) - + alba modificata dawn The name of the ParamType of the autocreated EventType (a5779b11-0499-4a6d-a7bd-8143dcc546b4) of DeviceClass today - + alba sunset changed The name of the autocreated EventType (377f04a7-df58-42ad-a234-e9e23bdc2f85) - + tramonto modificato sunset The name of the ParamType of the autocreated EventType (377f04a7-df58-42ad-a234-e9e23bdc2f85) of DeviceClass today - + tramonto Alarm The name of the DeviceClass (3f3c7ecc-9915-4e4e-95a1-e11f4f9d174d) - + Sveglia monday The name of the paramType (b36f1f62-60d7-49dd-926d-836c03563efa) of alarm - + lunedì tuesday The name of the paramType (6bcbecd9-d3b8-4a63-9a41-e3ee3f4c3bab) of alarm - + martedì wednesday The name of the paramType (66bf302c-a7de-41cd-9e12-415276b82e65) of alarm - + mercoledì thursday The name of the paramType (97aa24dc-a741-48db-ad13-7ba14ab71ea1) of alarm - + giovedì friday The name of the paramType (8d99b490-9b59-4812-a18d-d43c1259d1b0) of alarm - + venerdì saturday The name of the paramType (59cc3316-8de7-4602-9ee2-71559f7b665a) of alarm - + sabato sunday The name of the paramType (2d519d8f-4bda-4d30-801f-48fe6c10c540) of alarm - + domenica @@ -256,7 +256,7 @@ The name of the paramType (3e38649d-f415-400f-bec2-81f374cad1cb) of alarm ---------- The name of the paramType (733e4174-dc42-4bf1-9a1d-65e785c2e580) of countdown - + minuti @@ -265,79 +265,79 @@ The name of the paramType (733e4174-dc42-4bf1-9a1d-65e785c2e580) of countdownThe name of the paramType (85c1d50d-509b-4a6a-840f-fc8fdbf46a52) of alarm ---------- The name of the paramType (0a54fe54-45a7-4fc5-a8d2-f9b6a92033de) of countdown - + ore time type The name of the paramType (5c285d83-284b-4ab2-bff8-d9a0ebbecbe4) of alarm - + tipo ora offset The name of the paramType (b37ec6bb-9f37-4520-ae34-d788ac2d5056) of alarm - + offset alarm The name of the EventType 5ec9a4af-d5ea-4f68-ab32-f7a3fcd75ccc of deviceClass alarm - + sveglia Countdown The name of the DeviceClass (805c8948-e663-4ba6-aa67-df7446ed7098) - + Conto alla rovescia seconds The name of the paramType (7c1d33d8-bcc3-4890-a4be-2c753d9c14be) of countdown - + secondi repeating The name of the paramType (7b0c11cd-64c5-4cfc-9860-aa9ce7b7b3b5) of countdown - + ripetizione running changed The name of the autocreated EventType (b21ccd53-1ebd-41a0-a2a3-662874e79837) - + attività modificata running The name of the ParamType of the autocreated EventType (b21ccd53-1ebd-41a0-a2a3-662874e79837) of DeviceClass countdown - + attività start The name of the ActionType 436e9923-6eff-444e-bde7-a61228a4d748 of deviceClass countdown - + inizia stop The name of the ActionType bf4d1def-4159-4254-a76d-fd31aaa84e2d of deviceClass countdown - + stop restart The name of the ActionType 14aad613-b972-411f-93c9-f00bfd254285 of deviceClass countdown - + riavvia timeout The name of the EventType 1db11351-ad67-448e-a784-216741a06a58 of deviceClass countdown - + timeout diff --git a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-nl.ts b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-nl.ts index 9634cd60..c1c9b1e2 100644 --- a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-nl.ts +++ b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-nl.ts @@ -7,247 +7,247 @@ Today The name of the DeviceClass (fbf665fb-9aca-423f-a5f2-924e50ebe6ca) - + Vandaag timezone changed The name of the autocreated EventType (ab16997c-be29-438e-b588-2507d723d264) - + tijdzone gewijzigd city changed The name of the autocreated EventType (65d2a5ff-bcab-43a8-b043-f88cf01586f4) - + woonplaats gewijzigd city The name of the ParamType of the autocreated EventType (65d2a5ff-bcab-43a8-b043-f88cf01586f4) of DeviceClass today - + woonplaats country changed The name of the autocreated EventType (a534bd8b-6826-4d71-b9f9-df1433964b94) - + land gewijzigd country The name of the ParamType of the autocreated EventType (a534bd8b-6826-4d71-b9f9-df1433964b94) of DeviceClass today - + land day changed The name of the autocreated EventType (eb5231ea-6a1b-4d7e-a95f-d49e7b25122e) - + dag gewijzigd day The name of the ParamType of the autocreated EventType (eb5231ea-6a1b-4d7e-a95f-d49e7b25122e) of DeviceClass today - + dag month changed The name of the autocreated EventType (fcd8ec96-4488-438a-8b30-58bfe2a7fae2) - + maand gewijzigd month The name of the ParamType of the autocreated EventType (fcd8ec96-4488-438a-8b30-58bfe2a7fae2) of DeviceClass today - + maand month name changed The name of the autocreated EventType (a37acc9c-5cfb-4687-adce-e56beb32586f) - + maandnaam gewijzigd year changed The name of the autocreated EventType (79d4ae9b-ea27-4346-8229-1d90f1ddfc9d) - + jaar gewijzigd year The name of the ParamType of the autocreated EventType (79d4ae9b-ea27-4346-8229-1d90f1ddfc9d) of DeviceClass today - + jaar weekday changed The name of the autocreated EventType (452c0388-7fa1-414e-aeb2-8c7c385824b4) - + weekdag gewijzigd weekday The name of the ParamType of the autocreated EventType (452c0388-7fa1-414e-aeb2-8c7c385824b4) of DeviceClass today - + weekdag weekday name changed The name of the autocreated EventType (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 timezone The name of the ParamType of the autocreated EventType (ab16997c-be29-438e-b588-2507d723d264) of DeviceClass today - + tijdzone month name The name of the ParamType of the autocreated EventType (a37acc9c-5cfb-4687-adce-e56beb32586f) of DeviceClass today - + maandnaam weekday name The name of the ParamType of the autocreated EventType (f627d052-cee6-4727-b9c6-0e935d41e04a) of DeviceClass today - + naam weekdag weekend changed The name of the autocreated EventType (4de5b57b-bb1a-4d66-9ce3-22bb280b075d) - + weekend gewijzigd weekend The name of the ParamType of the autocreated EventType (4de5b57b-bb1a-4d66-9ce3-22bb280b075d) of DeviceClass today - + weekend dusk changed The name of the autocreated EventType (44a99419-fbcd-4d8e-9441-897848b8f77c) - + schemering gewijzigd dusk The name of the ParamType of the autocreated EventType (44a99419-fbcd-4d8e-9441-897848b8f77c) of DeviceClass today - + schemering sunrise changed The name of the autocreated EventType (3a08824d-285b-412e-a515-9664b491a85c) - + zonsopkomst gewijzigd sunrise The name of the ParamType of the autocreated EventType (3a08824d-285b-412e-a515-9664b491a85c) of DeviceClass today - + zonsopkomst noon changed The name of the autocreated EventType (d92be29a-929c-4240-91a0-30153850f838) - + middaguur gewijzigd noon The name of the ParamType of the autocreated EventType (d92be29a-929c-4240-91a0-30153850f838) of DeviceClass today - + middaguur dawn changed The name of the autocreated EventType (a5779b11-0499-4a6d-a7bd-8143dcc546b4) - + dageraad gewijzigd dawn The name of the ParamType of the autocreated EventType (a5779b11-0499-4a6d-a7bd-8143dcc546b4) of DeviceClass today - + dageraad sunset changed The name of the autocreated EventType (377f04a7-df58-42ad-a234-e9e23bdc2f85) - + zonsondergang gewijzigd sunset The name of the ParamType of the autocreated EventType (377f04a7-df58-42ad-a234-e9e23bdc2f85) of DeviceClass today - + zonsondergang Alarm The name of the DeviceClass (3f3c7ecc-9915-4e4e-95a1-e11f4f9d174d) - + Alarm monday The name of the paramType (b36f1f62-60d7-49dd-926d-836c03563efa) of alarm - + maandag tuesday The name of the paramType (6bcbecd9-d3b8-4a63-9a41-e3ee3f4c3bab) of alarm - + dinsdag wednesday The name of the paramType (66bf302c-a7de-41cd-9e12-415276b82e65) of alarm - + woensdag thursday The name of the paramType (97aa24dc-a741-48db-ad13-7ba14ab71ea1) of alarm - + donderdag friday The name of the paramType (8d99b490-9b59-4812-a18d-d43c1259d1b0) of alarm - + vrijdag saturday The name of the paramType (59cc3316-8de7-4602-9ee2-71559f7b665a) of alarm - + zaterdag sunday The name of the paramType (2d519d8f-4bda-4d30-801f-48fe6c10c540) of alarm - + zondag @@ -256,7 +256,7 @@ The name of the paramType (3e38649d-f415-400f-bec2-81f374cad1cb) of alarm ---------- The name of the paramType (733e4174-dc42-4bf1-9a1d-65e785c2e580) of countdown - + minuten @@ -265,79 +265,79 @@ The name of the paramType (733e4174-dc42-4bf1-9a1d-65e785c2e580) of countdownThe name of the paramType (85c1d50d-509b-4a6a-840f-fc8fdbf46a52) of alarm ---------- The name of the paramType (0a54fe54-45a7-4fc5-a8d2-f9b6a92033de) of countdown - + uren time type The name of the paramType (5c285d83-284b-4ab2-bff8-d9a0ebbecbe4) of alarm - + type tijd offset The name of the paramType (b37ec6bb-9f37-4520-ae34-d788ac2d5056) of alarm - + compensatie alarm The name of the EventType 5ec9a4af-d5ea-4f68-ab32-f7a3fcd75ccc of deviceClass alarm - + alarm Countdown The name of the DeviceClass (805c8948-e663-4ba6-aa67-df7446ed7098) - + Aftelprocedure seconds The name of the paramType (7c1d33d8-bcc3-4890-a4be-2c753d9c14be) of countdown - + seconden repeating The name of the paramType (7b0c11cd-64c5-4cfc-9860-aa9ce7b7b3b5) of countdown - + bezig met herhalen running changed The name of the autocreated EventType (b21ccd53-1ebd-41a0-a2a3-662874e79837) - + uitvoering gewijzigd running The name of the ParamType of the autocreated EventType (b21ccd53-1ebd-41a0-a2a3-662874e79837) of DeviceClass countdown - + bezig met uitvoering start The name of the ActionType 436e9923-6eff-444e-bde7-a61228a4d748 of deviceClass countdown - + beginnen stop The name of the ActionType bf4d1def-4159-4254-a76d-fd31aaa84e2d of deviceClass countdown - + stoppen restart The name of the ActionType 14aad613-b972-411f-93c9-f00bfd254285 of deviceClass countdown - + opnieuw beginnen timeout The name of the EventType 1db11351-ad67-448e-a784-216741a06a58 of deviceClass countdown - + timeout diff --git a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-pt.ts b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-pt.ts index 62a27b8a..a9599863 100644 --- a/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-pt.ts +++ b/datetime/translations/c26014c6-87fb-4233-85ed-01d18625018d-pt.ts @@ -7,247 +7,247 @@ Today The name of the DeviceClass (fbf665fb-9aca-423f-a5f2-924e50ebe6ca) - + Hoje timezone changed The name of the autocreated EventType (ab16997c-be29-438e-b588-2507d723d264) - + fuso horário alterado city changed The name of the autocreated EventType (65d2a5ff-bcab-43a8-b043-f88cf01586f4) - + cidade alterada city The name of the ParamType of the autocreated EventType (65d2a5ff-bcab-43a8-b043-f88cf01586f4) of DeviceClass today - + cidade country changed The name of the autocreated EventType (a534bd8b-6826-4d71-b9f9-df1433964b94) - + país alterado country The name of the ParamType of the autocreated EventType (a534bd8b-6826-4d71-b9f9-df1433964b94) of DeviceClass today - + país day changed The name of the autocreated EventType (eb5231ea-6a1b-4d7e-a95f-d49e7b25122e) - + dia alterado day The name of the ParamType of the autocreated EventType (eb5231ea-6a1b-4d7e-a95f-d49e7b25122e) of DeviceClass today - + dia month changed The name of the autocreated EventType (fcd8ec96-4488-438a-8b30-58bfe2a7fae2) - + mês alterado month The name of the ParamType of the autocreated EventType (fcd8ec96-4488-438a-8b30-58bfe2a7fae2) of DeviceClass today - + mês month name changed The name of the autocreated EventType (a37acc9c-5cfb-4687-adce-e56beb32586f) - + nome do mês alterado year changed The name of the autocreated EventType (79d4ae9b-ea27-4346-8229-1d90f1ddfc9d) - + ano alterado year The name of the ParamType of the autocreated EventType (79d4ae9b-ea27-4346-8229-1d90f1ddfc9d) of DeviceClass today - + ano weekday changed The name of the autocreated EventType (452c0388-7fa1-414e-aeb2-8c7c385824b4) - + dia da semana alterado weekday The name of the ParamType of the autocreated EventType (452c0388-7fa1-414e-aeb2-8c7c385824b4) of DeviceClass today - + dia da semana weekday name changed The name of the autocreated EventType (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 timezone The name of the ParamType of the autocreated EventType (ab16997c-be29-438e-b588-2507d723d264) of DeviceClass today - + fuso horário month name The name of the ParamType of the autocreated EventType (a37acc9c-5cfb-4687-adce-e56beb32586f) of DeviceClass today - + nome mês weekday name The name of the ParamType of the autocreated EventType (f627d052-cee6-4727-b9c6-0e935d41e04a) of DeviceClass today - + nome dia da semana weekend changed The name of the autocreated EventType (4de5b57b-bb1a-4d66-9ce3-22bb280b075d) - + dia da semana alterada weekend The name of the ParamType of the autocreated EventType (4de5b57b-bb1a-4d66-9ce3-22bb280b075d) of DeviceClass today - + dia da semana dusk changed The name of the autocreated EventType (44a99419-fbcd-4d8e-9441-897848b8f77c) - + crepúsculo alterado dusk The name of the ParamType of the autocreated EventType (44a99419-fbcd-4d8e-9441-897848b8f77c) of DeviceClass today - + crepúsculo sunrise changed The name of the autocreated EventType (3a08824d-285b-412e-a515-9664b491a85c) - + alvorada alterada sunrise The name of the ParamType of the autocreated EventType (3a08824d-285b-412e-a515-9664b491a85c) of DeviceClass today - + alvorada noon changed The name of the autocreated EventType (d92be29a-929c-4240-91a0-30153850f838) - + meio-dia alterado noon The name of the ParamType of the autocreated EventType (d92be29a-929c-4240-91a0-30153850f838) of DeviceClass today - + meio-dia dawn changed The name of the autocreated EventType (a5779b11-0499-4a6d-a7bd-8143dcc546b4) - + amanhecer alterado dawn The name of the ParamType of the autocreated EventType (a5779b11-0499-4a6d-a7bd-8143dcc546b4) of DeviceClass today - + amanhecer sunset changed The name of the autocreated EventType (377f04a7-df58-42ad-a234-e9e23bdc2f85) - + entardecer alterado sunset The name of the ParamType of the autocreated EventType (377f04a7-df58-42ad-a234-e9e23bdc2f85) of DeviceClass today - + entardecer Alarm The name of the DeviceClass (3f3c7ecc-9915-4e4e-95a1-e11f4f9d174d) - + Alarme monday The name of the paramType (b36f1f62-60d7-49dd-926d-836c03563efa) of alarm - + segunda-feira tuesday The name of the paramType (6bcbecd9-d3b8-4a63-9a41-e3ee3f4c3bab) of alarm - + terça-feira wednesday The name of the paramType (66bf302c-a7de-41cd-9e12-415276b82e65) of alarm - + quarta-feira thursday The name of the paramType (97aa24dc-a741-48db-ad13-7ba14ab71ea1) of alarm - + quinta-feira friday The name of the paramType (8d99b490-9b59-4812-a18d-d43c1259d1b0) of alarm - + sexta-feira saturday The name of the paramType (59cc3316-8de7-4602-9ee2-71559f7b665a) of alarm - + sábado sunday The name of the paramType (2d519d8f-4bda-4d30-801f-48fe6c10c540) of alarm - + domingo @@ -256,7 +256,7 @@ The name of the paramType (3e38649d-f415-400f-bec2-81f374cad1cb) of alarm ---------- The name of the paramType (733e4174-dc42-4bf1-9a1d-65e785c2e580) of countdown - + minutos @@ -265,79 +265,79 @@ The name of the paramType (733e4174-dc42-4bf1-9a1d-65e785c2e580) of countdownThe name of the paramType (85c1d50d-509b-4a6a-840f-fc8fdbf46a52) of alarm ---------- The name of the paramType (0a54fe54-45a7-4fc5-a8d2-f9b6a92033de) of countdown - + horas time type The name of the paramType (5c285d83-284b-4ab2-bff8-d9a0ebbecbe4) of alarm - + tipo de tempo offset The name of the paramType (b37ec6bb-9f37-4520-ae34-d788ac2d5056) of alarm - + compensação alarm The name of the EventType 5ec9a4af-d5ea-4f68-ab32-f7a3fcd75ccc of deviceClass alarm - + alarme Countdown The name of the DeviceClass (805c8948-e663-4ba6-aa67-df7446ed7098) - + contagem decrescente seconds The name of the paramType (7c1d33d8-bcc3-4890-a4be-2c753d9c14be) of countdown - + segundos repeating The name of the paramType (7b0c11cd-64c5-4cfc-9860-aa9ce7b7b3b5) of countdown - + repetir running changed The name of the autocreated EventType (b21ccd53-1ebd-41a0-a2a3-662874e79837) - + funcionamento alterado running The name of the ParamType of the autocreated EventType (b21ccd53-1ebd-41a0-a2a3-662874e79837) of DeviceClass countdown - + funcionamento start The name of the ActionType 436e9923-6eff-444e-bde7-a61228a4d748 of deviceClass countdown - + iniciar stop The name of the ActionType bf4d1def-4159-4254-a76d-fd31aaa84e2d of deviceClass countdown - + parar restart The name of the ActionType 14aad613-b972-411f-93c9-f00bfd254285 of deviceClass countdown - + restaurar timeout The name of the EventType 1db11351-ad67-448e-a784-216741a06a58 of deviceClass countdown - + tempo esgotado diff --git a/debian/control b/debian/control index 35d7b079..d17e3e89 100644 --- a/debian/control +++ b/debian/control @@ -108,6 +108,21 @@ Description: nymea.io plugin for denon This package will install the nymea.io plugin for denon +Package: nymea-plugin-dweetio +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + nymea-plugins-translations, +Description: nymea.io plugin for dweet.io + 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 dweet.io + + Package: nymea-plugin-elro Architecture: any Depends: ${shlibs:Depends}, diff --git a/debian/nymea-plugin-dweetio.install.in b/debian/nymea-plugin-dweetio.install.in new file mode 100644 index 00000000..0e0f6599 --- /dev/null +++ b/debian/nymea-plugin-dweetio.install.in @@ -0,0 +1 @@ +usr/lib/@DEB_HOST_MULTIARCH@/nymea/plugins/libnymea_deviceplugindweetio.so diff --git a/dweetio/deviceplugindweetio.cpp b/dweetio/deviceplugindweetio.cpp new file mode 100644 index 00000000..4f01476d --- /dev/null +++ b/dweetio/deviceplugindweetio.cpp @@ -0,0 +1,265 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * * + * Copyright (C) 2018 Bernhard Trinnes * + * * + * 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 * + * . * + * * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + + + +#include "deviceplugindweetio.h" +#include "plugininfo.h" +#include "hardwaremanager.h" +#include "network/networkaccessmanager.h" + +#include +#include +#include +#include +#include + +DevicePluginDweetio::DevicePluginDweetio() +{ + +} + +DevicePluginDweetio::~DevicePluginDweetio() +{ + hardwareManager()->pluginTimerManager()->unregisterTimer(m_pluginTimer); +} + +void DevicePluginDweetio::init() +{ + m_pluginTimer = hardwareManager()->pluginTimerManager()->registerTimer(60); + connect(m_pluginTimer, &PluginTimer::timeout, this, &DevicePluginDweetio::onPluginTimer); +} + +DeviceManager::DeviceSetupStatus DevicePluginDweetio::setupDevice(Device *device) +{ + + if (device->deviceClassId() == postDeviceClassId) { + + QString thing = device->paramValue(postThingParamTypeId).toString(); + if (thing.isEmpty()){ + qDebug(dcDweetio) << "No thing name given, creating one"; + thing = QUuid::createUuid().toString(); + } + return DeviceManager::DeviceSetupStatusSuccess; + } else if (device->deviceClassId() == getDeviceClassId) { + + return DeviceManager::DeviceSetupStatusSuccess; + } + return DeviceManager::DeviceSetupStatusFailure; +} + +void DevicePluginDweetio::postSetupDevice(Device *device) +{ + if (device->deviceClassId() == getDeviceClassId){ + getRequest(device); + } +} + +void DevicePluginDweetio::deviceRemoved(Device *device) +{ + if (device->deviceClassId() == getDeviceClassId) { + foreach(QNetworkReply *reply, m_getReplies.keys()){ + if (m_getReplies.value(reply) == device) { + m_getReplies.remove(reply); + } + } + } + + if (device->deviceClassId() == postDeviceClassId) { + foreach(QNetworkReply *reply, m_postReplies.keys()){ + if (m_postReplies.value(reply) == device) { + m_postReplies.remove(reply); + } + } + } +} + +DeviceManager::DeviceError DevicePluginDweetio::executeAction(Device *device, const Action &action) +{ + qCDebug(dcDweetio) << "Execute action" << device->id() << action.id() << action.params(); + + if (device->deviceClassId() == postDeviceClassId) { + + if (action.actionTypeId() == postContentDataActionTypeId) { + + QString content = action.param(postContentDataAreaParamTypeId).value().toString(); + postContent(content, device, action); + + return DeviceManager::DeviceErrorAsync; + } + return DeviceManager::DeviceErrorActionTypeNotFound; + } + return DeviceManager::DeviceErrorDeviceClassNotFound; +} + +void DevicePluginDweetio::postContent(const QString &content, Device *device, const Action &action) +{ + QUrl url = QString("https://dweet.io:443/dweet/for/") + device->paramValue(postThingParamTypeId).toString(); + QNetworkRequest request(url); + request.setRawHeader("Content-Type", QString("application/json").toLocal8Bit()); + request.setRawHeader("Accept", QString("application/json").toLocal8Bit()); + request.setSslConfiguration(QSslConfiguration::defaultConfiguration()); + + QString key = device->paramValue(postKeyParamTypeId).toString(); + if (!(key.isEmpty()) || !(key == "none")) { + QUrlQuery query; + query.addQueryItem("key", key); + url.setQuery(query); + } + + QVariantMap contentMap; + contentMap.insert(device->paramValue(postContentNameParamTypeId).toString(), content); + + QByteArray data = QJsonDocument::fromVariant(contentMap).toJson(QJsonDocument::Compact); + qDebug(dcDweetio) << "Dweet: " << data << "Url: " << url; + + QNetworkReply *reply = hardwareManager()->networkManager()->post(request, data); + m_asyncActions.insert(reply, action.id()); + connect(reply, &QNetworkReply::finished, this, &DevicePluginDweetio::onNetworkReplyFinished); + m_postReplies.insert(reply, device); + +} + +void DevicePluginDweetio::setConnectionStatus(bool status, Device *device) +{ + // Set connection status + device->setStateValue(postConnectedStateTypeId, status); +} + +void DevicePluginDweetio::processPostReply(const QVariantMap &data, Device *device) +{ + QString message = data.value("this").toString(); + qDebug(dcDweetio) << "Access Reply: " << message << "Device: " << device->name(); +} + +void DevicePluginDweetio::processGetReply(const QVariantMap &data, Device *device) +{ + QVariantList withList = data.value("with").toList(); + QVariantMap contentMap = withList.first().toMap().value("content").toMap(); + QString content = contentMap.value(device->paramValue(getContentNameParamTypeId).toString()).toString(); + device->setStateValue(getContentStateTypeId, content); + + qDebug(dcDweetio) << "Data: " << data << "Device: " << device->name(); +} + +void DevicePluginDweetio::onNetworkReplyFinished() +{ + QNetworkReply *reply = static_cast(sender()); + int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); + + if (m_postReplies.contains(reply)) { + Device *device = m_postReplies.value(reply); + m_postReplies.remove(reply); + ActionId actionId = m_asyncActions.value(reply); + + // check HTTP status code + if ((status != 200) && (status != 204)) { + qCWarning(dcDweetio) << "Update reply HTTP error:" << status << reply->errorString() << reply->readAll(); + emit actionExecutionFinished(actionId, DeviceManager::DeviceErrorMissingParameter); + setConnectionStatus(false, device); + reply->deleteLater(); + return; + } + + emit actionExecutionFinished(actionId, DeviceManager::DeviceErrorNoError); + setConnectionStatus(true, device); + if (status == 204){ + reply->deleteLater(); + return; + } + + // check JSON file + QJsonParseError error; + QJsonDocument jsonDoc = QJsonDocument::fromJson(reply->readAll(), &error); + if (error.error != QJsonParseError::NoError) { + qCWarning(dcDweetio) << "Update reply JSON error:" << error.errorString(); + + reply->deleteLater(); + return; + } + + processPostReply(jsonDoc.toVariant().toMap(), device); + + } else if (m_getReplies.contains(reply)) { + + Device *device = m_getReplies.value(reply); + m_getReplies.remove(reply); + + // check HTTP status code + if ((status != 200) && (status != 204)) { + qCWarning(dcDweetio) << "Update reply HTTP error:" << status << reply->errorString() << reply->readAll(); + setConnectionStatus(false, device); + reply->deleteLater(); + return; + } + + setConnectionStatus(true, device); + if (status == 204){ + reply->deleteLater(); + return; + } + + // check JSON file + QJsonParseError error; + QJsonDocument jsonDoc = QJsonDocument::fromJson(reply->readAll(), &error); + if (error.error != QJsonParseError::NoError) { + qCWarning(dcDweetio) << "Update reply JSON error:" << error.errorString(); + + reply->deleteLater(); + return; + } + + processGetReply(jsonDoc.toVariant().toMap(), device); + } +} + +void DevicePluginDweetio::getRequest(Device *device) +{ + qCDebug(dcDweetio()) << "Refresh data for" << device->name(); + + QUrl url = QString("https://dweet.io:443/get/latest/dweet/for/") + device->paramValue(postThingParamTypeId).toString(); + QNetworkRequest request(url); + request.setRawHeader("Content-Type", QString("application/json").toLocal8Bit()); + request.setRawHeader("Accept", QString("application/json").toLocal8Bit()); + request.setSslConfiguration(QSslConfiguration::defaultConfiguration()); + + QString key = device->paramValue(getKeyParamTypeId).toString(); + if (!(key.isEmpty()) || !(key == "none")) { + QUrlQuery query; + query.addQueryItem("key", key); + url.setQuery(query); + } + + QNetworkReply *reply = hardwareManager()->networkManager()->get(QNetworkRequest(url)); + connect(reply, &QNetworkReply::finished, this, &DevicePluginDweetio::onNetworkReplyFinished); + m_getReplies.insert(reply, device); +} + + +void DevicePluginDweetio::onPluginTimer() +{ + foreach (Device *device, myDevices()) { + if (device->deviceClassId() == getDeviceClassId) { + getRequest(device); + } + } +} diff --git a/dweetio/deviceplugindweetio.h b/dweetio/deviceplugindweetio.h new file mode 100644 index 00000000..21a1f942 --- /dev/null +++ b/dweetio/deviceplugindweetio.h @@ -0,0 +1,72 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * * + * Copyright (C) 2018 Bernhard Trinnes * + * * + * 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 * + * . * + * * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +#ifndef DEVICEPLUGINDWEETIO_H +#define DEVICEPLUGINDWEETIO_H + +#include "devicemanager.h" +#include "plugin/deviceplugin.h" + +#include +#include +#include +#include +#include + +#include "plugintimer.h" + +class DevicePluginDweetio : public DevicePlugin +{ + Q_OBJECT + + Q_PLUGIN_METADATA(IID "io.nymea.DevicePlugin" FILE "deviceplugindweetio.json") + Q_INTERFACES(DevicePlugin) + +public: + explicit DevicePluginDweetio(); + ~DevicePluginDweetio(); + + void init() override; + DeviceManager::DeviceSetupStatus setupDevice(Device *device) override; + void deviceRemoved(Device *device) override; + DeviceManager::DeviceError executeAction(Device *device, const Action &action) override; + void postSetupDevice(Device *device) override; + +private: + PluginTimer *m_pluginTimer = nullptr; + QHash m_postReplies; + QHash m_getReplies; + + QHash m_asyncActions; + + void postContent(const QString &content, Device *device, const Action &action); + void processPostReply(const QVariantMap &data, Device *device); + void processGetReply(const QVariantMap &data, Device *device); + void setConnectionStatus(bool status, Device *device); + + void getRequest(Device *device); +private slots: + void onNetworkReplyFinished(); + void onPluginTimer(); +}; + +#endif // DEVICEPLUGINDWEETIO_H diff --git a/dweetio/deviceplugindweetio.json b/dweetio/deviceplugindweetio.json new file mode 100644 index 00000000..97ec5535 --- /dev/null +++ b/dweetio/deviceplugindweetio.json @@ -0,0 +1,130 @@ +{ + "displayName": "Dweetio", + "name": "Dweetio", + "id": "9338f22c-df47-414e-a33c-9b6d40c953c9", + "vendors": [ + { + "id": "23ff381d-c580-4ba1-85bd-30598f893a43", + "displayName": "Dweetio", + "name": "dweetio", + "deviceClasses": [ + { + "id": "5036030e-adc7-403b-b9b6-a27a4a5afea8", + "name": "post", + "displayName": "Post", + "createMethods": ["user"], + "criticalStateTypeId": "4d1790bf-28c6-4c1f-8892-ba1a0ef140f5", + "deviceIcon": "Network", + "interfaces": [], + "basicTags": [ + "Service" + ], + "paramTypes": [ + { + "id": "b50b3682-fb2e-4185-b7aa-31741648d9bb", + "name": "thing", + "displayName": "Thing", + "type" : "QString", + "inputType": "TextLine" + }, + { + "id": "892b7323-ee85-4520-9160-f206f11b344e", + "name": "key", + "displayName": "key", + "defaultValue": "none", + "type" : "QString", + "inputType": "TextLine" + }, + { + "id": "f2b2c3ae-a915-4dd9-a9dd-9545d9dd3d4e", + "name": "contentName", + "displayName": "Content Name", + "type": "QString", + "inputType": "TextLine" + } + ], + "stateTypes": [ + { + "id": "4d1790bf-28c6-4c1f-8892-ba1a0ef140f5", + "name": "connected", + "displayName": "connected", + "displayNameEvent": "connected changed", + "defaultValue": false, + "type": "bool" + } + ], + "actionTypes": [ + { + "id": "76472328-dbaa-458f-90c9-0b46968af511", + "name": "contentData", + "displayName": "Send Content", + "paramTypes": [ + { + "id": "13760d36-26eb-40b5-85b3-450ca7937666", + "name": "contentDataArea", + "displayName": "Content", + "type": "QString", + "inputType": "TextArea" + } + ] + } + ] + }, + { + "id": "8318f86c-061a-450f-978d-f42e3513ca8c", + "name": "get", + "displayName": "Get", + "createMethods": ["user"], + "criticalStateTypeId": "4d1790bf-28c6-4c1f-8892-ba1a0ef140f5", + "deviceIcon": "Network", + "interfaces": [], + "basicTags": [ + "Service" + ], + "paramTypes": [ + { + "id": "b50b3682-fb2e-4185-b7aa-31741648d9bb", + "name": "thing", + "displayName": "Thing", + "type" : "QString", + "inputType": "TextLine" + }, + { + "id": "892b7323-ee85-4520-9160-f206f11b344e", + "name": "key", + "displayName": "Key", + "type" : "QString", + "defaultValue": "none", + "inputType": "TextLine" + }, + { + "id": "f2b2c3ae-a915-4dd9-a9dd-9545d9dd3d4e", + "name": "contentName", + "displayName": "Content name", + "type": "QString", + "inputType": "TextLine" + } + ], + "stateTypes": [ + { + "id": "4d1790bf-28c6-4c1f-8892-ba1a0ef140f5", + "name": "connected", + "displayName": "connected", + "displayNameEvent": "connected changed", + "defaultValue": false, + "type": "bool" + }, + { + "id": "53dfe2bc-792d-420e-bc1f-2890ad715b27", + "name": "content", + "displayName": "Content", + "displayNameEvent": "content changed", + "defaultValue": "", + "type": "QString" + } + ] + } + ] + } + ] +} diff --git a/dweetio/dweetio.pro b/dweetio/dweetio.pro new file mode 100644 index 00000000..07314abc --- /dev/null +++ b/dweetio/dweetio.pro @@ -0,0 +1,11 @@ +include(../plugins.pri) + +QT += network + +TARGET = $$qtLibraryTarget(nymea_deviceplugindweetio) + +SOURCES += \ + deviceplugindweetio.cpp \ + +HEADERS += \ + deviceplugindweetio.h \ diff --git a/dweetio/translations/9338f22c-df47-414e-a33c-9b6d40c953c9-en_US.ts b/dweetio/translations/9338f22c-df47-414e-a33c-9b6d40c953c9-en_US.ts new file mode 100644 index 00000000..bc2f1d44 --- /dev/null +++ b/dweetio/translations/9338f22c-df47-414e-a33c-9b6d40c953c9-en_US.ts @@ -0,0 +1,80 @@ + + + + + Dweetio + + Dweetio + The name of the plugin Dweetio (9338f22c-df47-414e-a33c-9b6d40c953c9) +---------- +The name of the vendor (23ff381d-c580-4ba1-85bd-30598f893a43) + + + + Post + The name of the DeviceClass (5036030e-adc7-403b-b9b6-a27a4a5afea8) + + + + Thing + The name of the paramType (b50b3682-fb2e-4185-b7aa-31741648d9bb) of post +---------- +The name of the paramType (b50b3682-fb2e-4185-b7aa-31741648d9bb) of get + + + + key + The name of the paramType (892b7323-ee85-4520-9160-f206f11b344e) of post + + + + Content Name + The name of the paramType (f2b2c3ae-a915-4dd9-a9dd-9545d9dd3d4e) of post + + + + connected changed + The name of the autocreated EventType (4d1790bf-28c6-4c1f-8892-ba1a0ef140f5) + + + + connected + The name of the ParamType of the autocreated EventType (4d1790bf-28c6-4c1f-8892-ba1a0ef140f5) of DeviceClass post +---------- +The name of the ParamType of the autocreated EventType (4d1790bf-28c6-4c1f-8892-ba1a0ef140f5) of DeviceClass get + + + + Send Content + The name of the ActionType 76472328-dbaa-458f-90c9-0b46968af511 of deviceClass post + + + + Content + The name of the paramType (13760d36-26eb-40b5-85b3-450ca7937666) of post +---------- +The name of the ParamType of the autocreated EventType (53dfe2bc-792d-420e-bc1f-2890ad715b27) of DeviceClass get + + + + Get + The name of the DeviceClass (8318f86c-061a-450f-978d-f42e3513ca8c) + + + + Key + The name of the paramType (892b7323-ee85-4520-9160-f206f11b344e) of get + + + + Content name + The name of the paramType (f2b2c3ae-a915-4dd9-a9dd-9545d9dd3d4e) of get + + + + content changed + The name of the autocreated EventType (53dfe2bc-792d-420e-bc1f-2890ad715b27) + + + + diff --git a/elgato/aveabulb.cpp b/elgato/aveabulb.cpp index cfd72330..1ab4bd16 100644 --- a/elgato/aveabulb.cpp +++ b/elgato/aveabulb.cpp @@ -205,7 +205,7 @@ bool AveaBulb::syncColor() return false; } - m_device->setStateValue(aveaBlueStateTypeId, m_white); + m_device->setStateValue(aveaWhiteStateTypeId, m_white); m_device->setStateValue(aveaRedStateTypeId, m_red); m_device->setStateValue(aveaGreenStateTypeId, m_green); m_device->setStateValue(aveaBlueStateTypeId, m_blue); diff --git a/elgato/devicepluginelgato.cpp b/elgato/devicepluginelgato.cpp index c9ba8226..6db65743 100644 --- a/elgato/devicepluginelgato.cpp +++ b/elgato/devicepluginelgato.cpp @@ -498,12 +498,32 @@ DeviceManager::DeviceError DevicePluginElgato::executeAction(Device *device, con device->setStateValue(aveaColorStateTypeId, color); return DeviceManager::DeviceErrorNoError; + } else if (action.actionTypeId() == aveaColorTemperatureActionTypeId) { + int ctValue = action.param(aveaColorTemperatureActionParamTypeId).value().toInt(); + // normalize from 0 to 347 instead of 153 to 500 + int ct = ctValue - 153; + // for blue: lower half fades blue from 255 to 0 + // ct : (255-blue) = (347 / 2) : 255 + int blue = qMax(0, 255 - (ct * 255 / (347 / 2))); + // for red: upper half fades red from 0 255 + // ct - (347/2) : red = (347 / 2) : 255 + int red = qMax(0, (ct - (347/2)) * 255 / ((500-153)/2)); + + QColor color; + color.setRed(red); + color.setGreen(0); + color.setBlue(blue); + if (!bulb->setWhite(4095) || !bulb->setColor(color)) { + return DeviceManager::DeviceErrorHardwareNotAvailable; + } + device->setStateValue(aveaColorStateTypeId, color); + device->setStateValue(aveaColorTemperatureStateTypeId, ctValue); + return DeviceManager::DeviceErrorNoError; } else if (action.actionTypeId() == aveaWhiteActionTypeId) { int whiteValue = action.param(aveaWhiteActionParamTypeId).value().toInt(); if (!bulb->setWhite(whiteValue)) return DeviceManager::DeviceErrorHardwareNotAvailable; - device->setStateValue(aveaWhiteStateTypeId, whiteValue); return DeviceManager::DeviceErrorNoError; } else if (action.actionTypeId() == aveaGreenActionTypeId) { int greenValue = action.param(aveaGreenActionParamTypeId).value().toInt(); diff --git a/elgato/devicepluginelgato.json b/elgato/devicepluginelgato.json index 8626a936..b531d48d 100644 --- a/elgato/devicepluginelgato.json +++ b/elgato/devicepluginelgato.json @@ -14,7 +14,7 @@ "displayName": "Avea", "deviceIcon": "LightBulb", "basicTags": ["Device", "Actuator", "Lighting"], - "interfaces": ["connectable"], + "interfaces": ["connectable", "light", "colorlight"], "createMethods": ["discovery"], "paramTypes": [ { @@ -78,6 +78,19 @@ "defaultValue": "#000000", "writable": true }, + { + "id": "8932ddac-d718-4345-94aa-f4c9611f132f", + "name": "colorTemperature", + "displayName": "color temperature", + "displayNameEvent": "color temperature changed", + "displayNameAction": "Set color temperature", + "type": "int", + "unit": "Mired", + "defaultValue": 170, + "minValue": 153, + "maxValue": 500, + "writable": true + }, { "id": "50f6a224-fb8d-487d-8774-1a0536e5b1aa", "name": "white", diff --git a/elgato/translations/c5c03ad4-bfdb-444a-8eca-2c234c46cc27-de_DE.ts b/elgato/translations/c5c03ad4-bfdb-444a-8eca-2c234c46cc27-de_DE.ts index 1a8c04ca..e690e2b3 100644 --- a/elgato/translations/c5c03ad4-bfdb-444a-8eca-2c234c46cc27-de_DE.ts +++ b/elgato/translations/c5c03ad4-bfdb-444a-8eca-2c234c46cc27-de_DE.ts @@ -4,8 +4,8 @@ Elgato - - + + Elgato The name of the plugin Elgato (c5c03ad4-bfdb-444a-8eca-2c234c46cc27) ---------- @@ -13,50 +13,50 @@ The name of the vendor (90a3091d-1053-4f77-8dc3-92e27bbcebe7) - + Avea The name of the DeviceClass (164f9602-90ee-4693-bda3-9cafae37603e) - + Set color The name of the autocreated ActionType (3f15637a-8272-4714-bd08-04806e05bbef) - + Name The name of the paramType (d7a5d96f-33dc-4dc3-a171-b1e89a5e1a4b) of avea - + MAC address The name of the paramType (20932e39-00fd-40e3-8f39-850ba149844e) of avea - + Connected changed The name of the autocreated EventType (6d5e792a-c786-40d2-ae35-a48ac6fafcbc) - + Connected The name of the ParamType of the autocreated EventType (6d5e792a-c786-40d2-ae35-a48ac6fafcbc) of DeviceClass avea - + Power changed The name of the autocreated EventType (2b779968-ff4f-4a05-a466-074e14288a8c) - - + + Power The name of the ParamType of the autocreated EventType (2b779968-ff4f-4a05-a466-074e14288a8c) of DeviceClass avea ---------- @@ -64,8 +64,8 @@ The name of the autocreated ParamType of the writable StateType (2b779968-ff4f-4 - - + + Brightness The name of the ParamType of the autocreated EventType (c38181a0-e19b-423f-8b66-dedda94e89b5) of DeviceClass avea ---------- @@ -73,8 +73,8 @@ The name of the autocreated ParamType of the writable StateType (c38181a0-e19b-4 - - + + Color The name of the ParamType of the autocreated EventType (3f15637a-8272-4714-bd08-04806e05bbef) of DeviceClass avea ---------- @@ -82,8 +82,8 @@ The name of the autocreated ParamType of the writable StateType (3f15637a-8272-4 - - + + Red The name of the ParamType of the autocreated EventType (50ab71d1-8970-4531-b1ad-f387d01bab90) of DeviceClass avea ---------- @@ -91,8 +91,8 @@ The name of the autocreated ParamType of the writable StateType (50ab71d1-8970-4 - - + + Green The name of the ParamType of the autocreated EventType (9e8ddebc-33fe-418a-895f-d8148fabcfee) of DeviceClass avea ---------- @@ -100,8 +100,8 @@ The name of the autocreated ParamType of the writable StateType (9e8ddebc-33fe-4 - - + + Blue The name of the ParamType of the autocreated EventType (f4310747-d468-4d2e-abe4-b5e4d0245dad) of DeviceClass avea ---------- @@ -109,8 +109,8 @@ The name of the autocreated ParamType of the writable StateType (f4310747-d468-4 - - + + Fade The name of the ParamType of the autocreated EventType (01ccda48-44c6-495b-b0a7-c2a0bf5a570d) of DeviceClass avea ---------- @@ -118,38 +118,59 @@ The name of the autocreated ParamType of the writable StateType (01ccda48-44c6-4 - + Set power The name of the autocreated ActionType (2b779968-ff4f-4a05-a466-074e14288a8c) - + Brightness changed The name of the autocreated EventType (c38181a0-e19b-423f-8b66-dedda94e89b5) - + Set brightness The name of the autocreated ActionType (c38181a0-e19b-423f-8b66-dedda94e89b5) - + Color changed The name of the autocreated EventType (3f15637a-8272-4714-bd08-04806e05bbef) - + + color temperature changed + The name of the autocreated EventType (8932ddac-d718-4345-94aa-f4c9611f132f) + + + + + + color temperature + The name of the ParamType of the autocreated EventType (8932ddac-d718-4345-94aa-f4c9611f132f) of DeviceClass avea +---------- +The name of the autocreated ParamType of the writable StateType (8932ddac-d718-4345-94aa-f4c9611f132f) of DeviceClass avea + + + + + Set color temperature + The name of the autocreated ActionType (8932ddac-d718-4345-94aa-f4c9611f132f) + + + + white changed The name of the autocreated EventType (50f6a224-fb8d-487d-8774-1a0536e5b1aa) - - + + white The name of the ParamType of the autocreated EventType (50f6a224-fb8d-487d-8774-1a0536e5b1aa) of DeviceClass avea ---------- @@ -157,55 +178,55 @@ The name of the autocreated ParamType of the writable StateType (50f6a224-fb8d-4 - + Set white The name of the autocreated ActionType (50f6a224-fb8d-487d-8774-1a0536e5b1aa) - + Red changed The name of the autocreated EventType (50ab71d1-8970-4531-b1ad-f387d01bab90) - + Set red The name of the autocreated ActionType (50ab71d1-8970-4531-b1ad-f387d01bab90) - + Green changed The name of the autocreated EventType (9e8ddebc-33fe-418a-895f-d8148fabcfee) - + Set green The name of the autocreated ActionType (9e8ddebc-33fe-418a-895f-d8148fabcfee) - + Blue changed The name of the autocreated EventType (f4310747-d468-4d2e-abe4-b5e4d0245dad) - + Set blue The name of the autocreated ActionType (f4310747-d468-4d2e-abe4-b5e4d0245dad) - + Fade changed The name of the autocreated EventType (01ccda48-44c6-495b-b0a7-c2a0bf5a570d) - + Set fade The name of the autocreated ActionType (01ccda48-44c6-495b-b0a7-c2a0bf5a570d) diff --git a/elgato/translations/c5c03ad4-bfdb-444a-8eca-2c234c46cc27-en_US.ts b/elgato/translations/c5c03ad4-bfdb-444a-8eca-2c234c46cc27-en_US.ts index 1a48e12e..a83070dc 100644 --- a/elgato/translations/c5c03ad4-bfdb-444a-8eca-2c234c46cc27-en_US.ts +++ b/elgato/translations/c5c03ad4-bfdb-444a-8eca-2c234c46cc27-en_US.ts @@ -4,8 +4,8 @@ Elgato - - + + Elgato The name of the plugin Elgato (c5c03ad4-bfdb-444a-8eca-2c234c46cc27) ---------- @@ -13,50 +13,50 @@ The name of the vendor (90a3091d-1053-4f77-8dc3-92e27bbcebe7) - + Avea The name of the DeviceClass (164f9602-90ee-4693-bda3-9cafae37603e) - + Set color The name of the autocreated ActionType (3f15637a-8272-4714-bd08-04806e05bbef) - + Name The name of the paramType (d7a5d96f-33dc-4dc3-a171-b1e89a5e1a4b) of avea - + MAC address The name of the paramType (20932e39-00fd-40e3-8f39-850ba149844e) of avea - + Connected changed The name of the autocreated EventType (6d5e792a-c786-40d2-ae35-a48ac6fafcbc) - + Connected The name of the ParamType of the autocreated EventType (6d5e792a-c786-40d2-ae35-a48ac6fafcbc) of DeviceClass avea - + Power changed The name of the autocreated EventType (2b779968-ff4f-4a05-a466-074e14288a8c) - - + + Power The name of the ParamType of the autocreated EventType (2b779968-ff4f-4a05-a466-074e14288a8c) of DeviceClass avea ---------- @@ -64,8 +64,8 @@ The name of the autocreated ParamType of the writable StateType (2b779968-ff4f-4 - - + + Brightness The name of the ParamType of the autocreated EventType (c38181a0-e19b-423f-8b66-dedda94e89b5) of DeviceClass avea ---------- @@ -73,8 +73,8 @@ The name of the autocreated ParamType of the writable StateType (c38181a0-e19b-4 - - + + Color The name of the ParamType of the autocreated EventType (3f15637a-8272-4714-bd08-04806e05bbef) of DeviceClass avea ---------- @@ -82,8 +82,8 @@ The name of the autocreated ParamType of the writable StateType (3f15637a-8272-4 - - + + Red The name of the ParamType of the autocreated EventType (50ab71d1-8970-4531-b1ad-f387d01bab90) of DeviceClass avea ---------- @@ -91,8 +91,8 @@ The name of the autocreated ParamType of the writable StateType (50ab71d1-8970-4 - - + + Green The name of the ParamType of the autocreated EventType (9e8ddebc-33fe-418a-895f-d8148fabcfee) of DeviceClass avea ---------- @@ -100,8 +100,8 @@ The name of the autocreated ParamType of the writable StateType (9e8ddebc-33fe-4 - - + + Blue The name of the ParamType of the autocreated EventType (f4310747-d468-4d2e-abe4-b5e4d0245dad) of DeviceClass avea ---------- @@ -109,8 +109,8 @@ The name of the autocreated ParamType of the writable StateType (f4310747-d468-4 - - + + Fade The name of the ParamType of the autocreated EventType (01ccda48-44c6-495b-b0a7-c2a0bf5a570d) of DeviceClass avea ---------- @@ -118,38 +118,59 @@ The name of the autocreated ParamType of the writable StateType (01ccda48-44c6-4 - + Set power The name of the autocreated ActionType (2b779968-ff4f-4a05-a466-074e14288a8c) - + Brightness changed The name of the autocreated EventType (c38181a0-e19b-423f-8b66-dedda94e89b5) - + Set brightness The name of the autocreated ActionType (c38181a0-e19b-423f-8b66-dedda94e89b5) - + Color changed The name of the autocreated EventType (3f15637a-8272-4714-bd08-04806e05bbef) - + + color temperature changed + The name of the autocreated EventType (8932ddac-d718-4345-94aa-f4c9611f132f) + + + + + + color temperature + The name of the ParamType of the autocreated EventType (8932ddac-d718-4345-94aa-f4c9611f132f) of DeviceClass avea +---------- +The name of the autocreated ParamType of the writable StateType (8932ddac-d718-4345-94aa-f4c9611f132f) of DeviceClass avea + + + + + Set color temperature + The name of the autocreated ActionType (8932ddac-d718-4345-94aa-f4c9611f132f) + + + + white changed The name of the autocreated EventType (50f6a224-fb8d-487d-8774-1a0536e5b1aa) - - + + white The name of the ParamType of the autocreated EventType (50f6a224-fb8d-487d-8774-1a0536e5b1aa) of DeviceClass avea ---------- @@ -157,55 +178,55 @@ The name of the autocreated ParamType of the writable StateType (50f6a224-fb8d-4 - + Set white The name of the autocreated ActionType (50f6a224-fb8d-487d-8774-1a0536e5b1aa) - + Red changed The name of the autocreated EventType (50ab71d1-8970-4531-b1ad-f387d01bab90) - + Set red The name of the autocreated ActionType (50ab71d1-8970-4531-b1ad-f387d01bab90) - + Green changed The name of the autocreated EventType (9e8ddebc-33fe-418a-895f-d8148fabcfee) - + Set green The name of the autocreated ActionType (9e8ddebc-33fe-418a-895f-d8148fabcfee) - + Blue changed The name of the autocreated EventType (f4310747-d468-4d2e-abe4-b5e4d0245dad) - + Set blue The name of the autocreated ActionType (f4310747-d468-4d2e-abe4-b5e4d0245dad) - + Fade changed The name of the autocreated EventType (01ccda48-44c6-495b-b0a7-c2a0bf5a570d) - + Set fade The name of the autocreated ActionType (01ccda48-44c6-495b-b0a7-c2a0bf5a570d) diff --git a/netatmo/translations/69d14951-0c02-4877-bcef-dffdf48b7ccb-fr.ts b/netatmo/translations/69d14951-0c02-4877-bcef-dffdf48b7ccb-fr.ts index 5edc24fd..0ecaf453 100644 --- a/netatmo/translations/69d14951-0c02-4877-bcef-dffdf48b7ccb-fr.ts +++ b/netatmo/translations/69d14951-0c02-4877-bcef-dffdf48b7ccb-fr.ts @@ -16,7 +16,7 @@ The name of the vendor (4b46b4ed-5ec9-4aa4-afc3-92d3f80e6351) Netatmo Connection The name of the DeviceClass (728d5a67-27a3-400e-b83c-2765f5196f69) - + Connexion Netatmo @@ -25,37 +25,37 @@ The name of the vendor (4b46b4ed-5ec9-4aa4-afc3-92d3f80e6351) The name of the paramType (a97d256c-e159-4aa0-bc71-6bd7cd0688b3) of indoor ---------- The name of the paramType (a97d256c-e159-4aa0-bc71-6bd7cd0688b3) of outdoor - + Nom username The name of the paramType (763c2c10-dee5-41c8-9f7e-ded741945e73) of connection - + Nom d'utilisateur password The name of the paramType (c0d892d6-f359-4782-9d7d-8f74a3b53e3e) of connection - + Mot de passe available changed The name of the autocreated EventType (2f79bc1d-27ed-480a-b583-728363c83ea6) - + Disponibilité modifié available The name of the ParamType of the autocreated EventType (2f79bc1d-27ed-480a-b583-728363c83ea6) of DeviceClass connection - + Disponible Indoor Station The name of the DeviceClass (1c809049-04f2-4710-99f5-6ed379a2934f) - + Sation intérieure @@ -64,14 +64,14 @@ The name of the paramType (a97d256c-e159-4aa0-bc71-6bd7cd0688b3) of outdoorThe name of the paramType (157d470a-e579-4d0e-b879-6b5bfa8e34ae) of indoor ---------- The name of the paramType (157d470a-e579-4d0e-b879-6b5bfa8e34ae) of outdoor - + MAC adresse last update changed The name of the autocreated EventType (50da9f6b-c350-401c-a72e-2e4036f3975d) - + Derniére version modernisée @@ -80,14 +80,14 @@ The name of the paramType (157d470a-e579-4d0e-b879-6b5bfa8e34ae) of outdoorThe name of the ParamType of the autocreated EventType (50da9f6b-c350-401c-a72e-2e4036f3975d) of DeviceClass indoor ---------- The name of the ParamType of the autocreated EventType (50da9f6b-c350-401c-a72e-2e4036f3975d) of DeviceClass outdoor - + Dernier version temperature changed The name of the autocreated EventType (3cb25538-e463-40ae-92f9-8f34f0c06b92) - + Temperature modifié @@ -96,14 +96,14 @@ The name of the ParamType of the autocreated EventType (50da9f6b-c350-401c-a72e- The name of the ParamType of the autocreated EventType (3cb25538-e463-40ae-92f9-8f34f0c06b92) of DeviceClass indoor ---------- The name of the ParamType of the autocreated EventType (3cb25538-e463-40ae-92f9-8f34f0c06b92) of DeviceClass outdoor - + Temperature temperature minimum changed The name of the autocreated EventType (ae8bb713-8805-4efd-89a1-bca44a1f1690) - + Temperatur minimum modifié @@ -112,14 +112,14 @@ The name of the ParamType of the autocreated EventType (3cb25538-e463-40ae-92f9- The name of the ParamType of the autocreated EventType (ae8bb713-8805-4efd-89a1-bca44a1f1690) of DeviceClass indoor ---------- The name of the ParamType of the autocreated EventType (ae8bb713-8805-4efd-89a1-bca44a1f1690) of DeviceClass outdoor - + Temperatur minimum temperature maximum changed The name of the autocreated EventType (dd30507e-037b-4c74-bcca-e04b94c7c5fe) - + Temperatur maximum modifié @@ -128,20 +128,20 @@ The name of the ParamType of the autocreated EventType (ae8bb713-8805-4efd-89a1- The name of the ParamType of the autocreated EventType (dd30507e-037b-4c74-bcca-e04b94c7c5fe) of DeviceClass indoor ---------- The name of the ParamType of the autocreated EventType (dd30507e-037b-4c74-bcca-e04b94c7c5fe) of DeviceClass outdoor - + Temperatur maximum wifi signal strength The name of the ParamType of the autocreated EventType (6ea906d4-5740-454d-a730-6fdb9fa0d624) of DeviceClass indoor - + Wifi signal modifié humidity changed The name of the autocreated EventType (e2db5f01-196a-48d1-8874-6b8cbfe0d8c9) - + Humidité modifié @@ -150,85 +150,85 @@ The name of the ParamType of the autocreated EventType (dd30507e-037b-4c74-bcca- The name of the ParamType of the autocreated EventType (e2db5f01-196a-48d1-8874-6b8cbfe0d8c9) of DeviceClass indoor ---------- The name of the ParamType of the autocreated EventType (e2db5f01-196a-48d1-8874-6b8cbfe0d8c9) of DeviceClass outdoor - + Humidité pressure changed The name of the autocreated EventType (03b0a7b7-987d-4d3b-b3f0-21d9f92ad326) - + Pression d'air modifié pressure The name of the ParamType of the autocreated EventType (03b0a7b7-987d-4d3b-b3f0-21d9f92ad326) of DeviceClass indoor - + Pression d'air noise changed The name of the autocreated EventType (906cea9d-1daf-4e9c-90b9-e40f43052a34) - + Puissance acoustique modifié noise The name of the ParamType of the autocreated EventType (906cea9d-1daf-4e9c-90b9-e40f43052a34) of DeviceClass indoor - + Puissance acoustique co2 changed The name of the autocreated EventType (e5710bd1-79fa-4bd4-9052-8416aae909b9) - + Valeur CO2 modifié co2 The name of the ParamType of the autocreated EventType (e5710bd1-79fa-4bd4-9052-8416aae909b9) of DeviceClass indoor - + Valeur CO2 wifi signal strength changed The name of the autocreated EventType (6ea906d4-5740-454d-a730-6fdb9fa0d624) - + Wifi signal modifié Outdoor Station The name of the DeviceClass (6cc01d62-7317-4ec4-8ac4-a4cab762c179) - + Station extérieur base station The name of the paramType (d7a0ec46-760c-4fdc-9753-fe10c86fe1b9) of outdoor - + Station de Base signal strength changed The name of the autocreated EventType (0faa3d08-9004-46fb-a5aa-a59b75e454cc) - + Force de signal modifié signal strength The name of the ParamType of the autocreated EventType (0faa3d08-9004-46fb-a5aa-a59b75e454cc) of DeviceClass outdoor - + Force de signal battery changed The name of the autocreated EventType (15d8fae1-ba47-42e1-994d-530e8017c965) - + Staut batterie modifié battery The name of the ParamType of the autocreated EventType (15d8fae1-ba47-42e1-994d-530e8017c965) of DeviceClass outdoor - + Batterie diff --git a/nymea-plugins.pro b/nymea-plugins.pro index 31347c4d..d418c08f 100644 --- a/nymea-plugins.pro +++ b/nymea-plugins.pro @@ -39,6 +39,7 @@ PLUGIN_DIRS = \ simulation \ keba \ remotessh \ + dweetio \ CONFIG+=all diff --git a/philipshue/translations/5f2e634b-b7f3-48ee-976a-b5ae22aa5c55-fr.ts b/philipshue/translations/5f2e634b-b7f3-48ee-976a-b5ae22aa5c55-fr.ts index 582341b1..5d0367be 100644 --- a/philipshue/translations/5f2e634b-b7f3-48ee-976a-b5ae22aa5c55-fr.ts +++ b/philipshue/translations/5f2e634b-b7f3-48ee-976a-b5ae22aa5c55-fr.ts @@ -7,19 +7,19 @@ Philips The name of the vendor (0ae1e001-2aa6-47ed-b8c0-334c3728a68f) - + Philips Please press the button on the Hue Bridge within 30 seconds before you continue The pairing info of deviceClass hueBridge - + S'il vous plaît presser le bouton de la "hue Brigde" au cours de 30 secondes avant que vous continues Hue gateway The name of the DeviceClass (642aa4c7-19aa-45ed-ba06-aa1ae6c9edf7) - + Pont de connexion Hue @@ -37,31 +37,31 @@ The name of the paramType (0d71522c-08c0-4a66-bb5e-e31eb2dd41e5) of hueWhiteLigh The name of the paramType (0d71522c-08c0-4a66-bb5e-e31eb2dd41e5) of hueRemote ---------- The name of the paramType (3d450f00-b521-4a2c-985f-046fad5122cb) of hueTap - + Nom api key The name of the paramType (8bf5776a-d5a6-4600-8b27-481f0d803a8f) of hueBridge - + Clé API host address The name of the paramType (1845975b-1184-4440-bc0d-73d53a9f683c) of hueBridge - + Adresse mac address The name of the paramType (2c67203d-a308-45ec-9a08-fc4183c06ff8) of hueBridge - + MAC adresse id The name of the paramType (a496feb0-3b7b-46cb-a63a-e063447d6b1d) of hueBridge - + ID @@ -70,13 +70,13 @@ The name of the paramType (3d450f00-b521-4a2c-985f-046fad5122cb) of hueTapThe name of the paramType (ea228c4d-975c-4b43-9445-7c9a907c29d6) of hueBridge ---------- The name of the ParamType of the autocreated EventType (4c707b18-6604-4e6d-b6bc-4e27769c2adc) of DeviceClass hueBridge - + Version logiciel zigbee channel The name of the paramType (53170394-956c-4511-b3a8-2c8a502ef1ed) of hueBridge - + Canaux Zigbee @@ -90,49 +90,49 @@ The name of the ParamType of the autocreated EventType (4c707b18-6604-4e6d-b6bc- The name of the autocreated EventType (19bb8d10-1b28-4ba3-99b7-a634138dcfde) ---------- The name of the autocreated EventType (5e21b032-1230-4e93-8543-0c4773da17d3) - + Accessibilité modifié api version changed The name of the autocreated EventType (7a230e89-c4ce-4276-90e0-6a9ddb890603) - + Version API modifié software version changed The name of the autocreated EventType (4c707b18-6604-4e6d-b6bc-4e27769c2adc) - + Version logiciel modifié update status changed The name of the autocreated EventType (16a126f3-0cef-4931-bb2b-9e1b49bec7fc) - + Satut mise à jour modifié search devices The name of the ActionType cca3f171-6318-44e7-a2ac-d841857c1c24 of deviceClass hueBridge - + Chercher appareil check updates The name of the ActionType 07a85e91-d064-4bce-b017-13fd0c320c0b of deviceClass hueBridge - + Cherche mise à jour Upgrade bridge The name of the ActionType 6dfbc7c0-7372-42f6-82ba-e777cb32dc4c of deviceClass hueBridge - + Mise à jour la Bridge Hue Light The name of the DeviceClass (0edba26c-96ab-44fb-a6a2-c0574d19630e) - + Hue lumiére @@ -147,7 +147,7 @@ The name of the paramType (095a463b-f59e-46b1-989a-a71f9cbe3e30) of hueWhiteLigh The name of the paramType (095a463b-f59e-46b1-989a-a71f9cbe3e30) of hueRemote ---------- The name of the paramType (62d92175-db3a-4da2-a72b-f58f34cb6911) of hueTap - + Model ID @@ -162,7 +162,7 @@ The name of the paramType (3f3467ef-4483-4eb9-bcae-84e628322f84) of hueWhiteLigh The name of the paramType (3f3467ef-4483-4eb9-bcae-84e628322f84) of hueRemote ---------- The name of the paramType (eace85b9-5369-466f-89eb-46c4de718305) of hueTap - + Typ @@ -177,7 +177,7 @@ The name of the paramType (1a5129ca-006c-446c-9f2e-79b065de715f) of hueWhiteLigh The name of the paramType (1a5129ca-006c-446c-9f2e-79b065de715f) of hueRemote ---------- The name of the paramType (25cf4167-6c28-4497-9fa9-3d02faf4f3ed) of hueTap - + UUID @@ -186,14 +186,14 @@ The name of the paramType (25cf4167-6c28-4497-9fa9-3d02faf4f3ed) of hueTapThe name of the paramType (491dc012-ccf2-4d3a-9f18-add98f7374af) of hueLight ---------- The name of the paramType (491dc012-ccf2-4d3a-9f18-add98f7374af) of hueWhiteLight - + ID lumiére power changed The name of the autocreated EventType (90aaffe5-6a76-47d2-a14a-550f60390245) - + Allumer modifié @@ -208,32 +208,32 @@ The name of the autocreated ParamType of the writable StateType (90aaffe5-6a76-4 The name of the ParamType of the autocreated EventType (90aaffe5-6a76-47d2-a14a-550f60390245) of DeviceClass hueWhiteLight ---------- The name of the autocreated ParamType of the writable StateType (90aaffe5-6a76-47d2-a14a-550f60390245) of DeviceClass hueWhiteLight - + Allumée Set power The name of the autocreated ActionType (90aaffe5-6a76-47d2-a14a-550f60390245) - + Allumer color temperature changed The name of the autocreated EventType (c0f4206f-f219-4f06-93c4-4ca515a56f79) - + Températur de couleur modifié Set color temperature The name of the autocreated ActionType (c0f4206f-f219-4f06-93c4-4ca515a56f79) - + Définir la températur de couleur color changed The name of the autocreated EventType (d25423e7-b924-4b20-80b6-77eecc65d089) - + Couleur modifié @@ -242,20 +242,20 @@ The name of the autocreated ParamType of the writable StateType (90aaffe5-6a76-4 The name of the ParamType of the autocreated EventType (d25423e7-b924-4b20-80b6-77eecc65d089) of DeviceClass hueLight ---------- The name of the autocreated ParamType of the writable StateType (d25423e7-b924-4b20-80b6-77eecc65d089) of DeviceClass hueLight - + Couleur Set color The name of the autocreated ActionType (d25423e7-b924-4b20-80b6-77eecc65d089) - + Définir la couleur brightness changed The name of the autocreated EventType (90e91f64-a208-468c-a5a2-7f47e08859e2) - + Luminosité modifié @@ -270,25 +270,25 @@ The name of the autocreated ParamType of the writable StateType (90e91f64-a208-4 The name of the ParamType of the autocreated EventType (90e91f64-a208-468c-a5a2-7f47e08859e2) of DeviceClass hueWhiteLight ---------- The name of the autocreated ParamType of the writable StateType (90e91f64-a208-468c-a5a2-7f47e08859e2) of DeviceClass hueWhiteLight - + Luminosité Set brigtness The name of the autocreated ActionType (90e91f64-a208-468c-a5a2-7f47e08859e2) - + Définir luminosité effect changed The name of the autocreated EventType (0b7cdd8d-4db8-4183-abe2-f3c01d1c9afc) - + Effet de lumière modifié battery critical changed The name of the autocreated EventType (f8516899-6312-4110-bb97-70ffa81dc530) - + Statut de batterie critique modifié @@ -297,7 +297,7 @@ The name of the autocreated ParamType of the writable StateType (90e91f64-a208-4 The name of the EventType 8da28cf1-2457-451e-953e-2685f8daeda8 of deviceClass hueRemote ---------- The name of the EventType c45dd703-7cbd-48f7-88dc-31045cc3d39c of deviceClass hueTap - + Bouton appuyer @@ -306,25 +306,25 @@ The name of the EventType c45dd703-7cbd-48f7-88dc-31045cc3d39c of deviceClass hu The name of the paramType (e4e3eb3a-a7c4-49e3-9344-0b3f213e0b42) of hueRemote ---------- The name of the paramType (8ed643c0-1b8a-4709-8abf-717cf213f4a4) of hueTap - + Nom de bouton Button longpressed The name of the EventType 2c64561b-2381-4769-8e21-0e206c84bbcc of deviceClass hueRemote - + Bouton appuyer le plus long Hue Tap The name of the DeviceClass (2b8c1fb8-67ee-42e9-947b-16e0a09f0d4e) - + Hue Tap Philips Hue The name of the plugin PhilipsHue (5f2e634b-b7f3-48ee-976a-b5ae22aa5c55) - + Philips Hue @@ -342,19 +342,19 @@ The name of the ParamType of the autocreated EventType (19bb8d10-1b28-4ba3-99b7- The name of the ParamType of the autocreated EventType (19bb8d10-1b28-4ba3-99b7-a634138dcfde) of DeviceClass hueRemote ---------- The name of the ParamType of the autocreated EventType (5e21b032-1230-4e93-8543-0c4773da17d3) of DeviceClass hueTap - + Accessible api version The name of the ParamType of the autocreated EventType (7a230e89-c4ce-4276-90e0-6a9ddb890603) of DeviceClass hueBridge - + API version update status The name of the ParamType of the autocreated EventType (16a126f3-0cef-4931-bb2b-9e1b49bec7fc) of DeviceClass hueBridge - + Satut mise à jour @@ -363,7 +363,7 @@ The name of the ParamType of the autocreated EventType (5e21b032-1230-4e93-8543- The name of the ParamType of the autocreated EventType (c0f4206f-f219-4f06-93c4-4ca515a56f79) of DeviceClass hueLight ---------- The name of the autocreated ParamType of the writable StateType (c0f4206f-f219-4f06-93c4-4ca515a56f79) of DeviceClass hueLight - + Températur de couleur @@ -372,13 +372,13 @@ The name of the autocreated ParamType of the writable StateType (c0f4206f-f219-4 The name of the ParamType of the autocreated EventType (0b7cdd8d-4db8-4183-abe2-f3c01d1c9afc) of DeviceClass hueLight ---------- The name of the autocreated ParamType of the writable StateType (0b7cdd8d-4db8-4183-abe2-f3c01d1c9afc) of DeviceClass hueLight - + Effet Set effect The name of the autocreated ActionType (0b7cdd8d-4db8-4183-abe2-f3c01d1c9afc) - + Définir effet de luminosité @@ -387,7 +387,7 @@ The name of the autocreated ParamType of the writable StateType (0b7cdd8d-4db8-4 The name of the ActionType d25dcfbc-d28c-4905-80e3-300ffb1248f5 of deviceClass hueLight ---------- The name of the ActionType d25dcfbc-d28c-4905-80e3-300ffb1248f5 of deviceClass hueWhiteLight - + S'allumer @@ -396,25 +396,25 @@ The name of the ActionType d25dcfbc-d28c-4905-80e3-300ffb1248f5 of deviceClass h The name of the paramType (8ace6f8c-b2c7-4d0d-a407-52a54ad0ab05) of hueLight ---------- The name of the paramType (8ace6f8c-b2c7-4d0d-a407-52a54ad0ab05) of hueWhiteLight - + Alarme Hue White Light The name of the DeviceClass (4fa568ef-7a3a-422b-b0c0-206d37cb4eed) - + Hue lumiére blanc Set brightness The name of the autocreated ActionType (90e91f64-a208-468c-a5a2-7f47e08859e2) - + Définir luminosité Hue Remote The name of the DeviceClass (bb482d39-67ef-46dc-88e9-7b181d642b28) - + Hue télécommande @@ -423,73 +423,73 @@ The name of the paramType (8ace6f8c-b2c7-4d0d-a407-52a54ad0ab05) of hueWhiteLigh The name of the paramType (2ddb571b-149f-4f08-a76a-78b7d3aa27e0) of hueRemote ---------- The name of the paramType (5eca2b24-8986-4487-bc12-50e91d023d97) of hueTap - + Senseur ID battery changed The name of the autocreated EventType (683e493a-9796-4d5e-b0e3-61cb178d5819) - + Batterie modifié battery The name of the ParamType of the autocreated EventType (683e493a-9796-4d5e-b0e3-61cb178d5819) of DeviceClass hueRemote - + Batterie battery critical The name of the ParamType of the autocreated EventType (f8516899-6312-4110-bb97-70ffa81dc530) of DeviceClass hueRemote - + Satut du chargement batterie critique on pressed The name of the EventType de769db0-4c31-46cf-9760-dbc6f9209c26 of deviceClass hueRemote - + Quand appuyer on long pressed The name of the EventType 6c5e596b-7c15-40bb-af9d-c778a6b0f30e of deviceClass hueRemote - + Quand appuyer trés long dim up pressed The name of the EventType 8e3d6a62-6a19-4e9a-a25b-e1da2e56ede9 of deviceClass hueRemote - + Varier l'intensité de lumière appuyer dim up long pressed The name of the EventType 53d3c9af-3e25-4116-b22b-38d897bc20aa of deviceClass hueRemote - + Varier l'intensité de lumière appuyer trés long dim down pressed The name of the EventType efd8b972-9a37-43f2-b9bc-f9dfe144a96d of deviceClass hueRemote - + Varier l'intensité de lumière en bas appuyer dim down long pressed The name of the EventType 1986d4c6-4c9f-4e43-ba70-0ff06c6f177b of deviceClass hueRemote - + Varier l'intensité de lumière en bas appuyer trés long off pressed The name of the EventType 7c2a58f1-137c-4bf3-8f9e-453dff020487 of deviceClass hueRemote - + Appuyer pour déclencher off long pressed The name of the EventType d69306eb-ea52-4841-9e26-89c69e9cf6fc of deviceClass hueRemote - + Appuyer plus longtemps pour déclencher diff --git a/pushbullet/devicepluginpushbullet.cpp b/pushbullet/devicepluginpushbullet.cpp index 4eeef069..cbe5f996 100644 --- a/pushbullet/devicepluginpushbullet.cpp +++ b/pushbullet/devicepluginpushbullet.cpp @@ -34,7 +34,23 @@ DeviceManager::DeviceSetupStatus DevicePluginPushbullet::setupDevice(Device *dev { qCDebug(dcPushbullet()) << "Setup" << device->name(); - return DeviceManager::DeviceSetupStatusSuccess; + QUrlQuery urlParams; + urlParams.addQueryItem("limit", "1"); + + QUrl requestUrl("https://api.pushbullet.com/v2/pushes"); + requestUrl.setQuery(urlParams); + + QNetworkRequest request(requestUrl); + request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded"); + request.setRawHeader(QByteArray("Access-Token"), device->paramValue(pushNotificationTokenParamTypeId).toByteArray()); + + QNetworkReply *reply = hardwareManager()->networkManager()->get(request); + connect(reply, &QNetworkReply::finished, this, [this, reply, device](){ + emit deviceSetupFinished(device, reply->error() == QNetworkReply::NoError ? DeviceManager::DeviceSetupStatusSuccess : DeviceManager::DeviceSetupStatusFailure); + reply->deleteLater(); + }); + + return DeviceManager::DeviceSetupStatusAsync; } DeviceManager::DeviceError DevicePluginPushbullet::executeAction(Device *device, const Action &action) { diff --git a/pushbullet/translations/46986575-0e62-483d-b5a8-76ac356fcce7-fr.ts b/pushbullet/translations/46986575-0e62-483d-b5a8-76ac356fcce7-fr.ts index c740f17a..6c928f13 100644 --- a/pushbullet/translations/46986575-0e62-483d-b5a8-76ac356fcce7-fr.ts +++ b/pushbullet/translations/46986575-0e62-483d-b5a8-76ac356fcce7-fr.ts @@ -16,31 +16,31 @@ The name of the vendor (b5e1896e-b7fa-4c19-ac2b-10bd489f8302) Push Notification The name of the DeviceClass (56029c6d-777b-4889-9e17-29f813d34da4) - + notification pushbullet access token The name of the paramType (1f37ce22-50b8-4183-8b74-557fdb2d3076) of pushNotification - + jeton pour accés notify The name of the ActionType 1378480f-6583-44e2-8fdd-22afe979a9a3 of deviceClass pushNotification - + notifier title The name of the paramType (ceed6e66-0dcb-4405-832d-e9091f882acc) of pushNotification - + titre body The name of the paramType (f72cc56c-4d0b-4b96-ab9b-ff3ca92b00e2) of pushNotification - + Contenu des informations diff --git a/snapd/devicepluginsnapd.json b/snapd/devicepluginsnapd.json index 5b75490e..a9f49b23 100644 --- a/snapd/devicepluginsnapd.json +++ b/snapd/devicepluginsnapd.json @@ -64,6 +64,7 @@ "displayName": "System update available", "displayNameEvent": "System update available changed", "type": "bool", + "cached": false, "defaultValue": false }, { diff --git a/snapd/snapdcontrol.cpp b/snapd/snapdcontrol.cpp index 8a1d3f76..41ccab4f 100644 --- a/snapd/snapdcontrol.cpp +++ b/snapd/snapdcontrol.cpp @@ -243,7 +243,7 @@ void SnapdControl::onLoadRunningChangesFinished() QString changeStatus = changeMap.value("status").toString(); QString changeSummary = changeMap.value("summary").toString(); - // If there is a change kind "doing" or "Do" + // If there is a change kind "Doing" or "Do" if ( (changeStatus == "Doing" || changeStatus == "Do") && m_updateChangeKinds.contains(changeKind)) { // Set the status of the current running change updateRunning = true; @@ -251,12 +251,21 @@ void SnapdControl::onLoadRunningChangesFinished() updateStatus = changeSummary; qCDebug(dcSnapd()).noquote() << "Current change:" << changeId << (changeReady ? "ready" : "not ready") << changeStatus << changeKind << changeSummary; + // TODO: calculate the overall percentage of the update process (Do + Doing / Done) } } } device()->setStateValue(snapdControlUpdateRunningStateTypeId, updateRunning); device()->setStateValue(snapdControlStatusStateTypeId, updateStatus); + + // If currently an update is running, lets force update available to false if set to true + // keep this below the setStateValue for updateRunning or we might have intermediate states indicating + // no update running and none available + if (updateRunning && device()->stateValue(snapdControlUpdateAvailableStateTypeId).toBool()) { + device()->setStateValue(snapdControlUpdateAvailableStateTypeId, false); + } + } void SnapdControl::onConfigureRefreshScheduleFinished() diff --git a/snapd/translations/b82bce59-59bf-48b3-b781-54a6f45800f3-fr.ts b/snapd/translations/b82bce59-59bf-48b3-b781-54a6f45800f3-fr.ts index ab808b4d..086c6453 100644 --- a/snapd/translations/b82bce59-59bf-48b3-b781-54a6f45800f3-fr.ts +++ b/snapd/translations/b82bce59-59bf-48b3-b781-54a6f45800f3-fr.ts @@ -13,79 +13,79 @@ Advanced mode The name of the paramType (017fe4c5-fc41-41fe-8e67-08fdaccb89ea) of snapd - + Mode avancé Automatic daily refresh schedule The name of the paramType (d2e697d1-9a68-4666-bf40-8d70fa694eec) of snapd - + Calendrier de rafraîchissement quotidien automatique Canonical The name of the vendor (60582ddf-32ea-4fcd-a6f2-f3beaaf21517) - + Canonique System update available changed The name of the autocreated EventType (a6b1d24b-d523-4516-9bce-5b467e5e09b2) - + Disponibilité de mise à jour du système modifiée Last automatic system update time changed The name of the autocreated EventType (c671545a-6bde-4c08-8e37-0d256841a3a5) - + Dernière heure de mise à jour automatique du système modifiée Last automatic system update The name of the ParamType of the autocreated EventType (c671545a-6bde-4c08-8e37-0d256841a3a5) of DeviceClass snapdControl - + Dernière mise à jour automatique du système Next automatic system update time changed The name of the autocreated EventType (122c2423-a1d9-400f-80f8-b1f798975914) - + Prochaine heure de mise à jour automatique du système modifiée Next automatic system update The name of the ParamType of the autocreated EventType (122c2423-a1d9-400f-80f8-b1f798975914) of DeviceClass snapdControl - + Prochaine mise à jour automatique du système Status The name of the ParamType of the autocreated EventType (4987aca3-3916-4cb3-938f-df6c99d04dbf) of DeviceClass snapdControl - + Statut ID The name of the paramType (9afb98fb-f717-4f4c-8009-1a6514054c5f) of snap - + ID Summary The name of the paramType (12b9a65f-970b-49b5-b1d0-1625fc6d8758) of snap - + Récapitulatif Description The name of the paramType (fe24c61b-e154-4259-b7ca-6f0602e9d1c3) of snap - + Description Developer The name of the paramType (76ead9c5-0a18-40a2-b31d-f6bb6dfea0a5) of snap - + Développeur @@ -94,115 +94,115 @@ The name of the ParamType of the autocreated EventType (7be2b61e-3f59-4b92-b2bb-50d027bb92ff) of DeviceClass snap ---------- The name of the autocreated ParamType of the writable StateType (7be2b61e-3f59-4b92-b2bb-50d027bb92ff) of DeviceClass snap - + Canal Set channel The name of the autocreated ActionType (7be2b61e-3f59-4b92-b2bb-50d027bb92ff) - + Définir la chaîne Version changed The name of the autocreated EventType (532a95f3-db29-427e-bb32-d5a22029e586) - + Version modifiée Version The name of the ParamType of the autocreated EventType (532a95f3-db29-427e-bb32-d5a22029e586) of DeviceClass snap - + Version Revision changed The name of the autocreated EventType (f26a6404-e011-11e7-9224-2350048461eb) - + Révision modifiée Revision The name of the ParamType of the autocreated EventType (f26a6404-e011-11e7-9224-2350048461eb) of DeviceClass snap - + Révision Rollback to previous version The name of the ActionType e061dee6-62fc-45cc-9c9f-403c2be52939 of deviceClass snap - + Retour à la version précédente Start update The name of the ActionType 45626b75-f09d-4dd1-b6c4-ee33201b47b0 of deviceClass snapdControl - + Démarrer la mise a jour Update manager The name of the DeviceClass (d90cda58-4d8c-4b7f-a982-38e56a95b72a) - + Gestionnaire de mise à jour Update manager available changed The name of the autocreated EventType (6b662b3e-fd12-4f24-be77-aec066f16d8c) - + Disponibilité du gestionnaire de mise à jour modifiée Update manager available The name of the ParamType of the autocreated EventType (6b662b3e-fd12-4f24-be77-aec066f16d8c) of DeviceClass snapdControl - + Gestionnaire de mise à jour disponible System update available The name of the ParamType of the autocreated EventType (a6b1d24b-d523-4516-9bce-5b467e5e09b2) of DeviceClass snapdControl - + Mise à jour du système disponible System update running The name of the ParamType of the autocreated EventType (01ca7a22-5607-4c5e-a465-a2ae7e8b529c) of DeviceClass snapdControl - + Mise à jour du système en cours Snap The name of the DeviceClass (ff0840d7-fcfc-4403-9d9f-301610d5a437) - + Snap System update running changed The name of the autocreated EventType (01ca7a22-5607-4c5e-a465-a2ae7e8b529c) - + Le cours de la mise à jour du système a changé Status changed The name of the autocreated EventType (4987aca3-3916-4cb3-938f-df6c99d04dbf) - + Statut modifié Name The name of the paramType (4f38614d-8be0-48dc-a24d-cee9ff1f2a89) of snap - + Nom Channel changed The name of the autocreated EventType (7be2b61e-3f59-4b92-b2bb-50d027bb92ff) - + Canal modifié Check for updates The name of the ActionType 4738f2c9-666e-45b9-91d3-7bcbf722b669 of deviceClass snapdControl - + Vérifier les mises à jour diff --git a/tcpcommander/translations/741b7b0a-0c9c-4c93-be99-0d0bcf5a4643-de_DE.ts b/tcpcommander/translations/741b7b0a-0c9c-4c93-be99-0d0bcf5a4643-de_DE.ts index 0dd4a694..92670d11 100644 --- a/tcpcommander/translations/741b7b0a-0c9c-4c93-be99-0d0bcf5a4643-de_DE.ts +++ b/tcpcommander/translations/741b7b0a-0c9c-4c93-be99-0d0bcf5a4643-de_DE.ts @@ -7,25 +7,25 @@ tcp commander The name of the plugin TCPCommander (741b7b0a-0c9c-4c93-be99-0d0bcf5a4643) - + TCP Commander TCP Commander The name of the vendor (9181278e-7812-4a3e-a9ce-f00f3f8b8afd) - + TCP Commander TCP Output The name of the DeviceClass (c67d059f-694f-47cb-8e1d-9e3e6d014c1a) - + TCP Ausgang IPv4 Address The name of the paramType (2a3fcb23-931b-4ba1-b134-c49b656c76f7) of tcpOutput - + IPv4 Adresse @@ -34,14 +34,14 @@ The name of the paramType (bee8b151-815a-4159-9d8a-42b76e99b42c) of tcpOutput ---------- The name of the paramType (bee8b151-815a-4159-9d8a-42b76e99b42c) of tcpInput - + Port connection status changed The name of the autocreated EventType (725b541a-9e0c-4634-81eb-e415c0b8f025) - + Verbindungsstatus geändert @@ -50,55 +50,55 @@ The name of the paramType (bee8b151-815a-4159-9d8a-42b76e99b42c) of tcpInputThe name of the ParamType of the autocreated EventType (725b541a-9e0c-4634-81eb-e415c0b8f025) of DeviceClass tcpOutput ---------- The name of the ParamType of the autocreated EventType (725b541a-9e0c-4634-81eb-e415c0b8f025) of DeviceClass tcpInput - + Verbunden Send Data The name of the ActionType 6bc52462-b192-46a4-a6df-92cc5a479c89 of deviceClass tcpOutput - + Sende Daten Data The name of the paramType (6604c852-6b24-4707-b8e5-1ddd8032efcc) of tcpOutput - + Daten TCP Input The name of the DeviceClass (bc40e84a-69c4-4fd2-beb0-bd65f19aa8ff) - + TCP Eingang Data Comparison The name of the paramType (d99f55c7-0e14-45ee-b0f0-33f2d1d2e674) of tcpInput - + Datenvergleich Command The name of the paramType (23051bdf-3f50-41fa-abde-bc4fe0bcc4fc) of tcpInput - + Kommando Data received The name of the autocreated EventType (b98fdacc-59d7-41c4-b790-1fdca50dfb22) - + Daten empfangen Data Received The name of the ParamType of the autocreated EventType (b98fdacc-59d7-41c4-b790-1fdca50dfb22) of DeviceClass tcpInput - + Daten empfangen Command Received The name of the EventType 6d7c6df6-cb61-4d9e-b0d7-37c43911ca4b of deviceClass tcpInput - + Kommando empfangen diff --git a/udpcommander/devicepluginudpcommander.cpp b/udpcommander/devicepluginudpcommander.cpp index 51f97f65..bf92c4a0 100644 --- a/udpcommander/devicepluginudpcommander.cpp +++ b/udpcommander/devicepluginudpcommander.cpp @@ -80,6 +80,7 @@ DeviceManager::DeviceSetupStatus DevicePluginUdpCommander::setupDevice(Device *d delete udpSocket; return DeviceManager::DeviceSetupStatusFailure; } + qCDebug(dcUdpCommander()) << "Listening on port" << port; connect(udpSocket, SIGNAL(readyRead()), this, SLOT(readPendingDatagrams())); m_receiverList.insert(udpSocket, device); @@ -98,7 +99,7 @@ DeviceManager::DeviceSetupStatus DevicePluginUdpCommander::setupDevice(Device *d DeviceManager::DeviceError DevicePluginUdpCommander::executeAction(Device *device, const Action &action) { if (device->deviceClassId() == udpCommanderDeviceClassId) { - if (action.actionTypeId() == udpCommanderOutputDataActionTypeId) { + if (action.actionTypeId() == udpCommanderTriggerActionTypeId) { QUdpSocket *udpSocket = m_commanderList.key(device); int port = device->paramValue(udpCommanderPortParamTypeId).toInt(); QHostAddress address = QHostAddress(device->paramValue(udpCommanderAddressParamTypeId).toString()); @@ -131,11 +132,14 @@ void DevicePluginUdpCommander::deviceRemoved(Device *device) void DevicePluginUdpCommander::readPendingDatagrams() { + qCDebug(dcUdpCommander()) << "UDP datagram received"; QUdpSocket *socket= static_cast(sender()); Device *device = m_receiverList.value(socket); - if (!device) + if (!device) { + qCWarning(dcUdpCommander()) << "Received a datagram from a socket we don't know"; return; + } QByteArray datagram; QHostAddress sender; @@ -146,14 +150,13 @@ void DevicePluginUdpCommander::readPendingDatagrams() socket->readDatagram(datagram.data(), datagram.size(), &sender, &senderPort); } - device->setStateValue(udpReceiverInputDataStateTypeId, datagram); + qCDebug(dcUdpCommander()) << device->name() << "got command from" << sender.toString() << senderPort; + Event ev = Event(udpReceiverTriggeredEventTypeId, device->id()); + ParamList params; + params.append(Param(udpReceiverDataParamTypeId, datagram)); + ev.setParams(params); + emit emitEvent(ev); - if (datagram == device->paramValue(udpReceiverCommandParamTypeId).toByteArray() || - datagram == device->paramValue(udpReceiverCommandParamTypeId).toByteArray() + "\n") { - qCDebug(dcUdpCommander()) << device->name() << "got command from" << sender.toString() << senderPort; - emit emitEvent(Event(udpReceiverCommandReceivedEventTypeId, device->id())); - - // Send response for verification - socket->writeDatagram("OK\n", sender, senderPort); - } + // Send response for verification + socket->writeDatagram("OK\n", sender, senderPort); } diff --git a/udpcommander/devicepluginudpcommander.json b/udpcommander/devicepluginudpcommander.json index c9d2a0a5..c3cbd1f7 100644 --- a/udpcommander/devicepluginudpcommander.json +++ b/udpcommander/devicepluginudpcommander.json @@ -13,6 +13,7 @@ "displayName": "UDP Receiver", "name": "udpReceiver", "deviceIcon": "Network", + "interfaces": ["inputtrigger"], "basicTags": ["Service", "Sensor"], "createMethods": ["user"], "paramTypes": [ @@ -24,30 +25,21 @@ "minValue": 0, "maxValue": 65535, "defaultValue": 4242 - }, - { - "id": "d0f29961-1624-4b91-a0e8-9b1cc86c44c7", - "name": "command", - "displayName": "Command", - "type": "QString", - "defaultValue": "Hello" - } - ], - "stateTypes":[ - { - "id": "065a1a0a-d324-4ae6-a461-bef8143e8795", - "name": "inputData", - "displayName": "Received data", - "displayNameEvent": "Received data changed", - "type": "QString", - "defaultValue": "" } ], "eventTypes": [ { "id": "5fecbba3-ffbb-456b-872c-a2f571c681cb", - "name": "commandReceived", - "displayName": "Command received" + "name": "triggered", + "displayName": "Data received", + "paramTypes": [ + { + "id": "93c379e3-4707-46b7-9be0-2d6ff88f5d21", + "name": "data", + "displayName": "Data", + "type": "QString" + } + ] } ] }, @@ -57,6 +49,7 @@ "displayName": "UDP Commander", "deviceIcon": "Network", "basicTags": ["Service", "Sensor"], + "interfaces": ["outputtrigger"], "createMethods": ["user"], "paramTypes": [ { @@ -80,7 +73,7 @@ "actionTypes": [ { "id": "6bc52462-b192-46a4-a6df-92cc5a479c89", - "name": "outputData", + "name": "trigger", "displayName": "Send data", "paramTypes": [ { 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 207e3732..116025e9 100644 --- a/udpcommander/translations/24a8474c-1d86-499e-a76e-9cbfbf48dd72-de_DE.ts +++ b/udpcommander/translations/24a8474c-1d86-499e-a76e-9cbfbf48dd72-de_DE.ts @@ -4,8 +4,8 @@ UdpCommander - - + + UDP Commander The name of the plugin UdpCommander (24a8474c-1d86-499e-a76e-9cbfbf48dd72) ---------- @@ -13,20 +13,20 @@ The name of the DeviceClass (31b00639-8904-4522-84ed-54c46a54c63c) - + guh GmbH The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - + UDP Receiver The name of the DeviceClass (6ecd5a8d-595a-4520-85e3-dcc9679edf66) - - + + Port The name of the paramType (1843adcb-e377-44d1-8d70-ab4f9eeb32ec) of udpReceiver ---------- @@ -34,45 +34,30 @@ The name of the paramType (eb204dfe-11f8-413f-8b68-8bffef3f9a7f) of udpCommander - - Command - The name of the paramType (d0f29961-1624-4b91-a0e8-9b1cc86c44c7) of udpReceiver - - - - - Received data changed - The name of the autocreated EventType (065a1a0a-d324-4ae6-a461-bef8143e8795) - - - - - Received data - The name of the ParamType of the autocreated EventType (065a1a0a-d324-4ae6-a461-bef8143e8795) of DeviceClass udpReceiver - - - - - Command received + + Data received The name of the EventType 5fecbba3-ffbb-456b-872c-a2f571c681cb of deviceClass udpReceiver - + Address The name of the paramType (ea1be9fc-9a9b-44ba-a28d-e021aef4f046) of udpCommander - + Send data The name of the ActionType 6bc52462-b192-46a4-a6df-92cc5a479c89 of deviceClass udpCommander - + + Data - The name of the paramType (6604c852-6b24-4707-b8e5-1ddd8032efcc) of udpCommander + The name of the paramType (93c379e3-4707-46b7-9be0-2d6ff88f5d21) of udpReceiver +---------- +The name of the paramType (6604c852-6b24-4707-b8e5-1ddd8032efcc) of udpCommander 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 fb0f1893..3991d675 100644 --- a/udpcommander/translations/24a8474c-1d86-499e-a76e-9cbfbf48dd72-en_US.ts +++ b/udpcommander/translations/24a8474c-1d86-499e-a76e-9cbfbf48dd72-en_US.ts @@ -4,8 +4,8 @@ UdpCommander - - + + UDP Commander The name of the plugin UdpCommander (24a8474c-1d86-499e-a76e-9cbfbf48dd72) ---------- @@ -13,20 +13,20 @@ The name of the DeviceClass (31b00639-8904-4522-84ed-54c46a54c63c) - + guh GmbH The name of the vendor (2062d64d-3232-433c-88bc-0d33c0ba2ba6) - + UDP Receiver The name of the DeviceClass (6ecd5a8d-595a-4520-85e3-dcc9679edf66) - - + + Port The name of the paramType (1843adcb-e377-44d1-8d70-ab4f9eeb32ec) of udpReceiver ---------- @@ -34,45 +34,30 @@ The name of the paramType (eb204dfe-11f8-413f-8b68-8bffef3f9a7f) of udpCommander - - Command - The name of the paramType (d0f29961-1624-4b91-a0e8-9b1cc86c44c7) of udpReceiver - - - - - Received data changed - The name of the autocreated EventType (065a1a0a-d324-4ae6-a461-bef8143e8795) - - - - - Received data - The name of the ParamType of the autocreated EventType (065a1a0a-d324-4ae6-a461-bef8143e8795) of DeviceClass udpReceiver - - - - - Command received + + Data received The name of the EventType 5fecbba3-ffbb-456b-872c-a2f571c681cb of deviceClass udpReceiver - + Address The name of the paramType (ea1be9fc-9a9b-44ba-a28d-e021aef4f046) of udpCommander - + Send data The name of the ActionType 6bc52462-b192-46a4-a6df-92cc5a479c89 of deviceClass udpCommander - + + Data - The name of the paramType (6604c852-6b24-4707-b8e5-1ddd8032efcc) of udpCommander + The name of the paramType (93c379e3-4707-46b7-9be0-2d6ff88f5d21) of udpReceiver +---------- +The name of the paramType (6604c852-6b24-4707-b8e5-1ddd8032efcc) of udpCommander diff --git a/wakeonlan/devicepluginwakeonlan.json b/wakeonlan/devicepluginwakeonlan.json index b8e2e717..31da8a3a 100644 --- a/wakeonlan/devicepluginwakeonlan.json +++ b/wakeonlan/devicepluginwakeonlan.json @@ -23,7 +23,7 @@ { "id": "e2ba04ac-9fe1-4f9d-8152-024c27030cde", "name": "mac", - "displayName": "mac", + "displayName": "MAC address", "type": "QString", "inputType": "MacAddress" } diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-cs.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-cs.ts index 12abb3a0..912d3270 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-cs.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-cs.ts @@ -23,7 +23,7 @@ - mac + MAC address The name of the paramType (e2ba04ac-9fe1-4f9d-8152-024c27030cde) of wol diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-da.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-da.ts index b4d9e65c..76d882e5 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-da.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-da.ts @@ -23,7 +23,7 @@ - mac + MAC address The name of the paramType (e2ba04ac-9fe1-4f9d-8152-024c27030cde) of wol 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 5b2940f6..d653db16 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-de_DE.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-de_DE.ts @@ -23,9 +23,9 @@ - mac + MAC address The name of the paramType (e2ba04ac-9fe1-4f9d-8152-024c27030cde) of wol - MAC Adresse + 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 2087bf05..32afe2c5 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-en_US.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-en_US.ts @@ -23,7 +23,7 @@ - mac + MAC address The name of the paramType (e2ba04ac-9fe1-4f9d-8152-024c27030cde) of wol diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-es.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-es.ts index f86f52b9..a4dd56e0 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-es.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-es.ts @@ -23,7 +23,7 @@ - mac + MAC address The name of the paramType (e2ba04ac-9fe1-4f9d-8152-024c27030cde) of wol diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-fr.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-fr.ts index 27c3f379..4020ef4e 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-fr.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-fr.ts @@ -23,9 +23,9 @@ - mac + MAC address The name of the paramType (e2ba04ac-9fe1-4f9d-8152-024c27030cde) of wol - MAC adresse + diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-it.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-it.ts index f069fb19..b6046c36 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-it.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-it.ts @@ -23,7 +23,7 @@ - mac + MAC address The name of the paramType (e2ba04ac-9fe1-4f9d-8152-024c27030cde) of wol diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-nl.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-nl.ts index e1d0dcd3..b8144a7e 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-nl.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-nl.ts @@ -23,7 +23,7 @@ - mac + MAC address The name of the paramType (e2ba04ac-9fe1-4f9d-8152-024c27030cde) of wol diff --git a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-pt.ts b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-pt.ts index edc94b68..37583fc0 100644 --- a/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-pt.ts +++ b/wakeonlan/translations/b5a87848-de56-451e-84a6-edd26ad4958f-pt.ts @@ -23,7 +23,7 @@ - mac + MAC address The name of the paramType (e2ba04ac-9fe1-4f9d-8152-024c27030cde) of wol