Commit Graph

633 Commits

Author SHA1 Message Date
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
SebasKoedam
456b959c5e 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:28:42 +02:00
SebasKoedam
baffe8b9ac chore: Update activity_fitness.xml layout and fix bug in ExerciseManager 2024-06-03 14:28:00 +02:00
Luca Warmenhoven
926f369ff0 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	code/src/Fitbot/app/src/main/java/com/example/fitbot/exercise/ExerciseManager.java
#	code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/activities/FitnessActivity.java
2024-06-03 14:27:34 +02:00
Luca Warmenhoven
868542dba9 Updated InputProcessor and FitnessActivity, fixed some issues. 2024-06-03 14:26:17 +02:00
53bc94aba3 Fixed it so it only pulls the ip once 2024-06-03 14:21:42 +02:00
Luca Warmenhoven
c084443799 Fixed database request handling 2024-06-03 14:13:06 +02:00
Luca Warmenhoven
9f2bb805f0 Merge remote-tracking branch 'origin/main' 2024-06-03 14:04:03 +02:00
SebasKoedam
67860a6397 chore: Add transparent color to colors.xml, fix bug in incoming_request_handlers.js, and add close button drawable and dialog layout files 2024-06-03 14:03:48 +02:00
Niels Gras
dde65dd2b9 small documentation for fitbord ideas 2024-06-03 13:51:57 +02:00
Luca Warmenhoven
882f07988d Merge remote-tracking branch 'origin/main' 2024-06-03 13:41:59 +02:00
Luca Warmenhoven
517b5f8438 Why 2024-06-03 13:41:10 +02:00
ab6010d517 Hardware documentation 2024-06-03 13:17:23 +02:00
cad5c8508e 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 12:56:31 +02:00
3145d3b3b0 Update esp server ip 2024-06-03 12:56:22 +02:00
b6353d15ba added endpoints for pepper and esp 2024-06-03 12:55:43 +02:00
99c68fae9a Update server ip adres in app 2024-06-03 12:55:34 +02:00
SebasKoedam
fc41cea618 fitness layout finished 2024-06-03 11:53:21 +02:00
594d0b91d0 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-05-31 16:36:58 +02:00
eda0601228 Added permissions to android manifest 2024-05-31 16:36:05 +02:00
a080b6c737 Script to pass ip adres from pepper to esp 2024-05-31 16:35:41 +02:00
Niels Gras
333317a9de Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-05-31 16:32:09 +02:00
Niels Gras
b9b4a9ca9b chore: Update Connectivity class with fetchIPAddress method 2024-05-31 16:32:06 +02:00
61dde95684 Added so pepper sends its ip to another ip 2024-05-31 16:07:39 +02:00
SebasKoedam
92223fbf52 fitness activity 2024-05-31 15:44:56 +02:00
Niels Gras
3db278f92c Add launcher background and icon resources 2024-05-31 13:06:11 +02:00
Niels Gras
8df96091b1 Merge remote-tracking branch 'origin/main' 2024-05-31 13:05:33 +02:00
Niels Gras
3a6edc2cf0 custom icon for app 2024-05-31 13:05:04 +02:00
SebasKoedam
58b466dd27 opmaak 2024-05-31 12:59:26 +02:00
bc3c720fc2 OOP 2024-05-31 12:58:04 +02:00