From f0f24812889c62a4f3d07f273ffe3e018c8ed000 Mon Sep 17 00:00:00 2001 From: Sam Hos Date: Tue, 11 Jun 2024 09:55:09 +0200 Subject: [PATCH] last minute changes --- .../com/example/fitbot/ui/activities/FitnessActivity.java | 5 +---- .../java/com/example/fitbot/ui/activities/MainActivity.java | 3 ++- .../com/example/fitbot/util/processing/InputProcessor.java | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) 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 19f5166..9577101 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 @@ -69,7 +69,7 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall private static final float SENSOR_SAMPLE_RATE = 10.0f; private static final int EXERCISE_COUNT = 5; - private static int EXERCISE_VIDEO_REPETITION = 1; + public static int EXERCISE_VIDEO_REPETITION = 1; private static final float EXERCISE_SPEED_MULTIPLIER = 1.0f; @Override @@ -83,9 +83,6 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall this.exerciseShortDescriptionTextView = findViewById(R.id.textViewFitnessShortDescription); //this.exerciseDescriptionTextView = findViewById(R.id.textViewDialogDescription); - // Set the repetition count for the exercise - EXERCISE_VIDEO_REPETITION = 1; - progressCircle = findViewById(R.id.progressCircle); progressText = findViewById(R.id.progressText); progressCircle.setMax(maxProgress); diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java index 934a9df..ac3e398 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java @@ -16,8 +16,10 @@ import android.view.WindowManager; import android.widget.Button; import com.example.fitbot.R; +import com.example.fitbot.exercise.ExerciseManager; import com.example.fitbot.pepper.Pepper; import com.example.fitbot.util.NavigationManager; +import com.example.fitbot.ui.activities.FitnessActivity; import java.io.OutputStream; import java.net.HttpURLConnection; @@ -40,7 +42,6 @@ public class MainActivity extends AppCompatActivity { getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); - startButton = findViewById(R.id.startButtonMain); startButton.setOnClickListener(v -> { Uri videoUri = Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.bicepvideo); diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/InputProcessor.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/InputProcessor.java index 2572645..93683e6 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/InputProcessor.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/InputProcessor.java @@ -32,7 +32,6 @@ public class InputProcessor { private float exerciseRepetitionDurationInSeconds = 0.0f; public static int exercisesRemaining = 1; - private float errorCheckInterval_s; private int checksPerformed = 0; private int totalChecks = 0; @@ -81,6 +80,7 @@ public class InputProcessor { this.selfRotationVectorPaths[0] = new ArrayList<>(); this.selfRotationVectorPaths[1] = new ArrayList<>(); this.parentActivity = parentActivity; + ExerciseManager.TOTAL_REPETITIONS_PERFORMED = 0; // Initialize each ArrayList in the array } @@ -249,7 +249,7 @@ public class InputProcessor { // Create socket server this.server = WebServer.createServer(); // - FitnessActivity.progress = 1; +// FitnessActivity.progress = 1; Log.i("MotionProcessor", "Listening for incoming connections."); // Check if the socket