Commit Graph

Select branches

Hide Pull Requests

NextFocusOnEnter

connect-vr-client

dataOnTabs

develop

dokter

gethistoricdata

graph

master

newDoctor

sendmessageToAllClients

test

testResistance

unittest-setup

wpf

write

#1

#10

#11

#2

#3

#4

#5

#6

#7

#8

#9

Mono Color

• f31cdeb467 some writelines Sem van der Hoeven 2020-10-07 11:52:14 +02:00
• 05354b5ebe Merge remote-tracking branch 'origin/develop' into develop Logophilist 2020-10-07 11:51:07 +02:00
• f6c2b3c662 Panel fixed Logophilist 2020-10-07 11:51:02 +02:00
• 475159bbb2 fix conflicts Sem van der Hoeven 2020-10-07 11:24:19 +02:00
• c2b4b259a3 comment Sem van der Hoeven 2020-10-07 11:23:09 +02:00
• a2937c0427 Merge branch 'wpf' into develop fabjuuuh 2020-10-07 11:08:05 +02:00
• 02bd68d142 Merge branch 'develop' into wpf fabjuuuh 2020-10-07 11:07:40 +02:00
• 699528bb83 Merge remote-tracking branch 'origin/develop' into develop Logophilist 2020-10-05 20:21:08 +02:00
• e4d192fb06 Commit alt code of VR engine Logophilist 2020-10-05 20:20:57 +02:00
• 5d14d53df5 wip shinichi 2020-10-02 16:29:11 +02:00
• 09db19246e quick fix shinichi 2020-10-02 15:53:50 +02:00
• eb2738168b Merge remote-tracking branch 'origin/develop' into develop shinichi 2020-10-02 15:38:00 +02:00
• d85c5ff935 added function to get BPM graph data shinichi 2020-10-02 15:37:57 +02:00
• d420bdc2a4 merge conflicts 7: conflictnado Sem van der Hoeven 2020-10-02 11:49:48 +02:00
• cb2435bf53 weird fix connect-vr-client Sem van der Hoeven 2020-10-02 11:48:03 +02:00
• ca2e61eb8e Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop Sem van der Hoeven 2020-10-02 11:44:30 +02:00
• 32ef17365e pull Sem van der Hoeven 2020-10-02 11:44:26 +02:00
• fedf8c0e5b added client server login with hashed passwords and usernames Sem van der Hoeven 2020-10-02 11:43:07 +02:00
• 505c4907d0 Merge branch 'set-resistance' into develop shinichi 2020-09-30 19:40:46 +02:00
• a5e679e6fb server now gets response when resistance is set shinichi 2020-09-30 19:40:37 +02:00
• 3e5f6e46c4 progress on validation Sem van der Hoeven 2020-09-30 16:22:57 +02:00
• adea08cfb7 server can set resistance shinichi 2020-09-30 16:22:26 +02:00
• c20a1b292e upgraded doktor stuff wpf wouter 2020-09-30 16:08:35 +02:00
• 599b79ceee correctly implemented IHandler shinichi 2020-09-30 15:26:34 +02:00
• bd8994ad5b added start and stop session shinichi 2020-09-30 15:12:10 +02:00
• 97f9d863aa fix Sem van der Hoeven 2020-09-30 15:10:47 +02:00
• f777b583f5 progress fabjuuuh 2020-09-30 14:37:40 +02:00
• d6b938668f added reconnecting to the vr server when no tunnel id is found Sem van der Hoeven 2020-09-30 14:33:15 +02:00
• 45edbe5936 Merge branch 'binairy-writer' into develop shinichi 2020-09-30 14:25:29 +02:00
• a65c36b8d1 fix bug and more efficient code shinichi 2020-09-30 14:24:38 +02:00
• 82f2d6b71c saving bike and bpm data in separate files shinichi 2020-09-30 14:17:26 +02:00
• 41e77ba16c hi fabjuuuh 2020-09-30 13:12:18 +02:00
• 6f1ab57fe4 saving in binairy format shinichi 2020-09-30 13:00:13 +02:00
• 341723d1d1 added maincommand to engineconnection Sem van der Hoeven 2020-09-30 12:59:04 +02:00
• 0cd3753b76 properly added engineconnection to client Sem van der Hoeven 2020-09-30 12:30:40 +02:00
• 4388b39be5 only connects when username and password are entered Sem van der Hoeven 2020-09-30 12:27:31 +02:00
• 0dc4bb6fad connected engine to client Sem van der Hoeven 2020-09-30 12:23:53 +02:00
• 3ca3c1ad78 added engineconnection to client Sem van der Hoeven 2020-09-30 12:17:57 +02:00
• d06d621b13 added necessary methods and added method sig to cw of engineconnect Sem van der Hoeven 2020-09-30 12:13:59 +02:00
• 7b05fcc898 added engineconnect as singleton Sem van der Hoeven 2020-09-30 12:01:53 +02:00
• cc7f2d154c wpf fabjuuuh 2020-09-30 11:52:38 +02:00
• c5b9a7ec09 made rh engine classes public Sem van der Hoeven 2020-09-30 11:44:00 +02:00
• 3494f678e3 added doctor project Sem van der Hoeven 2020-09-30 10:15:30 +02:00
• 4af7b3bc44 Merge pull request #9 from SemvdH/develop SemvdH 2020-09-25 16:51:28 +02:00
• 9a80dc6260 Merge branch 'client' into develop Sem van der Hoeven 2020-09-25 16:49:53 +02:00
• 4cabce69d5 Merge branch 'dashboard_VR' into develop Sem van der Hoeven 2020-09-25 16:49:19 +02:00
• 38886ca7c3 Bike follows route Logophilist 2020-09-25 16:48:05 +02:00
• 04e29402f7 Merge remote-tracking branch 'origin/client' into client shinichi 2020-09-25 16:38:45 +02:00
• 78bb7f6a6c added possibility for multiple DataReceivers shinichi 2020-09-25 16:38:22 +02:00
• 99887a22ba Merge remote-tracking branch 'origin/client' into client fabjuuuh 2020-09-25 16:38:22 +02:00
• 68a43fb930 Save Raw data fabjuuuh 2020-09-25 16:38:16 +02:00
• dc4d3c852b removed internal Sem van der Hoeven 2020-09-25 15:56:47 +02:00
• 13d99eb107 cleanup files Sem van der Hoeven 2020-09-25 15:56:26 +02:00
• aa5f58e752 cleaned program.cs Sem van der Hoeven 2020-09-25 15:54:41 +02:00
• a353d6839e added some flair shinichi 2020-09-25 15:50:20 +02:00
• b6e4842cf8 updated method to get id based on name Sem van der Hoeven 2020-09-25 15:48:47 +02:00
• 1057c0caab added comments Sem van der Hoeven 2020-09-25 15:40:07 +02:00
• 21203fd3ff login implemented shinichi 2020-09-25 15:33:39 +02:00
• 8160e1c158 probably fixed the serials Sem van der Hoeven 2020-09-25 15:26:57 +02:00
• 9c3b2c3f9b Auto stash before merge of "client" and "origin/client" shinichi 2020-09-25 15:00:43 +02:00
• d3a37d0238 progress on improving responses Sem van der Hoeven 2020-09-25 14:30:33 +02:00
• bb30538f00 added features panel Logophilist 2020-09-25 14:12:16 +02:00
• 23846b14bc creating connection with new reading stuff works Sem van der Hoeven 2020-09-25 14:06:56 +02:00
• 6ef5bbfe12 More SaveData fabjuuuh 2020-09-25 14:06:45 +02:00
• cf9341a93e SaveData fabjuuuh 2020-09-25 13:43:00 +02:00
• 23f146afdd getting response from server through callback Sem van der Hoeven 2020-09-25 13:41:54 +02:00
• fac3987678 added delegate for reading server response Sem van der Hoeven 2020-09-25 13:26:48 +02:00
• d0071bd13c bug fix shinichi 2020-09-25 13:22:16 +02:00
• 97e6a528bb Merge remote-tracking branch 'origin/client' into client fabjuuuh 2020-09-25 13:18:49 +02:00
• 80ee448acf Handledata fabjuuuh 2020-09-25 13:18:41 +02:00
• 8204f22fe7 better printing on client side shinichi 2020-09-25 13:18:19 +02:00
• 22558e3289 print received data on client side shinichi 2020-09-25 13:11:14 +02:00
• 360ec4175f OnRead for client updated shinichi 2020-09-25 13:04:39 +02:00
• 7b9ad2540c shit write fabjuuuh 2020-09-25 13:01:04 +02:00
• 506a074f36 Merge branch 'OnRead-rewrite' into client shinichi 2020-09-25 12:58:20 +02:00
• 96f2e6e973 rewrote OnRead shinichi 2020-09-25 12:58:12 +02:00
• 2139fcf2b2 removed clientId shinichi 2020-09-25 12:51:54 +02:00
• dded1a5b24 johan's code shinichi 2020-09-25 12:43:01 +02:00
• 5a425bf19b Merge remote-tracking branch 'origin/client' into write fabjuuuh 2020-09-23 15:40:25 +02:00
• 8e24274261 Merge remote-tracking branch 'origin/client' into write fabjuuuh 2020-09-23 15:38:16 +02:00
• fb57a1779c comments and some small fixes shinichi 2020-09-23 15:37:37 +02:00
• 8c45d5eccd Test fabjuuuh 2020-09-23 15:37:23 +02:00
• 5db3f28deb Write fabjuuuh 2020-09-23 15:33:50 +02:00
• 64773ffe1c Attempt 1 dashboard VR Logophilist 2020-09-23 15:33:23 +02:00
• 8c6cb443e3 deleted stuff shinichi 2020-09-23 15:22:45 +02:00
• 81dcebb5e8 added client id to protocol shinichi 2020-09-23 15:11:13 +02:00
• c782301cf2 connection from bike/simulator to client to server shinichi 2020-09-23 15:05:09 +02:00
• d5eadbe529 forgot to stage shinichi 2020-09-23 14:32:07 +02:00
• d67c8448ad client and server connect shinichi 2020-09-23 14:31:37 +02:00
• 8e45c9a435 Merge remote-tracking branch 'origin/client' into client fabjuuuh 2020-09-23 14:12:50 +02:00
• cd5f23d3e4 Works i think fabjuuuh 2020-09-23 14:12:35 +02:00
• 5f7f1c8510 connected to bike? shinichi 2020-09-23 14:12:33 +02:00
• cdaac839b9 Merge remote-tracking branch 'origin/client' into client shinichi 2020-09-23 13:53:14 +02:00
• f899c90ff7 fix login message, implemented IDatareceiver, added Raw and json message shinichi 2020-09-23 13:46:38 +02:00
• c62b0224e1 Merge remote-tracking branch 'origin/client' into client fabjuuuh 2020-09-23 13:46:54 +02:00
• be9553cc51 fix login message, implemented IDatareceiver, added Rawa and jsom messag shinichi 2020-09-23 13:46:38 +02:00
• 40cbff209b Auto stash before merge of "client" and "origin/client" fabjuuuh 2020-09-23 13:25:59 +02:00
• fd36e420d1 changed IDataConverter to IDataReceiver shinichi 2020-09-23 13:22:14 +02:00
• e315e1cf3f edited clients shinichi 2020-09-23 13:14:49 +02:00
• e0e910ac25 added newtonsoft to proftaakRH shinichi 2020-09-23 13:06:03 +02:00