sem/Proftaak-RH-B4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
309 Commits 15 Branches 0 Tags
9761d189ec89771a3b8191bcabba51bba2f42973
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
shinichi 9761d189ec background image 
i give up
 2020-10-09 17:05:11 +02:00
shinichi c8a812508f added folder for future use 2020-10-09 16:29:18 +02:00
shinichi 5fcf0d177b wip 2020-10-09 16:22:28 +02:00
shinichi 278a5adb5e change doctor password field to passwordbox 2020-10-09 16:03:49 +02:00
shinichi 528f515e0b Merge remote-tracking branch 'origin/develop' into develop 2020-10-09 15:37:30 +02:00
shinichi b4088f5d30 edited focusable 2020-10-09 15:37:23 +02:00
shinichi e410e9ec88 login failed popup shows 2020-10-09 15:07:27 +02:00
shinichi 50a2ae9521 added popup not binded yet 2020-10-09 12:18:34 +02:00
shinichi dffeb39337 mainView is now binded 2020-10-09 11:40:52 +02:00
shinichi 2cb3fd5ec3 ble and simulation stop when window closes 2020-10-09 11:33:26 +02:00
shinichi 124eee5f12 implemented stop for BLEHandler and BikeSimulator 2020-10-09 11:16:51 +02:00
shinichi 143f7e4d88 Merge branch 'move-Client-to-ClientApp' into develop 2020-10-07 21:21:19 +02:00
shinichi e09f4f1325 changed names 2020-10-07 21:21:12 +02:00
shinichi a23b268dc9 login working 
uuuuggglyyyyyyyyyyyyyy :(
 2020-10-07 19:45:20 +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 187beaf6c1 Merge branch 'develop' into Client-GUI 2020-10-07 16:42:17 +02:00
shinichi 04b0051e72 Merge branch 'develop' into Client-GUI 2020-10-07 16:32:42 +02:00
shinichi 91bb0d65b7 added status 2020-10-07 16:31:44 +02:00
shinichi d7dfe32cc3 wip 2020-10-07 15:49:57 +02:00
shinichi 6159f3f57b added login logic and text 2020-10-07 15:14:39 +02:00
shinichi 6e2b3a80b3 wip 2020-10-07 13:17:40 +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
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
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
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
shinichi bd8994ad5b added start and stop session 2020-09-30 15:12:10 +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
shinichi 6f1ab57fe4 saving in binairy format 
took forever
 2020-09-30 13:00:13 +02:00
shinichi 04e29402f7 Merge remote-tracking branch 'origin/client' into client 2020-09-25 16:38:45 +02:00
shinichi 78bb7f6a6c added possibility for multiple DataReceivers 2020-09-25 16:38:22 +02:00
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