Commit Graph

662 Commits

Author SHA1 Message Date
SebasKoedam
8a02bf1daa Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-04 15:16:23 +02:00
SebasKoedam
62c97c3475 updated UI 2024-06-04 15:16:21 +02:00
Luca Warmenhoven
f4b11dd4ee Updated documentation 2024-06-04 14:48:58 +02:00
Luca Warmenhoven
7aaa2da981 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	docs/documentation/diagrams/infrastructure.md
2024-06-04 14:43:06 +02:00
Luca Warmenhoven
3f560d9f47 Updated documentation 2024-06-04 14:42:30 +02:00
8cd2b00eb0 Fix automatic ip adress esp 2024-06-04 14:40:06 +02:00
7539892131 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-04 14:39:33 +02:00
af0cdf43de Reflectieopdracht 2024-06-04 14:39:10 +02:00
Luca Warmenhoven
79a96bc193 Fixed order 2024-06-04 14:18:04 +02:00
SebasKoedam
67fece4e2e Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-04 14:16:19 +02:00
SebasKoedam
d604a6ef84 chore: Update Fitbot launcher background color 2024-06-04 14:16:17 +02:00
Niels Gras
f64d7ff34e armraise 2024-06-04 13:47:02 +02:00
SebasKoedam
13b2b2f821 Fixed description size 2024-06-04 12:58:14 +02:00
SebasKoedam
c0aa0b46e9 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-04 12:31:30 +02:00
SebasKoedam
19e50eefea Refactor database query to fetch a specific exercise by ExerciseID 2024-06-04 12:31:29 +02:00
Niels Gras
ed1097bc00 added expert docs 2024-06-04 12:18:43 +02:00
Niels Gras
ae479087f7 ideas for fitbord docs 2024-06-04 12:17:36 +02:00
Niels Gras
761de7955d Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-04 12:02:31 +02:00
SebasKoedam
398389aa5e added comments and optimized code 2024-06-04 11:32:05 +02:00
0c98744bdd fix crashes and video player, changed loading elements to UI thread 2024-06-04 11:25:49 +02:00
cd00d36166 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-04 10:33:43 +02:00
3b65fffec8 motion processing stuff + logs + fix crash (luca) 2024-06-04 10:31:24 +02:00
Niels
2118680b27 removed wrong conclusion 2024-06-04 00:04:58 +02:00
Niels
3cfea7fc6f added the research? 2024-06-04 00:03:55 +02:00
Niels
930553ffea added dataprotocol research 2024-06-04 00:03:34 +02:00
Niels Gras
4273a43a1a fixed squat 2024-06-03 16:30:07 +02:00
SebasKoedam
d0d09aa2d2 Refactor FitnessActivity code to remove commented out video playback function 2024-06-03 16:28:56 +02:00
SebasKoedam
77875c45d6 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-03 16:25:36 +02:00
SebasKoedam
46ba5dbdbd video will now be displayed with link from database 2024-06-03 16:25:35 +02:00
ffb90c001d Refactoring 2024-06-03 16:17:27 +02:00
Niels Gras
452aad6929 added squat 2024-06-03 15:59:26 +02:00
Niels Gras
296d2f0fbf changed movement 2024-06-03 15:51:17 +02:00
Niels Gras
7264811444 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-03 15:32:34 +02:00
Niels Gras
d167aed8a6 added sound 2024-06-03 15:32:31 +02:00
Luca Warmenhoven
328cd2402a Merge remote-tracking branch 'origin/main' 2024-06-03 15:24:20 +02:00
Luca Warmenhoven
18ec63fcd1 Updated some stuff 2024-06-03 15:23:57 +02:00
Niels Gras
d46c0a8a92 changed file name 2024-06-03 15:18:59 +02:00
10b0421f90 Infrastructure update 2024-06-03 15:05:25 +02:00
e0794522b6 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-03 14:55:39 +02:00
f90bfb4d6e Update infrastructure 2024-06-03 14:55:36 +02:00
Luca Warmenhoven
b1bbe9531b Merge remote-tracking branch 'origin/main' 2024-06-03 14:55:27 +02:00
Luca Warmenhoven
627b50f7d5 Updated some stuff 2024-06-03 14:55:24 +02:00
SebasKoedam
f4fd183408 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-03 14:55:14 +02:00
SebasKoedam
85c6e4e918 feat: Add short description field to Exercise class 2024-06-03 14:55:13 +02:00
33a2f1ed70 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-03 14:48:26 +02:00
9639d6ba3b hardware docs update 2024-06-03 14:48:18 +02:00
Niels Gras
902cc184ee added arm circle movement 2024-06-03 14:47:51 +02:00
c0d002c46b Luca's attempt at fixing app 2024-06-03 14:47:31 +02:00
Niels Gras
7574a3eaea Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-06-03 14:32:00 +02:00
Niels Gras
f1464653b0 added comments 2024-06-03 14:31:39 +02:00