Commit Graph
73 Commits
Author SHA1 Message Date
shinichi a353d6839e added some flair 2020-09-25 15:50:20 +02:00
shinichi 21203fd3ff login implemented 2020-09-25 15:33:39 +02:00
shinichi 9c3b2c3f9b Auto stash before merge of "client" and "origin/client" 2020-09-25 15:00:43 +02:00
shinichi d0071bd13c bug fix 2020-09-25 13:22:16 +02:00
shinichi 8204f22fe7 better printing on client side 2020-09-25 13:18:19 +02:00
shinichi 22558e3289 print received data on client side 2020-09-25 13:11:14 +02:00
shinichi 360ec4175f OnRead for client updated 2020-09-25 13:04:39 +02:00
shinichi 506a074f36 Merge branch 'OnRead-rewrite' into client 2020-09-25 12:58:20 +02:00
shinichi 96f2e6e973 rewrote OnRead 2020-09-25 12:58:12 +02:00
shinichi 2139fcf2b2 removed clientId 2020-09-25 12:51:54 +02:00
shinichi dded1a5b24 johan's code
senior meeting
2020-09-25 12:43:01 +02:00
shinichi fb57a1779c comments and some small fixes 2020-09-23 15:37:37 +02:00
shinichi 8c6cb443e3 deleted stuff 2020-09-23 15:22:45 +02:00
shinichi 81dcebb5e8 added client id to protocol 2020-09-23 15:11:13 +02:00
shinichi c782301cf2 connection from bike/simulator to client to server 2020-09-23 15:05:09 +02:00
shinichi d5eadbe529 forgot to stage 2020-09-23 14:32:07 +02:00
shinichi d67c8448ad client and server connect 2020-09-23 14:31:37 +02:00
shinichi 5f7f1c8510 connected to bike? 2020-09-23 14:12:33 +02:00
shinichi cdaac839b9 Merge remote-tracking branch 'origin/client' into client 2020-09-23 13:53:14 +02:00
shinichi f899c90ff7 fix login message, implemented IDatareceiver, added Raw and json message 2020-09-23 13:53:00 +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 e315e1cf3f edited clients 2020-09-23 13:14:49 +02:00
shinichi e0e910ac25 added newtonsoft to proftaakRH 2020-09-23 13:06:03 +02:00
shinichi de18ddc0f0 Merge branch 'server' into client 2020-09-23 12:12:42 +02:00
shinichi 674a10a779 Merge branch 'develop' into client 2020-09-23 12:01:16 +02:00
shinichi 797fb16465 client stuff 2020-09-23 12:00:40 +02:00
shinichi a52f1ea7ed started client 2020-09-23 11:12:10 +02:00
shinichi 8f8490fe2a Merge remote-tracking branch 'origin/develop' into develop 2020-09-18 16:54:23 +02:00
shinichi 47cfe4efe6 nope 2020-09-18 16:54:21 +02:00
shinichi d912f2dd31 Merge remote-tracking branch 'origin/develop' into develop 2020-09-18 16:32:17 +02:00
shinichi 6d0439fab3 added follow route 2020-09-18 16:31:19 +02:00
shinichi 4a745ace75 added getUUIDFromResponse 2020-09-18 15:59:46 +02:00
shinichi f1d543dafc Merge remote-tracking branch 'origin/develop' into develop 2020-09-18 15:57:13 +02:00
shinichi c69c3193d4 added moveTo
not working
2020-09-18 15:56:34 +02:00
shinichi 17eb3b1845 added positions for models 2020-09-18 15:39:30 +02:00
shinichi a5a61a8a83 Merge remote-tracking branch 'origin/develop' into develop 2020-09-18 14:47:53 +02:00
shinichi b7f3f3542f various changes 2020-09-18 14:47:33 +02:00
shinichi 037bb8a6cf Merge remote-tracking branch 'origin/develop' into develop 2020-09-18 14:25:04 +02:00
shinichi 0a2a0405bf Merge remote-tracking branch 'origin/develop' into develop 2020-09-18 14:23:46 +02:00
shinichi 6e09b87f60 added method overloading and custom models 2020-09-18 14:23:43 +02:00
shinichi 178bbb030c Merge remote-tracking branch 'origin/develop' into develop 2020-09-18 12:51:17 +02:00
shinichi bb70d80409 added bike 2020-09-18 12:50:53 +02:00
shinichi a8494bc4d2 added first iteration of adding a bike 2020-09-18 12:15:18 +02:00
shinichi 5f18b3e772 working ish 2020-09-16 14:28:43 +02:00
shinichi 631342ba04 Merge remote-tracking branch 'origin/develop' into develop 2020-09-16 14:26:51 +02:00
shinichi cb1ca0b671 fix? 2020-09-16 14:26:39 +02:00
shinichi 119f6384b6 tunnel created? 2020-09-16 14:18:56 +02:00
shinichi 359484baa3 Merge branch 'plz-help-fix' into develop 2020-09-16 13:39:42 +02:00
shinichi 4854dcb759 fix re-added do while 2020-09-16 13:39:28 +02:00
shinichi ae4fd1f093 wip
WHHHHYYYYYYY NOT WORK?!?!?
2020-09-16 13:10:59 +02:00
shinichi 758fef325e added PC struct 2020-09-16 12:11:30 +02:00
shinichi b70da1148e added ReadPrefMessage 2020-09-16 10:23:35 +02:00
shinichi 03dcd4c8b0 added method to get packetLength 2020-09-16 09:59:30 +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
shinichi 6e07f3b33a fixed instant power
who doesn't love bit flipping
2020-09-11 11:50:28 +02:00
shinichi ce2f91854e forgot to add
:P
2020-09-09 21:00:08 +02:00
shinichi 0b659a9dc3 better checksum fix
i was the dumb one :`(
2020-09-09 20:55:38 +02:00
shinichi 75f5ce7d7e checksum fix
dumbest reason ever          (maybe)
2020-09-09 20:47:45 +02:00
shinichi 226bc265ef idk i give up (sending messages to BLE) 2020-09-09 18:29:26 +02:00
shinichi 2854684b86 wip 2020-09-09 17:09:08 +02:00
shinichi bd40a117ec done with data page 0x10
byte 7 isn't checked
2020-09-09 14:57:23 +02:00
shinichi 650f308cf5 wip 2020-09-09 14:49:40 +02:00
shinichi c5863e9026 Merge branch 'BLEReceiver' into develop 2020-09-09 13:45:15 +02:00
shinichi 8d9985ac89 BLEreceiver running bool 2020-09-09 13:44:50 +02:00
shinichi 87abee1207 error handling 2020-09-09 13:43:59 +02:00
shinichi 3e3a0cf4c4 wip
lunch break
2020-09-09 12:27:37 +02:00
shinichi 261048c2df added Main 2020-09-09 11:56:29 +02:00
shinichi 8dce607028 added IDataconverter interface 2020-09-09 11:35:54 +02:00
shinichi 213a098356 basic class layout 2020-09-09 11:30:02 +02:00
shinichi 2200e2f012 edit methode
pretty :)
2020-09-04 12:39:48 +02:00
shinichi e7ec765d2e edit method
debug stuff
2020-09-04 12:36:10 +02:00