100 Commits
Author SHA1 Message Date
Sem van der Hoeven d420bdc2a4 merge conflicts 7: conflictnado 2020-10-02 11:49:48 +02:00
Sem van der Hoeven cb2435bf53 weird fix 2020-10-02 11:48:03 +02:00
Sem van der Hoeven ca2e61eb8e Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop 2020-10-02 11:44:30 +02:00
Sem van der Hoeven 32ef17365e pull 2020-10-02 11:44:26 +02:00
Sem van der Hoeven fedf8c0e5b added client server login with hashed passwords and usernames 2020-10-02 11:43:07 +02:00
Sem van der Hoeven 3e5f6e46c4 progress on validation 2020-09-30 16:22:57 +02:00
Sem van der Hoeven 97f9d863aa fix 2020-09-30 15:10:47 +02:00
Sem van der Hoeven d6b938668f added reconnecting to the vr server when no tunnel id is found 2020-09-30 14:33:15 +02:00
Sem van der Hoeven 341723d1d1 added maincommand to engineconnection 2020-09-30 12:59:04 +02:00
Sem van der Hoeven 0cd3753b76 properly added engineconnection to client 2020-09-30 12:30:40 +02:00
Sem van der Hoeven 4388b39be5 only connects when username and password are entered 2020-09-30 12:27:31 +02:00
Sem van der Hoeven 0dc4bb6fad connected engine to client 2020-09-30 12:23:53 +02:00
Sem van der Hoeven 3ca3c1ad78 added engineconnection to client 2020-09-30 12:17:57 +02:00
Sem van der Hoeven d06d621b13 added necessary methods and added method sig to cw of engineconnect 2020-09-30 12:13:59 +02:00
Sem van der Hoeven 7b05fcc898 added engineconnect as singleton 2020-09-30 12:01:53 +02:00
Sem van der Hoeven c5b9a7ec09 made rh engine classes public 2020-09-30 11:44:00 +02:00
Sem van der Hoeven 3494f678e3 added doctor project 2020-09-30 10:15:30 +02:00
Sem van der Hoeven 9a80dc6260 Merge branch 'client' into develop 2020-09-25 16:49:53 +02:00
Sem van der Hoeven 4cabce69d5 Merge branch 'dashboard_VR' into develop 2020-09-25 16:49:19 +02:00
Sem van der Hoeven dc4d3c852b removed internal 2020-09-25 15:56:47 +02:00
Sem van der Hoeven 13d99eb107 cleanup files 2020-09-25 15:56:26 +02:00
Sem van der Hoeven aa5f58e752 cleaned program.cs 2020-09-25 15:54:41 +02:00
Sem van der Hoeven b6e4842cf8 updated method to get id based on name 2020-09-25 15:48:47 +02:00
Sem van der Hoeven 1057c0caab added comments 2020-09-25 15:40:07 +02:00
Sem van der Hoeven 8160e1c158 probably fixed the serials 2020-09-25 15:26:57 +02:00
Sem van der Hoeven d3a37d0238 progress on improving responses 2020-09-25 14:30:33 +02:00
Sem van der Hoeven 23846b14bc creating connection with new reading stuff works 2020-09-25 14:06:56 +02:00
Sem van der Hoeven 23f146afdd getting response from server through callback 2020-09-25 13:41:54 +02:00
Sem van der Hoeven fac3987678 added delegate for reading server response 2020-09-25 13:26:48 +02:00
Sem van der Hoeven 0bf41b5c07 fix projects not seeing message? 2020-09-23 12:31:55 +02:00
Sem van der Hoeven a8d7e03331 added comment to enum 2020-09-23 12:11:36 +02:00
Sem van der Hoeven 60cf23d980 added identifier enum and made message use it 2020-09-23 11:58:36 +02:00
Sem van der Hoeven 31ef1beb82 added comments to message 2020-09-23 11:57:20 +02:00
Sem van der Hoeven 603703b3f6 rename program to message 2020-09-23 11:52:49 +02:00
Sem van der Hoeven 1a67e97f75 removed unused boolean warning 2020-09-23 11:51:22 +02:00
Sem van der Hoeven 28242ff052 added message class and added references to server and client projects 2020-09-23 11:50:25 +02:00
Sem van der Hoeven 1041aa0391 added empty server and client projects 2020-09-23 10:43:03 +02:00
Sem van der Hoeven b391583107 added other project to solution 2020-09-23 09:57:36 +02:00
Sem van der Hoeven c63b51c22b fix? 2020-09-18 17:15:10 +02:00
Sem van der Hoeven 1ce519f661 wat 2020-09-18 17:14:16 +02:00
Sem van der Hoeven 7df8d98ed9 test 2020-09-18 17:08:19 +02:00
Sem van der Hoeven fce99ff9ec Merge branch 'master' into develop 2020-09-18 17:00:17 +02:00
Sem van der Hoeven a4bfac3de1 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop 2020-09-18 16:58:50 +02:00
Sem van der Hoeven fe977deb46 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop 2020-09-18 16:57:25 +02:00
Sem van der Hoeven 541538d50a test 2020-09-18 16:56:37 +02:00
Sem van der Hoeven 84a80df9ca Revert "removed unecessary folder"
This reverts commit 3f3a388ec1.
2020-09-18 16:52:33 +02:00
Sem van der Hoeven 3f3a388ec1 removed unecessary folder 2020-09-18 16:49:40 +02:00
Sem van der Hoeven 360767b6a5 added RH-Engine to solution 2020-09-18 16:49:02 +02:00
Sem van der Hoeven 688509dc66 conflicts 5: The return 2020-09-18 16:42:02 +02:00
Sem van der Hoeven 02b180c246 clean and comment 2020-09-18 16:41:05 +02:00
Sem van der Hoeven 6b78cf12a2 conflicts 4: the reckoning 2020-09-18 16:30:24 +02:00
Sem van der Hoeven 9f675844ed road showing 2020-09-18 16:29:39 +02:00
Sem van der Hoeven 7842baafb4 conflicts 3: revelations 2020-09-18 16:01:25 +02:00
Sem van der Hoeven 12b4b90bc5 create route method 2020-09-18 16:00:43 +02:00
Sem van der Hoeven 6eb2ac1a82 added route 2020-09-18 15:33:04 +02:00
Sem van der Hoeven f1066a365e comments on program.cs 2020-09-18 14:41:18 +02:00
Sem van der Hoeven 99b4e7f426 conflicts 2: the sequal 2020-09-18 14:26:24 +02:00
Sem van der Hoeven 3d72ed9694 conflicts yay 2020-09-18 14:25:21 +02:00
Sem van der Hoeven 0d107a7170 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop 2020-09-18 14:21:35 +02:00
Sem van der Hoeven 1cda955254 pc stuff 2020-09-18 14:21:33 +02:00
Sem van der Hoeven 8fd3322c63 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop 2020-09-18 12:53:17 +02:00
Sem van der Hoeven c82f1e9537 comments 2020-09-18 12:53:14 +02:00
Sem van der Hoeven e54cca454b added null message 2020-09-18 12:37:02 +02:00
Sem van der Hoeven 0e2ee807e1 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop 2020-09-18 12:18:42 +02:00
Sem van der Hoeven 9ff2eb4e68 added standard name identifiers 2020-09-18 12:18:32 +02:00
Sem van der Hoeven 2b80dbad47 merge conflicts 2020-09-18 11:51:56 +02:00
Sem van der Hoeven 7c7b64094b add scene/get and progress on node/delete 2020-09-18 11:50:47 +02:00
Sem van der Hoeven 189fc18448 oneliner 2020-09-16 16:36:22 +02:00
Sem van der Hoeven 2e19b4af92 fiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiix 2020-09-16 16:35:19 +02:00
Sem van der Hoeven fe05f7e71d clean 2020-09-16 16:28:05 +02:00
Sem van der Hoeven 5f65eb32fd senior gesprek fixes 2020-09-16 16:04:21 +02:00
Sem van der Hoeven c171f15316 vr message temp 2020-09-16 15:34:06 +02:00
Sem van der Hoeven 0264370b38 stuff 2020-09-16 15:30:49 +02:00
Sem van der Hoeven 39e4f655b1 change skybox 2020-09-16 15:21:07 +02:00
Sem van der Hoeven 87a370ee76 Merge remote-tracking branch 'origin/opdrachten' into skybox 2020-09-16 15:05:09 +02:00
Sem van der Hoeven b9dc2b82a6 stuff 2020-09-16 15:05:07 +02:00
Sem van der Hoeven ac45f1b454 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop 2020-09-16 14:43:23 +02:00
Sem van der Hoeven 2adfce27b0 added vr message class 2020-09-16 14:43:19 +02:00
Sem van der Hoeven 60ae9a3716 finished getting all users method 2020-09-16 13:52:52 +02:00
Sem van der Hoeven 3307f57f36 added getting all users from response 2020-09-16 13:48:31 +02:00
Sem van der Hoeven ececffef3f fixed conflicts 2020-09-16 12:14:43 +02:00
Sem van der Hoeven 5699f8678e json parser stuff 2020-09-16 12:14:04 +02:00
Sem van der Hoeven b0dc258455 removed offset for buffer 2020-09-16 11:47:37 +02:00
Sem van der Hoeven d197d01971 oneliner for getting length 2020-09-16 11:44:28 +02:00
Sem van der Hoeven 86a5ddfbc4 thanks johan 2020-09-16 11:43:03 +02:00
Sem van der Hoeven 7edb0ceded fix courtesy of fabian 2020-09-16 10:31:24 +02:00
Sem van der Hoeven 934507dd36 stuff 2020-09-16 10:20:06 +02:00
Sem van der Hoeven 9dd292dafc added stuff for connecting to vr engine 2020-09-16 09:55:13 +02:00
Sem van der Hoeven 34a3e409ab added new project for the vr engine 2020-09-16 09:32:41 +02:00
Sem van der Hoeven 72c369a578 merge simulation into develop 2020-09-11 15:34:21 +02:00
Sem van der Hoeven 40f70a42d4 changed while true 2020-09-11 12:41:29 +02:00
Sem van der Hoeven a471854d71 added null check for sending resistance 2020-09-11 12:37:15 +02:00
Sem van der Hoeven 45096558fb added comments to dataconverter 2020-09-11 11:37:53 +02:00
Sem van der Hoeven 8dac69ebf9 added documentation comments to BLEHandler 2020-09-11 11:27:37 +02:00
Sem van der Hoeven 5c29a9c064 removed some comments 2020-09-11 11:17:00 +02:00
Sem van der Hoeven 11772f33b7 finished displaying of data of data page 25 (0x19) 2020-09-09 16:00:19 +02:00
Sem van der Hoeven 53735b3cad added cadence and accumulated power 2020-09-09 15:17:13 +02:00
Sem van der Hoeven fafc3e38d3 Merge branch 'DataConverter' of https://github.com/SemvdH/Proftaak-RH-B4 into DataConverter 2020-09-09 14:58:14 +02:00
Sem van der Hoeven 3de18d7c23 added read for byte 1 of page 25 2020-09-09 14:58:10 +02:00
Sem van der Hoeven 5cd8322139 removed program.cs to be able to run fietsdemo 2020-09-04 11:45:16 +02:00