Commit Graph

290 Commits

Author SHA1 Message Date
SebasKoedam
bead6a5a13 ```text
feat: Update DeviceScanner to include ESP UUID characteristic

The DeviceScanner class in the Fitbot app is updated to include the ESP UUID characteristic for Bluetooth communication. This change adds the UUID "beb5483e-36e1-4688-b7f5-ea07361b26a8" to the CORRECT_CHARACTERISTIC_UUID constant. The purpose of this change is to enable communication with ESP32 devices.
2024-05-31 11:14:22 +02:00
SebasKoedam
49f97b57dd test is able to recieve data once 2024-05-21 15:51:04 +02:00
SebasKoedam
0153b70578 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 into 53-als-gebruiker-wil-ik-dat-mijn-positie-wordt-gemeten-zodat-dit-gebruikt-kan-worden-voor-bepaalde 2024-05-21 12:56:12 +02:00
SebasKoedam
39f3d4bb1d feat: Add Arduino code for position tracking
The code changes include adding a new Arduino sketch for position tracking. The sketch is located at `code/arduino/Position-tracking/Position-tracking.ino`. Additionally, a new class `PositionSensor` is added with its corresponding header and implementation files. This class handles the position sensor functionality and includes methods for initialization and measurement.

The commit message suggests that the changes are a new feature addition related to position tracking in the Arduino code.
2024-05-21 12:55:14 +02:00
Niels Gras
ba0ae4c6b7 fixed build errors 2024-05-21 12:43:12 +02:00
59d7c4f1ec Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-05-21 12:31:15 +02:00
SebasKoedam
a4907f00c8 added new research 2024-05-21 11:29:05 +02:00
SebasKoedam
67045ed342 Merge branch '53-als-gebruiker-wil-ik-dat-mijn-bewegingen-op-het-wii-fit-board-worden-gemeten-zodat-dit-gebruikt' 2024-05-21 11:25:19 +02:00
SebasKoedam
29c5e99017 chore: Add skill development plan documentation 2024-05-21 10:21:50 +02:00
SebasKoedam
a901c0f205 feat: Remove unused code and update Arduino board configuration 2024-05-20 15:31:25 +02:00
SebasKoedam
14f46775dd feat: Update FitBot architecture diagrams 2024-05-20 15:19:23 +02:00
SebasKoedam
536c8c75af feat: Update FitBot architecture diagrams 2024-05-20 14:27:30 +02:00
180817d073 Set correct name 2024-05-20 12:34:24 +02:00
4f57b87265 Added source 2024-05-20 12:33:51 +02:00
90487db6f0 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-05-20 12:31:12 +02:00
7b1a1f3f2b personaldocs 2024-05-20 12:31:08 +02:00
83a471ab06 Basic syntax diagram 2024-05-17 16:03:41 +02:00
72ca6bc77b Fix typos in sensors.md 2024-05-17 15:59:39 +02:00
Luca Warmenhoven
1fea68d90a Merge remote-tracking branch 'origin/main' 2024-05-17 15:28:49 +02:00
Luca Warmenhoven
368067eb8b Updated manifest 2024-05-17 15:28:43 +02:00
Luca Warmenhoven
6e8a66e327 Merge 2024-05-17 15:03:54 +02:00
Luca Warmenhoven
fb63b1364a Merge remote-tracking branch 'refs/remotes/origin/35-als-gebruiker-wil-ik-live-mijn-bewegingen-doen-zodat-ik-kan-inzien-of-ik-het-goed-doe' 2024-05-17 15:03:20 +02:00
Luca Warmenhoven
13fca50d6f Updated .gitignore 2024-05-17 14:56:20 +02:00
Luca Warmenhoven
7442d1fca4 Added fitness activity switching 2024-05-17 14:53:45 +02:00
Niels Gras
aa33bf2f12 Merge branch '54-als-gebruiker-wil-ik-een-scherm-waar-ik-mijn-score-kan-zien-na-de-oefeningen-zodat-ik-een' into 'main'
Resolve "Als gebruiker wil ik een scherm waar ik mijn score kan zien na de oefeningen zodat ik een inzicht heb van wat ik heb gedaan"

Closes #54

See merge request propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66!5
2024-05-17 13:34:08 +02:00
Niels Gras
2fdc8a7189 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 into 54-als-gebruiker-wil-ik-een-scherm-waar-ik-mijn-score-kan-zien-na-de-oefeningen-zodat-ik-een 2024-05-17 13:33:32 +02:00
Niels Gras
6b40c5c079 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-05-17 13:32:17 +02:00
Niels Gras
6720b2af3d Added new drawable and layout files for Fitbot app 2024-05-17 13:31:59 +02:00
Niels Gras
f9e340a500 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 into 54-als-gebruiker-wil-ik-een-scherm-waar-ik-mijn-score-kan-zien-na-de-oefeningen-zodat-ik-een 2024-05-17 13:30:47 +02:00
Luca Warmenhoven
cfcbe7d51c Added Gson for JSON parsing, added Exercise retriever 2024-05-17 13:25:50 +02:00
SebasKoedam
7dc0c7bc72 feat: Update FitBot architecture diagrams
The FitBot architecture diagrams have been updated to include a new version of the architecture diagram and a deployment diagram. These diagrams provide a visual representation of the infrastructure of FitBot.
2024-05-17 12:44:53 +02:00
Luca Warmenhoven
3edab82535 Added example exercises 2024-05-17 12:42:10 +02:00
SebasKoedam
031d766205 added docs voor expert 2 2024-05-17 12:35:55 +02:00
Luca Warmenhoven
3fe90ce547 Merge remote-tracking branch 'origin/main' 2024-05-17 12:32:59 +02:00
Luca Warmenhoven
59c374eb02 Added sport activity abstraction classes 2024-05-17 12:32:54 +02:00
Niels
866484c85b fixed color 2024-05-16 23:32:48 +02:00
Niels
87e8b725e4 Added curves on endscreen 2024-05-16 23:24:09 +02:00
SebasKoedam
54cf012288 i tried :(((((((((((((((((((((((((((((((((((( 2024-05-16 14:30:57 +02:00
SebasKoedam
01498b5643 Code is able to discover bluetooth devices but cant connect to the balance board 2024-05-16 11:30:10 +02:00
03b056811d Name change 2024-05-15 17:03:32 +02:00
58f1b14ab6 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-05-15 17:03:07 +02:00
ab73c5012b java class explanation 2024-05-15 17:03:02 +02:00
Luca Warmenhoven
a4a01ae9ef fixed issues 2024-05-15 16:50:22 +02:00
Luca Warmenhoven
5b5934d985 g 2024-05-15 16:44:25 +02:00
Luca Warmenhoven
b89dab7792 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	code/src/Fitbot/app/src/main/AndroidManifest.xml
#	code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java
2024-05-15 16:44:07 +02:00
SebasKoedam
32020ce801 feat: Add Java build configuration update to .vscode/settings.json 2024-05-15 16:42:21 +02:00
SebasKoedam
4d169a5e74 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-05-15 16:42:11 +02:00
SebasKoedam
3ca982c36f feat: Add Bluetooth permissions and location permission to AndroidManifest.xml 2024-05-15 16:41:32 +02:00
Luca Warmenhoven
ce5f50439a fixed 2024-05-15 16:40:35 +02:00
Luca Warmenhoven
37ef0aa118 Merge branch 'refs/heads/35-als-gebruiker-wil-ik-live-mijn-bewegingen-doen-zodat-ik-kan-inzien-of-ik-het-goed-doe'
# Conflicts:
#	code/src/Fitbot/app/src/main/AndroidManifest.xml
#	code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java
2024-05-15 16:35:40 +02:00