Commit Graph

92 Commits

Author SHA1 Message Date
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
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
Luca Warmenhoven
59e1cfab94 Updated motion processing and WebSocket code. 2024-05-14 12:57:25 +02:00
Luca Warmenhoven
a16bd22e99 Updated error function calculation to be more efficient 2024-05-14 12:57:10 +02:00
Luca Warmenhoven
8bbf5750f6 Added error calculations for GesturePath :: MotionProcessor.averageError, MotionProcessor.getErrors, GesturePath::getError 2024-05-14 12:56:51 +02:00
Luca Warmenhoven
8db4e8a208 Updated math behind path error calculation, fixed WebSocket not starting. 2024-05-14 12:56:27 +02:00
Luca Warmenhoven
d533ce97bb Added motion processing, fixed WebSocket packet processing, added Vector math to process motion data 2024-05-14 12:55:54 +02:00
Luca Warmenhoven
c5b08a4907 Added basic WebSocket functionality (no decoding yet) 2024-05-14 12:55:54 +02:00
Luca Warmenhoven
7936137912 Merge remote-tracking branch 'refs/remotes/origin/44-als-gebruiker-wil-ik-dat-ik-feedback-krijg-als-mijn-bewegingen-niet-optimaal-zijn-zodat-ik-weet'
# Conflicts:
#	code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java
#	code/src/Fitbot/app/src/main/java/com/example/fitbot/MainScreen.java
2024-05-14 12:15:19 +02:00
SebasKoedam
a28f7a28e5 Add ERD, EERD, and infrastructure documentation 2024-05-13 15:07:08 +02:00
SebasKoedam
45d211c71b Add darkred_button_gradient.xml and red_button_gradient.xml drawables 2024-05-13 15:07:00 +02:00
7cd7ed1545 Websocket server (stolen from last project) 2024-05-12 19:14:18 +02:00
1f7f4dcdbe send data in json format 2024-05-12 18:59:35 +02:00
c7c3ebe1c2 wifi and websocket connection added 2024-05-12 18:42:40 +02:00
Luca Warmenhoven
8724bf61c4 Updated motion processing and WebSocket code. 2024-05-10 12:49:24 +02:00
Luca Warmenhoven
f422e0a948 Updated error function calculation to be more efficient 2024-05-09 17:12:59 +02:00
Luca Warmenhoven
3e0e71489e Added error calculations for GesturePath :: MotionProcessor.averageError, MotionProcessor.getErrors, GesturePath::getError 2024-05-09 16:15:24 +02:00
4c80c69312 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-05-08 16:22:48 +02:00
ca34413fd7 Added wifi 2024-05-08 16:22:44 +02:00
Luca Warmenhoven
2ff4d8937a Added comment to incoming_request_handlers.js 2024-05-08 15:53:46 +02:00
Luca Warmenhoven
bc3ee24de1 Merge remote-tracking branch 'origin/main' 2024-05-08 15:47:45 +02:00
Luca Warmenhoven
b1db3b5612 Added basic server files for RaspBerry Pi 2024-05-08 15:47:41 +02:00
Luca Warmenhoven
ed49392210 Updated math behind path error calculation, fixed WebSocket not starting. 2024-05-08 15:41:04 +02:00
2c51596996 changed measuring datatype to quanternions and convert them to radials and degrees 2024-05-08 15:12:49 +02:00
Luca Warmenhoven
1695f08fb2 Added motion processing, fixed WebSocket packet processing, added Vector math to process motion data 2024-05-08 14:40:14 +02:00
c7951c3d9f Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-05-08 14:09:44 +02:00
6a20c8f16d class and script creation 2024-05-08 14:09:03 +02:00
Luca Warmenhoven
88c9908f1c Added basic WebSocket functionality (no decoding yet) 2024-05-07 16:25:10 +02:00