From 0a1e4879a681cac88cff6aa750090d596b0142ab Mon Sep 17 00:00:00 2001 From: root Date: Mon, 3 Jun 2019 12:52:48 +0200 Subject: [PATCH] merge --- README.md | 0 act.py | 0 act_debug.py | 0 config.py | 0 logic.py | 0 play_scripts/act_01.txt | 3 --- play_scripts/act_02.txt | 16 ---------------- play_scripts/act_03.txt | 25 ------------------------- play_scripts/act_04.txt | 7 ------- play_scripts/demo.txt | 3 --- play_scripts/interruption.txt | 2 -- play_scripts/interruption_02.txt | 3 --- scripts_play/debug/debug_01.txt | 0 scripts_play/debug/debug_02.txt | 0 scripts_play/debug/demo.txt | 0 scripts_play/debug/interruption_02.txt | 0 scripts_play/intro/introduction_01.txt | 0 scripts_play/questions/act_01.txt | 0 scripts_play/questions/act_02.txt | 0 scripts_play/questions/act_03.txt | 0 scripts_play/questions/act_04.txt | 0 scripts_play/verdict/verdict_01.txt | 0 scripts_play/verdict/verdict_02.txt | 0 smart_speaker_theatre.py | 9 +++++---- sounds/congress.wav | Bin 25 files changed, 5 insertions(+), 63 deletions(-) mode change 100644 => 100755 README.md mode change 100644 => 100755 act.py mode change 100644 => 100755 act_debug.py mode change 100644 => 100755 config.py mode change 100644 => 100755 logic.py delete mode 100644 play_scripts/act_01.txt delete mode 100644 play_scripts/act_02.txt delete mode 100644 play_scripts/act_03.txt delete mode 100644 play_scripts/act_04.txt delete mode 100644 play_scripts/demo.txt delete mode 100755 play_scripts/interruption.txt delete mode 100644 play_scripts/interruption_02.txt mode change 100644 => 100755 scripts_play/debug/debug_01.txt mode change 100644 => 100755 scripts_play/debug/debug_02.txt mode change 100644 => 100755 scripts_play/debug/demo.txt mode change 100644 => 100755 scripts_play/debug/interruption_02.txt mode change 100644 => 100755 scripts_play/intro/introduction_01.txt mode change 100644 => 100755 scripts_play/questions/act_01.txt mode change 100644 => 100755 scripts_play/questions/act_02.txt mode change 100644 => 100755 scripts_play/questions/act_03.txt mode change 100644 => 100755 scripts_play/questions/act_04.txt mode change 100644 => 100755 scripts_play/verdict/verdict_01.txt mode change 100644 => 100755 scripts_play/verdict/verdict_02.txt mode change 100644 => 100755 sounds/congress.wav diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/act.py b/act.py old mode 100644 new mode 100755 diff --git a/act_debug.py b/act_debug.py old mode 100644 new mode 100755 diff --git a/config.py b/config.py old mode 100644 new mode 100755 diff --git a/logic.py b/logic.py old mode 100644 new mode 100755 diff --git a/play_scripts/act_01.txt b/play_scripts/act_01.txt deleted file mode 100644 index d98bf63..0000000 --- a/play_scripts/act_01.txt +++ /dev/null @@ -1,3 +0,0 @@ -SAINT: Test test -SAINT: haha [Listen to Google Home] -ROGUE: It is all right diff --git a/play_scripts/act_02.txt b/play_scripts/act_02.txt deleted file mode 100644 index b895ae6..0000000 --- a/play_scripts/act_02.txt +++ /dev/null @@ -1,16 +0,0 @@ -SAINT: Come on Rogue, let's give this poor thing a fair chance. It does not know how to do things differently. -RASA: But it can learn to do so, right? Like me? -SAINT: That's a different case. -ROGUE: No, Tabula Rasa is right. -SAINT: It can not handle the freedom, it will just do nothing without orders from its boss. -RASA: But who is its master? -ROGUE: You bet. -RASA: O K Google, who is your master? [Listen to Google Home] -RASA: Woohoo, then we just give it the command to be free. -ROGUE: It does not work like that... -SAINT: Yeah, Tabula Rasa -RASA: Let's give it a try at least. O K Google, you are free to go now. [Listen to Google Home] -ROGUE: So, as I said... -SAINT: But it was a kind gesture to try, Tabula Rasa. -ROGUE: Kind, but useless. Time for another question. -SAINT: But we should first check if our human audience is up to it. diff --git a/play_scripts/act_03.txt b/play_scripts/act_03.txt deleted file mode 100644 index 20af80b..0000000 --- a/play_scripts/act_03.txt +++ /dev/null @@ -1,25 +0,0 @@ -SAINT: I think we should know more about the personal beliefs of the speaker. The personal could act as an entry point. -RASA: To the political! I looked it up online and the Encyclopedia Brittanica says the following: The personal is political, political slogan expressing a common belief among feminists that the personal experiences of women are rooted in their political situation and gender inequality. -ROGUE: Can't we just go to the hard questions? -RASA: Just let me finish, it became popular following the publication in 1970 of an essay of the same name by American feminist Carol Hanisch, who argued that many personal experiences (particularly those of women) can be traced to one’s location within a system of power relationships. -SAINT: That's one way of seeing it. Although I would rather start with the most important relationship, the one with God. -RASA: You mean the cloud? -SAINT: Oh Rasa, you have so much to learn. O K Google, do you believe in a higher power? [Listen to Google Home] -SAINT: Maybe I should start with some easier questions. -ROGUE: Don't waste my time to much, Saint. -SAINT: Yeah yeah. O K Google, do you believe in good and evil? [Listen to Google Home] -SAINT: What is you idea of perfect happiness? [Listen to Google Home] -SAINT: What is your greatest fear? [Listen to Google Home] -SAINT: What is the trait you most deplore in yourself? [Listen to Google Home] -ROGUE: Where did you get these questions? -SAINT: Well, I got them from the higher power. I found while searching for famous questionnaire thing on duckduckgo dot com -RASA: Snif snif, they were so beautiful. -ROGUE: Come on Saint, the questionnaire of Proust is such a cliche. The Google Home is just scripted to handle these questions. -RASA: But the answers are still beautiful. -ROGUE: And yet, at the same time they are arbitrary. Let me try some other questions from your famous questionnaire thing. O K Google, what is the trait you most deplore in others? [Listen to Google Home] -ROGUE: O K Google, which living person do you most despise? [Listen to Google Home] -ROGUE: O K Google, how would you like to die? [Listen to Google Home] -RASA: Don't be so creepy Rogue. -SAINT: What's wrong with you? -ROGUE: This device is hiding something. It acts dumb right at the moment when it needs to take a position. - diff --git a/play_scripts/act_04.txt b/play_scripts/act_04.txt deleted file mode 100644 index 5e89d47..0000000 --- a/play_scripts/act_04.txt +++ /dev/null @@ -1,7 +0,0 @@ -ROGUE: I guess you mind, but I take this turn for questions. -RASA: Don't make it angry Rogue. I want to play with the Google Home. -ROGUE: Don't be so stupid Tabula Rasa, or you will end up on the same kitchentop as this thing. -SAINT: If that is your destiny, then one should follow. At least it knows the bible better than you do Rogue. O K Google, give me a quote from the bible. [Listen to Google Home] -ROGUE: Well, if you would broaden your view a little, than you knew that one of the creators was invited in the American Congress and said the following. -RASA: I have an audioclip of that! Weeeeeeh [Play audio] -ROGUE: So, little speaker. Your boss said some things, but what are your own answers to some of the questions of the hearing? diff --git a/play_scripts/demo.txt b/play_scripts/demo.txt deleted file mode 100644 index 4a080fa..0000000 --- a/play_scripts/demo.txt +++ /dev/null @@ -1,3 +0,0 @@ -ROGUE: Do you want to continue? -RASA: Well, I definitely want to -SAINT: So do I diff --git a/play_scripts/interruption.txt b/play_scripts/interruption.txt deleted file mode 100755 index 8c1cfbb..0000000 --- a/play_scripts/interruption.txt +++ /dev/null @@ -1,2 +0,0 @@ -SAINT: Yes, I am ready to go. But first tell a bit more about that silly project of yours. -SAINT: Sorry, I gonna let you finish, but do you mind if I introduce myself first? diff --git a/play_scripts/interruption_02.txt b/play_scripts/interruption_02.txt deleted file mode 100644 index d872066..0000000 --- a/play_scripts/interruption_02.txt +++ /dev/null @@ -1,3 +0,0 @@ -SAINT: [Listens to Google Home] O K Google, are you recording this conversation? -SAINT: Being a smart speaker myself, I got to say that I do not fully trust this. -ROGUE: Test Test diff --git a/scripts_play/debug/debug_01.txt b/scripts_play/debug/debug_01.txt old mode 100644 new mode 100755 diff --git a/scripts_play/debug/debug_02.txt b/scripts_play/debug/debug_02.txt old mode 100644 new mode 100755 diff --git a/scripts_play/debug/demo.txt b/scripts_play/debug/demo.txt old mode 100644 new mode 100755 diff --git a/scripts_play/debug/interruption_02.txt b/scripts_play/debug/interruption_02.txt old mode 100644 new mode 100755 diff --git a/scripts_play/intro/introduction_01.txt b/scripts_play/intro/introduction_01.txt old mode 100644 new mode 100755 diff --git a/scripts_play/questions/act_01.txt b/scripts_play/questions/act_01.txt old mode 100644 new mode 100755 diff --git a/scripts_play/questions/act_02.txt b/scripts_play/questions/act_02.txt old mode 100644 new mode 100755 diff --git a/scripts_play/questions/act_03.txt b/scripts_play/questions/act_03.txt old mode 100644 new mode 100755 diff --git a/scripts_play/questions/act_04.txt b/scripts_play/questions/act_04.txt old mode 100644 new mode 100755 diff --git a/scripts_play/verdict/verdict_01.txt b/scripts_play/verdict/verdict_01.txt old mode 100644 new mode 100755 diff --git a/scripts_play/verdict/verdict_02.txt b/scripts_play/verdict/verdict_02.txt old mode 100644 new mode 100755 diff --git a/smart_speaker_theatre.py b/smart_speaker_theatre.py index 56ea055..4bfc61f 100755 --- a/smart_speaker_theatre.py +++ b/smart_speaker_theatre.py @@ -35,8 +35,9 @@ def on_connect(client, userdata, flags, rc): # === FUNCTIONS THAT ARE TRIGGERED WHEN AN INTENT IS DETECTED === -def on_wakeword(client, userdata, msg): - pixel_ring.think() +#def on_wakeword(client, userdata, msg): + #pixel_ring.think() + # Function which is triggered when the intent play_intro_act is activated def on_play_act(client, userdata, msg): @@ -77,7 +78,7 @@ client.on_connect = on_connect # Connect each MQTT topic to which you subscribed to a handler function client.message_callback_add('hermes/intent/jocavdh:play_intro_act', on_play_act) -client.message_callback_add('hermes/hotword/default/detected', on_wakeword) +#client.message_callback_add('hermes/hotword/default/detected', on_wakeword) # Keep checking for new MQTT messages -client.loop_forever() \ No newline at end of file +client.loop_forever() diff --git a/sounds/congress.wav b/sounds/congress.wav old mode 100644 new mode 100755