Commit Graph

118 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
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
536c8c75af feat: Update FitBot architecture diagrams 2024-05-20 14:27:30 +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
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
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
Luca Warmenhoven
3edab82535 Added example exercises 2024-05-17 12:42:10 +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
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
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
Luca Warmenhoven
9107d5d9f7 Merge remote-tracking branch 'origin/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:32:56 +02:00
Luca Warmenhoven
612b1c8a7c bread 2024-05-15 16:32:38 +02:00
Luca Warmenhoven
606a05aa13 Updated path math, started with 3d path to 2d screen space projection 2024-05-15 16:32:33 +02:00
Luca Warmenhoven
8224327a01 bread 2024-05-15 16:29:22 +02:00
Niels Gras
5dbbacd140 Update button ID in activity_end_screen.xml 2024-05-15 16:09:05 +02:00
Niels Gras
f06287d562 Added new XML files for vcs and modules configuration 2024-05-15 14:54:16 +02:00
Niels Gras
c8d90c0992 Added new XML file for rectangle drawable and renamed activity_completion_screen.xml to activity_end_screen.xml 2024-05-15 14:54:06 +02:00
3a7d1cb72c 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 13:45:16 +02:00
92a1c2b650 Repaired the websocket connector
for some reason it doesnt wannar in a class
2024-05-15 13:45:13 +02:00
SebasKoedam
307a06e53f feat: Add FitnessActivity for fitness tracking functionality 2024-05-15 12:36:50 +02:00
Luca Warmenhoven
20a2f3b6d5 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java
#	code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/MainActivity.java
#	code/src/Fitbot/app/src/main/java/com/example/fitbot/util/processing/MotionProcessor.java
2024-05-15 10:44:11 +02:00
Luca Warmenhoven
11489682eb Updated path math, started with 3d path to 2d screen space projection 2024-05-15 01:10:51 +02:00
1c39bf9153 cleanup + serial communication for setting zeropoint and put wifi in its own class 2024-05-14 16:01:41 +02:00
SebasKoedam
7bc97e93c2 optimized file structure 2024-05-14 14:34:02 +02:00
Luca Warmenhoven
490a97ae78 Updated PersonalMotionPreviewElement (previously SportPreviewCanvas) 2024-05-14 14:15:12 +02:00
Luca Warmenhoven
b7459f531b Added SportPreviewActivity and SportPreviewCanvas 2024-05-14 13:40:59 +02:00
Luca Warmenhoven
714a8a1c51 Merge remote-tracking branch 'origin/main' 2024-05-14 12:58:44 +02:00
Luca Warmenhoven
a276b6fcb1 Updated motion processing and WebSocket code. 2024-05-14 12:58:38 +02:00
SebasKoedam
58613e5c5d chore: Update button IDs in activity_main.xml 2024-05-14 12:58:24 +02:00
Luca Warmenhoven
98d30d6bc4 Updated motion processing and WebSocket code. 2024-05-14 12:57:29 +02:00