From 3966824b7619b304f1acfad045b306df13fcfa33 Mon Sep 17 00:00:00 2001 From: Luca Warmenhoven Date: Wed, 29 May 2024 15:22:39 +0200 Subject: [PATCH 1/5] Yebal --- .idea/workspace.xml | 21 +++++++++++++++------ code/web/pepper_data_test.js | 28 +++++++++++++--------------- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 4020532..d6c6e49 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -14,10 +14,9 @@ - - + - + @@ -424,6 +432,7 @@ - \ No newline at end of file diff --git a/code/web/pepper_data_test.js b/code/web/pepper_data_test.js index 674aa18..222a394 100644 --- a/code/web/pepper_data_test.js +++ b/code/web/pepper_data_test.js @@ -1,24 +1,22 @@ -const address = 'http://145.92.8.135:3445/'; - -const data = { - rotationX: 1, - rotationY: .4, - rotationZ: .1, - accelerationX: 1, - accelerationY: 2, - accelerationZ: 4, - deviceId: 1, - type: 'data' -}; - -for ( let i = 0; i < 10; i++) +const address = 'http://192.168.137.45:3445'; +const amount = 10; +for ( let i = 0; i < amount; i++) { setTimeout(() => { console.log("Sending data"); fetch(address, { method: 'POST', headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify(data) + body: JSON.stringify({ + rotationX: 0, + rotationY: 0, + rotationZ: 0, + accelerationX: Math.PI / amount * i, + accelerationY: 0, + accelerationZ: 0, + type: 'data', + deviceId: 0 + }) }); }, i * 1000); } \ No newline at end of file From dde65dd2b91c350abb6eef12b1e694a16b7a6435 Mon Sep 17 00:00:00 2001 From: Niels Gras Date: Mon, 3 Jun 2024 13:51:57 +0200 Subject: [PATCH 2/5] small documentation for fitbord ideas --- docs/documentation/assets/knocksensor.png | Bin 0 -> 15471 bytes docs/documentation/hardware/Ideas.md | 17 +++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 docs/documentation/assets/knocksensor.png create mode 100644 docs/documentation/hardware/Ideas.md diff --git a/docs/documentation/assets/knocksensor.png b/docs/documentation/assets/knocksensor.png new file mode 100644 index 0000000000000000000000000000000000000000..4a4907ff906e966aa18930eff05ad9dbe8e482c4 GIT binary patch literal 15471 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 literal 0 HcmV?d00001 diff --git a/docs/documentation/hardware/Ideas.md b/docs/documentation/hardware/Ideas.md new file mode 100644 index 0000000..8efdd05 --- /dev/null +++ b/docs/documentation/hardware/Ideas.md @@ -0,0 +1,17 @@ +# Ideas for hardware + +# making a balance bord + +Since We are not able to connect the wii fit bord we have to come up with a solution. We thought of it for some time and what we want to do with it. Origanlly we wanted to use the balance bord for excersises such as standing on one leg. This is a simple leg excersise we wanted to have. We thaugt of multiple solutions to still have this excersise. However we still needed to think of a design for the frame. + +# the frame + +We wanted it to have a similar style to the balance bord. howevere since we can make or own we wanted to make it a bit taller. This makes it easier to implement some other excersise such as the step up. This is na excersise that benefits from a taller box than the wii fit box. + +## LDR + +We can use a LDR to determine if someone is standing on the bord + +## Knock sensor + +![alt text](../assets/knocksensor.png) \ No newline at end of file From 67860a639743d18792877035a16640cdab4bebf5 Mon Sep 17 00:00:00 2001 From: SebasKoedam Date: Mon, 3 Jun 2024 14:03:48 +0200 Subject: [PATCH 3/5] chore: Add transparent color to colors.xml, fix bug in incoming_request_handlers.js, and add close button drawable and dialog layout files --- code/server/incoming_request_handlers.js | 2 +- code/src/Fitbot/.idea/misc.xml | 4 +- .../fitbot/exercise/ExerciseManager.java | 2 +- .../fitbot/ui/activities/FitnessActivity.java | 35 +++++++++++++++ .../res/drawable/ic_baseline_close_48.xml | 5 +++ .../app/src/main/res/layout/dialog_info.xml | 45 +++++++++++++++++++ .../Fitbot/app/src/main/res/values/colors.xml | 1 + .../app/src/main/res/values/strings.xml | 2 + 8 files changed, 93 insertions(+), 3 deletions(-) create mode 100644 code/src/Fitbot/app/src/main/res/drawable/ic_baseline_close_48.xml create mode 100644 code/src/Fitbot/app/src/main/res/layout/dialog_info.xml diff --git a/code/server/incoming_request_handlers.js b/code/server/incoming_request_handlers.js index 1f8d257..6fa0f41 100644 --- a/code/server/incoming_request_handlers.js +++ b/code/server/incoming_request_handlers.js @@ -42,7 +42,7 @@ function handleIncoming(request, response, app, pool) path: row.Path, duration: row.Duration }; - }); + })[0]; response .status(200) diff --git a/code/src/Fitbot/.idea/misc.xml b/code/src/Fitbot/.idea/misc.xml index a6192e8..b1965d6 100644 --- a/code/src/Fitbot/.idea/misc.xml +++ b/code/src/Fitbot/.idea/misc.xml @@ -35,13 +35,15 @@ - + + + diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/exercise/ExerciseManager.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/exercise/ExerciseManager.java index dc045e5..75b11ae 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/exercise/ExerciseManager.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/exercise/ExerciseManager.java @@ -85,7 +85,7 @@ public class ExerciseManager { */ public static Exercise fetchExerciseFromDatabase() { String response = sendHTTP( - HOST_ADDRESS, "POST", "application/json", null + HOST_ADDRESS, "POST", "application/json", ); // Validate the response if (response != null) { diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java index 8a40859..abde556 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java @@ -1,9 +1,14 @@ package com.example.fitbot.ui.activities; +import android.app.Dialog; import android.content.Context; +import android.graphics.drawable.ColorDrawable; import android.net.Uri; import android.os.Bundle; import android.util.Log; +import android.view.View; +import android.view.WindowManager; +import android.widget.Button; import android.widget.VideoView; import com.aldebaran.qi.sdk.QiContext; @@ -56,7 +61,17 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall VideoView videoView = findViewById(R.id.videoView); playVideo(videoView, this); NavigationManager.setupButtonNavigation(this, R.id.homeButtonFitness, MainActivity.class); + NavigationManager.setupButtonNavigation(this, R.id.skipButtonFitness, MainActivity.class); //Needs to skip exercises once those are implemented + NavigationManager.hideSystemUI(this); + + Button infoButtonFitness = findViewById(R.id.infoButtonFitness); + infoButtonFitness.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + showInfoDialog(); + } + }); } @Override @@ -157,4 +172,24 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall super.onDestroy(); } + + private void showInfoDialog() { + final Dialog dialog = new Dialog(this); + dialog.setContentView(R.layout.dialog_info); + + NavigationManager.hideSystemUI(this); + + dialog.getWindow().setDimAmount(0.5f); + dialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT)); + dialog.setCancelable(true); + + Button closeButton = dialog.findViewById(R.id.closeButtonDialog); + closeButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dialog.dismiss(); + } + }); + dialog.show(); + } } \ No newline at end of file diff --git a/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_close_48.xml b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_close_48.xml new file mode 100644 index 0000000..72f8573 --- /dev/null +++ b/code/src/Fitbot/app/src/main/res/drawable/ic_baseline_close_48.xml @@ -0,0 +1,5 @@ + + + diff --git a/code/src/Fitbot/app/src/main/res/layout/dialog_info.xml b/code/src/Fitbot/app/src/main/res/layout/dialog_info.xml new file mode 100644 index 0000000..f64e32a --- /dev/null +++ b/code/src/Fitbot/app/src/main/res/layout/dialog_info.xml @@ -0,0 +1,45 @@ + + + + + + + +