sem/Proftaak-RH-B4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
309 Commits 15 Branches 0 Tags
87e199d1b57e1d6ce1c1b8045eb00e91c9418dda
Commit Graph
309 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sem van der Hoeven f5eb59694e added comments 2020-10-07 12:22:10 +02:00
shinichi 71ff5dfc81 Merge branch 'fix-getBPMgraphdata' into develop 2020-10-07 11:55:56 +02:00
shinichi 472c514275 removed debugging 2020-10-07 11:55:49 +02:00
shinichi 7c943f4f73 fix 2020-10-07 11:54:47 +02:00
Sem van der Hoeven f31cdeb467 some writelines 2020-10-07 11:52:14 +02:00
Logophilist 05354b5ebe Merge remote-tracking branch 'origin/develop' into develop 2020-10-07 11:51:07 +02:00
Logophilist f6c2b3c662 Panel fixed 2020-10-07 11:51:02 +02:00
Sem van der Hoeven 475159bbb2 fix conflicts 2020-10-07 11:24:19 +02:00
Sem van der Hoeven c2b4b259a3 comment 2020-10-07 11:23:09 +02:00
fabjuuuh a2937c0427 Merge branch 'wpf' into develop 2020-10-07 11:08:05 +02:00
fabjuuuh 02bd68d142 Merge branch 'develop' into wpf 2020-10-07 11:07:40 +02:00
Logophilist 699528bb83 Merge remote-tracking branch 'origin/develop' into develop 2020-10-05 20:21:08 +02:00
Logophilist e4d192fb06 Commit alt code of VR engine 2020-10-05 20:20:57 +02:00
shinichi 5d14d53df5 wip 2020-10-02 16:29:11 +02:00
shinichi 09db19246e quick fix 2020-10-02 15:53:50 +02:00
shinichi eb2738168b Merge remote-tracking branch 'origin/develop' into develop 2020-10-02 15:38:00 +02:00
shinichi d85c5ff935 added function to get BPM graph data 2020-10-02 15:37:57 +02:00
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
shinichi 505c4907d0 Merge branch 'set-resistance' into develop 2020-09-30 19:40:46 +02:00
shinichi a5e679e6fb server now gets response when resistance is set 2020-09-30 19:40:37 +02:00
Sem van der Hoeven 3e5f6e46c4 progress on validation 2020-09-30 16:22:57 +02:00
shinichi adea08cfb7 server can set resistance 2020-09-30 16:22:26 +02:00
wouter c20a1b292e upgraded doktor stuff 2020-09-30 16:08:35 +02:00
shinichi 599b79ceee correctly implemented IHandler 2020-09-30 15:26:34 +02:00
shinichi bd8994ad5b added start and stop session 2020-09-30 15:12:10 +02:00
Sem van der Hoeven 97f9d863aa fix 2020-09-30 15:10:47 +02:00
fabjuuuh f777b583f5 progress 2020-09-30 14:37:40 +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
shinichi 45edbe5936 Merge branch 'binairy-writer' into develop 2020-09-30 14:25:29 +02:00
shinichi a65c36b8d1 fix bug and more efficient code 2020-09-30 14:24:38 +02:00
shinichi 82f2d6b71c saving bike and bpm data in separate files 2020-09-30 14:17:26 +02:00
fabjuuuh 41e77ba16c hi 2020-09-30 13:12:18 +02:00
shinichi 6f1ab57fe4 saving in binairy format 
took forever
 2020-09-30 13:00:13 +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
fabjuuuh cc7f2d154c wpf 2020-09-30 11:52:38 +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
Logophilist 38886ca7c3 Bike follows route 2020-09-25 16:48:05 +02:00