diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8668fe5..1beee62 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -14,10 +14,9 @@ - + - @@ -271,6 +288,8 @@ - \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..c5f3f6b --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "interactive" +} \ No newline at end of file diff --git a/code/src/Fitbot/app/src/main/AndroidManifest.xml b/code/src/Fitbot/app/src/main/AndroidManifest.xml index 1705cd8..23755ba 100644 --- a/code/src/Fitbot/app/src/main/AndroidManifest.xml +++ b/code/src/Fitbot/app/src/main/AndroidManifest.xml @@ -4,6 +4,10 @@ + + + + - - - - 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 7315545..49049d7 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 @@ -1,4 +1,4 @@ -package com.example.fitbot; +package com.example.fitbot.ui.activities; import android.annotation.SuppressLint; import android.os.Bundle; @@ -9,7 +9,7 @@ import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; -public class MainScreen extends AppCompatActivity { +public class MainActivity extends AppCompatActivity { //Variables DrawerLayout drawerLayout; diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/IMotionDataConsumer.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/IMotionDataConsumer.java new file mode 100644 index 0000000..75def12 --- /dev/null +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/IMotionDataConsumer.java @@ -0,0 +1,14 @@ +package com.example.fitbot.util.processing; + +public interface IMotionDataConsumer { + + /** + * Function for accepting motion data and the transformed vector. + * @param transformedVector The transformed vector. + * @param motionData The input motion data. + * @param sampleIndex The index of the current sample + * @param sampleRate The sample rate. + */ + void accept(Vector3f transformedVector, MotionData motionData, int sampleIndex, double sampleRate); + +} \ No newline at end of file diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/MotionProcessor.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/MotionProcessor.java index edc8560..f79d129 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/MotionProcessor.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/MotionProcessor.java @@ -22,7 +22,7 @@ public class MotionProcessor { private Vector3f ZERO = new Vector3f(0, 0, 0); private float sampleRate = 1.0F; // samples/second - private DataConsumer motionDataConsumer = (p1, p2, p3, p4) -> {}; + private IMotionDataConsumer motionDataConsumer = (p1, p2, p3, p4) -> {}; private GesturePath path; private WebSocket socket; @@ -245,19 +245,5 @@ public class MotionProcessor { Log.i("MotionProcessor", "Path length: " + relativePath.size()); Log.i("MotionProcessor", "Sample rate: " + sampleRate); Log.i("MotionProcessor", "Calibration point: " + ZERO.toString()); - - /** - * Interface that accepts motion data and the transformed vector. - */ - public interface DataConsumer { - - /** - * Function for accepting motion data and the transformed vector. - * @param transformedVector The transformed vector. - * @param motionData The input motion data. - * @param sampleIndex The index of the current sample - * @param sampleRate The sample rate. - */ - void accept(Vector3f transformedVector, MotionData motionData, int sampleIndex, double sampleRate); } } diff --git a/docs/documentation/research-questions/motion-tracking-system-analysis.md b/docs/documentation/research-questions/motion-tracking-system-analysis.md index bef7d99..9a349ea 100644 --- a/docs/documentation/research-questions/motion-tracking-system-analysis.md +++ b/docs/documentation/research-questions/motion-tracking-system-analysis.md @@ -46,5 +46,5 @@ acceleration vector `A(x, y, z)` and rotation vector `R(x, y, z)` to an accelera perpendicular to the normal vector of the earth. This is because the acceleration vector of the device is relative to its own axes, and not to the earth's normal vector. To convert this, we'll have to multiply the acceleration vector `A(x, y, z)` by the rotation matrix -with negative angles, to rotate it back to be perpendicular with the normal of the earth. -After \ No newline at end of file +with negative angles, to rotate it back to be perpendicular with the normal of the earth. +After this transformation \ No newline at end of file diff --git a/docs/documentation/research-questions/position-tracking-research.md b/docs/documentation/research-questions/position-tracking-research.md index 9aa5001..f9edfa8 100644 --- a/docs/documentation/research-questions/position-tracking-research.md +++ b/docs/documentation/research-questions/position-tracking-research.md @@ -55,7 +55,8 @@ The software of the system will consist of the following: The Wii Fit Board will be connected to Pepper using the Wiiboard-simple library. The library will be used to read the sensor data from the Wii Fit Board and transfer it to Pepper. The position tracking algorithm will process the sensor data and determine the user's position. -Challenge: +Challenge: + - Connecting to the wii fit board. It is not possible to connect directly to the Wii Fit Board, it is necessary to use a library that can interpret the data sent by the Wii Fit Board. - The Wii Fit Balance Board sends data in a specific format. To interpret this data, it's necessary to understand the format and how to convert it to a usable format. - The Wii Fit Balance Board uses Bluetooth 2.0 to communicate. Pepper uses Bluetooth 4.0 this means that there might be compatibility issues/latancy issues. @@ -79,6 +80,9 @@ To be added ## References [Wiiboard lib](https://code.google.com/archive/p/wiiboard-simple/wikis/Documentation.wiki) +https://advanti-lab.sb.dfki.de/?page_id=64 +https://github.com/paulburton/fitscales +https://github.com/micromu/WiiRemoteJ ## Appendices diff --git a/docs/teamdocumentatie/sprint-reports/sprint-report-s1.md b/docs/teamdocumentatie/sprint-reports/sprint-report-s1.md index a9120f1..61889f5 100644 --- a/docs/teamdocumentatie/sprint-reports/sprint-report-s1.md +++ b/docs/teamdocumentatie/sprint-reports/sprint-report-s1.md @@ -80,6 +80,6 @@ Wat moet er beter? Wat ging er goed? Welke SMART leerdoelen hebben jullie voor d We zijn samen gaan zitten voor de retrospective, hier uit is het volgende voort gekomen (we hebben gebruik gemaakt van the 4 L's): -![alt text](Sprint1Retro.png) +![Retro](Sprint1Retro.png) De leerdoelen zet iedereen in zijn eigen scorion formulier. \ No newline at end of file