From 4f57b872652c850e177d0e0f968eadac873af57a Mon Sep 17 00:00:00 2001 From: Sam Hos Date: Mon, 20 May 2024 12:33:51 +0200 Subject: [PATCH 1/3] Added source --- docs/documentation/android/javaClasses.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/documentation/android/javaClasses.md b/docs/documentation/android/javaClasses.md index dba5fbd..f7b2bb0 100644 --- a/docs/documentation/android/javaClasses.md +++ b/docs/documentation/android/javaClasses.md @@ -110,4 +110,5 @@ public class MyClass { ## Sources -* https://www.w3schools.com/java/java_modifiers.asp +* https://www.w3schools.com/java/java_modifiers.asp explanation of modifiers +* https://en.wikipedia.org/wiki/Syntax_diagram For syntax diagram \ No newline at end of file From 180817d073b6addfba99e0fad353c5da3b2e869d Mon Sep 17 00:00:00 2001 From: Sam Hos Date: Mon, 20 May 2024 12:34:24 +0200 Subject: [PATCH 2/3] Set correct name --- docs/documentation/hardware/pcb.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/documentation/hardware/pcb.md b/docs/documentation/hardware/pcb.md index 2f2050a..2142df2 100644 --- a/docs/documentation/hardware/pcb.md +++ b/docs/documentation/hardware/pcb.md @@ -8,7 +8,7 @@ #define PIN_IMU_INT_2 D6 ``` ## What does the pcb do -The pcb on itself is a espd1mini with no sensors or battery. You need to manual solder a battery and sensor of your choice to the pcb. +The pcb on itself is a ESP8266 with no sensors or battery. You need to manual solder a battery and sensor of your choice to the pcb. ## Original usage These pcb's where originally designed for virtual reality fullbody tracking. They are basicly movement trackers that can be used to track the movement of the body. We can also use this really well for our project. From ba0ae4c6b728dbfbc1cb91ee61cddf0c4850dd59 Mon Sep 17 00:00:00 2001 From: Niels Gras Date: Tue, 21 May 2024 12:43:12 +0200 Subject: [PATCH 3/3] fixed build errors --- code/src/Fitbot/.idea/misc.xml | 1 + .../main/java/com/example/fitbot/EndScreenActivity.java | 2 ++ code/src/Fitbot/app/src/main/res/values/themes.xml | 7 +++---- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/src/Fitbot/.idea/misc.xml b/code/src/Fitbot/.idea/misc.xml index fb7fa9e..adba5f8 100644 --- a/code/src/Fitbot/.idea/misc.xml +++ b/code/src/Fitbot/.idea/misc.xml @@ -13,6 +13,7 @@ + diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/EndScreenActivity.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/EndScreenActivity.java index a12c853..3670db5 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/EndScreenActivity.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/EndScreenActivity.java @@ -5,6 +5,8 @@ import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.widget.Button; +import com.example.fitbot.ui.activities.MainActivity; + public class EndScreenActivity extends AppCompatActivity { @Override diff --git a/code/src/Fitbot/app/src/main/res/values/themes.xml b/code/src/Fitbot/app/src/main/res/values/themes.xml index 14f6b4a..d524593 100644 --- a/code/src/Fitbot/app/src/main/res/values/themes.xml +++ b/code/src/Fitbot/app/src/main/res/values/themes.xml @@ -6,9 +6,8 @@ @color/purple_700 @color/teal_200 - - - - + + + \ No newline at end of file