diff --git a/code/arduino/Movement-sensor-code/SensorManager.h b/code/arduino/Movement-sensor-code/SensorManager.h index 141ffd8..41f800f 100644 --- a/code/arduino/Movement-sensor-code/SensorManager.h +++ b/code/arduino/Movement-sensor-code/SensorManager.h @@ -4,6 +4,7 @@ #include "Arduino.h" #include "SparkFun_BNO080_Arduino_Library.h" +// declare the class SensorManager with all functions class SensorManager { public: SensorManager(); @@ -18,7 +19,7 @@ public: float y; float z; }; - +// void sendData(float roll, float pitch, float yaw); eulerAngles getEulerAngles(); acceleration getAcelleration(); bool sensorTap(); @@ -31,7 +32,7 @@ private: float k; float w; }; - RotationQuaternions getQuaternions(); + RotationQuaternions getQuaternions(); // get the quaternions from the sensor BNO080 myIMU; }; diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/HelpActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/HelpActivity.java index 15e36a0..7dab65d 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/HelpActivity.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/HelpActivity.java @@ -14,7 +14,7 @@ public class HelpActivity extends AppCompatActivity { super.onCreate(savedInstanceState); 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");