From 0c1bff838e3dd8a3363bd0cea1422c8bf86164cf Mon Sep 17 00:00:00 2001 From: Luca Warmenhoven Date: Wed, 24 Apr 2024 13:56:45 +0200 Subject: [PATCH 1/2] Added SpeechGenerator.java --- .idea/workspace.xml | 31 +++++----------- .../Fitbot/.idea/deploymentTargetDropDown.xml | 17 --------- .../java/com/example/fitbot/MainActivity.java | 2 -- .../fitbot/speech/SpeechGenerator.java | 35 +++++++++++++++++++ 4 files changed, 44 insertions(+), 41 deletions(-) delete mode 100644 code/src/Fitbot/.idea/deploymentTargetDropDown.xml create mode 100644 code/src/Fitbot/app/src/main/java/com/example/fitbot/speech/SpeechGenerator.java diff --git a/.idea/workspace.xml b/.idea/workspace.xml index d1c290e..0ded7da 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -14,10 +14,7 @@ - - - - + + diff --git a/code/src/Fitbot/.idea/deploymentTargetDropDown.xml b/code/src/Fitbot/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 24e256e..0000000 --- a/code/src/Fitbot/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java index 16f9f66..65f5e43 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java @@ -1,6 +1,5 @@ package com.example.fitbot; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import com.aldebaran.qi.sdk.QiContext; @@ -8,7 +7,6 @@ import com.aldebaran.qi.sdk.QiSDK; import com.aldebaran.qi.sdk.RobotLifecycleCallbacks; import com.aldebaran.qi.sdk.builder.SayBuilder; import com.aldebaran.qi.sdk.design.activity.RobotActivity; -import com.aldebaran.qi.sdk.design.activity.conversationstatus.SpeechBarDisplayStrategy; import com.aldebaran.qi.sdk.object.conversation.Say; diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/speech/SpeechGenerator.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/speech/SpeechGenerator.java new file mode 100644 index 0000000..61c265a --- /dev/null +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/speech/SpeechGenerator.java @@ -0,0 +1,35 @@ +package com.example.fitbot.speech; + +import com.aldebaran.qi.sdk.QiContext; +import com.aldebaran.qi.sdk.builder.SayBuilder; +import com.aldebaran.qi.sdk.object.locale.Language; +import com.aldebaran.qi.sdk.object.locale.Locale; +import com.aldebaran.qi.sdk.object.locale.Region; + +public class SpeechGenerator { + + private static final Locale DUTCH_LOCALE = new Locale(Language.DUTCH, Region.NETHERLANDS); + private SayBuilder builder; + + /** + * Function for making the robot say something with DUTCH_LOCALE as locale + * @param phrase The phrase to make the robot say + * @param ctx The QiContext to use + */ + public static void say(String phrase, QiContext ctx) + { + say(phrase, ctx, DUTCH_LOCALE); + } + + + + public static void say(String text, QiContext ctx, Locale locale) + { + SayBuilder.with(ctx) + .withLocale(locale) + .withText(text) + .build() + .run(); + } + +} From ca89d7af941a5776771905e83a372194645ad040 Mon Sep 17 00:00:00 2001 From: SebasKoedam Date: Wed, 24 Apr 2024 15:18:22 +0200 Subject: [PATCH 2/2] Update Fitbot project files and add robot conversation in MainActivity.java --- .../Fitbot/.idea/deploymentTargetDropDown.xml | 2 +- .../java/com/example/fitbot/MainActivity.java | 21 +++++++++++++------ .../sebas/onderzoekEthiek/formulier.md | 4 ++-- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/code/src/Fitbot/.idea/deploymentTargetDropDown.xml b/code/src/Fitbot/.idea/deploymentTargetDropDown.xml index 24e256e..a5abdd5 100644 --- a/code/src/Fitbot/.idea/deploymentTargetDropDown.xml +++ b/code/src/Fitbot/.idea/deploymentTargetDropDown.xml @@ -12,6 +12,6 @@ - + \ No newline at end of file diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java index 16f9f66..f11358b 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java @@ -9,6 +9,7 @@ import com.aldebaran.qi.sdk.RobotLifecycleCallbacks; import com.aldebaran.qi.sdk.builder.SayBuilder; import com.aldebaran.qi.sdk.design.activity.RobotActivity; import com.aldebaran.qi.sdk.design.activity.conversationstatus.SpeechBarDisplayStrategy; +import com.aldebaran.qi.sdk.object.conversation.Phrase; import com.aldebaran.qi.sdk.object.conversation.Say; @@ -30,13 +31,21 @@ public class MainActivity extends RobotActivity implements RobotLifecycleCallbac @Override public void onRobotFocusGained(QiContext qiContext) { - // Create a new say action. - Say say = SayBuilder.with(qiContext) // Create the builder with the context. - .withText("Hallo hoe gaat het?") // Set the text to say. - .build(); // Build the say action. + String locationName = ("de Hogeschool van Amsterdam"); + String locationDescription = ("de Hogeschool van Amsterdam"); - // Execute the action. - say.run(); + Phrase namePhrase = new Phrase("This location is " + locationName); + Say sayName = SayBuilder.with(qiContext) + .withPhrase(namePhrase) + .build(); + + Phrase descriptionPhrase = new Phrase(locationDescription); + Say sayDescription = SayBuilder.with(qiContext) + .withPhrase(descriptionPhrase) + .build(); + + sayName.run(); + sayDescription.run(); } @Override diff --git a/docs/personalDocs/sebas/onderzoekEthiek/formulier.md b/docs/personalDocs/sebas/onderzoekEthiek/formulier.md index 39c2e88..592df66 100644 --- a/docs/personalDocs/sebas/onderzoekEthiek/formulier.md +++ b/docs/personalDocs/sebas/onderzoekEthiek/formulier.md @@ -13,7 +13,7 @@ Betoog op basis van literatuuronderzoek van minimaal 1000 tot maximaal 1500 woor Waar gaat je betoog over? -Het helpen van ouderen met fitness door middel van robots. +Hoe ethisch verantwoord is het om robots in te zetten in de ouderenzorg om ouderen te helpen met fitness? **B. AANLEIDING** – De aanleiding en/of context van het thema/vraagstuk is: @@ -43,7 +43,7 @@ Waar liggen de grenzen van de inzet van robots in de zorg voor ouderen wat fitne Welke vraag ga je beantwoorden in je betoog? -In hoeverre kunnen robots worden ingezet om ouderen te helpen met fitness? +In hoeverre is het etisch verantwoord om robots in te zetten in de ouderenzorg om ouderen te helpen met fitness? **H. BEGRIPSOMSCHRIJVING** – De volgende begrippen uit mijn vraagstelling definieer ik als: