From 43e46c57a33d79d214d6452028e3e27160c1d380 Mon Sep 17 00:00:00 2001 From: Beta-User Date: Tue, 6 Sep 2022 15:50:42 +0000 Subject: [PATCH] 10_RHASSPY: official launch; move from contrib to ./FHEM git-svn-id: https://svn.fhem.de/fhem/trunk@26384 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/{contrib/RHASSPY => FHEM}/10_RHASSPY.pm | 8 +++++--- fhem/MAINTAINER.txt | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) rename fhem/{contrib/RHASSPY => FHEM}/10_RHASSPY.pm (99%) diff --git a/fhem/CHANGED b/fhem/CHANGED index 4fe488769..f499c04d8 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - feature: 10_RHASSPY: new module for Rhasspy integration (from contrib) - bugfix: 73_AutoShuttersControl: fix can't locate object method after update - bugfix: 73_AutoShuttersControl: fix many reported bugs - feature: 93_DbRep: reduceLog - add max, max=day, min, min=day, sum, sum=day diff --git a/fhem/contrib/RHASSPY/10_RHASSPY.pm b/fhem/FHEM/10_RHASSPY.pm similarity index 99% rename from fhem/contrib/RHASSPY/10_RHASSPY.pm rename to fhem/FHEM/10_RHASSPY.pm index 25ecffc4d..35d22acb4 100644 --- a/fhem/contrib/RHASSPY/10_RHASSPY.pm +++ b/fhem/FHEM/10_RHASSPY.pm @@ -6216,7 +6216,7 @@ attr rhasspyMQTT2 subscriptions setByTheProgram

defmod rhasspyMQTT2 MQTT2_CLIENT 192.168.1.122:1884
attr rhasspyMQTT2 clientOrder RHASSPY MQTT_GENERIC_BRIDGE MQTT2_DEVICE
-attr rhasspyMQTT2 subscriptions hermes/intent/+ hermes/dialogueManager/sessionStarted hermes/dialogueManager/sessionEnded hermes/nlu/intentNotRecognized hermes/hotword/+/detected <additional subscriptions for other MQTT-Modules> +attr rhasspyMQTT2 subscriptions hermes/intent/+ hermes/dialogueManager/sessionStarted hermes/dialogueManager/sessionEnded hermes/nlu/intentNotRecognized hermes/hotword/+/detected hermes/hotword/toggleOn hermes/hotword/toggleOff hermes/tts/say <additional subscriptions for other MQTT-Modules>

define Rhasspy RHASSPY baseUrl=http://192.168.1.210:12101 defaultRoom="Büro Lisa" language=de devspec=genericDeviceType=.+,device_a1,device_xy handleHotword=1

@@ -6229,8 +6229,10 @@ attr rhasspyMQTT2 subscriptions hermes/intent/+ hermes/dialogueManager/sessionSt hermes/dialogueManager/sessionStarted
hermes/dialogueManager/sessionEnded
hermes/nlu/intentNotRecognized
-hermes/hotword/+/detected

- +hermes/hotword/+/detected
+hermes/hotword/toggleOn
+hermes/hotword/toggleOff
+hermes/tts/say

Important: After defining the RHASSPY module, you are supposed to manually set the attribute IODev to force a non-dynamic IO assignement. Use e.g. attr <deviceName> IODev <m2client>.

Note: RHASSPY consolidates a lot of data from different sources. The final data structure RHASSPY uses at runtime will be shown by the list command. It's highly recommended to have a close look at this data structure, especially when starting with RHASSPY or in case something doesn't work as expected!
diff --git a/fhem/MAINTAINER.txt b/fhem/MAINTAINER.txt index e22f3798e..a2050fba4 100644 --- a/fhem/MAINTAINER.txt +++ b/fhem/MAINTAINER.txt @@ -82,6 +82,7 @@ FHEM/10_NeuronPin.pm klausw Sonstige Systeme FHEM/10_OWServer.pm neubert/mfr69bs 1Wire FHEM/10_pilight_ctrl.pm risiko Sonstige Systeme FHEM/10_RESIDENTS.pm loredo Automatisierung +FHEM/10_RHASSPY.pm Beta-User Frontends/Sprachsteuerung http://forum.fhem.de/index.php/topic,129050.0.html FHEM/10_SD_GT.PM sidey/elektron-bbs SlowRF FHEM/10_SOMFY.pm viegener Sonstige Systeme FHEM/10_UNIRoll.pm C_Herrmann SlowRF