Smikkelbakje/J1B4-Fitbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	code/src/Fitbot/app/src/main/AndroidManifest.xml
#	code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java
This commit is contained in:
Luca Warmenhoven
2024-05-15 16:44:07 +02:00
parent 9107d5d9f7 32020ce801
commit b89dab7792
9 changed files with 58 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/src/Fitbot/app/src/main/AndroidManifest.xml
View File

@@ -4,6 +4,10 @@
<uses-feature android:name="com.softbank.hardware.pepper" />
<uses-permission android:name="android.permission.BLUETOOTH"/>
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
@@ -12,19 +16,7 @@
android:supportsRtl="true"
android:theme="@style/Theme.Fitbot" >
<activity
android:name=".Completion_Screen"
android:exported="false" />
<activity
android:name=".BicepVideo"
android:exported="false" />
<activity
android:name=".PowerScreen"
android:exported="false" />
<activity
android:name=".MainActivity"
android:exported="true" />
<activity
android:name=".MainScreen"
android:name=".ui.activities.MainActivity"
android:exported="true" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

4
code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java
View File

@@ -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;

14
code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/IMotionDataConsumer.java Normal file
View File

@@ -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);
}

16
code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/MotionProcessor.java
View File

@@ -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);
}
}