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

Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66

Browse Source
This commit is contained in:
Sam Hos
2024-06-07 16:21:51 +02:00
parent 495aaa9b09 465df515ed
commit 0a250ed238
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/arduino/Movement-sensor-code/SensorManager.h
View File

@@ -4,6 +4,7 @@
#include "Arduino.h" #include "Arduino.h"
#include "SparkFun_BNO080_Arduino_Library.h" #include "SparkFun_BNO080_Arduino_Library.h"
// declare the class SensorManager with all functions
class SensorManager { class SensorManager {
public: public:
SensorManager(); SensorManager();
@@ -18,7 +19,7 @@ public:
float y; float y;
float z; float z;
}; };
// void sendData(float roll, float pitch, float yaw);
eulerAngles getEulerAngles(); eulerAngles getEulerAngles();
acceleration getAcelleration(); acceleration getAcelleration();
bool sensorTap(); bool sensorTap();
@@ -31,7 +32,7 @@ private:
float k; float k;
float w; float w;
}; };
RotationQuaternions getQuaternions(); RotationQuaternions getQuaternions(); // get the quaternions from the sensor
BNO080 myIMU; BNO080 myIMU;
}; };

2
code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/HelpActivity.java
View File

@@ -14,7 +14,7 @@ public class HelpActivity extends AppCompatActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_help); setContentView(R.layout.activity_help);
Pepper.say("@string/uitlegStart"+"@string/uitlegHome"); Pepper.say("Welkom bij FitBot. De robot die helpt om fit te blijven. Druk op Start om de oefening te beginnen. Ga terug naar het begin scherm door op het huisje te klikken");