Commit Graph
81 Commits
Author SHA1 Message Date
fabjuuuh ecb3be2916 Merge branch 'newDoctor' into develop 2020-10-14 13:07:20 +02:00
Sem van der Hoeven ea3afdeda1 added automatic reconnect to vr engine 2020-10-14 11:19:39 +02:00
fabjuuuh df5e276eb3 Vastgelopen 2020-10-12 12:50:38 +02:00
Sem van der Hoeven fafc96ad6a removed client 2020-10-09 12:50:46 +02:00
Sem van der Hoeven b642e17268 readded clientapp 2020-10-09 12:35:56 +02:00
Sem van der Hoeven 8e48fe7902 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop 2020-10-09 12:02:34 +02:00
Sem van der Hoeven 68994fd3fe added BLEHANDLER tag to blehandler cw 2020-10-09 12:02:03 +02:00
Sem van der Hoeven 2aa736b0a8 formatted speed to show km/h too 2020-10-09 12:01:23 +02:00
shinichi 124eee5f12 implemented stop for BLEHandler and BikeSimulator 2020-10-09 11:16:51 +02:00
fabjuuuh a043cdc723 Merge branch 'develop' into dokter 2020-10-09 10:56:48 +02:00
shinichi 7bf5bdb1ce delete 2020-10-07 18:34:04 +02:00
shinichi 46083b3912 copy 2020-10-07 17:56:21 +02:00
shinichi 04b0051e72 Merge branch 'develop' into Client-GUI 2020-10-07 16:32:42 +02:00
fabjuuuh aea1b4fce4 connectie met server 2020-10-07 13:21:30 +02:00
shinichi 6e2b3a80b3 wip 2020-10-07 13:17:40 +02:00
Sem van der Hoeven f5eb59694e added comments 2020-10-07 12:22:10 +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 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
shinichi 599b79ceee correctly implemented IHandler 2020-09-30 15:26:34 +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
shinichi 78bb7f6a6c added possibility for multiple DataReceivers 2020-09-25 16:38:22 +02:00
Logophilist bb30538f00 added features panel 2020-09-25 14:12:16 +02:00
shinichi c782301cf2 connection from bike/simulator to client to server 2020-09-23 15:05:09 +02:00
shinichi d67c8448ad client and server connect 2020-09-23 14:31:37 +02:00
shinichi be9553cc51 fix login message, implemented IDatareceiver, added Rawa and jsom messag 2020-09-23 13:46:38 +02:00
shinichi fd36e420d1 changed IDataConverter to IDataReceiver 2020-09-23 13:22:14 +02:00
shinichi e0e910ac25 added newtonsoft to proftaakRH 2020-09-23 13:06:03 +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
SemvdH 5cd4e61194 Merge pull request #4 from SemvdH/develop
merge Develop into master... again
2020-09-18 16:53:42 +02:00
Sem van der Hoeven 360767b6a5 added RH-Engine to solution 2020-09-18 16:49:02 +02:00
SemvdH b6be86b811 Revert "merge Develop into master" 2020-09-18 16:44:47 +02:00
Sem van der Hoeven 5f65eb32fd senior gesprek fixes 2020-09-16 16:04:21 +02:00
Sem van der Hoeven 72c369a578 merge simulation into develop 2020-09-11 15:34:21 +02:00
Logophilist 1c0958f33c Bike Simulator 0x19 (acc)Power update and cadence fix 2020-09-11 15:31:14 +02:00
Logophilist dee370a4cb Worked on 0x19 simulator 2020-09-11 14:48:44 +02:00
Sem van der Hoeven 40f70a42d4 changed while true 2020-09-11 12:41:29 +02:00
shinichi 4ab46d94db Merge branch 'DataConverter' into develop 2020-09-11 12:39:43 +02:00
shinichi e77372c913 added resistance changing 2020-09-11 12:39:06 +02:00
Sem van der Hoeven a471854d71 added null check for sending resistance 2020-09-11 12:37:15 +02:00
fabjuuuh 7da952628d Added comments to BikeSimulation 2020-09-11 11:55:13 +02:00
shinichi 6e07f3b33a fixed instant power
who doesn't love bit flipping
2020-09-11 11:50:28 +02:00
fabjuuuh 631129a206 Set resistance in simulator 2020-09-11 11:48:39 +02:00
Sem van der Hoeven 45096558fb added comments to dataconverter 2020-09-11 11:37:53 +02:00
fabjuuuh 024490df1e Made Interface 2020-09-11 11:32:28 +02:00