Commit Graph

669 Commits

Author SHA1 Message Date
ab88c5625b pipeline fix 2024-04-26 10:52:50 +02:00
bf99aab6ae Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-04-26 10:51:49 +02:00
4c5d21ce6b Documentation about sensors 2024-04-26 10:51:41 +02:00
Niels
6d745a0449 expanded the research of colors a bit 2024-04-25 23:43:07 +02:00
38695b9cfb Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-04-25 21:29:37 +02:00
3af435116f Updated documenation 2024-04-25 21:29:32 +02:00
SebasKoedam
a824d4d37b Update Fitbot app resources and dependencies 2024-04-25 20:32:21 +02:00
SebasKoedam
daddd73dfb Add new files for Fitbot app: MainScreen.java, main_menu.xml, toolbar.xml, header.xml, ic_baseline_home_48.xml, ic_baseline_star_rate_48.xml, ic_baseline_settings_48.xml 2024-04-25 20:32:14 +02:00
SebasKoedam
0805990af5 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-04-25 17:02:53 +02:00
SebasKoedam
842f8dc41a Update Pepper Setup link in documentation 2024-04-25 17:02:52 +02:00
Niels
adfc60c827 moved files and started researching colors 2024-04-25 16:21:29 +02:00
Niels
63b4b74132 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-04-25 15:44:42 +02:00
Niels
5bf81d1713 added image buttons and change mainscreen to powerscreen 2024-04-25 15:13:25 +02:00
SebasKoedam
82d12efacb added pepper docs to pages 2024-04-25 15:09:11 +02:00
SebasKoedam
88f0805139 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-04-25 14:50:38 +02:00
SebasKoedam
41aa418dab Add guide for setting up Android Studio for Pepper SDK 2024-04-25 14:50:37 +02:00
0f66ece3f2 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-04-25 14:30:32 +02:00
f4443f36ce Made class to play animations on robot 2024-04-25 14:30:12 +02:00
SebasKoedam
b1653820ae Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-04-25 14:20:19 +02:00
SebasKoedam
53332d59ef Update Fitbot project files and daily updates documentation 2024-04-25 14:19:04 +02:00
d7f5daae1b Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-04-25 13:50:02 +02:00
5f6ff11f4a Added libraries 2024-04-25 13:49:46 +02:00
e2daa41f8b Images 2024-04-25 13:49:22 +02:00
cf7ad0f461 Tutorial on how to make arms move 2024-04-25 13:49:11 +02:00
Niels
d33e60e0ef videoviewer documentation 2024-04-25 13:23:32 +02:00
f55a9c7d8f Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-04-25 11:50:01 +02:00
5955d02586 aanleiding geupdate opdracht 2024-04-25 11:49:55 +02:00
Niels
969d004d1a fixed file and class names and added Completion Screen 2024-04-24 21:12:35 +02:00
f7c9e9ea01 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-04-24 16:53:51 +02:00
c40be9ecc9 animation 2024-04-24 16:50:24 +02:00
9955dd5854 added libraries and attempted to call class in mainactivity 2024-04-24 16:50:16 +02:00
Luca Warmenhoven
547cccc27f Merge remote-tracking branch 'origin/main'
# Conflicts:
#	code/src/Fitbot/.idea/deploymentTargetDropDown.xml
#	code/src/Fitbot/app/src/main/java/com/example/fitbot/MainActivity.java
2024-04-24 15:59:43 +02:00
Luca Warmenhoven
4b44533c36 Added test UI for selecting sport items 2024-04-24 15:59:24 +02:00
SebasKoedam
82a2f28927 Fix import statements in MainActivity.java 2024-04-24 15:19:37 +02:00
SebasKoedam
ca89d7af94 Update Fitbot project files and add robot conversation in MainActivity.java 2024-04-24 15:18:22 +02:00
ea184c9fc4 Added new libraries and made it so it can speak dutch 2024-04-24 13:58:27 +02:00
Luca Warmenhoven
0c1bff838e Added SpeechGenerator.java 2024-04-24 13:56:45 +02:00
SebasKoedam
0482c2b386 Add deploymentTargetDropDown.xml file for Fitbot project 2024-04-24 12:35:32 +02:00
2ad9330042 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-04-24 12:29:20 +02:00
9f891d41c6 Added issues 2024-04-24 12:28:34 +02:00
Niels
7d996bcb52 added video files 2024-04-23 19:25:09 +02:00
SebasKoedam
e3fc105e7c Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-04-23 14:40:59 +02:00
SebasKoedam
45805c4c6f Update project files and remove unused files 2024-04-23 14:40:57 +02:00
SebasKoedam
b505086a66 Add Fitbot project files and update Gradle settings 2024-04-23 14:40:49 +02:00
71a10d2c3d Added extra info 2024-04-23 12:40:03 +02:00
3e6634f5fe Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 2024-04-23 12:25:33 +02:00
44fcc41f11 pepper sdk 2024-04-23 12:25:22 +02:00
7cb05ba4fc appsetup documentation 2024-04-23 12:24:37 +02:00
Luca Warmenhoven
109147c2b2 Final update onderzoek-formulier.md 2024-04-23 11:20:13 +02:00
Luca Warmenhoven
9506665a3e Final update onderzoek-formulier.md 2024-04-23 09:52:47 +02:00