From d0c74c4e25a688a84d126a221d5bac85e182f461 Mon Sep 17 00:00:00 2001 From: Sam Hos Date: Wed, 5 Jun 2024 13:56:23 +0200 Subject: [PATCH 1/5] comments and cleanup --- .../Movement-sensor-code/Connectivity.h | 6 +++--- .../Movement-sensor-code.ino | 20 +++++++++---------- .../Movement-sensor-code/SensorManager.h | 10 +++++----- .../arduino/Movement-sensor-code/headerFIle.h | 7 +++---- 4 files changed, 20 insertions(+), 23 deletions(-) diff --git a/code/arduino/Movement-sensor-code/Connectivity.h b/code/arduino/Movement-sensor-code/Connectivity.h index 27cfe94..3df3524 100644 --- a/code/arduino/Movement-sensor-code/Connectivity.h +++ b/code/arduino/Movement-sensor-code/Connectivity.h @@ -1,5 +1,5 @@ -#ifndef Connectivity_h -#define Connectivity_h +#ifndef MOVEMENTSENSORCODE_CONNECTIVITY_h +#define MOVEMENTSENSORCODE_CONNECTIVITY_h #include "Arduino.h" #include @@ -30,4 +30,4 @@ private: }; -#endif \ No newline at end of file +#endif // MOVEMENTSENSORCODE_CONNECTIVITY_h \ No newline at end of file diff --git a/code/arduino/Movement-sensor-code/Movement-sensor-code.ino b/code/arduino/Movement-sensor-code/Movement-sensor-code.ino index 4a17a93..6acc498 100644 --- a/code/arduino/Movement-sensor-code/Movement-sensor-code.ino +++ b/code/arduino/Movement-sensor-code/Movement-sensor-code.ino @@ -9,9 +9,10 @@ void setup() { } void loop() { - SensorManager::RotationQuaternions Rotation = sensorManager.getQuaternions(); - // SensorManager::acceleration rotationAcceleration = sensorManager.getAcelleration(); + SensorManager::eulerAngles Rotation = sensorManager.getEulerAngles(); +//static structure +// TODO: redo json for esp8266 and in android studio struct acceleration { float x = 9; float y = 9; @@ -19,22 +20,22 @@ struct acceleration { } accelData; if (!ipAquired) { - serverIp = connectivity.fetchIPAddress(); // Assign the value here + serverIp = connectivity.fetchIPAddress(); //Fetch pepper ip address ipAquired = true; } unsigned long lastTime = 0; // will store the last time the code was run unsigned long currentTime = millis(); - if (currentTime - lastTime >= 100) { // 100 ms has passed + if (currentTime - lastTime >= 100) { // do everything inside every 100 ms memset(buffer, 0, BUFFER_SIZE); sprintf( buffer, "{\"deviceId\": %d, \"rotationX\": %f, \"rotationY\": %f, \"rotationZ\": %f, \"accelerationX\": %f, \"accelerationY\": %f, \"accelerationZ\": %f, \"type\": %s}", DEVICE_ID, - Rotation.i, - Rotation.j, - Rotation.k, - Rotation.w, + Rotation.roll, + Rotation.pitch, + Rotation.yaw, + accelData.x, accelData.y, accelData.z, "data"); @@ -45,6 +46,3 @@ struct acceleration { lastTime = currentTime; } } -//acceleration.X -//acceleration.Y -//acceleration.Z \ No newline at end of file diff --git a/code/arduino/Movement-sensor-code/SensorManager.h b/code/arduino/Movement-sensor-code/SensorManager.h index d1a0e4e..141ffd8 100644 --- a/code/arduino/Movement-sensor-code/SensorManager.h +++ b/code/arduino/Movement-sensor-code/SensorManager.h @@ -1,5 +1,5 @@ -#ifndef SensorManager_h -#define SensorManager_h +#ifndef MOVEMENTSENSORCODE_SENSORMANAGER_H +#define MOVEMENTSENSORCODE_SENSORMANAGER_H #include "Arduino.h" #include "SparkFun_BNO080_Arduino_Library.h" @@ -23,6 +23,8 @@ public: acceleration getAcelleration(); bool sensorTap(); +private: + struct RotationQuaternions { float i; float j; @@ -31,9 +33,7 @@ public: }; RotationQuaternions getQuaternions(); -private: - BNO080 myIMU; }; -#endif \ No newline at end of file +#endif // MOVEMENTSENSORCODE_SENSORMANAGER_H \ No newline at end of file diff --git a/code/arduino/Movement-sensor-code/headerFIle.h b/code/arduino/Movement-sensor-code/headerFIle.h index cc25dec..1c21dcb 100644 --- a/code/arduino/Movement-sensor-code/headerFIle.h +++ b/code/arduino/Movement-sensor-code/headerFIle.h @@ -8,11 +8,10 @@ Connectivity connectivity; WebSocketsClient webSocket; #define USE_SERIAL Serial -#define ssid "msi 5556" -#define pass "abc12345" +#define ssid "1235678i" +#define pass "12345678" #define BUFFER_SIZE 1024 -#define DEVICE_ID 1 -#define IP_ADDRESS "192.168.137.12" +#define DEVICE_ID 0 char *buffer = (char *)malloc(sizeof(char) * BUFFER_SIZE); const char* serverIp = NULL; // Declare serverIp here From b5d2e057c3b662b468ad16cac42d016c0e0e5452 Mon Sep 17 00:00:00 2001 From: SebasKoedam Date: Wed, 5 Jun 2024 14:08:17 +0200 Subject: [PATCH 2/5] hoppelijk sloopt dit niks --- code/src/Fitbot/app/build.gradle | 1 + .../fitbot/ui/activities/FitnessActivity.java | 8 ++ .../src/main/res/layout/activity_fitness.xml | 111 ++++++++++-------- .../app/src/main/res/values/strings.xml | 4 +- code/src/Fitbot/gradle.properties | 3 +- 5 files changed, 73 insertions(+), 54 deletions(-) diff --git a/code/src/Fitbot/app/build.gradle b/code/src/Fitbot/app/build.gradle index 1348df8..390414f 100644 --- a/code/src/Fitbot/app/build.gradle +++ b/code/src/Fitbot/app/build.gradle @@ -30,6 +30,7 @@ android { dependencies { + implementation 'com.facebook.shimmer:shimmer:0.5.0' implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support.constraint:constraint-layout:2.0.4' implementation 'com.android.support:cardview-v7:28.0.0' 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 9fcb10d..30dcb16 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 @@ -34,6 +34,7 @@ import com.example.fitbot.exercise.ExerciseManager; import com.example.fitbot.pepper.Pepper; import com.example.fitbot.util.NavigationManager; import com.example.fitbot.util.processing.InputProcessor; +import com.facebook.shimmer.ShimmerFrameLayout; public class FitnessActivity extends RobotActivity implements RobotLifecycleCallbacks { @@ -92,6 +93,10 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall progressText = findViewById(R.id.progressText); progressCircle.setMax(maxProgress); + ShimmerFrameLayout shimmerLayout = findViewById(R.id.shimmerFrameLayout); + shimmerLayout.startShimmer(); // Start shimmer animation + + // Set color of loading circle ProgressBar loadingCircle = findViewById(R.id.loadingCircle); loadingCircle.setIndeterminateTintList(ColorStateList.valueOf(Color.RED)); @@ -176,6 +181,9 @@ public class FitnessActivity extends RobotActivity implements RobotLifecycleCall // exerciseDescriptionTextView.setText(exercise.description); exerciseVideoUrl = exercise.videoUrl; + ShimmerFrameLayout shimmerLayout = findViewById(R.id.shimmerFrameLayout); + shimmerLayout.stopShimmer(); // Start shimmer animation + // Play the video playVideo(videoView, this); diff --git a/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml b/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml index 641d8d9..8b2e257 100644 --- a/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml +++ b/code/src/Fitbot/app/src/main/res/layout/activity_fitness.xml @@ -60,74 +60,81 @@ - - - + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> - - - - - - - - + android:layout_gravity="center_horizontal" + android:text="@string/exerciseTitle" + android:textAlignment="center" /> - + + + + + + + + + + + + + + + + -