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 |
|
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 |
|
Sem van der Hoeven
|
8dac69ebf9
|
added documentation comments to BLEHandler
|
2020-09-11 11:27:37 +02:00 |
|
fabjuuuh
|
e5e6ae16fd
|
Page 0x10 working
|
2020-09-11 11:24:04 +02:00 |
|
Sem van der Hoeven
|
5c29a9c064
|
removed some comments
|
2020-09-11 11:17:00 +02:00 |
|
fabjuuuh
|
03a0c6febb
|
Merged
|
2020-09-11 11:09:59 +02:00 |
|
fabjuuuh
|
24ab1a01c1
|
Merge remote-tracking branch 'origin/DataConverter' into simulation
|
2020-09-11 11:03:08 +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 |
|
fabjuuuh
|
a0e1e527a1
|
Almost done with page 0x10
|
2020-09-09 16:59:36 +02:00 |
|
fabjuuuh
|
692f9700cc
|
Merge remote-tracking branch 'origin/DataConverter' into simulation
|
2020-09-09 16:02:11 +02:00 |
|