Commit Graph

Select branches

Hide Pull Requests

35-als-gebruiker-wil-ik-live-mijn-bewegingen-doen-zodat-ik-kan-inzien-of-ik-het-goed-doe

44-als-gebruiker-wil-ik-dat-ik-feedback-krijg-als-mijn-bewegingen-niet-optimaal-zijn-zodat-ik-weet

51-als-gebruiker-wil-ik-dat-pepper-mee-beweegt-tijdens-oefeningen-zodat-ik-meer-motivatie-heb-om

53-als-gebruiker-wil-ik-dat-mijn-bewegingen-op-het-wii-fit-board-worden-gemeten-zodat-dit-gebruikt

53-als-gebruiker-wil-ik-dat-mijn-positie-wordt-gemeten-zodat-dit-gebruikt-kan-worden-voor-bepaalde

59-als-student-wil-ik-dat-de-ui-in-mijn-app-overal-het-zelfde-is-en-in-het-nederlands-wordt

main

Mono Color

• bead6a5a13 ```text feat: Update DeviceScanner to include ESP UUID characteristic 53-als-gebruiker-wil-ik-dat-mijn-positie-wordt-gemeten-zodat-dit-gebruikt-kan-worden-voor-bepaalde SebasKoedam 2024-05-31 11:14:22 +02:00
• 84bdc7ca59 Renamed functions for clarity Luca Warmenhoven 2024-05-30 17:57:49 +02:00
• 826ae8a9c7 Added motion recording functionality in InputProcessor (setRecording) and recorded data conversion to string for in the database (convertRecordedDataToString) Luca Warmenhoven 2024-05-30 17:41:06 +02:00
• 3f37f44f22 Removed FitnessCycle, reformatted code, made Pepper actions globally accessible Luca Warmenhoven 2024-05-30 17:16:09 +02:00
• b4ce40ca7d Merge remote-tracking branch 'origin/main' Luca Warmenhoven 2024-05-30 16:38:56 +02:00
• f7e96cf356 Added Pepper abstraction for synchronous events to prevent app from crashing Luca Warmenhoven 2024-05-30 16:38:48 +02:00
• 985d0b5219 refactor: Update layout for FitnessActivity SebasKoedam 2024-05-30 16:32:10 +02:00
• fa48f71407 Added hideUI in nav Manager SebasKoedam 2024-05-30 15:57:49 +02:00
• a0988bf8cc Merge remote-tracking branch 'origin/main' Luca Warmenhoven 2024-05-30 15:38:16 +02:00
• 5c3b84b3ae Updated exercise handling code to make pepper more verbal Luca Warmenhoven 2024-05-30 15:38:11 +02:00
• e61ed86ea9 feat: Add exercise details to API response SebasKoedam 2024-05-30 15:35:43 +02:00
• 4bd1419a8b added new request handlers SebasKoedam 2024-05-30 15:23:46 +02:00
• 562a863595 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Sam Hos 2024-05-30 14:16:17 +02:00
• 18ae9f0768 Testkaart Sam Hos 2024-05-30 14:16:09 +02:00
• 1426e039d1 Issues with hardware Sam Hos 2024-05-30 14:16:04 +02:00
• af490e6f2e Animations for pepper Sam Hos 2024-05-30 14:15:47 +02:00
• 045e7fbe91 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Sam Hos 2024-05-30 14:14:41 +02:00
• f656a61b98 Infrastructure diagram Sam Hos 2024-05-30 14:14:37 +02:00
• c6875d2ac7 Merge remote-tracking branch 'origin/main' Luca Warmenhoven 2024-05-30 14:12:31 +02:00
• e5c91b53f7 Updated motion handling, updated FitnessActivity to match motion handling Luca Warmenhoven 2024-05-30 14:11:16 +02:00
• 5685683aaf last ui changes SebasKoedam 2024-05-30 12:36:15 +02:00
• 20b75278f0 Fixed button ids SebasKoedam 2024-05-30 10:43:56 +02:00
• 17f40a7a07 Merge branch '59-als-student-wil-ik-dat-de-ui-in-mijn-app-overal-het-zelfde-is-en-in-het-nederlands-wordt' SebasKoedam 2024-05-30 10:01:59 +02:00
• 5753f7047d finished all ui 59-als-student-wil-ik-dat-de-ui-in-mijn-app-overal-het-zelfde-is-en-in-het-nederlands-wordt SebasKoedam 2024-05-30 10:01:35 +02:00
• dc68acc2a5 daily updates Sebas Koedam 2024-05-30 08:37:58 +02:00
• 7b72554110 poepies SebasKoedam 2024-05-29 18:34:53 +02:00
• 59c906918e added style for help menu SebasKoedam 2024-05-29 18:31:03 +02:00
• 406e2843f4 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Sam Hos 2024-05-29 17:56:59 +02:00
• 3e2a36c185 disabled accelerometer (use past commit for this script to work for app) Sam Hos 2024-05-29 17:56:47 +02:00
• fbe392d511 removal of junk and changes made by luca Sam Hos 2024-05-29 17:34:24 +02:00
• 9f17cf9d8b added docs about the usertest Niels Gras 2024-05-29 17:27:29 +02:00
• 7efdf3579e Added new style for fitness activity SebasKoedam 2024-05-29 17:17:29 +02:00
• f350e58fda Junk removal Sam Hos 2024-05-29 16:30:35 +02:00
• 447ef3a6af toolbar navigation button white SebasKoedam 2024-05-29 16:30:24 +02:00
• 98c4df1ad5 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Sam Hos 2024-05-29 16:18:56 +02:00
• 2e8feb686b Updated PersonalMotionPreviewElement Luca Warmenhoven 2024-05-29 16:18:48 +02:00
• 426725a632 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 into 59-als-student-wil-ik-dat-de-ui-in-mijn-app-overal-het-zelfde-is-en-in-het-nederlands-wordt SebasKoedam 2024-05-29 16:14:12 +02:00
• 4b46738bf0 fixed the main menu bars and theme SebasKoedam 2024-05-29 16:12:37 +02:00
• 34dc294d06 fixed the main menu bars and theme SebasKoedam 2024-05-29 16:12:23 +02:00
• bceef3bde1 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Sam Hos 2024-05-29 16:11:54 +02:00
• 2426e7b2e2 Updated PersonalMotionPreviewElement Luca Warmenhoven 2024-05-29 16:11:43 +02:00
• ba92ae62c7 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Sam Hos 2024-05-29 16:06:15 +02:00
• 6ffbb503c9 Added more logging for debugging functionality Luca Warmenhoven 2024-05-29 16:06:10 +02:00
• 8441097bf1 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Sam Hos 2024-05-29 15:56:50 +02:00
• 9b71df061f change array Sam Hos 2024-05-29 15:56:04 +02:00
• bd9ace61e9 Added more logging for debugging functionality Luca Warmenhoven 2024-05-29 15:55:37 +02:00
• 60a45fd510 Merge remote-tracking branch 'origin/main' Luca Warmenhoven 2024-05-29 15:39:34 +02:00
• a6977b057c Added more logging for debugging functionality Luca Warmenhoven 2024-05-29 15:39:13 +02:00
• 7e60d5e5e6 fixed type error causing bootloop Sam Hos 2024-05-29 15:35:29 +02:00
• 4270ecde7f Merge remote-tracking branch 'origin/main' Luca Warmenhoven 2024-05-29 15:22:49 +02:00
• 3966824b76 Yebal Luca Warmenhoven 2024-05-29 15:22:39 +02:00
• 9ad44897ff optimization Sam Hos 2024-05-29 15:22:38 +02:00
• 0441133744 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Sam Hos 2024-05-29 15:15:23 +02:00
• c3329a4c52 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Sam Hos 2024-05-29 15:15:14 +02:00
• 4c8c9d9f32 Merge branch '57-als-gebruiker-wil-ik-een-uitleg-scherm-zodat-ik-kan-zien-wat-fitbot-inhoudt' into 'main' Niels Gras 2024-05-29 15:14:48 +02:00
• 447a021b10 Added more logging for debugging functionality Luca Warmenhoven 2024-05-29 15:13:04 +02:00
• 49eb09b105 added logging Sam Hos 2024-05-29 15:12:27 +02:00
• ea9a35030b qi.sdk unregister added Sam Hos 2024-05-29 15:12:18 +02:00
• 940202d9f4 Edited help screen Niels Gras 2024-05-29 14:00:45 +02:00
• 4983162ac9 Merge remote-tracking branch 'origin/main' Luca Warmenhoven 2024-05-29 13:41:00 +02:00
• 95ed46d9ac cermit Luca Warmenhoven 2024-05-29 13:40:53 +02:00
• d6fc5098dd Update database host to use IP address instead of localhost SebasKoedam 2024-05-29 13:06:55 +02:00
• b8e3e89bb2 Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 SebasKoedam 2024-05-29 13:04:59 +02:00
• c362a41f06 added infrastructure documentation SebasKoedam 2024-05-29 13:04:57 +02:00
• bd74b0b5aa Merge remote-tracking branch 'origin/main' Luca Warmenhoven 2024-05-29 12:17:48 +02:00
• d080f0af8d Updated incoming_request_handlers.js to match database querying Luca Warmenhoven 2024-05-29 12:17:33 +02:00
• e4ee419e2d finished betoog Niels 2024-05-28 21:39:25 +02:00
• 58c80ed60c Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Niels 2024-05-28 20:16:59 +02:00
• f1570aaea9 added part of research Niels 2024-05-28 20:16:56 +02:00
• 1a56a05409 Junk cleanup and new json formatting Sam Hos 2024-05-28 16:17:06 +02:00
• cdd8ac9d49 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Sam Hos 2024-05-28 16:11:09 +02:00
• 3d01749aa2 Attempt to make good Luca Warmenhoven 2024-05-28 16:11:03 +02:00
• 004d216767 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Sam Hos 2024-05-28 15:58:44 +02:00
• 5789f4c0dd Attempt to make good Luca Warmenhoven 2024-05-28 15:58:25 +02:00
• 5a226dd56b Attempt to make good Luca Warmenhoven 2024-05-28 15:56:28 +02:00
• 6961801a67 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Sam Hos 2024-05-28 15:39:28 +02:00
• 3c0e07336d Attempt to make good Luca Warmenhoven 2024-05-28 15:37:26 +02:00
• 48848de44d Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Sam Hos 2024-05-28 15:28:21 +02:00
• c527289c68 Attempt to make good Luca Warmenhoven 2024-05-28 15:28:09 +02:00
• 83b233e275 dead code removal Sam Hos 2024-05-28 15:16:04 +02:00
• 80ef0ac99e Pep crack cocaine Luca Warmenhoven 2024-05-28 15:06:54 +02:00
• 565d19ec00 Pep crack cocaine Luca Warmenhoven 2024-05-28 15:04:17 +02:00
• 62e1320b3c Pep crack cocaine Luca Warmenhoven 2024-05-28 15:00:48 +02:00
• 31135d1aa7 poep Luca Warmenhoven 2024-05-28 14:36:48 +02:00
• 4c9a256d6c Pep crack cocaine Luca Warmenhoven 2024-05-28 14:15:30 +02:00
• bcfc622c90 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Sam Hos 2024-05-28 14:08:19 +02:00
• 9397028c1b Added port config Sam Hos 2024-05-28 14:08:12 +02:00
• d9c05b2975 But crack Luca Warmenhoven 2024-05-28 14:08:12 +02:00
• 8c1e4332aa Commit balls Luca Warmenhoven 2024-05-28 13:50:35 +02:00
• eb6ffcf4c8 Merge remote-tracking branch 'origin/main' Luca Warmenhoven 2024-05-28 13:47:09 +02:00
• 976d5b1ef1 Gitter Committer Crack balls Luca Warmenhoven 2024-05-28 13:46:59 +02:00
• 20906379d3 tekst to string Niels Gras 2024-05-28 13:04:58 +02:00
• 1b955baf6b added help tekst Niels Gras 2024-05-28 13:01:42 +02:00
• df8a7a6395 Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 Sam Hos 2024-05-28 12:59:35 +02:00
• f66f167812 Refactor package import in FitnessCycle.java Sam Hos 2024-05-28 12:59:31 +02:00
• 1a086a9f57 added issues about hardware Sam Hos 2024-05-28 12:59:04 +02:00
• 2be0efc37e Disabled websocket in favour of other protocol Sam Hos 2024-05-28 12:58:01 +02:00
• fcb5c7f61b Made the buttons functional and cleaned up start button in main Niels Gras 2024-05-28 12:44:48 +02:00
• c3cf6e3cf9 styled help activity Niels Gras 2024-05-28 12:33:01 +02:00
• d1e0c5b08e Crack butt Luca Warmenhoven 2024-05-28 12:12:34 +02:00